opencode-windows-scheduler 1.5.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 +37 -1
- package/LICENSE +21 -21
- package/README.md +24 -2
- package/ROADMAP-STRATEGY.md +16 -16
- package/ROADMAP.md +410 -141
- package/dist/core/dry-run.d.ts +10 -0
- package/dist/core/dry-run.d.ts.map +1 -1
- package/dist/core/dry-run.js +55 -34
- package/dist/core/git-trigger.d.ts.map +1 -1
- package/dist/core/git-trigger.js +15 -9
- package/dist/core/matrix.d.ts.map +1 -1
- package/dist/core/matrix.js +48 -22
- package/dist/core/schedule-v2.d.ts.map +1 -1
- package/dist/core/schedule-v2.js +29 -17
- package/dist/core/scheduler/types.d.ts +6 -0
- 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/i18n.d.ts +52 -0
- package/dist/i18n.d.ts.map +1 -0
- package/dist/i18n.js +292 -0
- package/dist/index.d.ts +6 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +781 -179
- package/dist/notifications.d.ts.map +1 -1
- package/dist/notifications.js +74 -40
- package/dist/rpc.d.ts +15 -2
- package/dist/rpc.d.ts.map +1 -1
- package/dist/rpc.js +6 -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 +13 -0
- package/dist/task-transfer.d.ts.map +1 -1
- package/dist/task-transfer.js +11 -0
- 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 +36 -1
- package/docs/FEATURES.md +19 -0
- package/docs/README.ru.md +17 -1
- package/gui-experimental.cjs +9 -9
- package/locales/en.json +695 -0
- package/locales/ru.json +695 -0
- package/package.json +6 -3
- package/scripts/test-locale.mjs +44 -0
- package/src/core/dry-run.ts +76 -38
- package/src/core/git-trigger.ts +15 -9
- package/src/core/matrix.ts +52 -26
- package/src/core/schedule-v2.ts +47 -17
- package/src/core/scheduler/types.ts +6 -0
- package/src/core/scheduler/windows.ts +25 -10
- package/src/core/telegram.ts +16 -10
- package/src/gui.tsx +575 -480
- package/src/i18n.ts +339 -0
- package/src/index.ts +943 -191
- package/src/notifications.ts +83 -42
- package/src/rpc.ts +6 -2
- package/src/server.ts +89 -48
- package/src/settings.ts +38 -10
- package/src/task-transfer.ts +24 -0
- package/src/types.ts +37 -0
package/dist/core/dry-run.d.ts
CHANGED
|
@@ -54,6 +54,16 @@ export interface DryRunTaskItem {
|
|
|
54
54
|
session?: string | null;
|
|
55
55
|
/** Идентификатор переиспользуемой сессии (только для session=reuse). */
|
|
56
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;
|
|
57
67
|
/**
|
|
58
68
|
* Эффективное расписание cron-задачи (Спринт 19): пояс, окно запуска и
|
|
59
69
|
* ближайшие срабатывания с учётом часового пояса. Позволяет проверить
|
|
@@ -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":"AAiBA,MAAM,WAAW,gBAAgB;IAC/B,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;CACnB;AAED;;;GAGG;AACH,MAAM,WAAW,oBAAoB;IACnC,IAAI,EAAE,QAAQ,GAAG,MAAM,GAAG,MAAM,GAAG,KAAK,GAAG,WAAW,GAAG,MAAM,CAAC;IAChE,mDAAmD;IACnD,WAAW,EAAE,MAAM,CAAC;IACpB,sEAAsE;IACtE,YAAY,CAAC,EAAE;QACb,MAAM,EAAE,OAAO,CAAC;QAChB,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;KAC3B,CAAC;IACF,gDAAgD;IAChD,GAAG,CAAC,EAAE;QACJ,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;QACtB,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;QACpB,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;QAC1B,YAAY,EAAE,MAAM,EAAE,CAAC;QACvB,OAAO,EAAE,MAAM,EAAE,CAAC;KACnB,CAAC;IACF,oCAAoC;IACpC,IAAI,CAAC,EAAE;QACL,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;QACzB,KAAK,EAAE,MAAM,EAAE,CAAC;QAChB,MAAM,EAAE,MAAM,EAAE,CAAC;KAClB,CAAC;CACH;AAED,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,QAAQ,GAAG,MAAM,GAAG,KAAK,GAAG,MAAM,CAAC;IAC5C,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC;IAC3C,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,UAAU,CAAC,EAAE,gBAAgB,GAAG,IAAI,CAAC;IACrC,oBAAoB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACrC,gBAAgB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACjC,eAAe,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAChC,4DAA4D;IAC5D,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,0EAA0E;IAC1E,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,wEAAwE;IACxE,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B;;;;;;OAMG;IACH,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,sEAAsE;IACtE,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B;;;;OAIG;IACH,eAAe,CAAC,EAAE;QAChB,IAAI,EAAE,MAAM,CAAC;QACb,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;QACxB,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;QACzB,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;QACxB,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;QAC3B,QAAQ,EAAE,MAAM,EAAE,CAAC;KACpB,CAAC;IACF,iEAAiE;IACjE,cAAc,CAAC,EAAE,oBAAoB,CAAC;CACvC;AAED,MAAM,WAAW,YAAY;IAC3B,oBAAoB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACrC,gBAAgB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACjC,eAAe,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACjC;AAED,MAAM,WAAW,YAAY;IAC3B,OAAO,EAAE,OAAO,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,cAAc,EAAE,CAAC;IACxB,MAAM,EAAE,YAAY,CAAC;IACrB,QAAQ,EAAE,MAAM,EAAE,CAAC;CACpB;AAKD,4EAA4E;AAC5E,eAAO,MAAM,gCAAgC,QAAQ,CAAC;AA6KtD;;;GAGG;AACH,wBAAsB,gBAAgB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC,CAkT9E"}
|
package/dist/core/dry-run.js
CHANGED
|
@@ -12,14 +12,15 @@ import { getWorkspace } from "../workspaces.js";
|
|
|
12
12
|
import { expandMatrixTask } from "./matrix.js";
|
|
13
13
|
import { nextRun, activeWindowState } from "./schedule-v2.js";
|
|
14
14
|
import { checkGitTrigger } from "./git-trigger.js";
|
|
15
|
+
import { t } from "../i18n.js";
|
|
15
16
|
/** Сколько последних успешных/любых запусков усредняем для оценки. */
|
|
16
17
|
const ESTIMATE_SAMPLE = 10;
|
|
17
18
|
/** Средняя цена за 1K токенов (должна совпадать с dashboards/server.ts). */
|
|
18
19
|
export const ESTIMATED_COST_PER_1K_TOKENS_USD = 0.003;
|
|
19
|
-
/** Опасные паттерны, о которых обязательно
|
|
20
|
+
/** Опасные паттерны, о которых обязательно предупреждаем (ключи каталога). */
|
|
20
21
|
const DANGEROUS_PATTERNS = [
|
|
21
|
-
{ test: /rm\s+-rf\s+\/(?:\s|$)/,
|
|
22
|
-
{ 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" },
|
|
23
24
|
];
|
|
24
25
|
/**
|
|
25
26
|
* Описывает триггер задачи: что запускает задачу, не будет ли запуск
|
|
@@ -54,14 +55,16 @@ async function describeTrigger(opts) {
|
|
|
54
55
|
};
|
|
55
56
|
base.explanation = result.message;
|
|
56
57
|
if (result.status === "no-repo") {
|
|
57
|
-
warnings.push("
|
|
58
|
+
warnings.push(t("dryRun.git.notRepo"));
|
|
58
59
|
}
|
|
59
60
|
else if (result.status === "branch-mismatch") {
|
|
60
|
-
warnings.push(
|
|
61
|
+
warnings.push(t("dryRun.git.branchMismatch", { branch: def.gitBranch ?? "" }));
|
|
61
62
|
}
|
|
62
63
|
}
|
|
63
64
|
catch (err) {
|
|
64
|
-
base.explanation =
|
|
65
|
+
base.explanation = t("dryRun.git.checkError", {
|
|
66
|
+
error: err instanceof Error ? err.message : String(err),
|
|
67
|
+
});
|
|
65
68
|
warnings.push(base.explanation);
|
|
66
69
|
}
|
|
67
70
|
break;
|
|
@@ -76,36 +79,46 @@ async function describeTrigger(opts) {
|
|
|
76
79
|
if (def.watchPath)
|
|
77
80
|
parts.push(`«${def.watchPath}»`);
|
|
78
81
|
if (def.watchGlobs?.length)
|
|
79
|
-
parts.push(
|
|
82
|
+
parts.push(t("dryRun.file.globs", { count: def.watchGlobs.length }));
|
|
80
83
|
if (def.watchIgnore?.length)
|
|
81
|
-
parts.push(
|
|
84
|
+
parts.push(t("dryRun.file.ignore", { count: def.watchIgnore.length }));
|
|
82
85
|
base.explanation =
|
|
83
86
|
parts.length > 0
|
|
84
|
-
?
|
|
85
|
-
: "
|
|
87
|
+
? t("dryRun.file.trigger", { parts: parts.join("; ") })
|
|
88
|
+
: t("dryRun.file.any");
|
|
86
89
|
break;
|
|
87
90
|
}
|
|
88
91
|
case "mcp-event": {
|
|
89
92
|
const ev = def.mcpEvent;
|
|
90
93
|
base.explanation = ev && ev.event
|
|
91
|
-
?
|
|
92
|
-
|
|
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");
|
|
93
102
|
break;
|
|
94
103
|
}
|
|
95
104
|
case "cron": {
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
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 });
|
|
100
111
|
break;
|
|
101
112
|
}
|
|
102
113
|
case "once": {
|
|
103
|
-
base.explanation = def.runAt
|
|
114
|
+
base.explanation = def.runAt
|
|
115
|
+
? t("dryRun.once.at", { runAt: def.runAt })
|
|
116
|
+
: t("dryRun.once");
|
|
104
117
|
break;
|
|
105
118
|
}
|
|
106
119
|
case "manual":
|
|
107
120
|
default: {
|
|
108
|
-
base.explanation = "
|
|
121
|
+
base.explanation = t("dryRun.manual");
|
|
109
122
|
break;
|
|
110
123
|
}
|
|
111
124
|
}
|
|
@@ -123,19 +136,22 @@ async function describeTrigger(opts) {
|
|
|
123
136
|
nextOpenAt: state.nextOpenAt ? state.nextOpenAt.toISOString() : null,
|
|
124
137
|
};
|
|
125
138
|
if (!state.active && policy !== "run") {
|
|
139
|
+
const reason = state.reason ?? t("dryRun.window.outside");
|
|
126
140
|
if (policy === "skip") {
|
|
127
|
-
warnings.push(
|
|
141
|
+
warnings.push(t("dryRun.window.skip", { reason }));
|
|
128
142
|
}
|
|
129
143
|
else {
|
|
130
144
|
// postpone — переносим на ближайшее открытие.
|
|
131
145
|
const iso = base.activeWindow.nextOpenAt ?? null;
|
|
132
146
|
warnings.push(iso
|
|
133
|
-
?
|
|
134
|
-
:
|
|
147
|
+
? t("dryRun.window.postpone", { reason, nextOpenAt: iso })
|
|
148
|
+
: t("dryRun.window.noOpening", { reason }));
|
|
135
149
|
}
|
|
136
150
|
}
|
|
137
151
|
else if (!state.active && policy === "run") {
|
|
138
|
-
warnings.push(
|
|
152
|
+
warnings.push(t("dryRun.window.run", {
|
|
153
|
+
reason: state.reason ?? t("dryRun.window.outside"),
|
|
154
|
+
}));
|
|
139
155
|
}
|
|
140
156
|
}
|
|
141
157
|
return base;
|
|
@@ -150,7 +166,7 @@ export async function simulatePipeline(taskName) {
|
|
|
150
166
|
const rootLower = taskName.trim().toLowerCase();
|
|
151
167
|
const root = allDefs.find((d) => d.name.toLowerCase() === rootLower);
|
|
152
168
|
if (!root) {
|
|
153
|
-
throw new Error(
|
|
169
|
+
throw new Error(t("dryRun.taskNotFound", { task: taskName }));
|
|
154
170
|
}
|
|
155
171
|
// Собираем подграф зависимостей рекурсивно, обнаруживая циклы.
|
|
156
172
|
const byLower = new Map(allDefs.map((d) => [d.name.toLowerCase(), d]));
|
|
@@ -160,7 +176,7 @@ export async function simulatePipeline(taskName) {
|
|
|
160
176
|
const collect = (lowerName) => {
|
|
161
177
|
if (visiting.has(lowerName)) {
|
|
162
178
|
const list = warningsPerTask.get(lowerName) ?? [];
|
|
163
|
-
list.push(
|
|
179
|
+
list.push(t("dryRun.cycle", { task: lowerName }));
|
|
164
180
|
warningsPerTask.set(lowerName, list);
|
|
165
181
|
return undefined;
|
|
166
182
|
}
|
|
@@ -170,7 +186,7 @@ export async function simulatePipeline(taskName) {
|
|
|
170
186
|
const def = byLower.get(lowerName);
|
|
171
187
|
if (!def) {
|
|
172
188
|
const list = warningsPerTask.get(lowerName) ?? [];
|
|
173
|
-
list.push(
|
|
189
|
+
list.push(t("dryRun.dependencyMissing", { task: lowerName }));
|
|
174
190
|
warningsPerTask.set(lowerName, list);
|
|
175
191
|
return undefined;
|
|
176
192
|
}
|
|
@@ -228,13 +244,15 @@ export async function simulatePipeline(taskName) {
|
|
|
228
244
|
if (def.matrix) {
|
|
229
245
|
try {
|
|
230
246
|
const clones = expandMatrixTask(def);
|
|
231
|
-
warnings.push(
|
|
247
|
+
warnings.push(t("dryRun.matrix.parent", { name: def.name, count: clones.length }));
|
|
232
248
|
for (const clone of clones)
|
|
233
249
|
units.push({ def: clone, matrixParent: def.name });
|
|
234
250
|
}
|
|
235
251
|
catch (err) {
|
|
236
252
|
const list = warningsPerTask.get(def.name.toLowerCase()) ?? [];
|
|
237
|
-
list.push(
|
|
253
|
+
list.push(t("dryRun.matrix.expandError", {
|
|
254
|
+
error: err instanceof Error ? err.message : String(err),
|
|
255
|
+
}));
|
|
238
256
|
warningsPerTask.set(def.name.toLowerCase(), list);
|
|
239
257
|
warnings.push(`[${def.name}] ${list[list.length - 1]}`);
|
|
240
258
|
}
|
|
@@ -255,17 +273,17 @@ export async function simulatePipeline(taskName) {
|
|
|
255
273
|
const workspace = def.workspaceId ? getWorkspace(def.workspaceId) : undefined;
|
|
256
274
|
const cwd = workspace?.path || def.workingDirectory || def.workdir || "";
|
|
257
275
|
if (!cwd) {
|
|
258
|
-
taskWarnings.push("
|
|
276
|
+
taskWarnings.push(t("dryRun.cwdImplicit"));
|
|
259
277
|
}
|
|
260
278
|
else {
|
|
261
279
|
try {
|
|
262
280
|
const stat = fs.statSync(cwd);
|
|
263
281
|
if (!stat.isDirectory()) {
|
|
264
|
-
taskWarnings.push(
|
|
282
|
+
taskWarnings.push(t("dryRun.cwdNotDir", { path: cwd }));
|
|
265
283
|
}
|
|
266
284
|
}
|
|
267
285
|
catch {
|
|
268
|
-
taskWarnings.push(
|
|
286
|
+
taskWarnings.push(t("dryRun.cwdMissing", { path: cwd }));
|
|
269
287
|
}
|
|
270
288
|
}
|
|
271
289
|
// Триггер: корневая задача (или клон корневой матрицы) — manual,
|
|
@@ -293,7 +311,7 @@ export async function simulatePipeline(taskName) {
|
|
|
293
311
|
let estimatedCostUsd = null;
|
|
294
312
|
let estimatedTokens = null;
|
|
295
313
|
if (records.length === 0) {
|
|
296
|
-
taskWarnings.push("
|
|
314
|
+
taskWarnings.push(t("dryRun.noHistory"));
|
|
297
315
|
}
|
|
298
316
|
else {
|
|
299
317
|
const sample = records.slice(0, ESTIMATE_SAMPLE);
|
|
@@ -314,9 +332,9 @@ export async function simulatePipeline(taskName) {
|
|
|
314
332
|
.filter((s) => typeof s === "string")
|
|
315
333
|
.join("\n")
|
|
316
334
|
.toLowerCase();
|
|
317
|
-
for (const { test,
|
|
335
|
+
for (const { test, messageKey } of DANGEROUS_PATTERNS) {
|
|
318
336
|
if (test.test(scanned)) {
|
|
319
|
-
taskWarnings.push(
|
|
337
|
+
taskWarnings.push(t("dryRun.dangerPattern", { message: t(messageKey) }));
|
|
320
338
|
}
|
|
321
339
|
}
|
|
322
340
|
const roleScoped = Array.isArray(def.allowedTools) && def.allowedTools.length > 0
|
|
@@ -352,7 +370,7 @@ export async function simulatePipeline(taskName) {
|
|
|
352
370
|
}
|
|
353
371
|
}
|
|
354
372
|
catch {
|
|
355
|
-
taskWarnings.push(
|
|
373
|
+
taskWarnings.push(t("dryRun.cronParseError", { schedule: def.schedule }));
|
|
356
374
|
}
|
|
357
375
|
scheduleDetails = {
|
|
358
376
|
cron: def.schedule,
|
|
@@ -369,6 +387,9 @@ export async function simulatePipeline(taskName) {
|
|
|
369
387
|
trigger,
|
|
370
388
|
session: def.session ?? "new",
|
|
371
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",
|
|
372
393
|
cwd,
|
|
373
394
|
command,
|
|
374
395
|
workspace: workspace ? { name: workspace.name, path: workspace.path } : undefined,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"git-trigger.d.ts","sourceRoot":"","sources":["../../src/core/git-trigger.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"git-trigger.d.ts","sourceRoot":"","sources":["../../src/core/git-trigger.ts"],"names":[],"mappings":"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"}
|
package/dist/core/git-trigger.js
CHANGED
|
@@ -5,6 +5,7 @@ import { loadTaskDefinitions } from "../task-transfer.js";
|
|
|
5
5
|
import { getGitState, setGitState, deleteGitState } from "../db/git-state-repo.js";
|
|
6
6
|
import { filterPaths } from "./glob.js";
|
|
7
7
|
import { getWorkspace } from "../workspaces.js";
|
|
8
|
+
import { t } from "../i18n.js";
|
|
8
9
|
/**
|
|
9
10
|
* Git-триггеры (Спринт 27).
|
|
10
11
|
*
|
|
@@ -108,7 +109,7 @@ export async function checkGitTrigger(task, options = {}) {
|
|
|
108
109
|
status: "no-repo",
|
|
109
110
|
files: [],
|
|
110
111
|
matched: [],
|
|
111
|
-
message:
|
|
112
|
+
message: t("gitTrigger.noRepo", { cwd: task.cwd }),
|
|
112
113
|
};
|
|
113
114
|
}
|
|
114
115
|
const state = getGitState(task.name);
|
|
@@ -121,7 +122,7 @@ export async function checkGitTrigger(task, options = {}) {
|
|
|
121
122
|
branch: probe.branch,
|
|
122
123
|
files: [],
|
|
123
124
|
matched: [],
|
|
124
|
-
message:
|
|
125
|
+
message: t("gitTrigger.baseline", { commit: probe.head.slice(0, 7) }),
|
|
125
126
|
};
|
|
126
127
|
}
|
|
127
128
|
if (!branchMatches(probe.branch, task.branch)) {
|
|
@@ -132,7 +133,10 @@ export async function checkGitTrigger(task, options = {}) {
|
|
|
132
133
|
from: state.commitSha,
|
|
133
134
|
files: [],
|
|
134
135
|
matched: [],
|
|
135
|
-
message:
|
|
136
|
+
message: t("gitTrigger.branchMismatch", {
|
|
137
|
+
branch: probe.branch ?? "(detached)",
|
|
138
|
+
pattern: task.branch,
|
|
139
|
+
}),
|
|
136
140
|
};
|
|
137
141
|
}
|
|
138
142
|
if (probe.head === state.commitSha) {
|
|
@@ -143,7 +147,7 @@ export async function checkGitTrigger(task, options = {}) {
|
|
|
143
147
|
from: state.commitSha,
|
|
144
148
|
files: [],
|
|
145
149
|
matched: [],
|
|
146
|
-
message: "
|
|
150
|
+
message: t("gitTrigger.noChanges"),
|
|
147
151
|
};
|
|
148
152
|
}
|
|
149
153
|
const files = await gitChangedFiles(task.cwd, state.commitSha, probe.head, run);
|
|
@@ -159,8 +163,8 @@ export async function checkGitTrigger(task, options = {}) {
|
|
|
159
163
|
files,
|
|
160
164
|
matched: [],
|
|
161
165
|
message: files.length === 0
|
|
162
|
-
? "
|
|
163
|
-
:
|
|
166
|
+
? t("gitTrigger.noChanges")
|
|
167
|
+
: t("gitTrigger.ignored", { count: files.length }),
|
|
164
168
|
};
|
|
165
169
|
}
|
|
166
170
|
if (persist)
|
|
@@ -172,9 +176,11 @@ export async function checkGitTrigger(task, options = {}) {
|
|
|
172
176
|
from: state.commitSha,
|
|
173
177
|
files,
|
|
174
178
|
matched,
|
|
175
|
-
message:
|
|
176
|
-
.slice(0,
|
|
177
|
-
|
|
179
|
+
message: t("gitTrigger.changed", {
|
|
180
|
+
commit: probe.head.slice(0, 7),
|
|
181
|
+
count: matched.length,
|
|
182
|
+
files: `${matched.slice(0, 3).join(", ")}${matched.length > 3 ? ", …" : ""}`,
|
|
183
|
+
}),
|
|
178
184
|
};
|
|
179
185
|
}
|
|
180
186
|
function cwdOf(def) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"matrix.d.ts","sourceRoot":"","sources":["../../src/core/matrix.ts"],"names":[],"mappings":"AAYA,OAAO,KAAK,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"matrix.d.ts","sourceRoot":"","sources":["../../src/core/matrix.ts"],"names":[],"mappings":"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"}
|
package/dist/core/matrix.js
CHANGED
|
@@ -15,13 +15,18 @@ import { getHistory, recordRun } from "../db/history-repo.js";
|
|
|
15
15
|
import { notifyMatrixCompletion } from "../notifications.js";
|
|
16
16
|
import { getWorkspace } from "../workspaces.js";
|
|
17
17
|
import { createSchedulerBackend } from "./scheduler/index.js";
|
|
18
|
+
import { t } from "../i18n.js";
|
|
18
19
|
/** Суффикс агрегирующей задачи, запускаемой после всех клонов. */
|
|
19
20
|
export const MATRIX_COMPLETE_SUFFIX = "-matrix-complete";
|
|
20
21
|
/** Имя клона: <родитель>-matrix-<workspace>. */
|
|
21
22
|
export function matrixCloneName(parentName, workspaceName) {
|
|
22
23
|
const parent = parentName.trim();
|
|
23
24
|
const ws = workspaceName.trim() || "workspace";
|
|
24
|
-
const safeWs = ws
|
|
25
|
+
const safeWs = ws
|
|
26
|
+
// Спринт 27.5: метасимволы оболочки и недопустимые для имени задачи
|
|
27
|
+
// символы заменяем на дефис, чтобы имя клона проходило validateTaskName.
|
|
28
|
+
.replace(/[\\/:*?"<>|&^%'`;()]+/g, "-")
|
|
29
|
+
.replace(/\s+/g, "-");
|
|
25
30
|
return `${parent}-matrix-${safeWs}`;
|
|
26
31
|
}
|
|
27
32
|
/** Имя агрегирующей задачи matrix-complete. */
|
|
@@ -39,14 +44,17 @@ export function isMatrixCompleteName(name) {
|
|
|
39
44
|
export function expandMatrixTask(task) {
|
|
40
45
|
const matrix = task.matrix;
|
|
41
46
|
if (!matrix || !Array.isArray(matrix.workspaceIds) || matrix.workspaceIds.length === 0) {
|
|
42
|
-
throw new Error(
|
|
47
|
+
throw new Error(t("matrix.error.workspaceIdsEmpty", { task: task.name }));
|
|
43
48
|
}
|
|
44
49
|
const clones = [];
|
|
45
50
|
const usedNames = new Set();
|
|
46
51
|
for (const workspaceId of matrix.workspaceIds) {
|
|
47
52
|
const workspace = getWorkspace(workspaceId);
|
|
48
53
|
if (!workspace) {
|
|
49
|
-
throw new Error(
|
|
54
|
+
throw new Error(t("matrix.error.workspaceMissing", {
|
|
55
|
+
task: task.name,
|
|
56
|
+
workspace: workspaceId,
|
|
57
|
+
}));
|
|
50
58
|
}
|
|
51
59
|
const name = matrixCloneName(task.name, workspace.name);
|
|
52
60
|
if (usedNames.has(name.toLowerCase()))
|
|
@@ -95,7 +103,7 @@ export function expandMatrixTask(task) {
|
|
|
95
103
|
clones.push(cloneDefinition);
|
|
96
104
|
}
|
|
97
105
|
if (clones.length === 0) {
|
|
98
|
-
throw new Error(
|
|
106
|
+
throw new Error(t("matrix.error.cloneCreation", { task: task.name }));
|
|
99
107
|
}
|
|
100
108
|
return clones;
|
|
101
109
|
}
|
|
@@ -136,26 +144,41 @@ export function aggregateMatrixResults(parentId) {
|
|
|
136
144
|
let message;
|
|
137
145
|
if (totalCount === 0) {
|
|
138
146
|
status = "empty";
|
|
139
|
-
message =
|
|
147
|
+
message = t("matrix.aggregate.empty", { parent: parentId });
|
|
140
148
|
}
|
|
141
149
|
else if (pendingCount > 0) {
|
|
142
150
|
status = "running";
|
|
143
|
-
message =
|
|
151
|
+
message = t("matrix.aggregate.running", {
|
|
152
|
+
done: totalCount - pendingCount,
|
|
153
|
+
total: totalCount,
|
|
154
|
+
});
|
|
144
155
|
}
|
|
145
156
|
else if (errorCount === 0) {
|
|
146
157
|
status = "success";
|
|
147
|
-
message =
|
|
158
|
+
message = t("matrix.aggregate.success", { total: totalCount });
|
|
148
159
|
}
|
|
149
160
|
else if (failureMode === "stop") {
|
|
150
161
|
const firstError = results.find((r) => r.status === "error");
|
|
151
162
|
status = "error";
|
|
152
163
|
message =
|
|
153
|
-
|
|
154
|
-
|
|
164
|
+
t("matrix.aggregate.stopped", {
|
|
165
|
+
errors: errorCount,
|
|
166
|
+
total: totalCount,
|
|
167
|
+
}) +
|
|
168
|
+
(firstError?.error
|
|
169
|
+
? t("matrix.aggregate.stoppedFirst", {
|
|
170
|
+
name: firstError.name,
|
|
171
|
+
error: firstError.error,
|
|
172
|
+
})
|
|
173
|
+
: "");
|
|
155
174
|
}
|
|
156
175
|
else {
|
|
157
176
|
status = "partial";
|
|
158
|
-
message =
|
|
177
|
+
message = t("matrix.aggregate.partial", {
|
|
178
|
+
success: successCount,
|
|
179
|
+
total: totalCount,
|
|
180
|
+
errors: errorCount,
|
|
181
|
+
});
|
|
159
182
|
}
|
|
160
183
|
return {
|
|
161
184
|
parentId,
|
|
@@ -192,11 +215,11 @@ export function resolveMatrixConcurrency(matrix, totalClones) {
|
|
|
192
215
|
export async function runMatrix(task) {
|
|
193
216
|
const matrix = task.matrix;
|
|
194
217
|
if (!matrix) {
|
|
195
|
-
throw new Error(
|
|
218
|
+
throw new Error(t("matrix.error.notMatrix", { task: task.name }));
|
|
196
219
|
}
|
|
197
220
|
const clones = listMatrixClones(task.name);
|
|
198
221
|
if (clones.length === 0) {
|
|
199
|
-
throw new Error(
|
|
222
|
+
throw new Error(t("matrix.error.noClones", { task: task.name }));
|
|
200
223
|
}
|
|
201
224
|
const strategy = matrix.strategy === "sequential" ? "sequential" : "parallel";
|
|
202
225
|
const failureMode = matrix.failureMode === "stop" ? "stop" : "continue";
|
|
@@ -385,8 +408,10 @@ export function ensureMatrixCompleteTask(parent) {
|
|
|
385
408
|
name,
|
|
386
409
|
schedule: parent.schedule,
|
|
387
410
|
prompt: existing?.prompt ??
|
|
388
|
-
|
|
389
|
-
|
|
411
|
+
t("matrix.aggregator.prompt", {
|
|
412
|
+
parent: parent.name,
|
|
413
|
+
clones: clones.map((c) => c.name).join(", "),
|
|
414
|
+
}),
|
|
390
415
|
triggerType: "file",
|
|
391
416
|
watchPath: undefined,
|
|
392
417
|
mcpEvent: undefined,
|
|
@@ -443,7 +468,7 @@ function cloneSignature(definition) {
|
|
|
443
468
|
*/
|
|
444
469
|
export function planMatrixSync(parent) {
|
|
445
470
|
if (!parent.matrix) {
|
|
446
|
-
throw new Error(
|
|
471
|
+
throw new Error(t("matrix.error.notMatrix", { task: parent.name }));
|
|
447
472
|
}
|
|
448
473
|
const desired = expandMatrixTask(parent);
|
|
449
474
|
const existing = listMatrixClones(parent.name);
|
|
@@ -465,7 +490,7 @@ export function planMatrixSync(parent) {
|
|
|
465
490
|
// Выполняющийся клон не трогаем: не обновляем, не удаляем.
|
|
466
491
|
running.push(current.name);
|
|
467
492
|
if (cloneSignature(current) !== cloneSignature(wanted)) {
|
|
468
|
-
warnings.push(
|
|
493
|
+
warnings.push(t("matrix.clone.runningChanges", { name: current.name }));
|
|
469
494
|
}
|
|
470
495
|
continue;
|
|
471
496
|
}
|
|
@@ -479,7 +504,7 @@ export function planMatrixSync(parent) {
|
|
|
479
504
|
const latest = latestCloneStatus(current.name);
|
|
480
505
|
if (latest.status === "running") {
|
|
481
506
|
running.push(current.name);
|
|
482
|
-
warnings.push(
|
|
507
|
+
warnings.push(t("matrix.clone.runningDeletion", { name: current.name }));
|
|
483
508
|
continue;
|
|
484
509
|
}
|
|
485
510
|
remove.push(current.name);
|
|
@@ -540,9 +565,10 @@ export function getMatrixDeletionGuard(taskName) {
|
|
|
540
565
|
const parentId = definition?.matrixParentId?.trim();
|
|
541
566
|
if (!parentId)
|
|
542
567
|
return undefined;
|
|
543
|
-
return (
|
|
544
|
-
|
|
545
|
-
|
|
568
|
+
return t("matrix.deletionGuard", {
|
|
569
|
+
name: definition?.name ?? taskName,
|
|
570
|
+
parent: parentId,
|
|
571
|
+
});
|
|
546
572
|
}
|
|
547
573
|
/**
|
|
548
574
|
* Осиротевшие задачи матриц: клоны, чей родитель уже удалён, и агрегаторы,
|
|
@@ -575,10 +601,10 @@ export function findOrphanedMatrixTasks() {
|
|
|
575
601
|
* агрегированный итог. Реальные процессы клонов останавливает вызывающая
|
|
576
602
|
* сторона (index.ts), т.к. для этого нужен бэкенд планировщика ОС.
|
|
577
603
|
*/
|
|
578
|
-
export async function cancelPendingMatrixClones(parentName, reason = "
|
|
604
|
+
export async function cancelPendingMatrixClones(parentName, reason = t("matrix.cancel.defaultReason")) {
|
|
579
605
|
const parent = getTask(parentName);
|
|
580
606
|
if (!parent?.matrix) {
|
|
581
|
-
throw new Error(
|
|
607
|
+
throw new Error(t("matrix.error.notMatrix", { task: parentName }));
|
|
582
608
|
}
|
|
583
609
|
const clones = listMatrixClones(parent.name);
|
|
584
610
|
const cancelled = [];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"schedule-v2.d.ts","sourceRoot":"","sources":["../../src/core/schedule-v2.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"schedule-v2.d.ts","sourceRoot":"","sources":["../../src/core/schedule-v2.ts"],"names":[],"mappings":"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"}
|