opencode-windows-scheduler 1.4.0 → 1.5.0

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.
Files changed (63) hide show
  1. package/CHANGELOG.md +24 -0
  2. package/README.md +2 -2
  3. package/ROADMAP-STRATEGY.md +43 -24
  4. package/ROADMAP.md +280 -31
  5. package/dist/core/dry-run.d.ts +31 -0
  6. package/dist/core/dry-run.d.ts.map +1 -1
  7. package/dist/core/dry-run.js +129 -1
  8. package/dist/core/file-watcher.d.ts.map +1 -1
  9. package/dist/core/file-watcher.js +53 -10
  10. package/dist/core/git-trigger.d.ts +80 -0
  11. package/dist/core/git-trigger.d.ts.map +1 -0
  12. package/dist/core/git-trigger.js +288 -0
  13. package/dist/core/glob.d.ts +38 -0
  14. package/dist/core/glob.d.ts.map +1 -0
  15. package/dist/core/glob.js +233 -0
  16. package/dist/core/ps-wrapper.d.ts.map +1 -1
  17. package/dist/core/ps-wrapper.js +7 -0
  18. package/dist/core/schedule-gate.js +55 -30
  19. package/dist/core/schedule-v2.d.ts +29 -1
  20. package/dist/core/schedule-v2.d.ts.map +1 -1
  21. package/dist/core/schedule-v2.js +81 -3
  22. package/dist/core/scheduler/types.d.ts +1 -1
  23. package/dist/core/scheduler/types.d.ts.map +1 -1
  24. package/dist/core/wrappers/bash.d.ts.map +1 -1
  25. package/dist/core/wrappers/bash.js +4 -0
  26. package/dist/db/git-state-repo.d.ts +16 -0
  27. package/dist/db/git-state-repo.d.ts.map +1 -0
  28. package/dist/db/git-state-repo.js +38 -0
  29. package/dist/db/schema.d.ts +1 -1
  30. package/dist/db/schema.d.ts.map +1 -1
  31. package/dist/db/schema.js +8 -0
  32. package/dist/index.d.ts +44 -0
  33. package/dist/index.d.ts.map +1 -1
  34. package/dist/index.js +247 -26
  35. package/dist/rpc.d.ts +223 -0
  36. package/dist/rpc.d.ts.map +1 -1
  37. package/dist/rpc.js +73 -0
  38. package/dist/task-transfer.d.ts +30 -3
  39. package/dist/task-transfer.d.ts.map +1 -1
  40. package/dist/task-transfer.js +83 -6
  41. package/dist/templates.d.ts +1 -1
  42. package/dist/templates.d.ts.map +1 -1
  43. package/docs/ARCHITECTURE.md +1 -0
  44. package/docs/FEATURES.md +51 -0
  45. package/docs/README.ru.md +2 -2
  46. package/gui-experimental.cjs +9 -4
  47. package/package.json +6 -3
  48. package/src/core/dry-run.ts +188 -1
  49. package/src/core/file-watcher.ts +65 -10
  50. package/src/core/git-trigger.ts +367 -0
  51. package/src/core/glob.ts +226 -0
  52. package/src/core/ps-wrapper.ts +7 -0
  53. package/src/core/schedule-gate.ts +67 -33
  54. package/src/core/schedule-v2.ts +108 -3
  55. package/src/core/scheduler/types.ts +1 -1
  56. package/src/core/wrappers/bash.ts +4 -0
  57. package/src/db/git-state-repo.ts +62 -0
  58. package/src/db/schema.ts +8 -0
  59. package/src/gui.tsx +225 -4
  60. package/src/index.ts +338 -28
  61. package/src/rpc.ts +73 -0
  62. package/src/task-transfer.ts +124 -5
  63. package/src/templates.ts +1 -1
@@ -29,12 +29,12 @@
29
29
  */
30
30
  import fs from "node:fs";
31
31
  import {
32
+ activeWindowState,
32
33
  cronMatches,
33
34
  isValidIanaTimeZone,
34
- isInWindow,
35
+ normalizeActiveDays,
35
36
  parseCron,
36
37
  validateLaunchWindow,
37
- windowDelayMs,
38
38
  } from "./schedule-v2.js";
39
39
 
40
40
  const STALE_DEFER_MS = 25 * 60 * 60 * 1000;
@@ -42,6 +42,9 @@ const STALE_DEFER_MS = 25 * 60 * 60 * 1000;
42
42
  /** Сколько живёт маркер ручного запуска. */
43
43
  const FORCE_TTL_MS = 2 * 60 * 1000;
44
44
 
45
+ /** Дольше 12 часов перенос не ждём — тик просто пропускается. */
46
+ const MAX_POSTPONE_MS = 12 * 60 * 60 * 1000;
47
+
45
48
  function argValue(args: string[], name: string): string | undefined {
46
49
  const idx = args.indexOf(name);
47
50
  if (idx === -1 || idx + 1 >= args.length) return undefined;
@@ -113,10 +116,23 @@ async function main(): Promise<number> {
113
116
  const tz = argValue(args, "--tz");
114
117
  const notBefore = argValue(args, "--not-before");
115
118
  const notAfter = argValue(args, "--not-after");
119
+ const daysArg = argValue(args, "--days");
120
+ const policyArg = argValue(args, "--window-policy");
116
121
  const deferFile = argValue(args, "--defer-file");
117
122
  const forceFile = argValue(args, "--force-file");
118
123
  const nowArg = argValue(args, "--now");
119
124
 
125
+ const days = daysArg
126
+ ? normalizeActiveDays(
127
+ daysArg
128
+ .split(",")
129
+ .map((value) => Number(value.trim()))
130
+ .filter((value) => Number.isFinite(value))
131
+ )
132
+ : undefined;
133
+ const policy: "skip" | "postpone" | "run" =
134
+ policyArg === "skip" || policyArg === "run" ? policyArg : "postpone";
135
+
120
136
  const now = nowArg ? new Date(nowArg) : new Date();
121
137
  if (Number.isNaN(now.getTime())) {
122
138
  console.error(`[schedule-gate] Некорректное значение --now: ${nowArg}`);
@@ -139,7 +155,6 @@ async function main(): Promise<number> {
139
155
  if (windowError) {
140
156
  console.error(`[schedule-gate] Окно запуска игнорируется: ${windowError}`);
141
157
  }
142
- const windowOk = !windowError && !!notBefore && !!notAfter;
143
158
 
144
159
  let spec = null;
145
160
  if (cronExpr) {
@@ -159,43 +174,62 @@ async function main(): Promise<number> {
159
174
  return 3;
160
175
  }
161
176
 
162
- if (windowOk && !isInWindow(now, notBefore, notAfter, zone)) {
163
- const wait = windowDelayMs(now, notBefore, notAfter, zone);
164
- if (wait <= 0) return 0;
165
-
166
- // ПЕРЕНОС: ждём открытия окна. Откладываем один запуск, остальные тики
167
- // отсекаются по defer-файлу.
168
- if (deferFile) {
169
- if (deferFileBusy(deferFile, now.getTime())) {
170
- console.error("[schedule-gate] Отложенный запуск уже ожидает открытия окна.");
177
+ // Дни недели и окно запуска (Спринт 27). Политика вне окна:
178
+ // postpone (по умолчанию) — ждём открытия окна;
179
+ // skip — тихо пропускаем тик;
180
+ // run — выполняем, несмотря на окно.
181
+ const windowOptions = { notBefore, notAfter, days, timeZone: zone };
182
+ if (policy !== "run") {
183
+ const state = activeWindowState(now, windowOptions);
184
+ if (!state.active) {
185
+ if (policy === "skip") {
186
+ console.error(`[schedule-gate] Пропуск: ${state.reason ?? "вне окна"}.`);
171
187
  return 3;
172
188
  }
173
- if (!acquireDefer(deferFile, now.getTime())) {
174
- console.error("[schedule-gate] Не удалось захватить defer-файл — пропускаем.");
189
+
190
+ const wait = state.nextOpenAt
191
+ ? Math.max(0, state.nextOpenAt.getTime() - now.getTime())
192
+ : 0;
193
+ if (wait <= 0) return 0;
194
+ if (wait > MAX_POSTPONE_MS) {
195
+ console.error(
196
+ `[schedule-gate] ${state.reason ?? "вне окна"} — до открытия больше 12 часов, тик пропущен.`
197
+ );
175
198
  return 3;
176
199
  }
177
- }
178
200
 
179
- console.error(
180
- `[schedule-gate] Вне окна ${notBefore}–${notAfter} — запуск перенесён на ~${Math.round(
181
- wait / 60000
182
- )} мин.`
183
- );
184
- let remaining = wait;
185
- let woke = now;
186
- while (remaining > 0) {
187
- const chunk = Math.min(remaining, 60_000);
188
- await sleepMs(chunk);
189
- remaining -= chunk;
190
- woke = new Date();
191
- if (isInWindow(woke, notBefore, notAfter, zone)) break;
192
- }
201
+ // ПЕРЕНОС: ждём открытия окна. Откладываем один запуск, остальные тики
202
+ // отсекаются по defer-файлу.
203
+ if (deferFile) {
204
+ if (deferFileBusy(deferFile, now.getTime())) {
205
+ console.error("[schedule-gate] Отложенный запуск уже ожидает открытия окна.");
206
+ return 3;
207
+ }
208
+ if (!acquireDefer(deferFile, now.getTime())) {
209
+ console.error("[schedule-gate] Не удалось захватить defer-файл — пропускаем.");
210
+ return 3;
211
+ }
212
+ }
193
213
 
194
- if (deferFile) releaseDefer(deferFile);
214
+ console.error(
215
+ `[schedule-gate] ${state.reason ?? "Вне окна"} — запуск перенесён на ~${Math.round(
216
+ wait / 60000
217
+ )} мин.`
218
+ );
219
+ let remaining = wait;
220
+ while (remaining > 0) {
221
+ const chunk = Math.min(remaining, 60_000);
222
+ await sleepMs(chunk);
223
+ remaining -= chunk;
224
+ }
195
225
 
196
- if (!isInWindow(woke, notBefore, notAfter, zone)) {
197
- console.error("[schedule-gate] Окно не открылось за отведённое время — не запускаем.");
198
- return 3;
226
+ const woke = new Date();
227
+ if (deferFile) releaseDefer(deferFile);
228
+
229
+ if (!activeWindowState(woke, windowOptions).active) {
230
+ console.error("[schedule-gate] Окно не открылось за отведённое время — не запускаем.");
231
+ return 3;
232
+ }
199
233
  }
200
234
  }
201
235
 
@@ -466,6 +466,96 @@ export function windowDelayMs(now: Date, notBefore?: string | null, notAfter?: s
466
466
  return Math.max(0, deltaSec * 1000 - ms);
467
467
  }
468
468
 
469
+ // ---------------------------------------------------------------------------
470
+ // Дни недели и политика вне окна (Спринт 27).
471
+
472
+ /** 0=Вс..6=Сб. Пустой/полный список трактуется как «все дни» (undefined). */
473
+ export function normalizeActiveDays(days?: number[] | null): number[] | undefined {
474
+ if (!Array.isArray(days)) return undefined;
475
+ const unique = [
476
+ ...new Set(
477
+ days
478
+ .map((value) => Math.floor(Number(value)))
479
+ .filter((value) => Number.isInteger(value) && value >= 0 && value <= 6)
480
+ ),
481
+ ].sort((a, b) => a - b);
482
+ if (unique.length === 0 || unique.length === 7) return undefined;
483
+ return unique;
484
+ }
485
+
486
+ /** Разрешён ли день недели (в поясе задачи). */
487
+ export function isActiveDay(now: Date, days?: number[] | null, timeZone?: string): boolean {
488
+ const normalized = normalizeActiveDays(days);
489
+ if (!normalized) return true;
490
+ return normalized.includes(zonedParts(now, timeZone).weekday);
491
+ }
492
+
493
+ export interface ActiveWindowOptions {
494
+ notBefore?: string | null;
495
+ notAfter?: string | null;
496
+ days?: number[] | null;
497
+ timeZone?: string;
498
+ }
499
+
500
+ export interface ActiveWindowState {
501
+ /** Можно запускать сейчас. */
502
+ active: boolean;
503
+ /** Почему нельзя (человекочитаемо, для dry-run и логов). */
504
+ reason?: string;
505
+ /** Ближайшее открытие окна; null — не требуется или не найдено. */
506
+ nextOpenAt: Date | null;
507
+ }
508
+
509
+ const WINDOW_SCAN_MINUTES = 8 * 24 * 60;
510
+
511
+ /** Ближайшая минута, когда и день, и окно разрешают запуск. */
512
+ export function nextWindowOpenAt(now: Date, options: ActiveWindowOptions): Date | null {
513
+ const { notBefore, notAfter, timeZone } = options;
514
+ const normalizedDays = normalizeActiveDays(options.days);
515
+ const hasWindow = Boolean((notBefore || "").trim() || (notAfter || "").trim());
516
+ if (!hasWindow && !normalizedDays) return null;
517
+ const invalidWindow = validateLaunchWindow(notBefore, notAfter) !== null;
518
+ for (let i = 1; i <= WINDOW_SCAN_MINUTES; i++) {
519
+ const candidate = new Date(now.getTime() + i * 60_000);
520
+ const dayOk =
521
+ !normalizedDays || normalizedDays.includes(zonedParts(candidate, timeZone).weekday);
522
+ const windowOk = invalidWindow || isInWindow(candidate, notBefore, notAfter, timeZone);
523
+ if (dayOk && windowOk) return candidate;
524
+ }
525
+ return null;
526
+ }
527
+
528
+ /** Состояние окна с учётом дней недели. */
529
+ export function activeWindowState(now: Date, options: ActiveWindowOptions = {}): ActiveWindowState {
530
+ const normalizedDays = normalizeActiveDays(options.days);
531
+ const dayOk =
532
+ !normalizedDays ||
533
+ normalizedDays.includes(zonedParts(now, options.timeZone).weekday);
534
+ const windowOk = isInWindow(now, options.notBefore, options.notAfter, options.timeZone);
535
+ if (dayOk && windowOk) return { active: true, nextOpenAt: null };
536
+
537
+ const reasons: string[] = [];
538
+ if (!dayOk) {
539
+ const names = ["Вс", "Пн", "Вт", "Ср", "Чт", "Пт", "Сб"];
540
+ reasons.push(`день недели не разрешён (${(normalizedDays ?? []).map((d) => names[d]).join(", ")})`);
541
+ }
542
+ if (!windowOk) {
543
+ reasons.push(`время вне окна ${options.notBefore}–${options.notAfter}`);
544
+ }
545
+ return {
546
+ active: false,
547
+ reason: reasons.join("; "),
548
+ nextOpenAt: nextWindowOpenAt(now, options),
549
+ };
550
+ }
551
+
552
+ /** Сколько мс до следующего разрешённого окна (0 — можно запускать). */
553
+ export function nextWindowOpenDelayMs(now: Date, options: ActiveWindowOptions = {}): number {
554
+ const state = activeWindowState(now, options);
555
+ if (state.active) return 0;
556
+ return state.nextOpenAt ? Math.max(0, state.nextOpenAt.getTime() - now.getTime()) : 0;
557
+ }
558
+
469
559
  // ---------------------------------------------------------------------------
470
560
  // Проверка совместимости с schtasks (родной режим).
471
561
 
@@ -502,6 +592,10 @@ export interface ScheduleGateSpec {
502
592
  tz?: string;
503
593
  notBefore?: string;
504
594
  notAfter?: string;
595
+ /** Разрешённые дни недели (0=Вс..6=Сб); пусто — все дни. */
596
+ days?: number[];
597
+ /** Поведение вне окна: skip — пропустить, run — выполнить всё равно. */
598
+ windowPolicy?: "skip" | "run";
505
599
  }
506
600
 
507
601
  /**
@@ -523,11 +617,22 @@ export function buildScheduleGate(
523
617
  expr: string,
524
618
  timezone?: string | null,
525
619
  notBefore?: string,
526
- notAfter?: string
620
+ notAfter?: string,
621
+ days?: number[] | null,
622
+ windowPolicy?: string | null
527
623
  ): ScheduleGateSpec | undefined {
528
624
  const tz = (timezone || "").trim() || undefined;
529
625
  const poll = needsPollMode(expr, tz);
530
- if (!poll && !(notBefore && notAfter)) return undefined;
626
+ const normalizedDays = normalizeActiveDays(days);
627
+ const policy = windowPolicy === "skip" || windowPolicy === "run" ? windowPolicy : undefined;
628
+ if (!poll && !(notBefore && notAfter) && !normalizedDays) return undefined;
531
629
  // cron проверяем только в poll-режиме (см. комментарий у ScheduleGateSpec).
532
- return { ...(poll ? { cron: expr } : {}), tz, notBefore, notAfter };
630
+ return {
631
+ ...(poll ? { cron: expr } : {}),
632
+ tz,
633
+ notBefore,
634
+ notAfter,
635
+ ...(normalizedDays ? { days: normalizedDays } : {}),
636
+ ...(policy ? { windowPolicy: policy } : {}),
637
+ };
533
638
  }
@@ -1,7 +1,7 @@
1
1
  import type { ScheduledTaskInfo } from "../../types.js";
2
2
 
3
3
  /** Чем запускается задача. */
4
- export type TriggerType = "cron" | "file" | "mcp-event" | "once";
4
+ export type TriggerType = "cron" | "file" | "git" | "mcp-event" | "once";
5
5
 
6
6
  /**
7
7
  * Параметры создания задачи. Бэкенд сам решает, как преобразовать cron
@@ -128,6 +128,8 @@ export function buildBashWrapperScript(options: BashWrapperOptions): string {
128
128
  `SCHEDULE_TZ=${shellQuote(scheduleGate?.tz ?? "")}`,
129
129
  `SCHEDULE_NOT_BEFORE=${shellQuote(scheduleGate?.notBefore ?? "")}`,
130
130
  `SCHEDULE_NOT_AFTER=${shellQuote(scheduleGate?.notAfter ?? "")}`,
131
+ `SCHEDULE_DAYS=${shellQuote((scheduleGate?.days ?? []).join(","))}`,
132
+ `SCHEDULE_WINDOW_POLICY=${shellQuote(scheduleGate?.windowPolicy ?? "")}`,
131
133
  `SCHEDULE_DEFER_FILE=${shellQuote(scheduleGate?.deferFile ?? "")}`,
132
134
  `SCHEDULE_FORCE_FILE=${shellQuote(scheduleGate?.forceFile ?? "")}`,
133
135
  `ENV_FILE=${shellQuote(envFile ?? "")}`,
@@ -148,6 +150,8 @@ export function buildBashWrapperScript(options: BashWrapperOptions): string {
148
150
  ' [ -n "$SCHEDULE_TZ" ] && SCHED_GATE_ARGS+=(--tz "$SCHEDULE_TZ")',
149
151
  ' [ -n "$SCHEDULE_NOT_BEFORE" ] && SCHED_GATE_ARGS+=(--not-before "$SCHEDULE_NOT_BEFORE")',
150
152
  ' [ -n "$SCHEDULE_NOT_AFTER" ] && SCHED_GATE_ARGS+=(--not-after "$SCHEDULE_NOT_AFTER")',
153
+ ' [ -n "$SCHEDULE_DAYS" ] && SCHED_GATE_ARGS+=(--days "$SCHEDULE_DAYS")',
154
+ ' [ -n "$SCHEDULE_WINDOW_POLICY" ] && SCHED_GATE_ARGS+=(--window-policy "$SCHEDULE_WINDOW_POLICY")',
151
155
  ' [ -n "$SCHEDULE_DEFER_FILE" ] && SCHED_GATE_ARGS+=(--defer-file "$SCHEDULE_DEFER_FILE")',
152
156
  ' [ -n "$SCHEDULE_FORCE_FILE" ] && SCHED_GATE_ARGS+=(--force-file "$SCHEDULE_FORCE_FILE")',
153
157
  ' if ! command -v node >/dev/null 2>&1; then',
@@ -0,0 +1,62 @@
1
+ import { getDb } from "./index.js";
2
+
3
+ /**
4
+ * Состояние git-триггера (Спринт 27): последний обработанный коммит задачи.
5
+ * Хранится в SQLite, чтобы после перезапуска плагина не запускать задачу
6
+ * повторно на тех же коммитах.
7
+ */
8
+ export interface GitState {
9
+ taskName: string;
10
+ commitSha: string;
11
+ branch: string | null;
12
+ updatedAt: string;
13
+ }
14
+
15
+ interface GitStateRow {
16
+ task_name: string;
17
+ commit_sha: string;
18
+ branch: string | null;
19
+ updated_at: string;
20
+ }
21
+
22
+ export function getGitState(taskName: string): GitState | undefined {
23
+ const row = getDb()
24
+ .prepare("SELECT task_name, commit_sha, branch, updated_at FROM git_state WHERE task_name = ?")
25
+ .get(taskName) as GitStateRow | undefined;
26
+ if (!row) return undefined;
27
+ return {
28
+ taskName: String(row.task_name),
29
+ commitSha: String(row.commit_sha),
30
+ branch: row.branch == null ? null : String(row.branch),
31
+ updatedAt: String(row.updated_at),
32
+ };
33
+ }
34
+
35
+ export function setGitState(taskName: string, commitSha: string, branch?: string | null): void {
36
+ getDb()
37
+ .prepare(
38
+ `INSERT INTO git_state (task_name, commit_sha, branch, updated_at)
39
+ VALUES (?, ?, ?, ?)
40
+ ON CONFLICT(task_name) DO UPDATE SET
41
+ commit_sha = excluded.commit_sha,
42
+ branch = excluded.branch,
43
+ updated_at = excluded.updated_at`
44
+ )
45
+ .run(taskName, commitSha, branch ?? null, new Date().toISOString());
46
+ }
47
+
48
+ export function deleteGitState(taskName: string): void {
49
+ getDb().prepare("DELETE FROM git_state WHERE task_name = ?").run(taskName);
50
+ }
51
+
52
+ export function listGitStates(): GitState[] {
53
+ const rows = getDb()
54
+ .prepare("SELECT task_name, commit_sha, branch, updated_at FROM git_state ORDER BY task_name")
55
+ .all() as GitStateRow[];
56
+ return rows.map((row) => ({
57
+ taskName: String(row.task_name),
58
+ commitSha: String(row.commit_sha),
59
+ branch: row.branch == null ? null : String(row.branch),
60
+ updatedAt: String(row.updated_at),
61
+ }));
62
+ }
package/src/db/schema.ts CHANGED
@@ -82,6 +82,14 @@ CREATE TABLE IF NOT EXISTS audit_log (
82
82
 
83
83
  CREATE INDEX IF NOT EXISTS idx_audit_ts ON audit_log(ts DESC);
84
84
  CREATE INDEX IF NOT EXISTS idx_audit_action ON audit_log(action, ts DESC);
85
+
86
+ -- Спринт 27: последний обработанный коммит для git-триггеров.
87
+ CREATE TABLE IF NOT EXISTS git_state (
88
+ task_name TEXT PRIMARY KEY,
89
+ commit_sha TEXT NOT NULL,
90
+ branch TEXT,
91
+ updated_at TEXT NOT NULL
92
+ );
85
93
  `;
86
94
 
87
95
  interface SchemaDb {