opencode-windows-scheduler 1.3.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.
- package/CHANGELOG.md +47 -1
- package/README.md +11 -5
- package/ROADMAP-STRATEGY.md +45 -26
- package/ROADMAP.md +279 -35
- package/dist/core/audit.d.ts +68 -0
- package/dist/core/audit.d.ts.map +1 -0
- package/dist/core/audit.js +206 -0
- package/dist/core/dry-run.d.ts +31 -0
- package/dist/core/dry-run.d.ts.map +1 -1
- package/dist/core/dry-run.js +129 -1
- package/dist/core/file-watcher.d.ts.map +1 -1
- package/dist/core/file-watcher.js +53 -10
- package/dist/core/git-trigger.d.ts +80 -0
- package/dist/core/git-trigger.d.ts.map +1 -0
- package/dist/core/git-trigger.js +288 -0
- package/dist/core/glob.d.ts +38 -0
- package/dist/core/glob.d.ts.map +1 -0
- package/dist/core/glob.js +233 -0
- package/dist/core/ps-wrapper.d.ts.map +1 -1
- package/dist/core/ps-wrapper.js +7 -0
- package/dist/core/schedule-gate.js +55 -30
- package/dist/core/schedule-v2.d.ts +29 -1
- package/dist/core/schedule-v2.d.ts.map +1 -1
- package/dist/core/schedule-v2.js +81 -3
- package/dist/core/scheduler/types.d.ts +1 -1
- package/dist/core/scheduler/types.d.ts.map +1 -1
- package/dist/core/secrets.d.ts +57 -0
- package/dist/core/secrets.d.ts.map +1 -0
- package/dist/core/secrets.js +331 -0
- package/dist/core/structured-log.d.ts.map +1 -1
- package/dist/core/structured-log.js +9 -0
- package/dist/core/wrappers/bash.d.ts.map +1 -1
- package/dist/core/wrappers/bash.js +4 -0
- package/dist/db/git-state-repo.d.ts +16 -0
- package/dist/db/git-state-repo.d.ts.map +1 -0
- package/dist/db/git-state-repo.js +38 -0
- package/dist/db/schema.d.ts +1 -1
- package/dist/db/schema.d.ts.map +1 -1
- package/dist/db/schema.js +23 -0
- package/dist/index.d.ts +68 -4
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +589 -45
- package/dist/rpc.d.ts +623 -0
- package/dist/rpc.d.ts.map +1 -1
- package/dist/rpc.js +219 -0
- package/dist/server.d.ts.map +1 -1
- package/dist/server.js +67 -0
- package/dist/settings.d.ts +16 -0
- package/dist/settings.d.ts.map +1 -1
- package/dist/settings.js +29 -0
- package/dist/task-transfer.d.ts +30 -3
- package/dist/task-transfer.d.ts.map +1 -1
- package/dist/task-transfer.js +83 -6
- package/dist/templates.d.ts +1 -1
- package/dist/templates.d.ts.map +1 -1
- package/dist/workspaces.d.ts +8 -2
- package/dist/workspaces.d.ts.map +1 -1
- package/dist/workspaces.js +21 -4
- package/docs/ARCHITECTURE.md +14 -5
- package/docs/FEATURES.md +80 -1
- package/docs/README.ru.md +15 -5
- package/gui-experimental.cjs +9 -4
- package/package.json +8 -3
- package/src/core/audit.ts +291 -0
- package/src/core/dry-run.ts +188 -1
- package/src/core/file-watcher.ts +65 -10
- package/src/core/git-trigger.ts +367 -0
- package/src/core/glob.ts +226 -0
- package/src/core/ps-wrapper.ts +7 -0
- package/src/core/schedule-gate.ts +67 -33
- package/src/core/schedule-v2.ts +108 -3
- package/src/core/scheduler/types.ts +1 -1
- package/src/core/secrets.ts +385 -0
- package/src/core/structured-log.ts +9 -0
- package/src/core/wrappers/bash.ts +4 -0
- package/src/db/git-state-repo.ts +62 -0
- package/src/db/schema.ts +23 -0
- package/src/gui.tsx +548 -4
- package/src/index.ts +790 -47
- package/src/rpc.ts +230 -0
- package/src/server.ts +67 -0
- package/src/settings.ts +51 -0
- package/src/task-transfer.ts +124 -5
- package/src/templates.ts +1 -1
- package/src/workspaces.ts +22 -4
package/src/task-transfer.ts
CHANGED
|
@@ -8,7 +8,11 @@ import {
|
|
|
8
8
|
deleteTask,
|
|
9
9
|
} from "./db/tasks-repo.js";
|
|
10
10
|
import { normalizeOneShotRunAt } from "./core/one-shot.js";
|
|
11
|
-
import {
|
|
11
|
+
import {
|
|
12
|
+
isValidIanaTimeZone,
|
|
13
|
+
normalizeActiveDays,
|
|
14
|
+
validateLaunchWindow,
|
|
15
|
+
} from "./core/schedule-v2.js";
|
|
12
16
|
import { isValidSessionId } from "./core/session.js";
|
|
13
17
|
|
|
14
18
|
/** Триггер задачи по событию из MCP-шины. */
|
|
@@ -115,10 +119,11 @@ export interface TaskDefinition {
|
|
|
115
119
|
dependsOn?: string[];
|
|
116
120
|
/**
|
|
117
121
|
* Чем запускается задача: по расписанию ("cron", по умолчанию),
|
|
118
|
-
* при изменении файла ("file"), по
|
|
119
|
-
* однократно в runAt ("once").
|
|
122
|
+
* при изменении файла ("file"), по новому коммиту в git ("git"),
|
|
123
|
+
* по MCP-событию ("mcp-event") или однократно в runAt ("once").
|
|
124
|
+
* Для file/git/mcp-event/once расписание не нужно.
|
|
120
125
|
*/
|
|
121
|
-
triggerType?: "cron" | "file" | "mcp-event" | "once";
|
|
126
|
+
triggerType?: "cron" | "file" | "git" | "mcp-event" | "once";
|
|
122
127
|
/** Абсолютное время однократного запуска (ISO-8601, triggerType "once"). */
|
|
123
128
|
runAt?: string;
|
|
124
129
|
/**
|
|
@@ -170,6 +175,32 @@ export interface TaskDefinition {
|
|
|
170
175
|
notBefore?: string;
|
|
171
176
|
/** Конец окна запуска "HH:MM"; может быть меньше notBefore (через полночь). */
|
|
172
177
|
notAfter?: string;
|
|
178
|
+
/**
|
|
179
|
+
* Разрешённые дни недели для окна и cron (Спринт 27): 0 = воскресенье … 6 = суббота.
|
|
180
|
+
* Пусто — все дни.
|
|
181
|
+
*/
|
|
182
|
+
activeDays?: number[];
|
|
183
|
+
/**
|
|
184
|
+
* Поведение вне окна запуска или в неразрешённый день (Спринт 27):
|
|
185
|
+
* "postpone" (по умолчанию) — ждать открытия окна, "skip" — пропустить,
|
|
186
|
+
* "run" — выполнить всё равно.
|
|
187
|
+
*/
|
|
188
|
+
windowPolicy?: "skip" | "postpone" | "run";
|
|
189
|
+
/**
|
|
190
|
+
* Git-триггер (Спринт 27): запускать при новых коммитах в рабочем каталоге.
|
|
191
|
+
* До первого запуска плагин запоминает текущий HEAD без запуска задачи.
|
|
192
|
+
*/
|
|
193
|
+
gitBranch?: string;
|
|
194
|
+
/** Glob-маски путей через запятую: запускать только при изменениях в них. */
|
|
195
|
+
gitPaths?: string[];
|
|
196
|
+
/** Glob-маски путей, изменения в которых не считаются триггером. */
|
|
197
|
+
gitIgnore?: string[];
|
|
198
|
+
/** Период опроса git, секунды (минимум 5, по умолчанию 60). */
|
|
199
|
+
gitPollSeconds?: number;
|
|
200
|
+
/** Glob-маски файлов для triggerType "file" (Спринт 27). */
|
|
201
|
+
watchGlobs?: string[];
|
|
202
|
+
/** Glob-маски игнорируемых файлов для triggerType "file". */
|
|
203
|
+
watchIgnore?: string[];
|
|
173
204
|
/** Пауза до даты (ISO, Спринт 19): плагин включит задачу автоматически. */
|
|
174
205
|
pausedUntil?: string;
|
|
175
206
|
/** Когда задача была создана — защита от ложного catch-up сразу после создания. */
|
|
@@ -294,6 +325,7 @@ export async function buildExportJson(
|
|
|
294
325
|
? { dependsOn: definition.dependsOn }
|
|
295
326
|
: {}),
|
|
296
327
|
...(definition?.triggerType === "file" ? { triggerType: "file" as const } : {}),
|
|
328
|
+
...(definition?.triggerType === "git" ? { triggerType: "git" as const } : {}),
|
|
297
329
|
...(definition?.triggerType === "mcp-event"
|
|
298
330
|
? { triggerType: "mcp-event" as const }
|
|
299
331
|
: {}),
|
|
@@ -317,6 +349,27 @@ export async function buildExportJson(
|
|
|
317
349
|
...(definition?.timezone ? { timezone: definition.timezone } : {}),
|
|
318
350
|
...(definition?.notBefore ? { notBefore: definition.notBefore } : {}),
|
|
319
351
|
...(definition?.notAfter ? { notAfter: definition.notAfter } : {}),
|
|
352
|
+
// Спринт 27: дни недели, политика окна и git/glob-триггеры.
|
|
353
|
+
...(Array.isArray(definition?.activeDays) && definition.activeDays.length > 0
|
|
354
|
+
? { activeDays: definition.activeDays }
|
|
355
|
+
: {}),
|
|
356
|
+
...(definition?.windowPolicy ? { windowPolicy: definition.windowPolicy } : {}),
|
|
357
|
+
...(definition?.gitBranch ? { gitBranch: definition.gitBranch } : {}),
|
|
358
|
+
...(Array.isArray(definition?.gitPaths) && definition.gitPaths.length > 0
|
|
359
|
+
? { gitPaths: definition.gitPaths }
|
|
360
|
+
: {}),
|
|
361
|
+
...(Array.isArray(definition?.gitIgnore) && definition.gitIgnore.length > 0
|
|
362
|
+
? { gitIgnore: definition.gitIgnore }
|
|
363
|
+
: {}),
|
|
364
|
+
...(definition?.gitPollSeconds !== undefined
|
|
365
|
+
? { gitPollSeconds: definition.gitPollSeconds }
|
|
366
|
+
: {}),
|
|
367
|
+
...(Array.isArray(definition?.watchGlobs) && definition.watchGlobs.length > 0
|
|
368
|
+
? { watchGlobs: definition.watchGlobs }
|
|
369
|
+
: {}),
|
|
370
|
+
...(Array.isArray(definition?.watchIgnore) && definition.watchIgnore.length > 0
|
|
371
|
+
? { watchIgnore: definition.watchIgnore }
|
|
372
|
+
: {}),
|
|
320
373
|
...(definition?.pausedUntil ? { pausedUntil: definition.pausedUntil } : {}),
|
|
321
374
|
...(Array.isArray(definition?.allowedTools) && definition.allowedTools.length > 0
|
|
322
375
|
? { allowedTools: definition.allowedTools }
|
|
@@ -402,9 +455,11 @@ export function parseImportJson(raw: string): ParsedImport {
|
|
|
402
455
|
const schedule =
|
|
403
456
|
typeof source.schedule === "string" ? source.schedule.trim() : "";
|
|
404
457
|
const prompt = typeof source.prompt === "string" ? source.prompt.trim() : "";
|
|
405
|
-
const triggerType: "cron" | "file" | "mcp-event" | "once" =
|
|
458
|
+
const triggerType: "cron" | "file" | "git" | "mcp-event" | "once" =
|
|
406
459
|
source.triggerType === "file"
|
|
407
460
|
? "file"
|
|
461
|
+
: source.triggerType === "git"
|
|
462
|
+
? "git"
|
|
408
463
|
: source.triggerType === "mcp-event"
|
|
409
464
|
? "mcp-event"
|
|
410
465
|
: source.triggerType === "once"
|
|
@@ -558,6 +613,62 @@ export function parseImportJson(raw: string): ParsedImport {
|
|
|
558
613
|
const priority = normalizePriority(source.priority);
|
|
559
614
|
const workspaceId = readOptionalString(source.workspaceId);
|
|
560
615
|
|
|
616
|
+
// Спринт 27: git-триггер, glob-маски и временные окна.
|
|
617
|
+
if (triggerType === "git" && !workspaceId && !workingDirectory) {
|
|
618
|
+
errors.push(
|
|
619
|
+
`Запись ${position}${name ? ` (${name})` : ""}: для git-триггера нужна рабочая директория (workingDirectory или workspaceId).`
|
|
620
|
+
);
|
|
621
|
+
return;
|
|
622
|
+
}
|
|
623
|
+
const readStringList = (value: unknown): string[] | undefined => {
|
|
624
|
+
if (!Array.isArray(value)) return undefined;
|
|
625
|
+
const items = value
|
|
626
|
+
.filter((entry): entry is string => typeof entry === "string" && Boolean(entry.trim()))
|
|
627
|
+
.map((entry) => entry.trim());
|
|
628
|
+
return items.length > 0 ? items : undefined;
|
|
629
|
+
};
|
|
630
|
+
const gitBranch = readOptionalString(source.gitBranch);
|
|
631
|
+
const gitPaths = readStringList(source.gitPaths);
|
|
632
|
+
const gitIgnore = readStringList(source.gitIgnore);
|
|
633
|
+
const watchGlobs = readStringList(source.watchGlobs);
|
|
634
|
+
const watchIgnore = readStringList(source.watchIgnore);
|
|
635
|
+
const gitPollSeconds =
|
|
636
|
+
typeof source.gitPollSeconds === "number" &&
|
|
637
|
+
Number.isFinite(source.gitPollSeconds) &&
|
|
638
|
+
source.gitPollSeconds > 0
|
|
639
|
+
? Math.floor(source.gitPollSeconds)
|
|
640
|
+
: undefined;
|
|
641
|
+
const rawDays = Array.isArray(source.activeDays) ? source.activeDays : undefined;
|
|
642
|
+
let activeDays: number[] | undefined;
|
|
643
|
+
if (rawDays) {
|
|
644
|
+
const days = rawDays.filter(
|
|
645
|
+
(value): value is number =>
|
|
646
|
+
typeof value === "number" && Number.isInteger(value) && value >= 0 && value <= 6
|
|
647
|
+
);
|
|
648
|
+
if (days.length !== rawDays.length) {
|
|
649
|
+
errors.push(
|
|
650
|
+
`Запись ${position}${name ? ` (${name})` : ""}: activeDays должен содержать числа 0..6 (0 = воскресенье).`
|
|
651
|
+
);
|
|
652
|
+
return;
|
|
653
|
+
}
|
|
654
|
+
activeDays = normalizeActiveDays(days);
|
|
655
|
+
}
|
|
656
|
+
let windowPolicy: "skip" | "postpone" | "run" | undefined;
|
|
657
|
+
if (source.windowPolicy !== undefined) {
|
|
658
|
+
if (
|
|
659
|
+
source.windowPolicy === "skip" ||
|
|
660
|
+
source.windowPolicy === "postpone" ||
|
|
661
|
+
source.windowPolicy === "run"
|
|
662
|
+
) {
|
|
663
|
+
windowPolicy = source.windowPolicy;
|
|
664
|
+
} else {
|
|
665
|
+
errors.push(
|
|
666
|
+
`Запись ${position}${name ? ` (${name})` : ""}: неизвестный windowPolicy «${String(source.windowPolicy)}» (ожидается skip, postpone или run).`
|
|
667
|
+
);
|
|
668
|
+
return;
|
|
669
|
+
}
|
|
670
|
+
}
|
|
671
|
+
|
|
561
672
|
// Планирование 2.0 (Спринт 19): IANA-зона, окно запуска, пауза до даты.
|
|
562
673
|
const timezone = readOptionalString(source.timezone);
|
|
563
674
|
if (timezone && !isValidIanaTimeZone(timezone)) {
|
|
@@ -781,6 +892,14 @@ export function parseImportJson(raw: string): ParsedImport {
|
|
|
781
892
|
...(timezone !== undefined ? { timezone } : {}),
|
|
782
893
|
...(notBefore !== undefined ? { notBefore } : {}),
|
|
783
894
|
...(notAfter !== undefined ? { notAfter } : {}),
|
|
895
|
+
...(activeDays !== undefined ? { activeDays } : {}),
|
|
896
|
+
...(windowPolicy !== undefined ? { windowPolicy } : {}),
|
|
897
|
+
...(gitBranch !== undefined ? { gitBranch } : {}),
|
|
898
|
+
...(gitPaths !== undefined ? { gitPaths } : {}),
|
|
899
|
+
...(gitIgnore !== undefined ? { gitIgnore } : {}),
|
|
900
|
+
...(gitPollSeconds !== undefined ? { gitPollSeconds } : {}),
|
|
901
|
+
...(watchGlobs !== undefined ? { watchGlobs } : {}),
|
|
902
|
+
...(watchIgnore !== undefined ? { watchIgnore } : {}),
|
|
784
903
|
...(pausedUntil !== undefined ? { pausedUntil } : {}),
|
|
785
904
|
...(mcpEvent ? { mcpEvent } : {}),
|
|
786
905
|
...(allowedTools !== undefined ? { allowedTools } : {}),
|
package/src/templates.ts
CHANGED
|
@@ -34,7 +34,7 @@ export interface TaskTemplate {
|
|
|
34
34
|
nextTaskOnError?: string;
|
|
35
35
|
/** DAG-зависимости: задачи, которые должны успешно завершиться раньше этой. */
|
|
36
36
|
dependsOn?: string[];
|
|
37
|
-
triggerType?: "cron" | "file" | "mcp-event";
|
|
37
|
+
triggerType?: "cron" | "file" | "git" | "mcp-event";
|
|
38
38
|
/** Параметры MCP-события (для triggerType === "mcp-event"). */
|
|
39
39
|
mcpEvent?: { server: string; event: string; filter?: string };
|
|
40
40
|
watchPath?: string;
|
package/src/workspaces.ts
CHANGED
|
@@ -4,6 +4,7 @@ import { basename, join, resolve } from "node:path";
|
|
|
4
4
|
import { spawnSync } from "node:child_process";
|
|
5
5
|
import { getDb } from "./db/index.js";
|
|
6
6
|
import { clearWorkspaceAssignments } from "./db/tasks-repo.js";
|
|
7
|
+
import { hasSecretRef, resolveSecretRefs } from "./core/secrets.js";
|
|
7
8
|
|
|
8
9
|
/**
|
|
9
10
|
* Multi-repo workspaces.
|
|
@@ -134,14 +135,23 @@ export function readWorkspaceEnvFile(envFile?: string): Record<string, string> {
|
|
|
134
135
|
|
|
135
136
|
/**
|
|
136
137
|
* Итоговые env-переменные workspace: сначала .env-файл, затем явные пары
|
|
137
|
-
* (пары важнее файла).
|
|
138
|
+
* (пары важнее файла). Ссылки `${secret:NAME}` разворачиваются из
|
|
139
|
+
* зашифрованного хранилища (Спринт 26); отсутствующий секрет даёт пустую
|
|
140
|
+
* строку и предупреждение с именем — без значения. Никогда не бросает.
|
|
138
141
|
*/
|
|
139
142
|
export function resolveWorkspaceEnv(workspace: Workspace | undefined): Record<string, string> {
|
|
140
143
|
if (!workspace) return {};
|
|
141
|
-
|
|
144
|
+
const merged = {
|
|
142
145
|
...readWorkspaceEnvFile(workspace.envFile),
|
|
143
146
|
...(workspace.env ?? {}),
|
|
144
147
|
};
|
|
148
|
+
const resolved = resolveSecretRefs(merged);
|
|
149
|
+
if (resolved.missing.length > 0) {
|
|
150
|
+
console.warn(
|
|
151
|
+
`[workspace] "${workspace.name}": не найдены секреты: ${resolved.missing.join(", ")}`
|
|
152
|
+
);
|
|
153
|
+
}
|
|
154
|
+
return resolved.env;
|
|
145
155
|
}
|
|
146
156
|
|
|
147
157
|
/** Маскирует значение секрета для логов. */
|
|
@@ -151,12 +161,20 @@ export function maskSecretValue(): string {
|
|
|
151
161
|
|
|
152
162
|
const SECRET_KEY_RE = /(TOKEN|SECRET|PASS|PASSWORD|KEY|CREDENTIAL|AUTH)/i;
|
|
153
163
|
|
|
154
|
-
/**
|
|
164
|
+
/**
|
|
165
|
+
* Копия env для логов: значения «секретных» ключей заменены на ***.
|
|
166
|
+
* Чистые ссылки `${secret:NAME}` сохраняются как есть — это не секрет,
|
|
167
|
+
* а указатель, и он помогает диагностике (Спринт 26).
|
|
168
|
+
*/
|
|
155
169
|
export function maskEnvForLog(env: Record<string, string> | undefined): Record<string, string> {
|
|
156
170
|
if (!env) return {};
|
|
157
171
|
const masked: Record<string, string> = {};
|
|
158
172
|
for (const [key, value] of Object.entries(env)) {
|
|
159
|
-
|
|
173
|
+
if (hasSecretRef(value)) {
|
|
174
|
+
masked[key] = String(value);
|
|
175
|
+
} else {
|
|
176
|
+
masked[key] = SECRET_KEY_RE.test(key) ? maskSecretValue() : value;
|
|
177
|
+
}
|
|
160
178
|
}
|
|
161
179
|
return masked;
|
|
162
180
|
}
|