opencode-windows-scheduler 1.4.0 → 1.5.1
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 +61 -1
- package/LICENSE +21 -21
- package/README.md +26 -4
- package/ROADMAP-STRATEGY.md +43 -24
- package/ROADMAP.md +549 -31
- package/dist/core/dry-run.d.ts +41 -0
- package/dist/core/dry-run.d.ts.map +1 -1
- package/dist/core/dry-run.js +165 -16
- 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 +294 -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/matrix.d.ts.map +1 -1
- package/dist/core/matrix.js +48 -22
- 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 +107 -17
- package/dist/core/scheduler/types.d.ts +7 -1
- package/dist/core/scheduler/types.d.ts.map +1 -1
- package/dist/core/scheduler/windows.d.ts +6 -2
- package/dist/core/scheduler/windows.d.ts.map +1 -1
- package/dist/core/scheduler/windows.js +25 -10
- package/dist/core/telegram.d.ts.map +1 -1
- package/dist/core/telegram.js +13 -10
- 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 +8 -0
- package/dist/i18n.d.ts +52 -0
- package/dist/i18n.d.ts.map +1 -0
- package/dist/i18n.js +292 -0
- package/dist/index.d.ts +50 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +1020 -197
- package/dist/notifications.d.ts.map +1 -1
- package/dist/notifications.js +74 -40
- package/dist/rpc.d.ts +238 -2
- package/dist/rpc.d.ts.map +1 -1
- package/dist/rpc.js +79 -2
- package/dist/server.d.ts.map +1 -1
- package/dist/server.js +89 -48
- package/dist/settings.d.ts +3 -0
- package/dist/settings.d.ts.map +1 -1
- package/dist/settings.js +20 -8
- package/dist/task-transfer.d.ts +43 -3
- package/dist/task-transfer.d.ts.map +1 -1
- package/dist/task-transfer.js +94 -6
- package/dist/templates.d.ts +1 -1
- package/dist/templates.d.ts.map +1 -1
- package/dist/types.d.ts +11 -0
- package/dist/types.d.ts.map +1 -1
- package/dist/types.js +32 -0
- package/docs/ARCHITECTURE.md +37 -1
- package/docs/FEATURES.md +70 -0
- package/docs/README.ru.md +19 -3
- package/gui-experimental.cjs +9 -4
- package/locales/en.json +695 -0
- package/locales/ru.json +695 -0
- package/package.json +9 -3
- package/scripts/test-locale.mjs +44 -0
- package/src/core/dry-run.ts +244 -19
- package/src/core/file-watcher.ts +65 -10
- package/src/core/git-trigger.ts +373 -0
- package/src/core/glob.ts +226 -0
- package/src/core/matrix.ts +52 -26
- package/src/core/ps-wrapper.ts +7 -0
- package/src/core/schedule-gate.ts +67 -33
- package/src/core/schedule-v2.ts +152 -17
- package/src/core/scheduler/types.ts +7 -1
- package/src/core/scheduler/windows.ts +25 -10
- package/src/core/telegram.ts +16 -10
- package/src/core/wrappers/bash.ts +4 -0
- package/src/db/git-state-repo.ts +62 -0
- package/src/db/schema.ts +8 -0
- package/src/gui.tsx +772 -456
- package/src/i18n.ts +339 -0
- package/src/index.ts +1274 -212
- package/src/notifications.ts +83 -42
- package/src/rpc.ts +79 -2
- package/src/server.ts +89 -48
- package/src/settings.ts +38 -10
- package/src/task-transfer.ts +148 -5
- package/src/templates.ts +1 -1
- package/src/types.ts +37 -0
package/dist/core/dry-run.d.ts
CHANGED
|
@@ -2,6 +2,35 @@ export interface DryRunRoleScoped {
|
|
|
2
2
|
allowed?: string[];
|
|
3
3
|
denied?: string[];
|
|
4
4
|
}
|
|
5
|
+
/**
|
|
6
|
+
* Детали триггера (Спринт 27): чем задача запускается и не будет ли запуск
|
|
7
|
+
* пропущен из-за окна/дней недели. Для git-триггера — состояние репозитория.
|
|
8
|
+
*/
|
|
9
|
+
export interface DryRunTriggerDetails {
|
|
10
|
+
type: "manual" | "cron" | "file" | "git" | "mcp-event" | "once";
|
|
11
|
+
/** Человекочитаемое объяснение условия запуска. */
|
|
12
|
+
explanation: string;
|
|
13
|
+
/** Состояние окна запуска и разрешённых дней недели (если заданы). */
|
|
14
|
+
activeWindow?: {
|
|
15
|
+
active: boolean;
|
|
16
|
+
reason?: string;
|
|
17
|
+
nextOpenAt: string | null;
|
|
18
|
+
};
|
|
19
|
+
/** Состояние git-триггера на момент dry-run. */
|
|
20
|
+
git?: {
|
|
21
|
+
branch: string | null;
|
|
22
|
+
head: string | null;
|
|
23
|
+
lastCommit: string | null;
|
|
24
|
+
changedFiles: string[];
|
|
25
|
+
matched: string[];
|
|
26
|
+
};
|
|
27
|
+
/** Настройки файлового триггера. */
|
|
28
|
+
file?: {
|
|
29
|
+
watchPath: string | null;
|
|
30
|
+
globs: string[];
|
|
31
|
+
ignore: string[];
|
|
32
|
+
};
|
|
33
|
+
}
|
|
5
34
|
export interface DryRunTaskItem {
|
|
6
35
|
name: string;
|
|
7
36
|
order: number;
|
|
@@ -25,6 +54,16 @@ export interface DryRunTaskItem {
|
|
|
25
54
|
session?: string | null;
|
|
26
55
|
/** Идентификатор переиспользуемой сессии (только для session=reuse). */
|
|
27
56
|
sessionId?: string | null;
|
|
57
|
+
/**
|
|
58
|
+
* Windows-режим входа (Спринт 27.5.4): false — задача интерактивная и идёт
|
|
59
|
+
* только при активном входе пользователя (Interactive only); true — запуск
|
|
60
|
+
* без входа через `/ru SYSTEM` (session 0, без профиля пользователя).
|
|
61
|
+
* На Linux/macOS поле всегда false: cron работает без входа, launchd-агент —
|
|
62
|
+
* только при входе.
|
|
63
|
+
*/
|
|
64
|
+
runWhenLoggedOff?: boolean;
|
|
65
|
+
/** Человекочитаемое пояснение к режиму входа (для отчёта dry-run). */
|
|
66
|
+
logonMode?: string | null;
|
|
28
67
|
/**
|
|
29
68
|
* Эффективное расписание cron-задачи (Спринт 19): пояс, окно запуска и
|
|
30
69
|
* ближайшие срабатывания с учётом часового пояса. Позволяет проверить
|
|
@@ -38,6 +77,8 @@ export interface DryRunTaskItem {
|
|
|
38
77
|
pausedUntil: string | null;
|
|
39
78
|
nextRuns: string[];
|
|
40
79
|
};
|
|
80
|
+
/** Детали триггера и причина возможного пропуска (Спринт 27). */
|
|
81
|
+
triggerDetails?: DryRunTriggerDetails;
|
|
41
82
|
}
|
|
42
83
|
export interface DryRunTotals {
|
|
43
84
|
estimatedDurationSec?: number | null;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dry-run.d.ts","sourceRoot":"","sources":["../../src/core/dry-run.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"dry-run.d.ts","sourceRoot":"","sources":["../../src/core/dry-run.ts"],"names":[],"mappings":"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"}
|
package/dist/core/dry-run.js
CHANGED
|
@@ -10,16 +10,152 @@ import { loadTaskDefinitions } from "../task-transfer.js";
|
|
|
10
10
|
import { getHistory } from "../db/history-repo.js";
|
|
11
11
|
import { getWorkspace } from "../workspaces.js";
|
|
12
12
|
import { expandMatrixTask } from "./matrix.js";
|
|
13
|
-
import { nextRun } from "./schedule-v2.js";
|
|
13
|
+
import { nextRun, activeWindowState } from "./schedule-v2.js";
|
|
14
|
+
import { checkGitTrigger } from "./git-trigger.js";
|
|
15
|
+
import { t } from "../i18n.js";
|
|
14
16
|
/** Сколько последних успешных/любых запусков усредняем для оценки. */
|
|
15
17
|
const ESTIMATE_SAMPLE = 10;
|
|
16
18
|
/** Средняя цена за 1K токенов (должна совпадать с dashboards/server.ts). */
|
|
17
19
|
export const ESTIMATED_COST_PER_1K_TOKENS_USD = 0.003;
|
|
18
|
-
/** Опасные паттерны, о которых обязательно
|
|
20
|
+
/** Опасные паттерны, о которых обязательно предупреждаем (ключи каталога). */
|
|
19
21
|
const DANGEROUS_PATTERNS = [
|
|
20
|
-
{ test: /rm\s+-rf\s+\/(?:\s|$)/,
|
|
21
|
-
{ test: /git\s+push\s+.*--force(?:\s|$)/,
|
|
22
|
+
{ test: /rm\s+-rf\s+\/(?:\s|$)/, messageKey: "dryRun.danger.rmRoot" },
|
|
23
|
+
{ test: /git\s+push\s+.*--force(?:\s|$)/, messageKey: "dryRun.danger.forcePush" },
|
|
22
24
|
];
|
|
25
|
+
/**
|
|
26
|
+
* Описывает триггер задачи: что запускает задачу, не будет ли запуск
|
|
27
|
+
* пропущен из-за окна/дней недели, и (для git) состояние репозитория.
|
|
28
|
+
* Не имеет побочных эффектов (для git используется persist: false).
|
|
29
|
+
*/
|
|
30
|
+
async function describeTrigger(opts) {
|
|
31
|
+
const { def, cwd, triggerType, warnings } = opts;
|
|
32
|
+
const policy = def.windowPolicy ?? "postpone";
|
|
33
|
+
const base = {
|
|
34
|
+
type: triggerType,
|
|
35
|
+
explanation: "",
|
|
36
|
+
};
|
|
37
|
+
const hasWindow = Boolean((def.notBefore ?? "").trim() || (def.notAfter ?? "").trim());
|
|
38
|
+
const hasDays = Array.isArray(def.activeDays) && def.activeDays.length > 0;
|
|
39
|
+
switch (triggerType) {
|
|
40
|
+
case "git": {
|
|
41
|
+
try {
|
|
42
|
+
const result = await checkGitTrigger({
|
|
43
|
+
name: def.name,
|
|
44
|
+
cwd,
|
|
45
|
+
branch: def.gitBranch ?? undefined,
|
|
46
|
+
paths: def.gitPaths ?? undefined,
|
|
47
|
+
ignore: def.gitIgnore ?? undefined,
|
|
48
|
+
}, { persist: false });
|
|
49
|
+
base.git = {
|
|
50
|
+
branch: result.branch ?? null,
|
|
51
|
+
head: result.head ?? null,
|
|
52
|
+
lastCommit: result.from ?? null,
|
|
53
|
+
changedFiles: result.files,
|
|
54
|
+
matched: result.matched,
|
|
55
|
+
};
|
|
56
|
+
base.explanation = result.message;
|
|
57
|
+
if (result.status === "no-repo") {
|
|
58
|
+
warnings.push(t("dryRun.git.notRepo"));
|
|
59
|
+
}
|
|
60
|
+
else if (result.status === "branch-mismatch") {
|
|
61
|
+
warnings.push(t("dryRun.git.branchMismatch", { branch: def.gitBranch ?? "" }));
|
|
62
|
+
}
|
|
63
|
+
}
|
|
64
|
+
catch (err) {
|
|
65
|
+
base.explanation = t("dryRun.git.checkError", {
|
|
66
|
+
error: err instanceof Error ? err.message : String(err),
|
|
67
|
+
});
|
|
68
|
+
warnings.push(base.explanation);
|
|
69
|
+
}
|
|
70
|
+
break;
|
|
71
|
+
}
|
|
72
|
+
case "file": {
|
|
73
|
+
base.file = {
|
|
74
|
+
watchPath: def.watchPath ?? null,
|
|
75
|
+
globs: Array.isArray(def.watchGlobs) ? def.watchGlobs : [],
|
|
76
|
+
ignore: Array.isArray(def.watchIgnore) ? def.watchIgnore : [],
|
|
77
|
+
};
|
|
78
|
+
const parts = [];
|
|
79
|
+
if (def.watchPath)
|
|
80
|
+
parts.push(`«${def.watchPath}»`);
|
|
81
|
+
if (def.watchGlobs?.length)
|
|
82
|
+
parts.push(t("dryRun.file.globs", { count: def.watchGlobs.length }));
|
|
83
|
+
if (def.watchIgnore?.length)
|
|
84
|
+
parts.push(t("dryRun.file.ignore", { count: def.watchIgnore.length }));
|
|
85
|
+
base.explanation =
|
|
86
|
+
parts.length > 0
|
|
87
|
+
? t("dryRun.file.trigger", { parts: parts.join("; ") })
|
|
88
|
+
: t("dryRun.file.any");
|
|
89
|
+
break;
|
|
90
|
+
}
|
|
91
|
+
case "mcp-event": {
|
|
92
|
+
const ev = def.mcpEvent;
|
|
93
|
+
base.explanation = ev && ev.event
|
|
94
|
+
? t("dryRun.mcp.event", {
|
|
95
|
+
server: ev.server,
|
|
96
|
+
event: ev.event,
|
|
97
|
+
filter: ev.filter
|
|
98
|
+
? t("dryRun.mcp.filter", { filter: ev.filter })
|
|
99
|
+
: "",
|
|
100
|
+
})
|
|
101
|
+
: t("dryRun.mcp.missing");
|
|
102
|
+
break;
|
|
103
|
+
}
|
|
104
|
+
case "cron": {
|
|
105
|
+
base.explanation = def.timezone
|
|
106
|
+
? t("dryRun.cronTimezone", {
|
|
107
|
+
schedule: def.schedule,
|
|
108
|
+
timezone: def.timezone,
|
|
109
|
+
})
|
|
110
|
+
: t("dryRun.cron", { schedule: def.schedule });
|
|
111
|
+
break;
|
|
112
|
+
}
|
|
113
|
+
case "once": {
|
|
114
|
+
base.explanation = def.runAt
|
|
115
|
+
? t("dryRun.once.at", { runAt: def.runAt })
|
|
116
|
+
: t("dryRun.once");
|
|
117
|
+
break;
|
|
118
|
+
}
|
|
119
|
+
case "manual":
|
|
120
|
+
default: {
|
|
121
|
+
base.explanation = t("dryRun.manual");
|
|
122
|
+
break;
|
|
123
|
+
}
|
|
124
|
+
}
|
|
125
|
+
// Окно запуска и дни недели (если заданы).
|
|
126
|
+
if (hasWindow || hasDays) {
|
|
127
|
+
const state = activeWindowState(new Date(), {
|
|
128
|
+
notBefore: def.notBefore ?? undefined,
|
|
129
|
+
notAfter: def.notAfter ?? undefined,
|
|
130
|
+
days: def.activeDays ?? undefined,
|
|
131
|
+
timeZone: def.timezone ?? undefined,
|
|
132
|
+
});
|
|
133
|
+
base.activeWindow = {
|
|
134
|
+
active: state.active,
|
|
135
|
+
...(state.reason ? { reason: state.reason } : {}),
|
|
136
|
+
nextOpenAt: state.nextOpenAt ? state.nextOpenAt.toISOString() : null,
|
|
137
|
+
};
|
|
138
|
+
if (!state.active && policy !== "run") {
|
|
139
|
+
const reason = state.reason ?? t("dryRun.window.outside");
|
|
140
|
+
if (policy === "skip") {
|
|
141
|
+
warnings.push(t("dryRun.window.skip", { reason }));
|
|
142
|
+
}
|
|
143
|
+
else {
|
|
144
|
+
// postpone — переносим на ближайшее открытие.
|
|
145
|
+
const iso = base.activeWindow.nextOpenAt ?? null;
|
|
146
|
+
warnings.push(iso
|
|
147
|
+
? t("dryRun.window.postpone", { reason, nextOpenAt: iso })
|
|
148
|
+
: t("dryRun.window.noOpening", { reason }));
|
|
149
|
+
}
|
|
150
|
+
}
|
|
151
|
+
else if (!state.active && policy === "run") {
|
|
152
|
+
warnings.push(t("dryRun.window.run", {
|
|
153
|
+
reason: state.reason ?? t("dryRun.window.outside"),
|
|
154
|
+
}));
|
|
155
|
+
}
|
|
156
|
+
}
|
|
157
|
+
return base;
|
|
158
|
+
}
|
|
23
159
|
/**
|
|
24
160
|
* Симулирует конвейер задачи: сама задача + все зависимости (dependsOn)
|
|
25
161
|
* в топологическом порядке. Возвращает отчёт без реального запуска.
|
|
@@ -30,7 +166,7 @@ export async function simulatePipeline(taskName) {
|
|
|
30
166
|
const rootLower = taskName.trim().toLowerCase();
|
|
31
167
|
const root = allDefs.find((d) => d.name.toLowerCase() === rootLower);
|
|
32
168
|
if (!root) {
|
|
33
|
-
throw new Error(
|
|
169
|
+
throw new Error(t("dryRun.taskNotFound", { task: taskName }));
|
|
34
170
|
}
|
|
35
171
|
// Собираем подграф зависимостей рекурсивно, обнаруживая циклы.
|
|
36
172
|
const byLower = new Map(allDefs.map((d) => [d.name.toLowerCase(), d]));
|
|
@@ -40,7 +176,7 @@ export async function simulatePipeline(taskName) {
|
|
|
40
176
|
const collect = (lowerName) => {
|
|
41
177
|
if (visiting.has(lowerName)) {
|
|
42
178
|
const list = warningsPerTask.get(lowerName) ?? [];
|
|
43
|
-
list.push(
|
|
179
|
+
list.push(t("dryRun.cycle", { task: lowerName }));
|
|
44
180
|
warningsPerTask.set(lowerName, list);
|
|
45
181
|
return undefined;
|
|
46
182
|
}
|
|
@@ -50,7 +186,7 @@ export async function simulatePipeline(taskName) {
|
|
|
50
186
|
const def = byLower.get(lowerName);
|
|
51
187
|
if (!def) {
|
|
52
188
|
const list = warningsPerTask.get(lowerName) ?? [];
|
|
53
|
-
list.push(
|
|
189
|
+
list.push(t("dryRun.dependencyMissing", { task: lowerName }));
|
|
54
190
|
warningsPerTask.set(lowerName, list);
|
|
55
191
|
return undefined;
|
|
56
192
|
}
|
|
@@ -108,13 +244,15 @@ export async function simulatePipeline(taskName) {
|
|
|
108
244
|
if (def.matrix) {
|
|
109
245
|
try {
|
|
110
246
|
const clones = expandMatrixTask(def);
|
|
111
|
-
warnings.push(
|
|
247
|
+
warnings.push(t("dryRun.matrix.parent", { name: def.name, count: clones.length }));
|
|
112
248
|
for (const clone of clones)
|
|
113
249
|
units.push({ def: clone, matrixParent: def.name });
|
|
114
250
|
}
|
|
115
251
|
catch (err) {
|
|
116
252
|
const list = warningsPerTask.get(def.name.toLowerCase()) ?? [];
|
|
117
|
-
list.push(
|
|
253
|
+
list.push(t("dryRun.matrix.expandError", {
|
|
254
|
+
error: err instanceof Error ? err.message : String(err),
|
|
255
|
+
}));
|
|
118
256
|
warningsPerTask.set(def.name.toLowerCase(), list);
|
|
119
257
|
warnings.push(`[${def.name}] ${list[list.length - 1]}`);
|
|
120
258
|
}
|
|
@@ -135,17 +273,17 @@ export async function simulatePipeline(taskName) {
|
|
|
135
273
|
const workspace = def.workspaceId ? getWorkspace(def.workspaceId) : undefined;
|
|
136
274
|
const cwd = workspace?.path || def.workingDirectory || def.workdir || "";
|
|
137
275
|
if (!cwd) {
|
|
138
|
-
taskWarnings.push("
|
|
276
|
+
taskWarnings.push(t("dryRun.cwdImplicit"));
|
|
139
277
|
}
|
|
140
278
|
else {
|
|
141
279
|
try {
|
|
142
280
|
const stat = fs.statSync(cwd);
|
|
143
281
|
if (!stat.isDirectory()) {
|
|
144
|
-
taskWarnings.push(
|
|
282
|
+
taskWarnings.push(t("dryRun.cwdNotDir", { path: cwd }));
|
|
145
283
|
}
|
|
146
284
|
}
|
|
147
285
|
catch {
|
|
148
|
-
taskWarnings.push(
|
|
286
|
+
taskWarnings.push(t("dryRun.cwdMissing", { path: cwd }));
|
|
149
287
|
}
|
|
150
288
|
}
|
|
151
289
|
// Триггер: корневая задача (или клон корневой матрицы) — manual,
|
|
@@ -156,6 +294,13 @@ export async function simulatePipeline(taskName) {
|
|
|
156
294
|
: lower === rootLower || (matrixParent && matrixParent.toLowerCase() === rootLower)
|
|
157
295
|
? "manual"
|
|
158
296
|
: "dag";
|
|
297
|
+
// Детали триггера (Спринт 27): состояние окна/дней недели, git-статус.
|
|
298
|
+
const triggerDetails = await describeTrigger({
|
|
299
|
+
def,
|
|
300
|
+
cwd,
|
|
301
|
+
triggerType,
|
|
302
|
+
warnings: taskWarnings,
|
|
303
|
+
});
|
|
159
304
|
// Команда, которую выполнит обёртка.
|
|
160
305
|
const modelArg = def.model ? ` --model ${def.model}` : "";
|
|
161
306
|
const promptPreview = (def.prompt ?? "").replace(/\s+/g, " ").trim();
|
|
@@ -166,7 +311,7 @@ export async function simulatePipeline(taskName) {
|
|
|
166
311
|
let estimatedCostUsd = null;
|
|
167
312
|
let estimatedTokens = null;
|
|
168
313
|
if (records.length === 0) {
|
|
169
|
-
taskWarnings.push("
|
|
314
|
+
taskWarnings.push(t("dryRun.noHistory"));
|
|
170
315
|
}
|
|
171
316
|
else {
|
|
172
317
|
const sample = records.slice(0, ESTIMATE_SAMPLE);
|
|
@@ -187,9 +332,9 @@ export async function simulatePipeline(taskName) {
|
|
|
187
332
|
.filter((s) => typeof s === "string")
|
|
188
333
|
.join("\n")
|
|
189
334
|
.toLowerCase();
|
|
190
|
-
for (const { test,
|
|
335
|
+
for (const { test, messageKey } of DANGEROUS_PATTERNS) {
|
|
191
336
|
if (test.test(scanned)) {
|
|
192
|
-
taskWarnings.push(
|
|
337
|
+
taskWarnings.push(t("dryRun.dangerPattern", { message: t(messageKey) }));
|
|
193
338
|
}
|
|
194
339
|
}
|
|
195
340
|
const roleScoped = Array.isArray(def.allowedTools) && def.allowedTools.length > 0
|
|
@@ -225,7 +370,7 @@ export async function simulatePipeline(taskName) {
|
|
|
225
370
|
}
|
|
226
371
|
}
|
|
227
372
|
catch {
|
|
228
|
-
taskWarnings.push(
|
|
373
|
+
taskWarnings.push(t("dryRun.cronParseError", { schedule: def.schedule }));
|
|
229
374
|
}
|
|
230
375
|
scheduleDetails = {
|
|
231
376
|
cron: def.schedule,
|
|
@@ -242,6 +387,9 @@ export async function simulatePipeline(taskName) {
|
|
|
242
387
|
trigger,
|
|
243
388
|
session: def.session ?? "new",
|
|
244
389
|
sessionId: def.session === "reuse" ? def.sessionId ?? null : null,
|
|
390
|
+
// Спринт 27.5.4: показываем режим входа до регистрации в ОС.
|
|
391
|
+
runWhenLoggedOff: def.runWhenLoggedOff === true,
|
|
392
|
+
logonMode: def.runWhenLoggedOff === true ? "background" : "interactive",
|
|
245
393
|
cwd,
|
|
246
394
|
command,
|
|
247
395
|
workspace: workspace ? { name: workspace.name, path: workspace.path } : undefined,
|
|
@@ -254,6 +402,7 @@ export async function simulatePipeline(taskName) {
|
|
|
254
402
|
estimatedTokens: estimatedTokens != null ? Math.round(estimatedTokens) : null,
|
|
255
403
|
...(matrixParent ? { matrixParent } : {}),
|
|
256
404
|
...(scheduleDetails ? { scheduleDetails } : {}),
|
|
405
|
+
...(triggerDetails ? { triggerDetails } : {}),
|
|
257
406
|
});
|
|
258
407
|
if (taskWarnings.length > 0) {
|
|
259
408
|
for (const warning of taskWarnings) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"file-watcher.d.ts","sourceRoot":"","sources":["../../src/core/file-watcher.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"file-watcher.d.ts","sourceRoot":"","sources":["../../src/core/file-watcher.ts"],"names":[],"mappings":"AAIA;;;;GAIG;AACH,eAAO,MAAM,wBAAwB,OAAO,CAAC;AAE7C,MAAM,MAAM,kBAAkB,GAAG,CAC/B,QAAQ,EAAE,MAAM,EAChB,WAAW,EAAE,MAAM,KAChB,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;AAe1B;;;GAGG;AACH,qBAAa,gBAAgB;IAKzB,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,UAAU;IAL7B,OAAO,CAAC,OAAO,CAAkC;IACjD,OAAO,CAAC,OAAO,CAAS;gBAGL,OAAO,EAAE,kBAAkB,EAC3B,UAAU,GAAE,MAAiC;IAGhE,0CAA0C;IAC1C,IAAI,IAAI,IAAI,MAAM,CAEjB;IAED;;;;OAIG;IACG,OAAO,IAAI,OAAO,CAAC,MAAM,CAAC;IAiDhC,iEAAiE;IAC3D,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAO3B,OAAO,CAAC,GAAG;YAsGG,MAAM;CAcrB"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { watch } from "chokidar";
|
|
2
2
|
import { loadTaskDefinitions } from "../task-transfer.js";
|
|
3
|
+
import { filterPaths, relativeTo } from "./glob.js";
|
|
3
4
|
/**
|
|
4
5
|
* Задержка между последним изменением файла и запуском задачи.
|
|
5
6
|
* Нужна потому, что редакторы часто пишут файл несколькими порциями
|
|
@@ -34,13 +35,26 @@ export class FileWatchManager {
|
|
|
34
35
|
.filter((d) => d.triggerType === "file" &&
|
|
35
36
|
typeof d.watchPath === "string" &&
|
|
36
37
|
d.watchPath.trim().length > 0)
|
|
37
|
-
.map((d) => ({
|
|
38
|
+
.map((d) => ({
|
|
39
|
+
name: d.name.trim(),
|
|
40
|
+
path: d.watchPath.trim(),
|
|
41
|
+
globs: Array.isArray(d.watchGlobs)
|
|
42
|
+
? d.watchGlobs.filter((g) => typeof g === "string" && g.trim().length > 0)
|
|
43
|
+
: [],
|
|
44
|
+
ignore: Array.isArray(d.watchIgnore)
|
|
45
|
+
? d.watchIgnore.filter((g) => typeof g === "string" && g.trim().length > 0)
|
|
46
|
+
: [],
|
|
47
|
+
}))
|
|
38
48
|
.filter((d) => d.name.length > 0);
|
|
39
49
|
const wantedKeys = new Set(wanted.map((d) => d.name.toLowerCase()));
|
|
40
|
-
// Убираем watcher'ы для задач, которых больше нет или у которых сменился
|
|
50
|
+
// Убираем watcher'ы для задач, которых больше нет или у которых сменился
|
|
51
|
+
// путь/маски (Спринт 27).
|
|
41
52
|
for (const [key, entry] of Array.from(this.entries.entries())) {
|
|
42
53
|
const target = wanted.find((d) => d.name.toLowerCase() === key);
|
|
43
|
-
if (!target ||
|
|
54
|
+
if (!target ||
|
|
55
|
+
target.path !== entry.path ||
|
|
56
|
+
target.globs.join("\u0000") !== entry.globs.join("\u0000") ||
|
|
57
|
+
target.ignore.join("\u0000") !== entry.ignore.join("\u0000")) {
|
|
44
58
|
await this.remove(key);
|
|
45
59
|
}
|
|
46
60
|
}
|
|
@@ -49,7 +63,7 @@ export class FileWatchManager {
|
|
|
49
63
|
const key = item.name.toLowerCase();
|
|
50
64
|
if (this.entries.has(key) || !wantedKeys.has(key))
|
|
51
65
|
continue;
|
|
52
|
-
this.add(item.name, item.path);
|
|
66
|
+
this.add(item.name, item.path, item.globs, item.ignore);
|
|
53
67
|
}
|
|
54
68
|
return this.entries.size;
|
|
55
69
|
}
|
|
@@ -60,14 +74,17 @@ export class FileWatchManager {
|
|
|
60
74
|
await this.remove(key);
|
|
61
75
|
}
|
|
62
76
|
}
|
|
63
|
-
add(name, watchPath) {
|
|
77
|
+
add(name, watchPath, globs = [], ignore = []) {
|
|
78
|
+
// Спринт 27: маски с "**" требуют рекурсивного обхода директории.
|
|
79
|
+
const needsRecursive = globs.some((g) => g.includes("**"));
|
|
64
80
|
let watcher;
|
|
65
81
|
try {
|
|
66
82
|
watcher = watch(watchPath, {
|
|
67
83
|
// Не считаем уже существующий файл «изменением» при старте.
|
|
68
84
|
ignoreInitial: true,
|
|
69
|
-
// Следим за одним файлом/папкой, без рекурсии в
|
|
70
|
-
|
|
85
|
+
// Следим за одним файлом/папкой, без рекурсии в глубину, если маски
|
|
86
|
+
// этого не требуют.
|
|
87
|
+
depth: needsRecursive ? undefined : 0,
|
|
71
88
|
// Файлы могут быть большими: дождёмся, пока запись успокоится.
|
|
72
89
|
awaitWriteFinish: { stabilityThreshold: 500, pollInterval: 100 },
|
|
73
90
|
ignorePermissionErrors: true,
|
|
@@ -77,10 +94,31 @@ export class FileWatchManager {
|
|
|
77
94
|
console.error(`[windows-scheduler] Не удалось начать отслеживание "${watchPath}" для задачи "${name}": ${err instanceof Error ? err.message : String(err)}`);
|
|
78
95
|
return;
|
|
79
96
|
}
|
|
80
|
-
const entry = {
|
|
81
|
-
|
|
97
|
+
const entry = {
|
|
98
|
+
name,
|
|
99
|
+
path: watchPath,
|
|
100
|
+
globs,
|
|
101
|
+
ignore,
|
|
102
|
+
watcher,
|
|
103
|
+
timer: null,
|
|
104
|
+
};
|
|
105
|
+
/** Спринт 27: маски применяются к пути относительно watchPath. */
|
|
106
|
+
const accepts = (changedPath) => {
|
|
107
|
+
if (globs.length === 0 && ignore.length === 0)
|
|
108
|
+
return true;
|
|
109
|
+
if (globs.length === 0) {
|
|
110
|
+
const rel = relativeTo(watchPath, changedPath) ?? changedPath;
|
|
111
|
+
return filterPaths([rel], undefined, ignore).length > 0;
|
|
112
|
+
}
|
|
113
|
+
const rel = relativeTo(watchPath, changedPath);
|
|
114
|
+
const candidates = rel ? [rel, changedPath] : [changedPath];
|
|
115
|
+
return candidates.some((candidate) => filterPaths([candidate], globs, ignore).length > 0);
|
|
116
|
+
};
|
|
117
|
+
const onChange = (changedPath) => {
|
|
82
118
|
if (this.stopped)
|
|
83
119
|
return;
|
|
120
|
+
if (!accepts(changedPath))
|
|
121
|
+
return;
|
|
84
122
|
if (entry.timer)
|
|
85
123
|
clearTimeout(entry.timer);
|
|
86
124
|
entry.timer = setTimeout(() => {
|
|
@@ -102,7 +140,12 @@ export class FileWatchManager {
|
|
|
102
140
|
// Таймер не должен удерживать процесс, если хост завершается.
|
|
103
141
|
if (typeof entry.timer.unref === "function")
|
|
104
142
|
entry.timer.unref();
|
|
105
|
-
}
|
|
143
|
+
};
|
|
144
|
+
// Спринт 27: переименование/удаление файла тоже считается изменением —
|
|
145
|
+
// иначе mac/win-редакторы, пишущие через rename, «пропадали» бы.
|
|
146
|
+
watcher.on("change", onChange);
|
|
147
|
+
watcher.on("add", onChange);
|
|
148
|
+
watcher.on("unlink", onChange);
|
|
106
149
|
watcher.on("error", (err) => {
|
|
107
150
|
console.error(`[windows-scheduler] Ошибка наблюдения за "${watchPath}" (задача "${name}"): ${err?.message ?? String(err)}`);
|
|
108
151
|
});
|
|
@@ -0,0 +1,80 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Git-триггеры (Спринт 27).
|
|
3
|
+
*
|
|
4
|
+
* Задача с `triggerType: "git"` запускается, когда в её рабочей директории
|
|
5
|
+
* появился новый коммит, затронувший подходящие файлы. Состояние — последний
|
|
6
|
+
* обработанный `HEAD` — хранится в SQLite (`git_state`), поэтому перезапуск
|
|
7
|
+
* плагина не приводит к повторным запускам.
|
|
8
|
+
*
|
|
9
|
+
* Первый опрос только запоминает текущий `HEAD` (baseline) и ничего не запускает.
|
|
10
|
+
*/
|
|
11
|
+
export declare const GIT_TRIGGER_DEFAULT_POLL_SECONDS = 60;
|
|
12
|
+
export declare const GIT_TRIGGER_MIN_POLL_SECONDS = 5;
|
|
13
|
+
export declare const GIT_COMMAND_TIMEOUT_MS = 10000;
|
|
14
|
+
export interface GitProbe {
|
|
15
|
+
head: string;
|
|
16
|
+
branch: string | null;
|
|
17
|
+
}
|
|
18
|
+
export interface GitTriggerTask {
|
|
19
|
+
name: string;
|
|
20
|
+
cwd: string;
|
|
21
|
+
/** Разрешённые ветки (glob). Пусто — любая ветка. */
|
|
22
|
+
branch?: string;
|
|
23
|
+
/** Пути/glob-маски, изменение которых запускает задачу. Пусто — любой файл. */
|
|
24
|
+
paths?: string[];
|
|
25
|
+
/** Исключения (glob): изменения только в этих путях игнорируются. */
|
|
26
|
+
ignore?: string[];
|
|
27
|
+
pollSeconds?: number;
|
|
28
|
+
}
|
|
29
|
+
export type GitCheckStatus = "no-repo" | "baseline" | "no-changes" | "branch-mismatch" | "ignored" | "changed";
|
|
30
|
+
export interface GitCheckResult {
|
|
31
|
+
status: GitCheckStatus;
|
|
32
|
+
head?: string;
|
|
33
|
+
branch?: string | null;
|
|
34
|
+
from?: string | null;
|
|
35
|
+
files: string[];
|
|
36
|
+
matched: string[];
|
|
37
|
+
message: string;
|
|
38
|
+
}
|
|
39
|
+
export type GitTriggerHandler = (taskName: string, info: GitCheckResult & {
|
|
40
|
+
cwd: string;
|
|
41
|
+
}) => void | Promise<void>;
|
|
42
|
+
export type GitRunner = (cwd: string, args: string[]) => Promise<string>;
|
|
43
|
+
/** Текущий HEAD и ветка; null, если это не git-репозиторий. */
|
|
44
|
+
export declare function probeGit(cwd: string, run?: GitRunner): Promise<GitProbe | null>;
|
|
45
|
+
/** Файлы, изменённые между коммитами (или в самом коммите, если from пуст). */
|
|
46
|
+
export declare function gitChangedFiles(cwd: string, from: string | null, to: string, run?: GitRunner): Promise<string[]>;
|
|
47
|
+
/**
|
|
48
|
+
* Проверяет задачу без побочных эффектов (кроме baseline-записи).
|
|
49
|
+
* Используется и менеджером, и dry-run.
|
|
50
|
+
*/
|
|
51
|
+
export declare function checkGitTrigger(task: GitTriggerTask, options?: {
|
|
52
|
+
run?: GitRunner;
|
|
53
|
+
persist?: boolean;
|
|
54
|
+
}): Promise<GitCheckResult>;
|
|
55
|
+
export declare class GitTriggerManager {
|
|
56
|
+
private readonly tasks;
|
|
57
|
+
private readonly handler;
|
|
58
|
+
private readonly run?;
|
|
59
|
+
constructor(handler: GitTriggerHandler, options?: {
|
|
60
|
+
run?: GitRunner;
|
|
61
|
+
});
|
|
62
|
+
get size(): number;
|
|
63
|
+
/** Перечитывает задачи и пересобирает таймеры. Возвращает число задач. */
|
|
64
|
+
refresh(): Promise<number>;
|
|
65
|
+
/** Ручная проверка одной задачи (dry-run, тесты). */
|
|
66
|
+
check(taskName: string): Promise<GitCheckResult | null>;
|
|
67
|
+
private taskSpec;
|
|
68
|
+
private poll;
|
|
69
|
+
stop(): Promise<void>;
|
|
70
|
+
/** Забывает состояние (при удалении/пересоздании задачи). */
|
|
71
|
+
forget(taskName: string): void;
|
|
72
|
+
}
|
|
73
|
+
/** Задачи с git-триггером (для dry-run и вида задач). */
|
|
74
|
+
export declare function gitTriggerTasks(): Promise<{
|
|
75
|
+
name: string;
|
|
76
|
+
cwd: string;
|
|
77
|
+
}[]>;
|
|
78
|
+
/** Нормализует путь рабочей директории (для сравнения в тестах). */
|
|
79
|
+
export declare function normalizeGitCwd(cwd: string): string;
|
|
80
|
+
//# sourceMappingURL=git-trigger.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"git-trigger.d.ts","sourceRoot":"","sources":["../../src/core/git-trigger.ts"],"names":[],"mappings":"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"}
|