opencode-windows-scheduler 1.0.0 → 1.2.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.
- package/CHANGELOG.md +58 -7
- package/README.md +14 -4
- package/README.ru.md +14 -4
- package/ROADMAP.md +30 -20
- package/dist/core/analytics.d.ts +129 -0
- package/dist/core/analytics.d.ts.map +1 -0
- package/dist/core/analytics.js +286 -0
- package/dist/core/dry-run.d.ts +13 -0
- package/dist/core/dry-run.d.ts.map +1 -1
- package/dist/core/dry-run.js +30 -0
- package/dist/core/matrix.d.ts.map +1 -1
- package/dist/core/matrix.js +10 -0
- package/dist/core/ps-wrapper.d.ts +32 -2
- package/dist/core/ps-wrapper.d.ts.map +1 -1
- package/dist/core/ps-wrapper.js +101 -3
- package/dist/core/retention.d.ts +29 -0
- package/dist/core/retention.d.ts.map +1 -0
- package/dist/core/retention.js +98 -0
- package/dist/core/schedule-gate.d.ts +2 -0
- package/dist/core/schedule-gate.d.ts.map +1 -0
- package/dist/core/schedule-gate.js +182 -0
- package/dist/core/schedule-v2.d.ts +88 -0
- package/dist/core/schedule-v2.d.ts.map +1 -0
- package/dist/core/schedule-v2.js +496 -0
- package/dist/core/scheduler/types.d.ts +15 -0
- package/dist/core/scheduler/types.d.ts.map +1 -1
- package/dist/core/scheduler/windows.d.ts.map +1 -1
- package/dist/core/scheduler/windows.js +13 -1
- package/dist/core/wrappers/bash.d.ts +15 -0
- package/dist/core/wrappers/bash.d.ts.map +1 -1
- package/dist/core/wrappers/bash.js +44 -1
- package/dist/db/history-repo.d.ts +41 -0
- package/dist/db/history-repo.d.ts.map +1 -1
- package/dist/db/history-repo.js +78 -0
- package/dist/db/schema.d.ts +1 -1
- package/dist/db/schema.d.ts.map +1 -1
- package/dist/db/schema.js +11 -0
- package/dist/index.d.ts +117 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +1094 -56
- package/dist/notifications.d.ts +112 -6
- package/dist/notifications.d.ts.map +1 -1
- package/dist/notifications.js +396 -34
- package/dist/profiles.d.ts +60 -0
- package/dist/profiles.d.ts.map +1 -0
- package/dist/profiles.js +209 -0
- package/dist/rpc.d.ts +645 -0
- package/dist/rpc.d.ts.map +1 -1
- package/dist/rpc.js +251 -2
- package/dist/server.d.ts.map +1 -1
- package/dist/server.js +200 -7
- package/dist/settings.d.ts +80 -0
- package/dist/settings.d.ts.map +1 -1
- package/dist/settings.js +159 -8
- package/dist/task-transfer.d.ts +13 -0
- package/dist/task-transfer.d.ts.map +1 -1
- package/dist/task-transfer.js +26 -0
- package/dist/types.d.ts.map +1 -1
- package/dist/types.js +3 -11
- package/dist/version.d.ts +8 -0
- package/dist/version.d.ts.map +1 -0
- package/dist/version.js +27 -0
- package/dist/workspaces.d.ts +43 -0
- package/dist/workspaces.d.ts.map +1 -1
- package/dist/workspaces.js +174 -8
- package/docs/ARCHITECTURE.md +45 -13
- package/docs/FEATURES.md +103 -12
- package/gui-experimental.cjs +4 -2
- package/package.json +8 -2
- package/src/core/analytics.ts +414 -0
- package/src/core/dry-run.ts +42 -0
- package/src/core/matrix.ts +10 -0
- package/src/core/ps-wrapper.ts +117 -3
- package/src/core/retention.ts +141 -0
- package/src/core/schedule-gate.ts +213 -0
- package/src/core/schedule-v2.ts +533 -0
- package/src/core/scheduler/types.ts +15 -0
- package/src/core/scheduler/windows.ts +13 -1
- package/src/core/wrappers/bash.ts +60 -0
- package/src/db/history-repo.ts +116 -0
- package/src/db/schema.ts +14 -0
- package/src/gui.tsx +3613 -2725
- package/src/index.ts +1325 -55
- package/src/notifications.ts +516 -40
- package/src/profiles.ts +236 -0
- package/src/rpc.ts +267 -2
- package/src/server.ts +226 -7
- package/src/settings.ts +285 -9
- package/src/task-transfer.ts +44 -0
- package/src/types.ts +3 -13
- package/src/version.ts +27 -0
- package/src/workspaces.ts +214 -8
- package/dist/gui-experimental.cjs +0 -1
package/src/settings.ts
CHANGED
|
@@ -8,6 +8,55 @@ export interface WebhookNotificationSettings {
|
|
|
8
8
|
enabled: boolean;
|
|
9
9
|
/** URL вебхука. */
|
|
10
10
|
url: string;
|
|
11
|
+
/** Таймаут запроса в мс (1000..120000). */
|
|
12
|
+
timeoutMs: number;
|
|
13
|
+
/** Сколько раз повторить при сетевой ошибке / 5xx / 429 (0..5). */
|
|
14
|
+
retryCount: number;
|
|
15
|
+
/** Базовая задержка backoff в мс; каждая следующая попытка ждёт вдвое дольше. */
|
|
16
|
+
retryDelayMs: number;
|
|
17
|
+
}
|
|
18
|
+
|
|
19
|
+
/** Настраиваемые шаблоны сообщений о завершении задачи. */
|
|
20
|
+
export interface NotificationTemplates {
|
|
21
|
+
/** Шаблон успеха. Плейсхолдеры: {task} {status} {duration} {error} {emoji}. */
|
|
22
|
+
success: string;
|
|
23
|
+
/** Шаблон ошибки. {error} разворачивается в «: текст» или пустую строку. */
|
|
24
|
+
error: string;
|
|
25
|
+
}
|
|
26
|
+
|
|
27
|
+
/** Фильтры по задачам: include имеет приоритет, exclude сильнее include. */
|
|
28
|
+
export interface NotificationFilters {
|
|
29
|
+
/** Уведомлять только эти задачи (пусто — все). Поддерживает `*`. */
|
|
30
|
+
include: string[];
|
|
31
|
+
/** Никогда не уведомлять эти задачи. Поддерживает `*`. */
|
|
32
|
+
exclude: string[];
|
|
33
|
+
}
|
|
34
|
+
|
|
35
|
+
/** Уведомления о матрицах (Спринт 20). */
|
|
36
|
+
export interface MatrixNotificationSettings {
|
|
37
|
+
/** Включены ли уведомления о матрицах. */
|
|
38
|
+
enabled: boolean;
|
|
39
|
+
/** Сообщать о partial (часть клонов упала). */
|
|
40
|
+
onPartial: boolean;
|
|
41
|
+
/** Сообщать, когда упали все клоны. */
|
|
42
|
+
onAllFailed: boolean;
|
|
43
|
+
/** Порог «матрица зависла» в минутах (0 — детектор выключен). */
|
|
44
|
+
stuckAfterMinutes: number;
|
|
45
|
+
}
|
|
46
|
+
|
|
47
|
+
/** Периодичность дайджеста. */
|
|
48
|
+
export type DigestFrequency = "daily" | "weekly";
|
|
49
|
+
|
|
50
|
+
/** Дайджест по истории запусков (Спринт 20). */
|
|
51
|
+
export interface DigestSettings {
|
|
52
|
+
/** Включён ли дайджест. */
|
|
53
|
+
enabled: boolean;
|
|
54
|
+
/** Ежедневно или еженедельно (по понедельникам). */
|
|
55
|
+
frequency: DigestFrequency;
|
|
56
|
+
/** Время отправки в формате HH:MM (локальное время сервера). */
|
|
57
|
+
time: string;
|
|
58
|
+
/** ISO-момент последней отправки — дедуп между перезапусками плагина. */
|
|
59
|
+
lastSentAt: string | null;
|
|
11
60
|
}
|
|
12
61
|
|
|
13
62
|
/**
|
|
@@ -23,6 +72,32 @@ export interface NotificationSettings {
|
|
|
23
72
|
onlyOnError: boolean;
|
|
24
73
|
/** Webhook-канал. */
|
|
25
74
|
webhook?: WebhookNotificationSettings;
|
|
75
|
+
/** Шаблоны сообщений. */
|
|
76
|
+
templates?: NotificationTemplates;
|
|
77
|
+
/** Фильтры по задачам. */
|
|
78
|
+
filters?: NotificationFilters;
|
|
79
|
+
/** Уведомления о матрицах. */
|
|
80
|
+
matrix?: MatrixNotificationSettings;
|
|
81
|
+
/** Периодический дайджест. */
|
|
82
|
+
digest?: DigestSettings;
|
|
83
|
+
}
|
|
84
|
+
|
|
85
|
+
/**
|
|
86
|
+
* Ретеншн истории (Спринт 18).
|
|
87
|
+
*
|
|
88
|
+
* Дашборд и метрики живут на агрегатах, поэтому удаление старых записей
|
|
89
|
+
* не искажает «Всего запусков» и стоимость: чистится только сырая история.
|
|
90
|
+
* 0 — соответствующее ограничение выключено.
|
|
91
|
+
*/
|
|
92
|
+
export interface HistorySettings {
|
|
93
|
+
/** Удалять завершённые записи старше N дней (0 — не удалять по возрасту). */
|
|
94
|
+
retentionDays: number;
|
|
95
|
+
/** Хранить не более N последних записей (0 — без ограничения). */
|
|
96
|
+
maxRecords: number;
|
|
97
|
+
/** Когда последний раз запускалась автоочистка (ISO). */
|
|
98
|
+
lastCleanupAt: string | null;
|
|
99
|
+
/** Сколько записей удалила последняя очистка (для дашборда). */
|
|
100
|
+
lastCleanupDeleted: number;
|
|
26
101
|
}
|
|
27
102
|
|
|
28
103
|
/**
|
|
@@ -36,18 +111,93 @@ export interface SchedulerSettings {
|
|
|
36
111
|
winterMode: boolean;
|
|
37
112
|
/** Уведомления о завершении задач. */
|
|
38
113
|
notifications: NotificationSettings;
|
|
114
|
+
/** Ретеншн истории запусков. */
|
|
115
|
+
history: HistorySettings;
|
|
39
116
|
}
|
|
40
117
|
|
|
41
118
|
export const SETTINGS_FILE = path.join(PLUGIN_DIR, "settings.json");
|
|
42
119
|
export const DEFAULT_MAX_CONCURRENT = 1;
|
|
43
120
|
export const DEFAULT_WINTER_MODE = false;
|
|
121
|
+
export const DEFAULT_RETENTION_DAYS = 30;
|
|
122
|
+
export const DEFAULT_MAX_RECORDS = 5000;
|
|
123
|
+
|
|
124
|
+
/** Уведомления (Спринт 20): таймаут webhook, повторы и порог «зависшей» матрицы. */
|
|
125
|
+
export const DEFAULT_WEBHOOK_TIMEOUT_MS = 10_000;
|
|
126
|
+
export const DEFAULT_WEBHOOK_RETRY_COUNT = 2;
|
|
127
|
+
export const DEFAULT_WEBHOOK_RETRY_DELAY_MS = 1_000;
|
|
128
|
+
export const DEFAULT_STUCK_AFTER_MINUTES = 60;
|
|
129
|
+
|
|
130
|
+
/** Ретеншн по умолчанию: 30 дней и не больше 5000 записей. */
|
|
131
|
+
export function defaultHistorySettings(): HistorySettings {
|
|
132
|
+
return {
|
|
133
|
+
retentionDays: DEFAULT_RETENTION_DAYS,
|
|
134
|
+
maxRecords: DEFAULT_MAX_RECORDS,
|
|
135
|
+
lastCleanupAt: null,
|
|
136
|
+
lastCleanupDeleted: 0,
|
|
137
|
+
};
|
|
138
|
+
}
|
|
139
|
+
|
|
140
|
+
/** Приводит счётчик ретеншна к безопасному целому (>= 0). */
|
|
141
|
+
function normalizeRetentionLimit(value: unknown, fallback: number): number {
|
|
142
|
+
const n = Number(value);
|
|
143
|
+
if (!Number.isFinite(n)) return fallback;
|
|
144
|
+
const int = Math.floor(n);
|
|
145
|
+
return int >= 0 ? int : fallback;
|
|
146
|
+
}
|
|
147
|
+
|
|
148
|
+
/** Приводит настройки ретеншна к безопасному виду. */
|
|
149
|
+
function normalizeHistorySettings(
|
|
150
|
+
value: unknown,
|
|
151
|
+
fallback: HistorySettings
|
|
152
|
+
): HistorySettings {
|
|
153
|
+
if (!value || typeof value !== "object" || Array.isArray(value)) {
|
|
154
|
+
return { ...fallback };
|
|
155
|
+
}
|
|
156
|
+
const raw = value as Partial<HistorySettings>;
|
|
157
|
+
const lastCleanupAt =
|
|
158
|
+
typeof raw.lastCleanupAt === "string" && raw.lastCleanupAt.trim()
|
|
159
|
+
? raw.lastCleanupAt.trim()
|
|
160
|
+
: null;
|
|
161
|
+
return {
|
|
162
|
+
retentionDays: normalizeRetentionLimit(raw.retentionDays, fallback.retentionDays),
|
|
163
|
+
maxRecords: normalizeRetentionLimit(raw.maxRecords, fallback.maxRecords),
|
|
164
|
+
lastCleanupAt,
|
|
165
|
+
lastCleanupDeleted: normalizeRetentionLimit(
|
|
166
|
+
raw.lastCleanupDeleted,
|
|
167
|
+
fallback.lastCleanupDeleted
|
|
168
|
+
),
|
|
169
|
+
};
|
|
170
|
+
}
|
|
44
171
|
|
|
45
172
|
/** Значения уведомлений по умолчанию: всё выключено, только ошибки. */
|
|
46
173
|
export function defaultNotifications(): NotificationSettings {
|
|
47
174
|
return {
|
|
48
175
|
enabled: false,
|
|
49
176
|
onlyOnError: true,
|
|
50
|
-
webhook: {
|
|
177
|
+
webhook: {
|
|
178
|
+
enabled: false,
|
|
179
|
+
url: "",
|
|
180
|
+
timeoutMs: DEFAULT_WEBHOOK_TIMEOUT_MS,
|
|
181
|
+
retryCount: DEFAULT_WEBHOOK_RETRY_COUNT,
|
|
182
|
+
retryDelayMs: DEFAULT_WEBHOOK_RETRY_DELAY_MS,
|
|
183
|
+
},
|
|
184
|
+
templates: {
|
|
185
|
+
success: '✅ Задача "{task}" выполнена ({duration})',
|
|
186
|
+
error: '❌ Задача "{task}" упала ({duration}){error}',
|
|
187
|
+
},
|
|
188
|
+
filters: { include: [], exclude: [] },
|
|
189
|
+
matrix: {
|
|
190
|
+
enabled: true,
|
|
191
|
+
onPartial: true,
|
|
192
|
+
onAllFailed: true,
|
|
193
|
+
stuckAfterMinutes: DEFAULT_STUCK_AFTER_MINUTES,
|
|
194
|
+
},
|
|
195
|
+
digest: {
|
|
196
|
+
enabled: false,
|
|
197
|
+
frequency: "daily",
|
|
198
|
+
time: "09:00",
|
|
199
|
+
lastSentAt: null,
|
|
200
|
+
},
|
|
51
201
|
};
|
|
52
202
|
}
|
|
53
203
|
|
|
@@ -67,24 +217,82 @@ function normalizeWinterMode(value: unknown, fallback: boolean): boolean {
|
|
|
67
217
|
return fallback;
|
|
68
218
|
}
|
|
69
219
|
|
|
220
|
+
/** Приводит значение к конечному целому в диапазоне [min, max]. */
|
|
221
|
+
function normalizeIntInRange(
|
|
222
|
+
value: unknown,
|
|
223
|
+
fallback: number,
|
|
224
|
+
min: number,
|
|
225
|
+
max: number
|
|
226
|
+
): number {
|
|
227
|
+
const n = Number(value);
|
|
228
|
+
if (!Number.isFinite(n)) return fallback;
|
|
229
|
+
return Math.min(max, Math.max(min, Math.floor(n)));
|
|
230
|
+
}
|
|
231
|
+
|
|
232
|
+
/** Приводит время HH:MM к безопасному виду. */
|
|
233
|
+
function normalizeDailyTime(value: unknown, fallback: string): string {
|
|
234
|
+
if (typeof value === "string" && /^([01]\d|2[0-3]):[0-5]\d$/.test(value.trim())) {
|
|
235
|
+
return value.trim();
|
|
236
|
+
}
|
|
237
|
+
return fallback;
|
|
238
|
+
}
|
|
239
|
+
|
|
240
|
+
/** Список имён задач: массив строк, обрезанных и без пустых значений. */
|
|
241
|
+
function normalizeNameList(value: unknown, fallback: string[]): string[] {
|
|
242
|
+
if (!Array.isArray(value)) return [...fallback];
|
|
243
|
+
return value
|
|
244
|
+
.filter((item): item is string => typeof item === "string")
|
|
245
|
+
.map((item) => item.trim())
|
|
246
|
+
.filter((item) => item.length > 0);
|
|
247
|
+
}
|
|
248
|
+
|
|
249
|
+
function asRecord(value: unknown): Record<string, unknown> | undefined {
|
|
250
|
+
return value && typeof value === "object" && !Array.isArray(value)
|
|
251
|
+
? (value as Record<string, unknown>)
|
|
252
|
+
: undefined;
|
|
253
|
+
}
|
|
254
|
+
|
|
70
255
|
/** Приводит настройки уведомлений к безопасному виду. */
|
|
71
256
|
function normalizeNotifications(
|
|
72
257
|
value: unknown,
|
|
73
258
|
fallback: NotificationSettings
|
|
74
259
|
): NotificationSettings {
|
|
75
|
-
|
|
260
|
+
const fallbackWebhook = fallback.webhook ?? defaultNotifications().webhook!;
|
|
261
|
+
const fallbackTemplates = fallback.templates ?? defaultNotifications().templates!;
|
|
262
|
+
const fallbackFilters = fallback.filters ?? { include: [], exclude: [] };
|
|
263
|
+
const fallbackMatrix = fallback.matrix ?? defaultNotifications().matrix!;
|
|
264
|
+
const fallbackDigest = fallback.digest ?? defaultNotifications().digest!;
|
|
265
|
+
|
|
266
|
+
const raw = asRecord(value);
|
|
267
|
+
if (!raw) {
|
|
76
268
|
return {
|
|
77
269
|
...fallback,
|
|
78
|
-
webhook:
|
|
270
|
+
webhook: { ...fallbackWebhook },
|
|
271
|
+
templates: { ...fallbackTemplates },
|
|
272
|
+
filters: {
|
|
273
|
+
include: [...fallbackFilters.include],
|
|
274
|
+
exclude: [...fallbackFilters.exclude],
|
|
275
|
+
},
|
|
276
|
+
matrix: { ...fallbackMatrix },
|
|
277
|
+
digest: { ...fallbackDigest },
|
|
79
278
|
};
|
|
80
279
|
}
|
|
81
280
|
|
|
82
|
-
const
|
|
83
|
-
const
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
281
|
+
const rawWebhook = asRecord(raw.webhook);
|
|
282
|
+
const rawTemplates = asRecord(raw.templates);
|
|
283
|
+
const rawFilters = asRecord(raw.filters);
|
|
284
|
+
const rawMatrix = asRecord(raw.matrix);
|
|
285
|
+
const rawDigest = asRecord(raw.digest);
|
|
286
|
+
|
|
287
|
+
const frequency: DigestFrequency =
|
|
288
|
+
rawDigest?.frequency === "weekly" || rawDigest?.frequency === "daily"
|
|
289
|
+
? rawDigest.frequency
|
|
290
|
+
: fallbackDigest.frequency;
|
|
291
|
+
|
|
292
|
+
const lastSentAt =
|
|
293
|
+
typeof rawDigest?.lastSentAt === "string" && rawDigest.lastSentAt.trim()
|
|
294
|
+
? rawDigest.lastSentAt.trim()
|
|
295
|
+
: null;
|
|
88
296
|
|
|
89
297
|
return {
|
|
90
298
|
enabled: typeof raw.enabled === "boolean" ? raw.enabled : fallback.enabled,
|
|
@@ -99,6 +307,67 @@ function normalizeNotifications(
|
|
|
99
307
|
typeof rawWebhook?.url === "string"
|
|
100
308
|
? rawWebhook.url.trim()
|
|
101
309
|
: fallbackWebhook.url,
|
|
310
|
+
timeoutMs: normalizeIntInRange(
|
|
311
|
+
rawWebhook?.timeoutMs,
|
|
312
|
+
fallbackWebhook.timeoutMs,
|
|
313
|
+
1_000,
|
|
314
|
+
120_000
|
|
315
|
+
),
|
|
316
|
+
retryCount: normalizeIntInRange(
|
|
317
|
+
rawWebhook?.retryCount,
|
|
318
|
+
fallbackWebhook.retryCount,
|
|
319
|
+
0,
|
|
320
|
+
5
|
|
321
|
+
),
|
|
322
|
+
retryDelayMs: normalizeIntInRange(
|
|
323
|
+
rawWebhook?.retryDelayMs,
|
|
324
|
+
fallbackWebhook.retryDelayMs,
|
|
325
|
+
100,
|
|
326
|
+
60_000
|
|
327
|
+
),
|
|
328
|
+
},
|
|
329
|
+
templates: {
|
|
330
|
+
success:
|
|
331
|
+
typeof rawTemplates?.success === "string" && rawTemplates.success.trim()
|
|
332
|
+
? rawTemplates.success
|
|
333
|
+
: fallbackTemplates.success,
|
|
334
|
+
error:
|
|
335
|
+
typeof rawTemplates?.error === "string" && rawTemplates.error.trim()
|
|
336
|
+
? rawTemplates.error
|
|
337
|
+
: fallbackTemplates.error,
|
|
338
|
+
},
|
|
339
|
+
filters: {
|
|
340
|
+
include: normalizeNameList(rawFilters?.include, fallbackFilters.include),
|
|
341
|
+
exclude: normalizeNameList(rawFilters?.exclude, fallbackFilters.exclude),
|
|
342
|
+
},
|
|
343
|
+
matrix: {
|
|
344
|
+
enabled:
|
|
345
|
+
typeof rawMatrix?.enabled === "boolean"
|
|
346
|
+
? rawMatrix.enabled
|
|
347
|
+
: fallbackMatrix.enabled,
|
|
348
|
+
onPartial:
|
|
349
|
+
typeof rawMatrix?.onPartial === "boolean"
|
|
350
|
+
? rawMatrix.onPartial
|
|
351
|
+
: fallbackMatrix.onPartial,
|
|
352
|
+
onAllFailed:
|
|
353
|
+
typeof rawMatrix?.onAllFailed === "boolean"
|
|
354
|
+
? rawMatrix.onAllFailed
|
|
355
|
+
: fallbackMatrix.onAllFailed,
|
|
356
|
+
stuckAfterMinutes: normalizeIntInRange(
|
|
357
|
+
rawMatrix?.stuckAfterMinutes,
|
|
358
|
+
fallbackMatrix.stuckAfterMinutes,
|
|
359
|
+
0,
|
|
360
|
+
10_080
|
|
361
|
+
),
|
|
362
|
+
},
|
|
363
|
+
digest: {
|
|
364
|
+
enabled:
|
|
365
|
+
typeof rawDigest?.enabled === "boolean"
|
|
366
|
+
? rawDigest.enabled
|
|
367
|
+
: fallbackDigest.enabled,
|
|
368
|
+
frequency,
|
|
369
|
+
time: normalizeDailyTime(rawDigest?.time, fallbackDigest.time),
|
|
370
|
+
lastSentAt,
|
|
102
371
|
},
|
|
103
372
|
};
|
|
104
373
|
}
|
|
@@ -106,6 +375,7 @@ function normalizeNotifications(
|
|
|
106
375
|
/** Читает настройки. Битый/отсутствующий файл — значения по умолчанию. */
|
|
107
376
|
export async function loadSettings(): Promise<SchedulerSettings> {
|
|
108
377
|
const fallbackNotifications = defaultNotifications();
|
|
378
|
+
const fallbackHistory = defaultHistorySettings();
|
|
109
379
|
try {
|
|
110
380
|
const raw = await fs.readFile(SETTINGS_FILE, "utf8");
|
|
111
381
|
const parsed = JSON.parse(raw) as Partial<SchedulerSettings> | null;
|
|
@@ -122,12 +392,14 @@ export async function loadSettings(): Promise<SchedulerSettings> {
|
|
|
122
392
|
parsed?.notifications,
|
|
123
393
|
fallbackNotifications
|
|
124
394
|
),
|
|
395
|
+
history: normalizeHistorySettings(parsed?.history, fallbackHistory),
|
|
125
396
|
};
|
|
126
397
|
} catch {
|
|
127
398
|
return {
|
|
128
399
|
maxConcurrent: DEFAULT_MAX_CONCURRENT,
|
|
129
400
|
winterMode: DEFAULT_WINTER_MODE,
|
|
130
401
|
notifications: fallbackNotifications,
|
|
402
|
+
history: fallbackHistory,
|
|
131
403
|
};
|
|
132
404
|
}
|
|
133
405
|
}
|
|
@@ -150,6 +422,10 @@ export async function saveSettings(
|
|
|
150
422
|
patch.notifications !== undefined
|
|
151
423
|
? normalizeNotifications(patch.notifications, current.notifications)
|
|
152
424
|
: current.notifications,
|
|
425
|
+
history:
|
|
426
|
+
patch.history !== undefined
|
|
427
|
+
? normalizeHistorySettings(patch.history, current.history)
|
|
428
|
+
: current.history,
|
|
153
429
|
};
|
|
154
430
|
await fs.mkdir(PLUGIN_DIR, { recursive: true });
|
|
155
431
|
await fs.writeFile(SETTINGS_FILE, JSON.stringify(next, null, 2), "utf8");
|
package/src/task-transfer.ts
CHANGED
|
@@ -7,6 +7,7 @@ import {
|
|
|
7
7
|
saveTask,
|
|
8
8
|
deleteTask,
|
|
9
9
|
} from "./db/tasks-repo.js";
|
|
10
|
+
import { isValidIanaTimeZone, validateLaunchWindow } from "./core/schedule-v2.js";
|
|
10
11
|
|
|
11
12
|
/** Триггер задачи по событию из MCP-шины. */
|
|
12
13
|
export interface McpEventTrigger {
|
|
@@ -140,6 +141,19 @@ export interface TaskDefinition {
|
|
|
140
141
|
matrixQueue?: string[];
|
|
141
142
|
/** Для родителя матрицы — true (флаг для фильтров/DAG). */
|
|
142
143
|
isMatrixParent?: boolean;
|
|
144
|
+
/**
|
|
145
|
+
* IANA-часовой пояс задачи (Спринт 19), например "Europe/Moscow".
|
|
146
|
+
* Не задан — системный пояс. Если отличается от системного, задача
|
|
147
|
+
* регистрируется в poll-режиме: ОС будит её каждую минуту, а cron
|
|
148
|
+
* проверяется в обёртке с учётом этого пояса.
|
|
149
|
+
*/
|
|
150
|
+
timezone?: string;
|
|
151
|
+
/** Начало окна запуска "HH:MM" (Спринт 19); вне окна запуск переносится. */
|
|
152
|
+
notBefore?: string;
|
|
153
|
+
/** Конец окна запуска "HH:MM"; может быть меньше notBefore (через полночь). */
|
|
154
|
+
notAfter?: string;
|
|
155
|
+
/** Пауза до даты (ISO, Спринт 19): плагин включит задачу автоматически. */
|
|
156
|
+
pausedUntil?: string;
|
|
143
157
|
/** Когда задача была создана — защита от ложного catch-up сразу после создания. */
|
|
144
158
|
createdAt?: string;
|
|
145
159
|
}
|
|
@@ -266,6 +280,10 @@ export async function buildExportJson(
|
|
|
266
280
|
? { triggerType: "mcp-event" as const }
|
|
267
281
|
: {}),
|
|
268
282
|
...(definition?.watchPath ? { watchPath: definition.watchPath } : {}),
|
|
283
|
+
...(definition?.timezone ? { timezone: definition.timezone } : {}),
|
|
284
|
+
...(definition?.notBefore ? { notBefore: definition.notBefore } : {}),
|
|
285
|
+
...(definition?.notAfter ? { notAfter: definition.notAfter } : {}),
|
|
286
|
+
...(definition?.pausedUntil ? { pausedUntil: definition.pausedUntil } : {}),
|
|
269
287
|
...(Array.isArray(definition?.allowedTools) && definition.allowedTools.length > 0
|
|
270
288
|
? { allowedTools: definition.allowedTools }
|
|
271
289
|
: {}),
|
|
@@ -442,6 +460,28 @@ export function parseImportJson(raw: string): ParsedImport {
|
|
|
442
460
|
const priority = normalizePriority(source.priority);
|
|
443
461
|
const workspaceId = readOptionalString(source.workspaceId);
|
|
444
462
|
|
|
463
|
+
// Планирование 2.0 (Спринт 19): IANA-зона, окно запуска, пауза до даты.
|
|
464
|
+
const timezone = readOptionalString(source.timezone);
|
|
465
|
+
if (timezone && !isValidIanaTimeZone(timezone)) {
|
|
466
|
+
errors.push(
|
|
467
|
+
`Запись ${position}${name ? ` (${name})` : ""}: неизвестный часовой пояс ` +
|
|
468
|
+
`«${timezone}» (нужна IANA-зона, например Europe/Moscow).`
|
|
469
|
+
);
|
|
470
|
+
}
|
|
471
|
+
const notBefore = readOptionalString(source.notBefore);
|
|
472
|
+
const notAfter = readOptionalString(source.notAfter);
|
|
473
|
+
const windowError = validateLaunchWindow(notBefore, notAfter);
|
|
474
|
+
if (windowError) {
|
|
475
|
+
errors.push(`Запись ${position}${name ? ` (${name})` : ""}: ${windowError}`);
|
|
476
|
+
}
|
|
477
|
+
const pausedUntil = readOptionalString(source.pausedUntil);
|
|
478
|
+
if (pausedUntil && Number.isNaN(Date.parse(pausedUntil))) {
|
|
479
|
+
errors.push(
|
|
480
|
+
`Запись ${position}${name ? ` (${name})` : ""}: pausedUntil должен быть ` +
|
|
481
|
+
`датой в формате ISO (например 2026-12-01T09:00:00Z).`
|
|
482
|
+
);
|
|
483
|
+
}
|
|
484
|
+
|
|
445
485
|
// Ограничения инструментов (Спринт 14): массив непустых строк без дублей.
|
|
446
486
|
// Пустой allowedTools отклоняется с явной ошибкой (избегаем «запрещено всё»).
|
|
447
487
|
const readToolList = (raw: unknown, fieldLabel: string): string[] | undefined | "empty" => {
|
|
@@ -636,6 +676,10 @@ export function parseImportJson(raw: string): ParsedImport {
|
|
|
636
676
|
...(dependsOn !== undefined ? { dependsOn } : {}),
|
|
637
677
|
...(triggerType === "cron" ? {} : { triggerType }),
|
|
638
678
|
...(watchPath ? { watchPath } : {}),
|
|
679
|
+
...(timezone !== undefined ? { timezone } : {}),
|
|
680
|
+
...(notBefore !== undefined ? { notBefore } : {}),
|
|
681
|
+
...(notAfter !== undefined ? { notAfter } : {}),
|
|
682
|
+
...(pausedUntil !== undefined ? { pausedUntil } : {}),
|
|
639
683
|
...(mcpEvent ? { mcpEvent } : {}),
|
|
640
684
|
...(allowedTools !== undefined ? { allowedTools } : {}),
|
|
641
685
|
...(deniedTools !== undefined ? { deniedTools } : {}),
|
package/src/types.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import os from "node:os";
|
|
2
1
|
import path from "node:path";
|
|
3
2
|
import { z } from "zod";
|
|
3
|
+
import { getProfileDir, getProfileName } from "./profiles.js";
|
|
4
4
|
|
|
5
5
|
/** Префикс всех задач плагина (историческое имя, сохраняется для совместимости). */
|
|
6
6
|
export const TASK_PREFIX = "OpenCode\\windows-scheduler";
|
|
@@ -15,20 +15,10 @@ export const TASK_FOLDER_NAME = "windows-scheduler";
|
|
|
15
15
|
* Windows: %APPDATA%\opencode\windows-scheduler (как раньше — без миграции).
|
|
16
16
|
* macOS/Linux: $XDG_CONFIG_HOME/opencode/windows-scheduler или
|
|
17
17
|
* ~/.config/opencode/windows-scheduler.
|
|
18
|
+
* Спринт 21: директория зависит от активного профиля (см. src/profiles.ts).
|
|
18
19
|
*/
|
|
19
20
|
function resolvePluginDir(): string {
|
|
20
|
-
|
|
21
|
-
const custom = process.env.OPENCODE_SCHEDULER_HOME?.trim();
|
|
22
|
-
if (custom) return path.resolve(custom);
|
|
23
|
-
|
|
24
|
-
if (process.platform === "win32") {
|
|
25
|
-
const base = process.env.APPDATA || path.join(os.homedir(), "AppData", "Roaming");
|
|
26
|
-
return path.join(base, "opencode", TASK_FOLDER_NAME);
|
|
27
|
-
}
|
|
28
|
-
|
|
29
|
-
const configHome =
|
|
30
|
-
process.env.XDG_CONFIG_HOME || path.join(os.homedir(), ".config");
|
|
31
|
-
return path.join(configHome, "opencode", TASK_FOLDER_NAME);
|
|
21
|
+
return getProfileDir(getProfileName());
|
|
32
22
|
}
|
|
33
23
|
|
|
34
24
|
export const PLUGIN_DIR = resolvePluginDir();
|
package/src/version.ts
ADDED
|
@@ -0,0 +1,27 @@
|
|
|
1
|
+
import fs from "node:fs";
|
|
2
|
+
import path from "node:path";
|
|
3
|
+
import { fileURLToPath } from "node:url";
|
|
4
|
+
|
|
5
|
+
let cached: string | null = null;
|
|
6
|
+
|
|
7
|
+
/**
|
|
8
|
+
* Версия плагина из package.json.
|
|
9
|
+
*
|
|
10
|
+
* Читается в рантайме из корня пакета рядом со скомпилированным модулем
|
|
11
|
+
* (dist/version.js -> ../package.json). Если файл недоступен — «unknown».
|
|
12
|
+
*/
|
|
13
|
+
export function getPluginVersion(): string {
|
|
14
|
+
if (cached) return cached;
|
|
15
|
+
try {
|
|
16
|
+
const here = path.dirname(fileURLToPath(import.meta.url));
|
|
17
|
+
const raw = fs.readFileSync(path.join(here, "..", "package.json"), "utf8");
|
|
18
|
+
const pkg = JSON.parse(raw) as { version?: unknown };
|
|
19
|
+
cached =
|
|
20
|
+
typeof pkg.version === "string" && pkg.version.trim()
|
|
21
|
+
? pkg.version.trim()
|
|
22
|
+
: "unknown";
|
|
23
|
+
} catch {
|
|
24
|
+
cached = "unknown";
|
|
25
|
+
}
|
|
26
|
+
return cached;
|
|
27
|
+
}
|