@goodandready/dsh-cron 0.3.33 → 0.3.35
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +12 -0
- package/README.ru.md +12 -0
- package/README.zh.md +11 -0
- package/lib/client-src/10-locales.js +16 -2
- package/lib/client-src/50-cron-screen-state.js +3 -0
- package/lib/client-src/53-cron-screen-modal-actions.js +11 -1
- package/lib/client-src/60-modal-task-form-head.js +2 -1
- package/lib/client-src/62-modal-task-form-tail.js +29 -1
- package/lib/client.js +58 -2
- package/lib/cron-tool.js +9 -0
- package/lib/digest.js +179 -0
- package/lib/locales.json +8 -1
- package/lib/routes/routes.js +35 -0
- package/lib/runtimes/runtimes.js +1 -1
- package/lib/scheduler/scheduler-execution.js +42 -1
- package/lib/scheduler/scheduler-preflight.js +15 -0
- package/lib/scheduler/scheduler.js +23 -0
- package/lib/store/task-schema.js +2 -0
- package/lib/store/task-transfer.js +2 -0
- package/lib/task-create.js +3 -0
- package/lib/task-patch.js +7 -0
- package/lib/work-windows.js +167 -0
- package/package.json +1 -1
package/README.md
CHANGED
|
@@ -699,3 +699,15 @@ Wake agent tasks reactively based on local events:
|
|
|
699
699
|
- **Marker / Flag File**: trigger when a flag file (e.g., `build.ready`) appears, with automatic consumption.
|
|
700
700
|
- **Process Exit**: monitor a PID or `.pid` file and trigger post-processing as soon as the background job completes.
|
|
701
701
|
Context is automatically injected into prompts (`{{trigger.type}}`, `{{trigger.fileCount}}`) and process environment variables (`DSH_CRON_WAKE_TYPE`, `DSH_CRON_WAKE_PATH`).
|
|
702
|
+
|
|
703
|
+
### Time-Boxing & Work Windows (v0.3.34)
|
|
704
|
+
|
|
705
|
+
- **Time-Boxing (`timeBoxMinutes`)**: Set a maximum wall-clock execution limit per run. When exceeded, the agent turn aborts gracefully.
|
|
706
|
+
- **Work Windows (`workWindow`)**: Restrict resource-intensive tasks to run only within specific hours (e.g., `22:00-07:00`) or days.
|
|
707
|
+
- **Outside Policy**: Choose to either `skip` runs outside the window or `defer` execution until the window opens.
|
|
708
|
+
|
|
709
|
+
### Daily & Morning Digest (v0.3.35)
|
|
710
|
+
|
|
711
|
+
- **Dedicated Digest Tasks (`type: "digest"`)**: Schedule consolidated summary reports (e.g., daily at 09:00 AM) that aggregate runs, errors, token usage, and cost across all tasks.
|
|
712
|
+
- **REST API**: Inspect digests on-demand via `GET /dsh-cron/digest` or trigger delivery via `POST /dsh-cron/digest/send`.
|
|
713
|
+
- **Channel Routing**: Automatically delivers formatted summaries to Telegram, Feishu, or webhook channels.
|
package/README.ru.md
CHANGED
|
@@ -653,3 +653,15 @@ MIT © [GooDAnDReaDY](https://github.com/GooDAnDReaDY)
|
|
|
653
653
|
- **Файл-флаг / маркер (`marker_file`)**: запуск при появлении файла готовности (например, `ready.flag`) с автоматическим удалением (`consumeMarker`).
|
|
654
654
|
- **Завершение процесса (`process_exit`)**: отслеживание PID или файла `.pid` и запуск постобработки сразу после завершения фонового процесса.
|
|
655
655
|
Контекст передается в переменные промпта (`{{trigger.type}}`, `{{trigger.fileCount}}`) и окружения (`DSH_CRON_WAKE_TYPE`).
|
|
656
|
+
|
|
657
|
+
### Ограничение времени и окна допустимой работы (v0.3.34)
|
|
658
|
+
|
|
659
|
+
- **Time-Boxing (`timeBoxMinutes`)**: Лимит общего времени выполнения задачи в минутах с мягким прерыванием по таймауту.
|
|
660
|
+
- **Окна работы (`workWindow`)**: Запуск тяжелых задач только в разрешенные часы (например, `22:00-07:00`) или дни недели.
|
|
661
|
+
- **Политика вне окна (`outsidePolicy`)**: `skip` (пропуск с записью статуса) или `defer` (откладывание до открытия окна).
|
|
662
|
+
|
|
663
|
+
### Ежедневный дайджест и сводные отчеты (v0.3.35)
|
|
664
|
+
|
|
665
|
+
- **Тип задачи `type: "digest"`**: Настройка периодических отчетов (например, каждое утро в 09:00), агрегирующих количество запусков, сбои, токены и затраты в USD.
|
|
666
|
+
- **REST API**: Эндпоинты `GET /dsh-cron/digest` для просмотра статистики и `POST /dsh-cron/digest/send` для отправки в каналы.
|
|
667
|
+
- **Интеграция с каналами**: Доставка форматированного отчета в Telegram, Feishu или вебхуки.
|
package/README.zh.md
CHANGED
|
@@ -647,3 +647,14 @@ MIT © [GooDAnDReaDY](https://github.com/GooDAnDReaDY)
|
|
|
647
647
|
- **标记/Flag文件到达 (`marker_file`)**: 标志文件出现时触发并自动删除标记文件。
|
|
648
648
|
- **进程退出监听 (`process_exit`)**: 监听 PID 或 `.pid` 文件,后台任务退出后立即唤醒任务进行后续处理。
|
|
649
649
|
上下文自动注入到提示词变量 (`{{trigger.type}}`, `{{trigger.fileCount}}`) 及环境变量中。
|
|
650
|
+
|
|
651
|
+
### 时间预算与运行窗口 (v0.3.34)
|
|
652
|
+
|
|
653
|
+
- **Time-Boxing (`timeBoxMinutes`)**: 设置单次执行的最长分钟上限,超时时通过 AbortSignal 优雅中止。
|
|
654
|
+
- **时间窗口 (`workWindow`)**: 限制高负载任务仅在指定时段(如 `22:00-07:00`)或特定星期内运行。
|
|
655
|
+
- **窗口外策略 (`outsidePolicy`)**: 支持 `skip`(跳过本次运行)或 `defer`(推迟到窗口开启时自动执行)。
|
|
656
|
+
|
|
657
|
+
### 每日/定期简报与成本汇总 (v0.3.35)
|
|
658
|
+
|
|
659
|
+
- **简报专用任务类型 (`type: "digest"`)**: 可定时调度汇总报告(如每日早晨 09:00),聚合所有任务的运行状态、失败诊断、Token 消耗与估算成本。
|
|
660
|
+
- **REST API**: 支持 `GET /dsh-cron/digest` 查询统计报告,以及 `POST /dsh-cron/digest/send` 主动推送到各通知渠道。
|
|
@@ -68,6 +68,7 @@
|
|
|
68
68
|
'form.typePython': 'Python', 'form.typeHttp': 'HTTP request / webhook',
|
|
69
69
|
'form.typeSsh': 'Remote SSH', 'form.typeDocker': 'Docker container',
|
|
70
70
|
'form.typeSkill': 'DSH Skill', 'form.typeWorkflow': 'DSH Workflow',
|
|
71
|
+
'form.typeDigest': 'Daily / Periodic Digest',
|
|
71
72
|
'form.envLabel': 'Environment variables (KEY=VALUE per line)',
|
|
72
73
|
'form.envPlaceholder': 'NODE_ENV=production\nTZ=Europe/Berlin',
|
|
73
74
|
'form.envHint': 'Applied to non-LLM runtimes only. Do not store secrets here.',
|
|
@@ -215,7 +216,13 @@
|
|
|
215
216
|
'form.gracePeriodLabel': 'Heartbeat grace period (seconds)',
|
|
216
217
|
'form.priorityLabel': 'Queue priority (1-10, higher runs first)',
|
|
217
218
|
'form.concurrencyGroupLabel': 'Concurrency group',
|
|
218
|
-
|
|
219
|
+
'form.workWindowHoursLabel': 'Allowed work hours (e.g. 22:00-07:00)',
|
|
220
|
+
'form.workWindowHoursPlaceholder': 'e.g. 22:00-07:00 or 09:00-18:00',
|
|
221
|
+
'form.workWindowPolicyLabel': 'Outside window policy',
|
|
222
|
+
'form.workWindowPolicySkip': 'Skip execution (record skipped)',
|
|
223
|
+
'form.workWindowPolicyDefer': 'Defer until window opens',
|
|
224
|
+
'form.timeBoxMinutesLabel': 'Timebox deadline (minutes, 0 = unlimited)',
|
|
225
|
+
'form.wakeTriggerTypeLabel': 'Event wake trigger',
|
|
219
226
|
'form.wakeTriggerTypeNone': 'None (Schedule / Cron only)',
|
|
220
227
|
'form.wakeTriggerTypeFileCount': 'File count threshold (batch run)',
|
|
221
228
|
'form.wakeTriggerTypeMarkerFile': 'Marker file receipt (flag file)',
|
|
@@ -339,7 +346,8 @@
|
|
|
339
346
|
'form.typeNode': 'Node.js', 'form.typePython': 'Python',
|
|
340
347
|
'form.typeHttp': 'HTTP 请求 / Webhook', 'form.typeSsh': '远程 SSH',
|
|
341
348
|
'form.typeDocker': 'Docker 容器', 'form.typeSkill': 'DSH 技能',
|
|
342
|
-
'form.typeWorkflow': 'DSH 工作流',
|
|
349
|
+
'form.typeWorkflow': 'DSH 工作流',
|
|
350
|
+
'form.typeDigest': '每日/定期简报 (Daily Digest)', 'form.envLabel': '环境变量 (KEY=VALUE, 每行一个)',
|
|
343
351
|
'form.envPlaceholder': 'NODE_ENV=production\nTZ=Europe/Berlin', 'form.envHint': '仅对非 LLM 运行时生效。不要在这里存放密钥。',
|
|
344
352
|
'form.cwdLabel': '工作目录 (绝对路径)', 'form.workspaceLabel': '工作区 ID 或路径(可选)',
|
|
345
353
|
'form.worktreeLabel': '在独立的临时 Git Worktree 中执行', 'form.keepWorktreeLabel': '执行结束后保留 Git Worktree (不自动清理)',
|
|
@@ -435,6 +443,12 @@
|
|
|
435
443
|
'form.preflightTargetLabel': '预检目标参数', 'form.preflightTargetPlaceholder': 'https://example.com/healthz 或 ls /data 或 /:10%',
|
|
436
444
|
'form.heartbeatIntervalLabel': '心跳打卡时限 (秒, 0 = 禁用)', 'form.gracePeriodLabel': '心跳宽限期 (秒)',
|
|
437
445
|
'form.priorityLabel': '队列优先级 (1-10,数值越大越先执行)', 'form.concurrencyGroupLabel': '并发分组名称',
|
|
446
|
+
'form.workWindowHoursLabel': '运行时间窗口 (workWindow, 如 22:00-07:00)',
|
|
447
|
+
'form.workWindowHoursPlaceholder': '例如: 22:00-07:00 或 09:00-18:00',
|
|
448
|
+
'form.workWindowPolicyLabel': '窗口外执行策略',
|
|
449
|
+
'form.workWindowPolicySkip': '跳过本次执行 (record skipped)',
|
|
450
|
+
'form.workWindowPolicyDefer': '延迟至窗口开启时执行 (defer)',
|
|
451
|
+
'form.timeBoxMinutesLabel': 'Timebox 运行上限 (分钟, 0 = 不限制)',
|
|
438
452
|
'form.wakeTriggerTypeLabel': '事件唤醒触发器 (Wake Triggers)',
|
|
439
453
|
'form.wakeTriggerTypeNone': '无 (仅定时/间隔)',
|
|
440
454
|
'form.wakeTriggerTypeFileCount': '文件数量阈值 (批量触发)',
|
|
@@ -104,6 +104,9 @@
|
|
|
104
104
|
const [formWakeTriggerPath, setFormWakeTriggerPath] = React.useState('');
|
|
105
105
|
const [formWakeTriggerMinCount, setFormWakeTriggerMinCount] = React.useState(1);
|
|
106
106
|
const [formWakeTriggerConsume, setFormWakeTriggerConsume] = React.useState(true);
|
|
107
|
+
const [formWorkWindowHours, setFormWorkWindowHours] = React.useState('');
|
|
108
|
+
const [formWorkWindowPolicy, setFormWorkWindowPolicy] = React.useState('skip');
|
|
109
|
+
const [formTimeBoxMinutes, setFormTimeBoxMinutes] = React.useState(0);
|
|
107
110
|
const [formWriteScopes, setFormWriteScopes] = React.useState('');
|
|
108
111
|
const [formInputHashPaths, setFormInputHashPaths] = React.useState('');
|
|
109
112
|
const [formSkipIfUnchanged, setFormSkipIfUnchanged] = React.useState(false);
|
|
@@ -333,6 +333,10 @@
|
|
|
333
333
|
setFormPreflightTarget(task.preflightTarget || '');
|
|
334
334
|
setFormPriority(task.priority !== undefined ? task.priority : 5);
|
|
335
335
|
setFormConcurrencyGroup(task.concurrencyGroup || 'default');
|
|
336
|
+
const _ww = task.workWindow || {};
|
|
337
|
+
setFormWorkWindowHours(_ww.hours || '');
|
|
338
|
+
setFormWorkWindowPolicy(_ww.outsidePolicy || 'skip');
|
|
339
|
+
setFormTimeBoxMinutes(Number(task.timeBoxMinutes) || 0);
|
|
336
340
|
const _wt = task.wakeTrigger || {};
|
|
337
341
|
setFormWakeTriggerType(_wt.enabled && _wt.type ? _wt.type : 'none');
|
|
338
342
|
setFormWakeTriggerPath(_wt.markerPath || _wt.path || _wt.pidFile || '');
|
|
@@ -426,7 +430,13 @@
|
|
|
426
430
|
preflightTarget: formPreflightTarget.trim() || undefined,
|
|
427
431
|
priority: Number(formPriority) || 5,
|
|
428
432
|
concurrencyGroup: formConcurrencyGroup.trim() || 'default',
|
|
429
|
-
|
|
433
|
+
workWindow: formWorkWindowHours.trim() ? {
|
|
434
|
+
enabled: true,
|
|
435
|
+
hours: formWorkWindowHours.trim(),
|
|
436
|
+
outsidePolicy: formWorkWindowPolicy,
|
|
437
|
+
} : null,
|
|
438
|
+
timeBoxMinutes: Number(formTimeBoxMinutes) > 0 ? Number(formTimeBoxMinutes) : undefined,
|
|
439
|
+
wakeTrigger: formWakeTriggerType && formWakeTriggerType !== 'none' ? {
|
|
430
440
|
enabled: true,
|
|
431
441
|
type: formWakeTriggerType,
|
|
432
442
|
path: formWakeTriggerType === 'file_count' ? formWakeTriggerPath.trim() : undefined,
|
|
@@ -313,7 +313,8 @@
|
|
|
313
313
|
React.createElement('option', { value: 'ssh' }, T_KEY(t, 'form.typeSsh')),
|
|
314
314
|
React.createElement('option', { value: 'docker' }, T_KEY(t, 'form.typeDocker')),
|
|
315
315
|
React.createElement('option', { value: 'skill' }, T_KEY(t, 'form.typeSkill')),
|
|
316
|
-
React.createElement('option', { value: 'workflow' }, T_KEY(t, 'form.typeWorkflow'))
|
|
316
|
+
React.createElement('option', { value: 'workflow' }, T_KEY(t, 'form.typeWorkflow')),
|
|
317
|
+
React.createElement('option', { value: 'digest' }, T_KEY(t, 'form.typeDigest'))
|
|
317
318
|
)
|
|
318
319
|
),
|
|
319
320
|
React.createElement('div', { className: 'dsh-cron-form-group' },
|
|
@@ -294,7 +294,35 @@
|
|
|
294
294
|
})
|
|
295
295
|
)
|
|
296
296
|
),
|
|
297
|
-
|
|
297
|
+
React.createElement('div', { className: 'dsh-cron-form-group' },
|
|
298
|
+
React.createElement('label', null, T_KEY(t, 'form.workWindowHoursLabel')),
|
|
299
|
+
React.createElement('input', {
|
|
300
|
+
type: 'text',
|
|
301
|
+
value: formWorkWindowHours,
|
|
302
|
+
placeholder: T_KEY(t, 'form.workWindowHoursPlaceholder'),
|
|
303
|
+
onChange: (e) => setFormWorkWindowHours(e.target.value)
|
|
304
|
+
})
|
|
305
|
+
),
|
|
306
|
+
formWorkWindowHours.trim() && React.createElement('div', { className: 'dsh-cron-form-group' },
|
|
307
|
+
React.createElement('label', null, T_KEY(t, 'form.workWindowPolicyLabel')),
|
|
308
|
+
React.createElement('select', {
|
|
309
|
+
value: formWorkWindowPolicy,
|
|
310
|
+
onChange: (e) => setFormWorkWindowPolicy(e.target.value)
|
|
311
|
+
},
|
|
312
|
+
React.createElement('option', { value: 'skip' }, T_KEY(t, 'form.workWindowPolicySkip')),
|
|
313
|
+
React.createElement('option', { value: 'defer' }, T_KEY(t, 'form.workWindowPolicyDefer'))
|
|
314
|
+
)
|
|
315
|
+
),
|
|
316
|
+
React.createElement('div', { className: 'dsh-cron-form-group' },
|
|
317
|
+
React.createElement('label', null, T_KEY(t, 'form.timeBoxMinutesLabel')),
|
|
318
|
+
React.createElement('input', {
|
|
319
|
+
type: 'number',
|
|
320
|
+
min: 0,
|
|
321
|
+
value: formTimeBoxMinutes,
|
|
322
|
+
onChange: (e) => setFormTimeBoxMinutes(parseInt(e.target.value, 10) || 0)
|
|
323
|
+
})
|
|
324
|
+
),
|
|
325
|
+
React.createElement('div', { className: 'dsh-cron-form-group' },
|
|
298
326
|
React.createElement('label', null, T_KEY(t, 'form.wakeTriggerTypeLabel')),
|
|
299
327
|
React.createElement('select', {
|
|
300
328
|
value: formWakeTriggerType,
|
package/lib/client.js
CHANGED
|
@@ -114,6 +114,7 @@ en: {
|
|
|
114
114
|
'form.typePython': 'Python', 'form.typeHttp': 'HTTP request / webhook',
|
|
115
115
|
'form.typeSsh': 'Remote SSH', 'form.typeDocker': 'Docker container',
|
|
116
116
|
'form.typeSkill': 'DSH Skill', 'form.typeWorkflow': 'DSH Workflow',
|
|
117
|
+
'form.typeDigest': 'Daily / Periodic Digest',
|
|
117
118
|
'form.envLabel': 'Environment variables (KEY=VALUE per line)',
|
|
118
119
|
'form.envPlaceholder': 'NODE_ENV=production\nTZ=Europe/Berlin',
|
|
119
120
|
'form.envHint': 'Applied to non-LLM runtimes only. Do not store secrets here.',
|
|
@@ -261,6 +262,12 @@ en: {
|
|
|
261
262
|
'form.gracePeriodLabel': 'Heartbeat grace period (seconds)',
|
|
262
263
|
'form.priorityLabel': 'Queue priority (1-10, higher runs first)',
|
|
263
264
|
'form.concurrencyGroupLabel': 'Concurrency group',
|
|
265
|
+
'form.workWindowHoursLabel': 'Allowed work hours (e.g. 22:00-07:00)',
|
|
266
|
+
'form.workWindowHoursPlaceholder': 'e.g. 22:00-07:00 or 09:00-18:00',
|
|
267
|
+
'form.workWindowPolicyLabel': 'Outside window policy',
|
|
268
|
+
'form.workWindowPolicySkip': 'Skip execution (record skipped)',
|
|
269
|
+
'form.workWindowPolicyDefer': 'Defer until window opens',
|
|
270
|
+
'form.timeBoxMinutesLabel': 'Timebox deadline (minutes, 0 = unlimited)',
|
|
264
271
|
'form.wakeTriggerTypeLabel': 'Event wake trigger',
|
|
265
272
|
'form.wakeTriggerTypeNone': 'None (Schedule / Cron only)',
|
|
266
273
|
'form.wakeTriggerTypeFileCount': 'File count threshold (batch run)',
|
|
@@ -384,7 +391,8 @@ zh: {
|
|
|
384
391
|
'form.typeNode': 'Node.js', 'form.typePython': 'Python',
|
|
385
392
|
'form.typeHttp': 'HTTP 请求 / Webhook', 'form.typeSsh': '远程 SSH',
|
|
386
393
|
'form.typeDocker': 'Docker 容器', 'form.typeSkill': 'DSH 技能',
|
|
387
|
-
'form.typeWorkflow': 'DSH 工作流',
|
|
394
|
+
'form.typeWorkflow': 'DSH 工作流',
|
|
395
|
+
'form.typeDigest': '每日/定期简报 (Daily Digest)', 'form.envLabel': '环境变量 (KEY=VALUE, 每行一个)',
|
|
388
396
|
'form.envPlaceholder': 'NODE_ENV=production\nTZ=Europe/Berlin', 'form.envHint': '仅对非 LLM 运行时生效。不要在这里存放密钥。',
|
|
389
397
|
'form.cwdLabel': '工作目录 (绝对路径)', 'form.workspaceLabel': '工作区 ID 或路径(可选)',
|
|
390
398
|
'form.worktreeLabel': '在独立的临时 Git Worktree 中执行', 'form.keepWorktreeLabel': '执行结束后保留 Git Worktree (不自动清理)',
|
|
@@ -480,6 +488,12 @@ zh: {
|
|
|
480
488
|
'form.preflightTargetLabel': '预检目标参数', 'form.preflightTargetPlaceholder': 'https://example.com/healthz 或 ls /data 或 /:10%',
|
|
481
489
|
'form.heartbeatIntervalLabel': '心跳打卡时限 (秒, 0 = 禁用)', 'form.gracePeriodLabel': '心跳宽限期 (秒)',
|
|
482
490
|
'form.priorityLabel': '队列优先级 (1-10,数值越大越先执行)', 'form.concurrencyGroupLabel': '并发分组名称',
|
|
491
|
+
'form.workWindowHoursLabel': '运行时间窗口 (workWindow, 如 22:00-07:00)',
|
|
492
|
+
'form.workWindowHoursPlaceholder': '例如: 22:00-07:00 或 09:00-18:00',
|
|
493
|
+
'form.workWindowPolicyLabel': '窗口外执行策略',
|
|
494
|
+
'form.workWindowPolicySkip': '跳过本次执行 (record skipped)',
|
|
495
|
+
'form.workWindowPolicyDefer': '延迟至窗口开启时执行 (defer)',
|
|
496
|
+
'form.timeBoxMinutesLabel': 'Timebox 运行上限 (分钟, 0 = 不限制)',
|
|
483
497
|
'form.wakeTriggerTypeLabel': '事件唤醒触发器 (Wake Triggers)',
|
|
484
498
|
'form.wakeTriggerTypeNone': '无 (仅定时/间隔)',
|
|
485
499
|
'form.wakeTriggerTypeFileCount': '文件数量阈值 (批量触发)',
|
|
@@ -1660,6 +1674,9 @@ const [formWakeTriggerType, setFormWakeTriggerType] = React.useState('none');
|
|
|
1660
1674
|
const [formWakeTriggerPath, setFormWakeTriggerPath] = React.useState('');
|
|
1661
1675
|
const [formWakeTriggerMinCount, setFormWakeTriggerMinCount] = React.useState(1);
|
|
1662
1676
|
const [formWakeTriggerConsume, setFormWakeTriggerConsume] = React.useState(true);
|
|
1677
|
+
const [formWorkWindowHours, setFormWorkWindowHours] = React.useState('');
|
|
1678
|
+
const [formWorkWindowPolicy, setFormWorkWindowPolicy] = React.useState('skip');
|
|
1679
|
+
const [formTimeBoxMinutes, setFormTimeBoxMinutes] = React.useState(0);
|
|
1663
1680
|
const [formWriteScopes, setFormWriteScopes] = React.useState('');
|
|
1664
1681
|
const [formInputHashPaths, setFormInputHashPaths] = React.useState('');
|
|
1665
1682
|
const [formSkipIfUnchanged, setFormSkipIfUnchanged] = React.useState(false);
|
|
@@ -2585,6 +2602,10 @@ setFormPreflightType(task.preflightType || 'none');
|
|
|
2585
2602
|
setFormPreflightTarget(task.preflightTarget || '');
|
|
2586
2603
|
setFormPriority(task.priority !== undefined ? task.priority : 5);
|
|
2587
2604
|
setFormConcurrencyGroup(task.concurrencyGroup || 'default');
|
|
2605
|
+
const _ww = task.workWindow || {};
|
|
2606
|
+
setFormWorkWindowHours(_ww.hours || '');
|
|
2607
|
+
setFormWorkWindowPolicy(_ww.outsidePolicy || 'skip');
|
|
2608
|
+
setFormTimeBoxMinutes(Number(task.timeBoxMinutes) || 0);
|
|
2588
2609
|
const _wt = task.wakeTrigger || {};
|
|
2589
2610
|
setFormWakeTriggerType(_wt.enabled && _wt.type ? _wt.type : 'none');
|
|
2590
2611
|
setFormWakeTriggerPath(_wt.markerPath || _wt.path || _wt.pidFile || '');
|
|
@@ -2676,6 +2697,12 @@ preflightType: formPreflightType || 'none',
|
|
|
2676
2697
|
preflightTarget: formPreflightTarget.trim() || undefined,
|
|
2677
2698
|
priority: Number(formPriority) || 5,
|
|
2678
2699
|
concurrencyGroup: formConcurrencyGroup.trim() || 'default',
|
|
2700
|
+
workWindow: formWorkWindowHours.trim() ? {
|
|
2701
|
+
enabled: true,
|
|
2702
|
+
hours: formWorkWindowHours.trim(),
|
|
2703
|
+
outsidePolicy: formWorkWindowPolicy,
|
|
2704
|
+
} : null,
|
|
2705
|
+
timeBoxMinutes: Number(formTimeBoxMinutes) > 0 ? Number(formTimeBoxMinutes) : undefined,
|
|
2679
2706
|
wakeTrigger: formWakeTriggerType && formWakeTriggerType !== 'none' ? {
|
|
2680
2707
|
enabled: true,
|
|
2681
2708
|
type: formWakeTriggerType,
|
|
@@ -3635,7 +3662,8 @@ _h('option', { value: 'http' }, T_KEY(t, 'form.typeHttp')),
|
|
|
3635
3662
|
_h('option', { value: 'ssh' }, T_KEY(t, 'form.typeSsh')),
|
|
3636
3663
|
_h('option', { value: 'docker' }, T_KEY(t, 'form.typeDocker')),
|
|
3637
3664
|
_h('option', { value: 'skill' }, T_KEY(t, 'form.typeSkill')),
|
|
3638
|
-
_h('option', { value: 'workflow' }, T_KEY(t, 'form.typeWorkflow'))
|
|
3665
|
+
_h('option', { value: 'workflow' }, T_KEY(t, 'form.typeWorkflow')),
|
|
3666
|
+
_h('option', { value: 'digest' }, T_KEY(t, 'form.typeDigest'))
|
|
3639
3667
|
)
|
|
3640
3668
|
),
|
|
3641
3669
|
_h('div', { className: 'dsh-cron-form-group' },
|
|
@@ -4191,6 +4219,34 @@ onChange: (e) => setFormConcurrencyGroup(e.target.value)
|
|
|
4191
4219
|
)
|
|
4192
4220
|
),
|
|
4193
4221
|
_h('div', { className: 'dsh-cron-form-group' },
|
|
4222
|
+
_h('label', null, T_KEY(t, 'form.workWindowHoursLabel')),
|
|
4223
|
+
_h('input', {
|
|
4224
|
+
type: 'text',
|
|
4225
|
+
value: formWorkWindowHours,
|
|
4226
|
+
placeholder: T_KEY(t, 'form.workWindowHoursPlaceholder'),
|
|
4227
|
+
onChange: (e) => setFormWorkWindowHours(e.target.value)
|
|
4228
|
+
})
|
|
4229
|
+
),
|
|
4230
|
+
formWorkWindowHours.trim() && _h('div', { className: 'dsh-cron-form-group' },
|
|
4231
|
+
_h('label', null, T_KEY(t, 'form.workWindowPolicyLabel')),
|
|
4232
|
+
_h('select', {
|
|
4233
|
+
value: formWorkWindowPolicy,
|
|
4234
|
+
onChange: (e) => setFormWorkWindowPolicy(e.target.value)
|
|
4235
|
+
},
|
|
4236
|
+
_h('option', { value: 'skip' }, T_KEY(t, 'form.workWindowPolicySkip')),
|
|
4237
|
+
_h('option', { value: 'defer' }, T_KEY(t, 'form.workWindowPolicyDefer'))
|
|
4238
|
+
)
|
|
4239
|
+
),
|
|
4240
|
+
_h('div', { className: 'dsh-cron-form-group' },
|
|
4241
|
+
_h('label', null, T_KEY(t, 'form.timeBoxMinutesLabel')),
|
|
4242
|
+
_h('input', {
|
|
4243
|
+
type: 'number',
|
|
4244
|
+
min: 0,
|
|
4245
|
+
value: formTimeBoxMinutes,
|
|
4246
|
+
onChange: (e) => setFormTimeBoxMinutes(parseInt(e.target.value, 10) || 0)
|
|
4247
|
+
})
|
|
4248
|
+
),
|
|
4249
|
+
_h('div', { className: 'dsh-cron-form-group' },
|
|
4194
4250
|
_h('label', null, T_KEY(t, 'form.wakeTriggerTypeLabel')),
|
|
4195
4251
|
_h('select', {
|
|
4196
4252
|
value: formWakeTriggerType,
|
package/lib/cron-tool.js
CHANGED
|
@@ -326,6 +326,15 @@ export const cronToolParameters = {
|
|
|
326
326
|
type: 'string',
|
|
327
327
|
description: 'Named concurrency group to serialize related tasks',
|
|
328
328
|
},
|
|
329
|
+
workWindow: {
|
|
330
|
+
type: 'object',
|
|
331
|
+
additionalProperties: true,
|
|
332
|
+
description: 'Restricted hours or off-peak work window for execution',
|
|
333
|
+
},
|
|
334
|
+
timeBoxMinutes: {
|
|
335
|
+
type: 'number',
|
|
336
|
+
description: 'Maximum wall-clock execution time in minutes before graceful abort',
|
|
337
|
+
},
|
|
329
338
|
wakeTrigger: {
|
|
330
339
|
type: 'object',
|
|
331
340
|
additionalProperties: true,
|
package/lib/digest.js
ADDED
|
@@ -0,0 +1,179 @@
|
|
|
1
|
+
import { logger } from './logger.js';
|
|
2
|
+
import { sendTelegramMessage } from './telegram.js';
|
|
3
|
+
import { bestEffort } from './best-effort.js';
|
|
4
|
+
|
|
5
|
+
/**
|
|
6
|
+
* Aggregates execution metrics over a rolling time window (#414).
|
|
7
|
+
*/
|
|
8
|
+
export function collectDigestMetrics(store, options = {}) {
|
|
9
|
+
const windowMs = Number(options.windowMs) > 0 ? Number(options.windowMs) : 86400000;
|
|
10
|
+
const since = Date.now() - windowMs;
|
|
11
|
+
|
|
12
|
+
const tasksMap = new Map();
|
|
13
|
+
if (store && store.tasks) {
|
|
14
|
+
const list = Array.isArray(store.tasks)
|
|
15
|
+
? store.tasks
|
|
16
|
+
: (typeof store.tasks.values === 'function' ? Array.from(store.tasks.values()) : Object.values(store.tasks));
|
|
17
|
+
for (const t of list) {
|
|
18
|
+
if (t && t.id) tasksMap.set(t.id, t);
|
|
19
|
+
}
|
|
20
|
+
}
|
|
21
|
+
|
|
22
|
+
let totalRuns = 0;
|
|
23
|
+
let successRuns = 0;
|
|
24
|
+
let failedRuns = 0;
|
|
25
|
+
let skippedRuns = 0;
|
|
26
|
+
let inputTokens = 0;
|
|
27
|
+
let outputTokens = 0;
|
|
28
|
+
let cacheReadTokens = 0;
|
|
29
|
+
let totalCostUsd = 0;
|
|
30
|
+
|
|
31
|
+
const failures = [];
|
|
32
|
+
const perTask = new Map();
|
|
33
|
+
|
|
34
|
+
let allRunArrays = [];
|
|
35
|
+
if (store && store.history) {
|
|
36
|
+
if (typeof store.history.values === 'function') {
|
|
37
|
+
allRunArrays = Array.from(store.history.values());
|
|
38
|
+
} else if (typeof store.history === 'object') {
|
|
39
|
+
allRunArrays = Object.values(store.history);
|
|
40
|
+
}
|
|
41
|
+
}
|
|
42
|
+
|
|
43
|
+
for (const runs of allRunArrays) {
|
|
44
|
+
if (!Array.isArray(runs)) continue;
|
|
45
|
+
for (const run of runs) {
|
|
46
|
+
if (!run) continue;
|
|
47
|
+
const ts = run.finishedAt || run.startedAt || 0;
|
|
48
|
+
if (ts < since) continue;
|
|
49
|
+
|
|
50
|
+
totalRuns++;
|
|
51
|
+
const isSuccess = run.status === 'success' || run.status === 'completed';
|
|
52
|
+
const isFailed = run.status === 'error' || run.status === 'timeout' || run.status === 'failed';
|
|
53
|
+
const isSkipped = run.status === 'skipped';
|
|
54
|
+
|
|
55
|
+
if (isSuccess) successRuns++;
|
|
56
|
+
else if (isFailed) failedRuns++;
|
|
57
|
+
else if (isSkipped) skippedRuns++;
|
|
58
|
+
|
|
59
|
+
const u = run.usage || {};
|
|
60
|
+
const runIn = Number(u.inputTokens) || 0;
|
|
61
|
+
const runOut = Number(u.outputTokens) || 0;
|
|
62
|
+
const runCache = Number(u.cacheReadTokens) || 0;
|
|
63
|
+
const runCost = Number(run.costUsd) || 0;
|
|
64
|
+
|
|
65
|
+
inputTokens += runIn;
|
|
66
|
+
outputTokens += runOut;
|
|
67
|
+
cacheReadTokens += runCache;
|
|
68
|
+
totalCostUsd += runCost;
|
|
69
|
+
|
|
70
|
+
const taskId = run.taskId || 'unknown';
|
|
71
|
+
const taskObj = tasksMap.get(taskId);
|
|
72
|
+
const title = (taskObj && taskObj.title) || run.taskTitle || taskId;
|
|
73
|
+
|
|
74
|
+
if (isFailed) {
|
|
75
|
+
failures.push({
|
|
76
|
+
taskId,
|
|
77
|
+
title,
|
|
78
|
+
status: run.status,
|
|
79
|
+
error: run.error || 'Unknown error',
|
|
80
|
+
diagnosis: run.diagnosis || null,
|
|
81
|
+
finishedAt: ts,
|
|
82
|
+
});
|
|
83
|
+
}
|
|
84
|
+
|
|
85
|
+
if (!perTask.has(taskId)) {
|
|
86
|
+
perTask.set(taskId, {
|
|
87
|
+
id: taskId,
|
|
88
|
+
title,
|
|
89
|
+
total: 0,
|
|
90
|
+
success: 0,
|
|
91
|
+
failed: 0,
|
|
92
|
+
skipped: 0,
|
|
93
|
+
costUsd: 0,
|
|
94
|
+
tokens: 0,
|
|
95
|
+
});
|
|
96
|
+
}
|
|
97
|
+
const p = perTask.get(taskId);
|
|
98
|
+
p.total++;
|
|
99
|
+
if (isSuccess) p.success++;
|
|
100
|
+
if (isFailed) p.failed++;
|
|
101
|
+
if (isSkipped) p.skipped++;
|
|
102
|
+
p.costUsd += runCost;
|
|
103
|
+
p.tokens += (runIn + runOut);
|
|
104
|
+
}
|
|
105
|
+
}
|
|
106
|
+
|
|
107
|
+
const taskBreakdown = Array.from(perTask.values()).sort((a, b) => b.costUsd - a.costUsd || b.total - a.total);
|
|
108
|
+
|
|
109
|
+
return {
|
|
110
|
+
windowHours: Math.round(windowMs / 3600000),
|
|
111
|
+
since,
|
|
112
|
+
generatedAt: Date.now(),
|
|
113
|
+
totalRuns,
|
|
114
|
+
successRuns,
|
|
115
|
+
failedRuns,
|
|
116
|
+
skippedRuns,
|
|
117
|
+
totalTokens: inputTokens + outputTokens + cacheReadTokens,
|
|
118
|
+
inputTokens,
|
|
119
|
+
outputTokens,
|
|
120
|
+
cacheReadTokens,
|
|
121
|
+
totalCostUsd: Number(totalCostUsd.toFixed(4)),
|
|
122
|
+
failures: failures.slice(0, 10),
|
|
123
|
+
taskBreakdown,
|
|
124
|
+
};
|
|
125
|
+
}
|
|
126
|
+
|
|
127
|
+
/**
|
|
128
|
+
* Formats digest metrics into standard GitHub-flavored Markdown.
|
|
129
|
+
*/
|
|
130
|
+
export function formatDigestReport(metrics) {
|
|
131
|
+
const hours = metrics.windowHours || 24;
|
|
132
|
+
let md = `📊 **DSH-Cron Daily Digest** (Past ${hours} Hours)\n`;
|
|
133
|
+
md += `──────────────────────────────\n`;
|
|
134
|
+
md += `• **Total Runs**: ${metrics.totalRuns} (✅ ${metrics.successRuns} success, ❌ ${metrics.failedRuns} failed, ⏭️ ${metrics.skippedRuns} skipped)\n`;
|
|
135
|
+
md += `• **Estimated Cost**: $${metrics.totalCostUsd.toFixed(4)} USD\n`;
|
|
136
|
+
md += `• **Tokens**: ${metrics.totalTokens.toLocaleString()} (${metrics.inputTokens.toLocaleString()} in, ${metrics.outputTokens.toLocaleString()} out)\n`;
|
|
137
|
+
|
|
138
|
+
if (metrics.failures.length > 0) {
|
|
139
|
+
md += `\n⚠️ **Failures & Alerts (${metrics.failures.length})**:\n`;
|
|
140
|
+
for (const f of metrics.failures) {
|
|
141
|
+
const diag = f.diagnosis ? ` (${f.diagnosis})` : '';
|
|
142
|
+
md += `- **${f.title}**: ${f.error}${diag}\n`;
|
|
143
|
+
}
|
|
144
|
+
}
|
|
145
|
+
|
|
146
|
+
if (metrics.taskBreakdown.length > 0) {
|
|
147
|
+
md += `\n📈 **Top Tasks by Activity / Spend**:\n`;
|
|
148
|
+
for (const t of metrics.taskBreakdown.slice(0, 5)) {
|
|
149
|
+
md += `- **${t.title}**: ${t.total} runs (✅ ${t.success}, ❌ ${t.failed}), $${t.costUsd.toFixed(4)}\n`;
|
|
150
|
+
}
|
|
151
|
+
}
|
|
152
|
+
|
|
153
|
+
md += `──────────────────────────────\n`;
|
|
154
|
+
return md;
|
|
155
|
+
}
|
|
156
|
+
|
|
157
|
+
/**
|
|
158
|
+
* Sends formatted digest report to notification channels.
|
|
159
|
+
*/
|
|
160
|
+
export async function dispatchDigest(metricsOrText, settings = {}, options = {}) {
|
|
161
|
+
const text = typeof metricsOrText === 'string' ? metricsOrText : formatDigestReport(metricsOrText);
|
|
162
|
+
const channels = options.channels || ['telegram'];
|
|
163
|
+
const results = { delivered: [], failed: [] };
|
|
164
|
+
|
|
165
|
+
if (channels.includes('telegram')) {
|
|
166
|
+
const token = settings.telegramToken || process.env.TELEGRAM_BOT_TOKEN;
|
|
167
|
+
const chatId = settings.telegramChatId || process.env.TELEGRAM_CHAT_ID;
|
|
168
|
+
if (token && chatId) {
|
|
169
|
+
try {
|
|
170
|
+
await sendTelegramMessage(token, chatId, text);
|
|
171
|
+
results.delivered.push('telegram');
|
|
172
|
+
} catch (err) {
|
|
173
|
+
results.failed.push({ channel: 'telegram', error: err.message });
|
|
174
|
+
}
|
|
175
|
+
}
|
|
176
|
+
}
|
|
177
|
+
|
|
178
|
+
return results;
|
|
179
|
+
}
|
package/lib/locales.json
CHANGED
|
@@ -419,6 +419,13 @@
|
|
|
419
419
|
"form.wakeTriggerPathLabel": "触发目标路径 (目录 / markerPath / pidFile)",
|
|
420
420
|
"form.wakeTriggerPathPlaceholder": "例如: incoming/ 或 build.ready 或 run.pid",
|
|
421
421
|
"form.wakeTriggerMinCountLabel": "最小文件阈值 (minCount)",
|
|
422
|
-
"form.wakeTriggerConsumeLabel": "触发后自动删除标记/PID文件"
|
|
422
|
+
"form.wakeTriggerConsumeLabel": "触发后自动删除标记/PID文件",
|
|
423
|
+
"form.workWindowHoursLabel": "运行时间窗口 (workWindow, 如 22:00-07:00)",
|
|
424
|
+
"form.workWindowHoursPlaceholder": "例如: 22:00-07:00 或 09:00-18:00",
|
|
425
|
+
"form.workWindowPolicyLabel": "窗口外执行策略",
|
|
426
|
+
"form.workWindowPolicySkip": "跳过本次执行 (record skipped)",
|
|
427
|
+
"form.workWindowPolicyDefer": "延迟至窗口开启时执行 (defer)",
|
|
428
|
+
"form.timeBoxMinutesLabel": "Timebox 运行上限 (分钟, 0 = 不限制)",
|
|
429
|
+
"form.typeDigest": "每日/定期简报 (Daily Digest)"
|
|
423
430
|
}
|
|
424
431
|
}
|
package/lib/routes/routes.js
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { collectDigestMetrics, formatDigestReport, dispatchDigest } from '../digest.js';
|
|
1
2
|
import { readFileSync } from 'node:fs';
|
|
2
3
|
import { handleTaskWebhookRoute } from './api-task-webhook.js';
|
|
3
4
|
import { calculateCostHeatmap } from '../timeline.js';
|
|
@@ -229,6 +230,40 @@ export function registerRoutes(ctx, { store, scheduler, recommendations }) {
|
|
|
229
230
|
}
|
|
230
231
|
}), 'dsh-cron: /chat/start');
|
|
231
232
|
|
|
233
|
+
// GET & POST /dsh-cron/digest (#414)
|
|
234
|
+
ctx.effect(() => ctx.webServer.register({
|
|
235
|
+
kind: 'prefix',
|
|
236
|
+
path: '/dsh-cron/digest',
|
|
237
|
+
handler: async (req, res) => {
|
|
238
|
+
try {
|
|
239
|
+
const settings = store && typeof store.getSettings === 'function' ? store.getSettings() : {};
|
|
240
|
+
const apiToken = settings.apiToken;
|
|
241
|
+
if (rejectCrossOrigin(req, res, { apiToken, ctx })) return;
|
|
242
|
+
|
|
243
|
+
const url = new URL(req.url, 'http://127.0.0.1');
|
|
244
|
+
const hours = Number(url.searchParams.get('hours')) || 24;
|
|
245
|
+
const metrics = collectDigestMetrics(store, { windowMs: hours * 3600000 });
|
|
246
|
+
const report = formatDigestReport(metrics);
|
|
247
|
+
|
|
248
|
+
if (req.method === 'GET') {
|
|
249
|
+
sendJson(res, 200, { ok: true, metrics, report });
|
|
250
|
+
return;
|
|
251
|
+
}
|
|
252
|
+
|
|
253
|
+
if (req.method === 'POST') {
|
|
254
|
+
const results = await dispatchDigest(report, settings);
|
|
255
|
+
sendJson(res, 200, { ok: true, report, metrics, results });
|
|
256
|
+
return;
|
|
257
|
+
}
|
|
258
|
+
|
|
259
|
+
res.statusCode = 405;
|
|
260
|
+
res.end();
|
|
261
|
+
} catch (err) {
|
|
262
|
+
sendJson(res, 500, { ok: false, error: err.message });
|
|
263
|
+
}
|
|
264
|
+
}
|
|
265
|
+
}), 'dsh-cron: /digest');
|
|
266
|
+
|
|
232
267
|
// Analytics digest routes (#330)
|
|
233
268
|
ctx.effect(() => ctx.webServer.register({
|
|
234
269
|
kind: 'prefix',
|
package/lib/runtimes/runtimes.js
CHANGED
|
@@ -12,7 +12,7 @@ import path from 'node:path';
|
|
|
12
12
|
|
|
13
13
|
export const EXTERNAL_RUNTIMES = ['script', 'node', 'python', 'http', 'ssh', 'docker'];
|
|
14
14
|
const AGENT_RUNTIMES = ['llm', 'skill', 'workflow'];
|
|
15
|
-
export const TASK_TYPES = [...AGENT_RUNTIMES, ...EXTERNAL_RUNTIMES];
|
|
15
|
+
export const TASK_TYPES = [...AGENT_RUNTIMES, ...EXTERNAL_RUNTIMES, 'digest'];
|
|
16
16
|
|
|
17
17
|
/** Types that execute code and therefore need the HTTP confirm header. */
|
|
18
18
|
export const CODE_EXECUTING_TYPES = ['script', 'node', 'python', 'ssh', 'docker'];
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { isInsideWorkWindow, getNextWindowStart } from '../work-windows.js';
|
|
1
2
|
import { recordPromptRunOutcome } from '../prompt-evolver.js';
|
|
2
3
|
import { evaluateAdaptiveRun, calculateNextAdaptiveState } from '../adaptive.js';
|
|
3
4
|
import { globalBudgetManager } from '../global-budgets.js';
|
|
@@ -162,7 +163,27 @@ export async function executeTask(scheduler, taskId, options = {}) {
|
|
|
162
163
|
preflightBlocked: true,
|
|
163
164
|
};
|
|
164
165
|
}
|
|
165
|
-
|
|
166
|
+
// Work Window & Off-Peak enforcement (#412)
|
|
167
|
+
if (task.workWindow && task.workWindow.enabled && !options.dryRun && !options.ignoreWorkWindow) {
|
|
168
|
+
const windowCheck = isInsideWorkWindow(task.workWindow, new Date(), task.timezone);
|
|
169
|
+
if (!windowCheck.inside) {
|
|
170
|
+
const policy = task.workWindow.outsidePolicy || 'skip';
|
|
171
|
+
if (policy === 'skip') {
|
|
172
|
+
logger.info(`[dsh-cron] task "${task.title}" (${taskId}) skipped: outside work window (${windowCheck.reason})`);
|
|
173
|
+
scheduler.recordSkipped(taskId, `Outside work window: ${windowCheck.reason}`);
|
|
174
|
+
if (typeof scheduler.drainQueue === 'function') scheduler.drainQueue();
|
|
175
|
+
return { ok: false, status: 'skipped', reason: 'outside_work_window' };
|
|
176
|
+
} else if (policy === 'defer') {
|
|
177
|
+
const nextStart = getNextWindowStart(task.workWindow, new Date(), task.timezone);
|
|
178
|
+
const delayMs = Math.max(1000, nextStart - Date.now());
|
|
179
|
+
logger.info(`[dsh-cron] task "${task.title}" (${taskId}) deferred until work window opens in ${Math.round(delayMs / 1000)}s`);
|
|
180
|
+
scheduler.armDeferredTimer(taskId, delayMs, options);
|
|
181
|
+
return { ok: false, status: 'deferred', nextStart };
|
|
182
|
+
}
|
|
183
|
+
}
|
|
184
|
+
}
|
|
185
|
+
|
|
186
|
+
const preflight = await executePreflight(task);
|
|
166
187
|
if (!preflight.ok) {
|
|
167
188
|
return {
|
|
168
189
|
ok: false,
|
|
@@ -274,6 +295,26 @@ export async function executeTask(scheduler, taskId, options = {}) {
|
|
|
274
295
|
}
|
|
275
296
|
|
|
276
297
|
const preflightStart = Date.now();
|
|
298
|
+
// Work Window & Off-Peak enforcement (#412)
|
|
299
|
+
if (task.workWindow && task.workWindow.enabled && !options.dryRun && !options.ignoreWorkWindow) {
|
|
300
|
+
const windowCheck = isInsideWorkWindow(task.workWindow, new Date(), task.timezone);
|
|
301
|
+
if (!windowCheck.inside) {
|
|
302
|
+
const policy = task.workWindow.outsidePolicy || 'skip';
|
|
303
|
+
if (policy === 'skip') {
|
|
304
|
+
logger.info(`[dsh-cron] task "${task.title}" (${taskId}) skipped: outside work window (${windowCheck.reason})`);
|
|
305
|
+
scheduler.recordSkipped(taskId, `Outside work window: ${windowCheck.reason}`);
|
|
306
|
+
if (typeof scheduler.drainQueue === 'function') scheduler.drainQueue();
|
|
307
|
+
return { ok: false, status: 'skipped', reason: 'outside_work_window' };
|
|
308
|
+
} else if (policy === 'defer') {
|
|
309
|
+
const nextStart = getNextWindowStart(task.workWindow, new Date(), task.timezone);
|
|
310
|
+
const delayMs = Math.max(1000, nextStart - Date.now());
|
|
311
|
+
logger.info(`[dsh-cron] task "${task.title}" (${taskId}) deferred until work window opens in ${Math.round(delayMs / 1000)}s`);
|
|
312
|
+
scheduler.armDeferredTimer(taskId, delayMs, options);
|
|
313
|
+
return { ok: false, status: 'deferred', nextStart };
|
|
314
|
+
}
|
|
315
|
+
}
|
|
316
|
+
}
|
|
317
|
+
|
|
277
318
|
const preflight = await executePreflight(task);
|
|
278
319
|
const preflightDurationMs = Date.now() - preflightStart;
|
|
279
320
|
if (!preflight.ok) {
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { collectDigestMetrics, formatDigestReport } from '../digest.js';
|
|
1
2
|
import { exec } from 'node:child_process';
|
|
2
3
|
import fs from 'node:fs';
|
|
3
4
|
import { executeSwarmTask } from '../swarm.js';
|
|
@@ -127,6 +128,20 @@ export async function executeOnce(scheduler, task, signal, options = {}) {
|
|
|
127
128
|
model: task.model || '',
|
|
128
129
|
fallback: false,
|
|
129
130
|
};
|
|
131
|
+
if (task.type === 'digest') {
|
|
132
|
+
try {
|
|
133
|
+
const windowHours = Number(task.digestHours || task.windowHours) || 24;
|
|
134
|
+
const metrics = collectDigestMetrics(scheduler.store, { windowMs: windowHours * 3600000 });
|
|
135
|
+
const report = formatDigestReport(metrics);
|
|
136
|
+
result.output = report;
|
|
137
|
+
result.status = 'success';
|
|
138
|
+
return result;
|
|
139
|
+
} catch (err) {
|
|
140
|
+
result.error = err.message || String(err);
|
|
141
|
+
result.status = 'error';
|
|
142
|
+
return result;
|
|
143
|
+
}
|
|
144
|
+
}
|
|
130
145
|
if (task.type === 'swarm') {
|
|
131
146
|
try {
|
|
132
147
|
const swarmRes = await executeSwarmTask(task, {
|
|
@@ -333,6 +333,7 @@ export class TaskScheduler {
|
|
|
333
333
|
this.timers = new Map();
|
|
334
334
|
this.retryTimers = new Map();
|
|
335
335
|
this.adaptiveTimers = new Map();
|
|
336
|
+
this.deferredTimers = new Map();
|
|
336
337
|
this.running = new Map();
|
|
337
338
|
this.runCounters = {};
|
|
338
339
|
this.queue = [];
|
|
@@ -367,6 +368,26 @@ export class TaskScheduler {
|
|
|
367
368
|
}
|
|
368
369
|
}
|
|
369
370
|
|
|
371
|
+
armDeferredTimer(taskId, delayMs, options = {}) {
|
|
372
|
+
this.clearDeferredTimer(taskId);
|
|
373
|
+
const timer = setTimeout(() => {
|
|
374
|
+
this.deferredTimers.delete(taskId);
|
|
375
|
+
if (!this.isStopped) {
|
|
376
|
+
this.runTask(taskId, options).catch((_err) => { void _err; });
|
|
377
|
+
}
|
|
378
|
+
}, delayMs);
|
|
379
|
+
if (timer.unref) timer.unref();
|
|
380
|
+
this.deferredTimers.set(taskId, timer);
|
|
381
|
+
}
|
|
382
|
+
|
|
383
|
+
clearDeferredTimer(taskId) {
|
|
384
|
+
const t = this.deferredTimers.get(taskId);
|
|
385
|
+
if (t) {
|
|
386
|
+
clearTimeout(t);
|
|
387
|
+
this.deferredTimers.delete(taskId);
|
|
388
|
+
}
|
|
389
|
+
}
|
|
390
|
+
|
|
370
391
|
clearAdaptiveTimer(taskId) {
|
|
371
392
|
const t = this.adaptiveTimers.get(taskId);
|
|
372
393
|
if (t) {
|
|
@@ -377,6 +398,7 @@ export class TaskScheduler {
|
|
|
377
398
|
|
|
378
399
|
armAdaptiveTimer(taskId, delayMs) {
|
|
379
400
|
this.clearAdaptiveTimer(taskId);
|
|
401
|
+
this.clearDeferredTimer(taskId);
|
|
380
402
|
if (this.wakeTriggerManager) {
|
|
381
403
|
this.wakeTriggerManager.unregisterTask(taskId);
|
|
382
404
|
}
|
|
@@ -525,6 +547,7 @@ export class TaskScheduler {
|
|
|
525
547
|
|
|
526
548
|
clearScheduled(taskId) {
|
|
527
549
|
this.clearAdaptiveTimer(taskId);
|
|
550
|
+
this.clearDeferredTimer(taskId);
|
|
528
551
|
if (this.wakeTriggerManager) {
|
|
529
552
|
this.wakeTriggerManager.unregisterTask(taskId);
|
|
530
553
|
}
|
package/lib/store/task-schema.js
CHANGED
|
@@ -100,6 +100,8 @@ export const TaskSchema = z.object({
|
|
|
100
100
|
skipIfUnchanged: z.boolean().default(false),
|
|
101
101
|
lastInputHash: z.string().default(''),
|
|
102
102
|
wakeTrigger: z.any(),
|
|
103
|
+
workWindow: z.any(),
|
|
104
|
+
timeBoxMinutes: z.number().min(0).default(0),
|
|
103
105
|
maxMemoryMb: z.number().min(0).default(0),
|
|
104
106
|
executionTimeoutMs: z.number().min(0).default(900000),
|
|
105
107
|
maxLogBytesPerRun: z.number().min(0).default(5 * 1024 * 1024),
|
package/lib/task-create.js
CHANGED
|
@@ -11,6 +11,7 @@ import { CHANNEL_IDS } from './channels.js';
|
|
|
11
11
|
import { redactTaskSecrets } from './http-utils.js';
|
|
12
12
|
import { normalizeScopes } from './scope-locks.js';
|
|
13
13
|
import { normalizeWakeTrigger } from './wake-triggers.js';
|
|
14
|
+
import { normalizeWorkWindow } from './work-windows.js';
|
|
14
15
|
import { normalizeInputHashPaths } from './input-hash.js';
|
|
15
16
|
import { sanitizeDependsOn, sanitizeJoinPolicy, validateDAG } from './dag.js';
|
|
16
17
|
|
|
@@ -66,6 +67,8 @@ export function executeCreateTask(store, scheduler, args) {
|
|
|
66
67
|
elseTask: args.elseTask ? String(args.elseTask).trim() : undefined,
|
|
67
68
|
autoHeal: args.autoHeal !== undefined ? Boolean(args.autoHeal) : undefined,
|
|
68
69
|
wakeTrigger: args.wakeTrigger !== undefined ? normalizeWakeTrigger(args.wakeTrigger) : undefined,
|
|
70
|
+
workWindow: args.workWindow !== undefined ? normalizeWorkWindow(args.workWindow) : undefined,
|
|
71
|
+
timeBoxMinutes: args.timeBoxMinutes !== undefined ? Math.max(0, Number(args.timeBoxMinutes) || 0) : undefined,
|
|
69
72
|
writeScopes: args.writeScopes !== undefined ? normalizeScopes(args.writeScopes) : undefined,
|
|
70
73
|
inputHashPaths: args.inputHashPaths !== undefined ? normalizeInputHashPaths(args.inputHashPaths) : undefined,
|
|
71
74
|
skipIfUnchanged: args.skipIfUnchanged !== undefined ? Boolean(args.skipIfUnchanged) : undefined,
|
package/lib/task-patch.js
CHANGED
|
@@ -22,6 +22,7 @@ import { pickPatchableFields, restoreTaskSecrets } from './http-utils.js';
|
|
|
22
22
|
import { unknownChannelIds } from './channels.js';
|
|
23
23
|
import { normalizeScopes } from './scope-locks.js';
|
|
24
24
|
import { normalizeWakeTrigger } from './wake-triggers.js';
|
|
25
|
+
import { normalizeWorkWindow } from './work-windows.js';
|
|
25
26
|
import { normalizeInputHashPaths } from './input-hash.js';
|
|
26
27
|
import { isConfigOwned, configOwnedMessage } from './config-jobs.js';
|
|
27
28
|
|
|
@@ -135,6 +136,12 @@ export function buildTaskPatch(current, body) {
|
|
|
135
136
|
if (patch.autoHeal !== undefined) {
|
|
136
137
|
patch.autoHeal = Boolean(patch.autoHeal);
|
|
137
138
|
}
|
|
139
|
+
if (patch.workWindow !== undefined) {
|
|
140
|
+
patch.workWindow = normalizeWorkWindow(patch.workWindow);
|
|
141
|
+
}
|
|
142
|
+
if (patch.timeBoxMinutes !== undefined) {
|
|
143
|
+
patch.timeBoxMinutes = Math.max(0, Number(patch.timeBoxMinutes) || 0);
|
|
144
|
+
}
|
|
138
145
|
if (patch.wakeTrigger !== undefined) {
|
|
139
146
|
patch.wakeTrigger = normalizeWakeTrigger(patch.wakeTrigger);
|
|
140
147
|
}
|
|
@@ -0,0 +1,167 @@
|
|
|
1
|
+
import { logger } from './logger.js';
|
|
2
|
+
|
|
3
|
+
/**
|
|
4
|
+
* Parses an hours range string like "22:00-06:00", "09:00-18:00", "22-6".
|
|
5
|
+
* Returns { startMinute, endMinute, spansMidnight } or null if invalid.
|
|
6
|
+
*/
|
|
7
|
+
export function parseHoursRange(rangeStr) {
|
|
8
|
+
if (!rangeStr || typeof rangeStr !== 'string') return null;
|
|
9
|
+
const match = rangeStr.trim().match(/^(\d{1,2})(?::(\d{2}))?\s*-\s*(\d{1,2})(?::(\d{2}))?$/);
|
|
10
|
+
if (!match) return null;
|
|
11
|
+
|
|
12
|
+
const startH = parseInt(match[1], 10);
|
|
13
|
+
const startM = match[2] ? parseInt(match[2], 10) : 0;
|
|
14
|
+
const endH = parseInt(match[3], 10);
|
|
15
|
+
const endM = match[4] ? parseInt(match[4], 10) : 0;
|
|
16
|
+
|
|
17
|
+
if (startH < 0 || startH > 23 || startM < 0 || startM > 59) return null;
|
|
18
|
+
if (endH < 0 || endH > 23 || endM < 0 || endM > 59) return null;
|
|
19
|
+
|
|
20
|
+
const startMinute = startH * 60 + startM;
|
|
21
|
+
const endMinute = endH * 60 + endM;
|
|
22
|
+
const spansMidnight = startMinute > endMinute;
|
|
23
|
+
|
|
24
|
+
return { startMinute, endMinute, spansMidnight };
|
|
25
|
+
}
|
|
26
|
+
|
|
27
|
+
/**
|
|
28
|
+
* Normalizes workWindow configuration.
|
|
29
|
+
*/
|
|
30
|
+
export function normalizeWorkWindow(cfg) {
|
|
31
|
+
if (!cfg || typeof cfg !== 'object') return null;
|
|
32
|
+
const enabled = cfg.enabled !== false;
|
|
33
|
+
const hours = typeof cfg.hours === 'string' ? cfg.hours.trim() : '';
|
|
34
|
+
const parsedHours = parseHoursRange(hours);
|
|
35
|
+
|
|
36
|
+
let daysOfWeek = [];
|
|
37
|
+
if (Array.isArray(cfg.daysOfWeek)) {
|
|
38
|
+
daysOfWeek = cfg.daysOfWeek
|
|
39
|
+
.map((d) => parseInt(d, 10))
|
|
40
|
+
.filter((d) => Number.isInteger(d) && d >= 0 && d <= 6);
|
|
41
|
+
}
|
|
42
|
+
|
|
43
|
+
const outsidePolicy = ['defer', 'skip'].includes(String(cfg.outsidePolicy || '').toLowerCase())
|
|
44
|
+
? String(cfg.outsidePolicy).toLowerCase()
|
|
45
|
+
: 'skip';
|
|
46
|
+
|
|
47
|
+
const timeBoxMinutes = Number(cfg.timeBoxMinutes) > 0 ? Number(cfg.timeBoxMinutes) : null;
|
|
48
|
+
const offPeakOnly = Boolean(cfg.offPeakOnly);
|
|
49
|
+
|
|
50
|
+
// If offPeakOnly is set and hours are not specified, default to 22:00-07:00
|
|
51
|
+
const effectiveHours = offPeakOnly && !hours ? '22:00-07:00' : hours;
|
|
52
|
+
|
|
53
|
+
return {
|
|
54
|
+
enabled,
|
|
55
|
+
hours: effectiveHours,
|
|
56
|
+
daysOfWeek,
|
|
57
|
+
outsidePolicy,
|
|
58
|
+
timeBoxMinutes,
|
|
59
|
+
offPeakOnly,
|
|
60
|
+
};
|
|
61
|
+
}
|
|
62
|
+
|
|
63
|
+
/**
|
|
64
|
+
* Extracts current hour, minute, and day of week for a Date in a specific timezone.
|
|
65
|
+
*/
|
|
66
|
+
export function getTimeInTimezone(date, timezone) {
|
|
67
|
+
try {
|
|
68
|
+
const d = date instanceof Date ? date : new Date(date);
|
|
69
|
+
const formatter = new Intl.DateTimeFormat('en-US', {
|
|
70
|
+
timeZone: timezone || 'UTC',
|
|
71
|
+
hour12: false,
|
|
72
|
+
weekday: 'narrow',
|
|
73
|
+
hour: 'numeric',
|
|
74
|
+
minute: 'numeric',
|
|
75
|
+
});
|
|
76
|
+
const parts = formatter.formatToParts(d);
|
|
77
|
+
let hour = 0;
|
|
78
|
+
let minute = 0;
|
|
79
|
+
for (const part of parts) {
|
|
80
|
+
if (part.type === 'hour') hour = parseInt(part.value, 10) % 24;
|
|
81
|
+
if (part.type === 'minute') minute = parseInt(part.value, 10);
|
|
82
|
+
}
|
|
83
|
+
// Calculate 0-6 day of week in timezone
|
|
84
|
+
const dayFormatter = new Intl.DateTimeFormat('en-US', {
|
|
85
|
+
timeZone: timezone || 'UTC',
|
|
86
|
+
weekday: 'numeric', // 1..7 (Sunday is 1 or 7 depending on locale, let's use short)
|
|
87
|
+
});
|
|
88
|
+
const shortDay = new Intl.DateTimeFormat('en-US', {
|
|
89
|
+
timeZone: timezone || 'UTC',
|
|
90
|
+
weekday: 'short',
|
|
91
|
+
}).format(d);
|
|
92
|
+
const dayMap = { Sun: 0, Mon: 1, Tue: 2, Wed: 3, Thu: 4, Fri: 5, Sat: 6 };
|
|
93
|
+
const dayOfWeek = dayMap[shortDay] !== undefined ? dayMap[shortDay] : d.getDay();
|
|
94
|
+
|
|
95
|
+
return { hour, minute, currentMinute: hour * 60 + minute, dayOfWeek };
|
|
96
|
+
} catch (_err) {
|
|
97
|
+
void _err;
|
|
98
|
+
const d = date instanceof Date ? date : new Date(date);
|
|
99
|
+
return {
|
|
100
|
+
hour: d.getUTCHours(),
|
|
101
|
+
minute: d.getUTCMinutes(),
|
|
102
|
+
currentMinute: d.getUTCHours() * 60 + d.getUTCMinutes(),
|
|
103
|
+
dayOfWeek: d.getUTCDay(),
|
|
104
|
+
};
|
|
105
|
+
}
|
|
106
|
+
}
|
|
107
|
+
|
|
108
|
+
/**
|
|
109
|
+
* Checks if current time is inside the work window.
|
|
110
|
+
*/
|
|
111
|
+
export function isInsideWorkWindow(workWindow, date = new Date(), timezone = 'UTC') {
|
|
112
|
+
const norm = normalizeWorkWindow(workWindow);
|
|
113
|
+
if (!norm || !norm.enabled) return { inside: true };
|
|
114
|
+
|
|
115
|
+
const { currentMinute, dayOfWeek } = getTimeInTimezone(date, timezone);
|
|
116
|
+
|
|
117
|
+
// 1. Day of week check
|
|
118
|
+
if (norm.daysOfWeek && norm.daysOfWeek.length > 0) {
|
|
119
|
+
if (!norm.daysOfWeek.includes(dayOfWeek)) {
|
|
120
|
+
return {
|
|
121
|
+
inside: false,
|
|
122
|
+
reason: `Day of week (${dayOfWeek}) not in allowed days [${norm.daysOfWeek.join(',')}]`,
|
|
123
|
+
};
|
|
124
|
+
}
|
|
125
|
+
}
|
|
126
|
+
|
|
127
|
+
// 2. Hours check
|
|
128
|
+
if (norm.hours) {
|
|
129
|
+
const parsed = parseHoursRange(norm.hours);
|
|
130
|
+
if (parsed) {
|
|
131
|
+
const { startMinute, endMinute, spansMidnight } = parsed;
|
|
132
|
+
let inRange = false;
|
|
133
|
+
if (spansMidnight) {
|
|
134
|
+
inRange = currentMinute >= startMinute || currentMinute < endMinute;
|
|
135
|
+
} else {
|
|
136
|
+
inRange = currentMinute >= startMinute && currentMinute < endMinute;
|
|
137
|
+
}
|
|
138
|
+
if (!inRange) {
|
|
139
|
+
return {
|
|
140
|
+
inside: false,
|
|
141
|
+
reason: `Current time (${Math.floor(currentMinute / 60)}:${String(currentMinute % 60).padStart(2, '0')}) is outside allowed window ${norm.hours}`,
|
|
142
|
+
};
|
|
143
|
+
}
|
|
144
|
+
}
|
|
145
|
+
}
|
|
146
|
+
|
|
147
|
+
return { inside: true };
|
|
148
|
+
}
|
|
149
|
+
|
|
150
|
+
/**
|
|
151
|
+
* Calculates the next timestamp (ms) when the window opens.
|
|
152
|
+
*/
|
|
153
|
+
export function getNextWindowStart(workWindow, date = new Date(), timezone = 'UTC') {
|
|
154
|
+
const norm = normalizeWorkWindow(workWindow);
|
|
155
|
+
if (!norm || !norm.enabled) return Date.now();
|
|
156
|
+
|
|
157
|
+
const now = date instanceof Date ? date.getTime() : new Date(date).getTime();
|
|
158
|
+
// Step forward minute by minute (up to 7 days = 10080 minutes) to find when window opens
|
|
159
|
+
for (let m = 1; m <= 10080; m++) {
|
|
160
|
+
const candidate = new Date(now + m * 60 * 1000);
|
|
161
|
+
const check = isInsideWorkWindow(norm, candidate, timezone);
|
|
162
|
+
if (check.inside) {
|
|
163
|
+
return candidate.getTime();
|
|
164
|
+
}
|
|
165
|
+
}
|
|
166
|
+
return now + 3600000; // Fallback 1 hour
|
|
167
|
+
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@goodandready/dsh-cron",
|
|
3
|
-
"version": "0.3.
|
|
3
|
+
"version": "0.3.35",
|
|
4
4
|
"description": "Background automation runner for DSH: isolated agent runs, script/HTTP/SSH/Docker runtimes, cost guard, notifications, heartbeats.",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "lib/index.js",
|