agent-steward 0.0.2 → 0.0.4
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 +45 -2
- package/CROSS_PLATFORM.md +11 -9
- package/README.md +11 -10
- package/ROADMAP-STRATEGY.md +93 -44
- package/ROADMAP.md +148 -1017
- package/dist/core/cron-to-schtasks.d.ts +0 -8
- package/dist/core/cron-to-schtasks.d.ts.map +1 -1
- package/dist/core/cron-to-schtasks.js +11 -86
- package/dist/core/dlq-api.d.ts +44 -0
- package/dist/core/dlq-api.d.ts.map +1 -0
- package/dist/core/dlq-api.js +68 -0
- package/dist/core/dry-run.d.ts.map +1 -1
- package/dist/core/dry-run.js +19 -2
- package/dist/core/file-watcher.js +9 -9
- package/dist/core/git-trigger.js +4 -4
- package/dist/core/lock.d.ts +20 -4
- package/dist/core/lock.d.ts.map +1 -1
- package/dist/core/lock.js +99 -26
- package/dist/core/one-shot.d.ts +31 -5
- package/dist/core/one-shot.d.ts.map +1 -1
- package/dist/core/one-shot.js +78 -10
- package/dist/core/opencode-cli.d.ts +28 -0
- package/dist/core/opencode-cli.d.ts.map +1 -0
- package/dist/core/opencode-cli.js +74 -0
- package/dist/core/opencode-models.d.ts +62 -0
- package/dist/core/opencode-models.d.ts.map +1 -0
- package/dist/core/opencode-models.js +277 -0
- package/dist/core/otel.js +2 -2
- package/dist/core/ps-wrapper.d.ts +1 -1
- package/dist/core/ps-wrapper.d.ts.map +1 -1
- package/dist/core/ps-wrapper.js +66 -36
- package/dist/core/record-history.d.ts +15 -0
- package/dist/core/record-history.d.ts.map +1 -1
- package/dist/core/record-history.js +78 -54
- package/dist/core/router/dispatch.d.ts +36 -0
- package/dist/core/router/dispatch.d.ts.map +1 -0
- package/dist/core/router/dispatch.js +59 -0
- package/dist/core/router/escalation.d.ts +47 -0
- package/dist/core/router/escalation.d.ts.map +1 -0
- package/dist/core/router/escalation.js +87 -0
- package/dist/core/router/planner.d.ts +53 -0
- package/dist/core/router/planner.d.ts.map +1 -0
- package/dist/core/router/planner.js +113 -0
- package/dist/core/router/rules.d.ts +46 -0
- package/dist/core/router/rules.d.ts.map +1 -0
- package/dist/core/router/rules.js +85 -0
- package/dist/core/run-panel-api.d.ts +94 -0
- package/dist/core/run-panel-api.d.ts.map +1 -0
- package/dist/core/run-panel-api.js +169 -0
- package/dist/core/schedule-gate.js +5 -1
- package/dist/core/schedule-v2.d.ts +36 -2
- package/dist/core/schedule-v2.d.ts.map +1 -1
- package/dist/core/schedule-v2.js +98 -12
- package/dist/core/scheduler/at-fallback.d.ts +95 -0
- package/dist/core/scheduler/at-fallback.d.ts.map +1 -0
- package/dist/core/scheduler/at-fallback.js +200 -0
- package/dist/core/scheduler/linux.d.ts +13 -2
- package/dist/core/scheduler/linux.d.ts.map +1 -1
- package/dist/core/scheduler/linux.js +67 -13
- package/dist/core/scheduler/mac.d.ts +14 -8
- package/dist/core/scheduler/mac.d.ts.map +1 -1
- package/dist/core/scheduler/mac.js +71 -22
- package/dist/core/scheduler/posix.d.ts.map +1 -1
- package/dist/core/scheduler/posix.js +37 -2
- package/dist/core/scheduler/registry.d.ts +13 -0
- package/dist/core/scheduler/registry.d.ts.map +1 -1
- package/dist/core/scheduler/registry.js +83 -21
- package/dist/core/scheduler/run-now.d.ts +16 -0
- package/dist/core/scheduler/run-now.d.ts.map +1 -0
- package/dist/core/scheduler/run-now.js +28 -0
- package/dist/core/scheduler/windows.d.ts +16 -3
- package/dist/core/scheduler/windows.d.ts.map +1 -1
- package/dist/core/scheduler/windows.js +249 -96
- package/dist/core/secrets.d.ts.map +1 -1
- package/dist/core/secrets.js +127 -30
- package/dist/core/self-analysis.js +55 -55
- package/dist/core/session.d.ts.map +1 -1
- package/dist/core/session.js +18 -11
- package/dist/core/summary.js +1 -1
- package/dist/core/task-name.d.ts +24 -0
- package/dist/core/task-name.d.ts.map +1 -0
- package/dist/core/task-name.js +40 -0
- package/dist/core/triage-chain.js +1 -1
- package/dist/core/triage-worker.js +2 -2
- package/dist/core/triage.js +1 -1
- package/dist/core/wrappers/bash.d.ts.map +1 -1
- package/dist/core/wrappers/bash.js +82 -37
- package/dist/db/capability-repo.d.ts +83 -0
- package/dist/db/capability-repo.d.ts.map +1 -0
- package/dist/db/capability-repo.js +182 -0
- package/dist/db/history-repo.d.ts +8 -0
- package/dist/db/history-repo.d.ts.map +1 -1
- package/dist/db/history-repo.js +19 -0
- package/dist/db/index.d.ts +6 -0
- package/dist/db/index.d.ts.map +1 -1
- package/dist/db/index.js +48 -2
- package/dist/db/migrate.d.ts.map +1 -1
- package/dist/db/migrate.js +3 -1
- package/dist/db/run-context.d.ts +103 -0
- package/dist/db/run-context.d.ts.map +1 -0
- package/dist/db/run-context.js +224 -0
- package/dist/db/run-dlq.d.ts +100 -0
- package/dist/db/run-dlq.d.ts.map +1 -0
- package/dist/db/run-dlq.js +191 -0
- package/dist/db/run-journal.d.ts +60 -0
- package/dist/db/run-journal.d.ts.map +1 -0
- package/dist/db/run-journal.js +143 -0
- package/dist/db/run-resume.d.ts +51 -0
- package/dist/db/run-resume.d.ts.map +1 -0
- package/dist/db/run-resume.js +156 -0
- package/dist/db/runs-repo.d.ts +128 -0
- package/dist/db/runs-repo.d.ts.map +1 -0
- package/dist/db/runs-repo.js +342 -0
- package/dist/db/schema.d.ts +16 -2
- package/dist/db/schema.d.ts.map +1 -1
- package/dist/db/schema.js +342 -35
- package/dist/db/settings-repo.d.ts +11 -0
- package/dist/db/settings-repo.d.ts.map +1 -1
- package/dist/db/settings-repo.js +25 -0
- package/dist/db/step-idempotency.d.ts +51 -0
- package/dist/db/step-idempotency.d.ts.map +1 -0
- package/dist/db/step-idempotency.js +136 -0
- package/dist/index.d.ts +5 -5
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +168 -40
- package/dist/notifications.js +18 -18
- package/dist/profiles.d.ts +7 -3
- package/dist/profiles.d.ts.map +1 -1
- package/dist/profiles.js +85 -7
- package/dist/rpc.d.ts +787 -0
- package/dist/rpc.d.ts.map +1 -1
- package/dist/rpc.js +324 -0
- package/dist/server.d.ts +33 -2
- package/dist/server.d.ts.map +1 -1
- package/dist/server.js +115 -54
- package/dist/shared/jobs-view.d.ts.map +1 -1
- package/dist/skill.js +1 -1
- package/dist/task-transfer.d.ts +1 -1
- package/dist/task-transfer.d.ts.map +1 -1
- package/dist/task-transfer.js +14 -10
- package/dist/types.d.ts +20 -4
- package/dist/types.d.ts.map +1 -1
- package/dist/types.js +44 -9
- package/dist/workspaces.d.ts +25 -3
- package/dist/workspaces.d.ts.map +1 -1
- package/dist/workspaces.js +44 -9
- package/docs/ARCHITECTURE.md +335 -9
- package/docs/COMPATIBILITY.md +10 -6
- package/docs/CONCEPT.md +183 -91
- package/docs/CROSS_PLATFORM.ru.md +11 -9
- package/docs/CROSS_PLATFORM.zh.md +11 -9
- package/docs/EXECUTION-LOOP.md +196 -0
- package/docs/FAQ.md +2 -2
- package/docs/FAQ.ru.md +2 -2
- package/docs/FAQ.zh.md +2 -2
- package/docs/FEATURES.md +5 -4
- package/docs/FEATURES.zh.md +5 -4
- package/docs/MIGRATION.md +34 -26
- package/docs/README.ru.md +27 -8
- package/docs/README.zh.md +11 -10
- package/docs/SAFETY.md +122 -0
- package/docs/SAVINGS.md +29 -0
- package/docs/SAVINGS.ru.md +29 -0
- package/docs/SAVINGS.zh.md +18 -0
- package/docs/V1-V2-COMPATIBILITY-PLAN.md +6 -6
- package/gui-experimental.cjs +8 -8
- package/index.js +1 -0
- package/locales/en.json +68 -0
- package/locales/ru.json +68 -0
- package/locales/zh.json +68 -0
- package/package.json +57 -11
- package/scripts/audit-bundle.mjs +215 -0
- package/src/core/analytics.ts +2 -2
- package/src/core/audit.ts +17 -17
- package/src/core/cron-to-schtasks.ts +14 -93
- package/src/core/dlq-api.ts +98 -0
- package/src/core/dry-run.ts +51 -27
- package/src/core/file-watcher.ts +17 -17
- package/src/core/git-trigger.ts +9 -9
- package/src/core/glob.ts +1 -1
- package/src/core/local-ai.ts +2 -2
- package/src/core/lock.ts +104 -31
- package/src/core/matrix.ts +31 -31
- package/src/core/native-notify.ts +2 -2
- package/src/core/one-shot.ts +91 -13
- package/src/core/opencode-cli.ts +103 -0
- package/src/core/opencode-models.ts +315 -0
- package/src/core/otel.ts +4 -4
- package/src/core/permissions.ts +5 -5
- package/src/core/prometheus.ts +17 -17
- package/src/core/ps-wrapper.ts +68 -38
- package/src/core/record-history.ts +114 -76
- package/src/core/retention.ts +3 -3
- package/src/core/router/dispatch.ts +94 -0
- package/src/core/router/escalation.ts +129 -0
- package/src/core/router/planner.ts +166 -0
- package/src/core/router/rules.ts +109 -0
- package/src/core/run-panel-api.ts +262 -0
- package/src/core/savings.ts +1 -1
- package/src/core/schedule-gate.ts +17 -13
- package/src/core/schedule-v2.ts +138 -29
- package/src/core/scheduler/at-fallback.ts +298 -0
- package/src/core/scheduler/index.ts +3 -3
- package/src/core/scheduler/linux.ts +92 -19
- package/src/core/scheduler/logs.ts +1 -1
- package/src/core/scheduler/mac.ts +112 -60
- package/src/core/scheduler/posix.ts +35 -2
- package/src/core/scheduler/registry.ts +109 -26
- package/src/core/scheduler/run-now.ts +32 -0
- package/src/core/scheduler/windows.ts +295 -125
- package/src/core/secrets.ts +139 -39
- package/src/core/self-analysis.ts +61 -61
- package/src/core/session.ts +26 -13
- package/src/core/structured-log.ts +3 -3
- package/src/core/summary.ts +25 -25
- package/src/core/task-name.ts +67 -0
- package/src/core/telegram.ts +16 -16
- package/src/core/triage-chain.ts +4 -4
- package/src/core/triage-compare.ts +8 -8
- package/src/core/triage-rules.ts +4 -4
- package/src/core/triage-shadow.ts +7 -7
- package/src/core/triage-worker.ts +6 -6
- package/src/core/triage.ts +23 -23
- package/src/core/watch-paths.ts +1 -1
- package/src/core/wrappers/bash.ts +90 -45
- package/src/db/capability-repo.ts +285 -0
- package/src/db/git-state-repo.ts +1 -1
- package/src/db/history-repo.ts +44 -22
- package/src/db/index.ts +53 -7
- package/src/db/metrics-repo.ts +10 -10
- package/src/db/migrate.ts +13 -11
- package/src/db/recovery.ts +3 -3
- package/src/db/run-context.ts +370 -0
- package/src/db/run-dlq.ts +310 -0
- package/src/db/run-journal.ts +212 -0
- package/src/db/run-resume.ts +256 -0
- package/src/db/runs-repo.ts +504 -0
- package/src/db/schema.ts +357 -44
- package/src/db/settings-repo.ts +33 -2
- package/src/db/step-idempotency.ts +185 -0
- package/src/db/tasks-repo.ts +10 -10
- package/src/db/templates-repo.ts +7 -7
- package/src/gui.tsx +516 -1
- package/src/history.ts +4 -4
- package/src/i18n.ts +7 -7
- package/src/index.ts +465 -308
- package/src/integrations.ts +6 -6
- package/src/notifications.ts +76 -76
- package/src/profiles.ts +98 -7
- package/src/rpc.ts +347 -1
- package/src/schtasks.ts +2 -2
- package/src/server.ts +155 -78
- package/src/settings.ts +44 -44
- package/src/shared/jobs-view.ts +60 -60
- package/src/skill.ts +1 -1
- package/src/task-transfer.ts +58 -56
- package/src/templates.ts +1 -1
- package/src/types.ts +54 -10
- package/src/workspaces.ts +73 -24
- package/dist/core/self-analysis.test.d.ts +0 -2
- package/dist/core/self-analysis.test.d.ts.map +0 -1
- package/dist/core/self-analysis.test.js +0 -219
- package/dist/gui-experimental.cjs +0 -1
|
@@ -2,7 +2,7 @@ import { execFile } from "node:child_process";
|
|
|
2
2
|
import { promisify } from "node:util";
|
|
3
3
|
import iconv from "iconv-lite";
|
|
4
4
|
import type { ScheduledTaskInfo } from "../../types.js";
|
|
5
|
-
import { TASK_FOLDER, TASK_FOLDER_NAME, taskFolderNameForProfile } from "../../types.js";
|
|
5
|
+
import { TASK_FOLDER, TASK_FOLDER_NAME, LEGACY_TASK_FOLDER_NAME, taskFolderNameForProfile, legacyTaskFolderNameForProfile } from "../../types.js";
|
|
6
6
|
import { getProfileName } from "../../profiles.js";
|
|
7
7
|
import { buildScheduleFlags, convertCronToSchTasks } from "../cron-to-schtasks.js";
|
|
8
8
|
import { buildWindowsOneShotFlags } from "../one-shot.js";
|
|
@@ -15,17 +15,52 @@ import type {
|
|
|
15
15
|
|
|
16
16
|
const execFileAsync = promisify(execFile);
|
|
17
17
|
|
|
18
|
+
/** Кэш формата даты локали Windows (ShortDatePattern), полученного через PowerShell. */
|
|
19
|
+
let windowsDateFormatCache: string | null = null;
|
|
20
|
+
|
|
21
|
+
/** Определяет формат даты системной локали через PowerShell (P1-8). */
|
|
22
|
+
async function getWindowsDateFormat(): Promise<string> {
|
|
23
|
+
if (windowsDateFormatCache !== null) return windowsDateFormatCache;
|
|
24
|
+
try {
|
|
25
|
+
const { stdout } = await execFileAsync(
|
|
26
|
+
"powershell.exe",
|
|
27
|
+
["-NoProfile", "-Command", "(Get-Culture).DateTimeFormat.ShortDatePattern"],
|
|
28
|
+
{ maxBuffer: MAX_OUTPUT_BUFFER },
|
|
29
|
+
);
|
|
30
|
+
const pattern = String(stdout).trim();
|
|
31
|
+
windowsDateFormatCache = pattern || "dd.MM.yyyy";
|
|
32
|
+
return windowsDateFormatCache;
|
|
33
|
+
} catch {
|
|
34
|
+
windowsDateFormatCache = "dd.MM.yyyy";
|
|
35
|
+
return windowsDateFormatCache;
|
|
36
|
+
}
|
|
37
|
+
}
|
|
38
|
+
|
|
39
|
+
/** Форматирует дату «никогда» (заглушка для file/git/mcp-триггеров) в формате локали. */
|
|
40
|
+
async function buildNeverDate(format: string): Promise<string> {
|
|
41
|
+
const { formatDateByLocalePattern } = await import("../one-shot.js");
|
|
42
|
+
return formatDateByLocalePattern(new Date("2099-12-31T00:00:00Z"), format);
|
|
43
|
+
}
|
|
44
|
+
|
|
18
45
|
/** Максимальный размер вывода schtasks (обычно хватает с большим запасом). */
|
|
19
46
|
const MAX_OUTPUT_BUFFER = 10 * 1024 * 1024;
|
|
20
47
|
|
|
21
48
|
/** Префикс папки задач плагина в Планировщике заданий Windows. */
|
|
22
49
|
export const WINDOWS_TASK_PREFIX = `\\${TASK_FOLDER}\\${TASK_FOLDER_NAME}\\`;
|
|
23
50
|
|
|
24
|
-
/** Префикс папки
|
|
51
|
+
/** Префикс старой папки (до переименования) — поддерживается для миграции. */
|
|
52
|
+
export const LEGACY_WINDOWS_TASK_PREFIX = `\\${TASK_FOLDER}\\${LEGACY_TASK_FOLDER_NAME}\\`;
|
|
53
|
+
|
|
54
|
+
/** Префикс папки конкретного профиля (для удаления неактивного профиля). */
|
|
25
55
|
export function windowsTaskPrefixForProfile(profile: string): string {
|
|
26
56
|
return `\\${TASK_FOLDER}\\${taskFolderNameForProfile(profile)}\\`;
|
|
27
57
|
}
|
|
28
58
|
|
|
59
|
+
/** Префикс старой папки конкретного профиля. */
|
|
60
|
+
export function legacyWindowsTaskPrefixForProfile(profile: string): string {
|
|
61
|
+
return `\\${TASK_FOLDER}\\${legacyTaskFolderNameForProfile(profile)}\\`;
|
|
62
|
+
}
|
|
63
|
+
|
|
29
64
|
/** Полное имя задачи в папке конкретного профиля. */
|
|
30
65
|
export function taskFullNameForProfile(name: string, profile: string): string {
|
|
31
66
|
const prefix = windowsTaskPrefixForProfile(profile);
|
|
@@ -68,8 +103,8 @@ export async function getOemCodePage(): Promise<number> {
|
|
|
68
103
|
// поэтому декодировать можно через cp866/utf8 — цифры не пострадают.
|
|
69
104
|
const text = decodeConsoleOutputSync(stdout);
|
|
70
105
|
// Значение может быть REG_DWORD (0x362) или REG_SZ (866 / "866").
|
|
71
|
-
const hexMatch =
|
|
72
|
-
const decMatch =
|
|
106
|
+
const hexMatch = /0x([0-9A-Fa-f]{1,8})/i.exec(text);
|
|
107
|
+
const decMatch = /\b(\d{2,5})\b/.exec(text);
|
|
73
108
|
let cp: number | null = null;
|
|
74
109
|
if (hexMatch) {
|
|
75
110
|
cp = parseInt(hexMatch[1], 16);
|
|
@@ -167,7 +202,7 @@ export interface SchtasksResult {
|
|
|
167
202
|
*/
|
|
168
203
|
export function explainSchtasksError(
|
|
169
204
|
code: number | null,
|
|
170
|
-
text: string
|
|
205
|
+
text: string,
|
|
171
206
|
): string | null {
|
|
172
207
|
// HRESULT-коды приходят как знаковые 32-битные числа; приводим к unsigned.
|
|
173
208
|
const unsigned =
|
|
@@ -193,7 +228,7 @@ export function explainSchtasksError(
|
|
|
193
228
|
}
|
|
194
229
|
|
|
195
230
|
const lower = text.toLowerCase();
|
|
196
|
-
const byText:
|
|
231
|
+
const byText: [string[], string][] = [
|
|
197
232
|
[
|
|
198
233
|
["access is denied", "отказано в доступе"],
|
|
199
234
|
"Нет прав на операцию с задачей (access denied).",
|
|
@@ -223,7 +258,7 @@ export class SchtasksError extends Error {
|
|
|
223
258
|
constructor(
|
|
224
259
|
message: string,
|
|
225
260
|
public readonly code: number | null,
|
|
226
|
-
public readonly stderr: string
|
|
261
|
+
public readonly stderr: string,
|
|
227
262
|
) {
|
|
228
263
|
const hint = explainSchtasksError(code, `${message} ${stderr}`);
|
|
229
264
|
super(hint ? `${message} | пояснение: ${hint}` : message);
|
|
@@ -258,24 +293,54 @@ export async function runSchtasks(args: string[]): Promise<SchtasksResult> {
|
|
|
258
293
|
throw new SchtasksError(
|
|
259
294
|
`schtasks error: ${buildErrorDetails(err, stdout, stderr)}`,
|
|
260
295
|
e.code ?? null,
|
|
261
|
-
stderr
|
|
296
|
+
stderr,
|
|
262
297
|
);
|
|
263
298
|
}
|
|
264
299
|
}
|
|
265
300
|
|
|
266
301
|
/** Формирует полное имя задачи с папкой плагина. */
|
|
267
302
|
export function taskFullName(name: string): string {
|
|
268
|
-
if (
|
|
303
|
+
if (
|
|
304
|
+
name.startsWith(WINDOWS_TASK_PREFIX) ||
|
|
305
|
+
name.startsWith(LEGACY_WINDOWS_TASK_PREFIX)
|
|
306
|
+
) {
|
|
269
307
|
return name;
|
|
270
308
|
}
|
|
271
309
|
return WINDOWS_TASK_PREFIX + name;
|
|
272
310
|
}
|
|
273
311
|
|
|
274
|
-
/** Убирает папку плагина из полного имени задачи. */
|
|
312
|
+
/** Убирает папку плагина (новую или старую) из полного имени задачи. */
|
|
275
313
|
function shortTaskName(fullName: string): string {
|
|
276
|
-
|
|
277
|
-
|
|
278
|
-
|
|
314
|
+
if (fullName.startsWith(WINDOWS_TASK_PREFIX)) {
|
|
315
|
+
return fullName.slice(WINDOWS_TASK_PREFIX.length);
|
|
316
|
+
}
|
|
317
|
+
if (fullName.startsWith(LEGACY_WINDOWS_TASK_PREFIX)) {
|
|
318
|
+
return fullName.slice(LEGACY_WINDOWS_TASK_PREFIX.length);
|
|
319
|
+
}
|
|
320
|
+
return fullName;
|
|
321
|
+
}
|
|
322
|
+
|
|
323
|
+
/**
|
|
324
|
+
* Признак того, что schtasks не нашёл задачу (локаль-независимый набор фраз).
|
|
325
|
+
* Используется для fallback на старую папку windows-scheduler.
|
|
326
|
+
*/
|
|
327
|
+
function isTaskNotFoundText(text: string): boolean {
|
|
328
|
+
const t = text.toLowerCase();
|
|
329
|
+
return (
|
|
330
|
+
t.includes("cannot find") ||
|
|
331
|
+
t.includes("не удалось найти") ||
|
|
332
|
+
t.includes("не удается найти") ||
|
|
333
|
+
t.includes("не может найти") ||
|
|
334
|
+
t.includes("не найдено") ||
|
|
335
|
+
t.includes("the system cannot find the file specified") ||
|
|
336
|
+
t.includes("no tasks") ||
|
|
337
|
+
t.includes("could not find")
|
|
338
|
+
);
|
|
339
|
+
}
|
|
340
|
+
|
|
341
|
+
function isTaskNotFoundError(err: unknown): boolean {
|
|
342
|
+
if (!(err instanceof SchtasksError)) return false;
|
|
343
|
+
return isTaskNotFoundText(`${err.message} ${err.stderr}`);
|
|
279
344
|
}
|
|
280
345
|
|
|
281
346
|
/**
|
|
@@ -286,27 +351,48 @@ function shortTaskName(fullName: string): string {
|
|
|
286
351
|
*/
|
|
287
352
|
export class WindowsScheduler implements SchedulerBackend {
|
|
288
353
|
readonly platform: NodeJS.Platform = "win32";
|
|
289
|
-
readonly title = "
|
|
354
|
+
readonly title = "agent-steward by DeadSno";
|
|
290
355
|
|
|
291
356
|
/** Имя папки задач и её префикс — в пространстве имён своего профиля. */
|
|
292
357
|
private readonly taskFolderName: string;
|
|
293
358
|
private readonly taskPrefix: string;
|
|
359
|
+
/** Старая (до переименования) папка — только чтение/миграция. */
|
|
360
|
+
private readonly legacyTaskFolderName: string;
|
|
361
|
+
private readonly legacyTaskPrefix: string;
|
|
294
362
|
|
|
295
363
|
constructor(profile: string = getProfileName()) {
|
|
296
364
|
this.taskFolderName = taskFolderNameForProfile(profile);
|
|
297
365
|
this.taskPrefix = windowsTaskPrefixForProfile(profile);
|
|
366
|
+
this.legacyTaskFolderName = legacyTaskFolderNameForProfile(profile);
|
|
367
|
+
this.legacyTaskPrefix = legacyWindowsTaskPrefixForProfile(profile);
|
|
298
368
|
}
|
|
299
369
|
|
|
300
370
|
/** Полное имя задачи (\OpenCode\<профиль>\<name>) для этого бэкенда. */
|
|
301
371
|
private fullName(name: string): string {
|
|
302
|
-
return name.startsWith(this.taskPrefix)
|
|
372
|
+
return name.startsWith(this.taskPrefix) || name.startsWith(this.legacyTaskPrefix)
|
|
373
|
+
? name
|
|
374
|
+
: this.taskPrefix + name;
|
|
375
|
+
}
|
|
376
|
+
|
|
377
|
+
/** Оба возможных полных имени: новое и старое (для поиска legacy-задач). */
|
|
378
|
+
private fullNames(name: string): string[] {
|
|
379
|
+
const candidate = this.fullName(name);
|
|
380
|
+
const names = [candidate];
|
|
381
|
+
if (!candidate.startsWith(this.legacyTaskPrefix)) {
|
|
382
|
+
names.push(this.legacyTaskPrefix + name);
|
|
383
|
+
}
|
|
384
|
+
return names;
|
|
303
385
|
}
|
|
304
386
|
|
|
305
|
-
/** Убирает папку профиля из полного имени задачи. */
|
|
387
|
+
/** Убирает папку профиля (новую или старую) из полного имени задачи. */
|
|
306
388
|
private shortName(fullName: string): string {
|
|
307
|
-
|
|
308
|
-
|
|
309
|
-
|
|
389
|
+
if (fullName.startsWith(this.taskPrefix)) {
|
|
390
|
+
return fullName.slice(this.taskPrefix.length);
|
|
391
|
+
}
|
|
392
|
+
if (fullName.startsWith(this.legacyTaskPrefix)) {
|
|
393
|
+
return fullName.slice(this.legacyTaskPrefix.length);
|
|
394
|
+
}
|
|
395
|
+
return fullName;
|
|
310
396
|
}
|
|
311
397
|
|
|
312
398
|
async createTask(options: CreateTaskOptions): Promise<void> {
|
|
@@ -319,14 +405,25 @@ export class WindowsScheduler implements SchedulerBackend {
|
|
|
319
405
|
// единственного запуска, повторных срабатываний не будет.
|
|
320
406
|
if (!options.runAt) {
|
|
321
407
|
throw new Error(
|
|
322
|
-
`Задача "${name}": для triggerType=once не передано время runAt
|
|
408
|
+
`Задача "${name}": для triggerType=once не передано время runAt.`,
|
|
323
409
|
);
|
|
324
410
|
}
|
|
325
|
-
|
|
411
|
+
const dateFormat = await getWindowsDateFormat();
|
|
412
|
+
scheduleFlags = buildWindowsOneShotFlags(options.runAt, dateFormat);
|
|
326
413
|
} else if (triggerType && triggerType !== "cron") {
|
|
327
414
|
// Файловый или MCP-триггер: однократный запуск в далёком будущем.
|
|
328
415
|
// Активация — только вручную (runTask / файловый watcher / emit_event).
|
|
329
|
-
|
|
416
|
+
// Дата форматируется в формате системной локали (P1-8), а не захардкожена
|
|
417
|
+
// под русскую DD.MM.YYYY.
|
|
418
|
+
const dateFormat = await getWindowsDateFormat();
|
|
419
|
+
scheduleFlags = [
|
|
420
|
+
"/sc",
|
|
421
|
+
"ONCE",
|
|
422
|
+
"/sd",
|
|
423
|
+
await buildNeverDate(dateFormat),
|
|
424
|
+
"/st",
|
|
425
|
+
"00:00",
|
|
426
|
+
];
|
|
330
427
|
} else {
|
|
331
428
|
// Выражения, которые Windows не выражает нативно (список через запятую, L, #,
|
|
332
429
|
// именованные месяцы и т.д.), падают в минутный опрос + gate во враппере.
|
|
@@ -341,7 +438,8 @@ export class WindowsScheduler implements SchedulerBackend {
|
|
|
341
438
|
}
|
|
342
439
|
}
|
|
343
440
|
|
|
344
|
-
|
|
441
|
+
// Создаём всегда в новой папке, даже если передано полное legacy-имя.
|
|
442
|
+
const fullName = this.taskPrefix + this.shortName(name);
|
|
345
443
|
// Спринт 27.5.4: по умолчанию задача интерактивная — schtasks запускает её
|
|
346
444
|
// только при активном входе пользователя (Interactive only). Для работы без
|
|
347
445
|
// входа нужен SYSTEM: он не требует пароля, но работает в session 0 без
|
|
@@ -378,7 +476,7 @@ export class WindowsScheduler implements SchedulerBackend {
|
|
|
378
476
|
throw new SchtasksError(
|
|
379
477
|
`Задача с именем "${name}" уже существует и выполняется. Дождитесь её завершения или удалите её.`,
|
|
380
478
|
err.code,
|
|
381
|
-
err.stderr
|
|
479
|
+
err.stderr,
|
|
382
480
|
);
|
|
383
481
|
}
|
|
384
482
|
|
|
@@ -389,7 +487,7 @@ export class WindowsScheduler implements SchedulerBackend {
|
|
|
389
487
|
throw new SchtasksError(
|
|
390
488
|
`Задача с именем "${name}" уже существует. Используйте delete_task или выберите другое имя.`,
|
|
391
489
|
err.code,
|
|
392
|
-
err.stderr
|
|
490
|
+
err.stderr,
|
|
393
491
|
);
|
|
394
492
|
}
|
|
395
493
|
|
|
@@ -398,10 +496,31 @@ export class WindowsScheduler implements SchedulerBackend {
|
|
|
398
496
|
err.stderr || err.message || "неизвестная ошибка schtasks"
|
|
399
497
|
}`,
|
|
400
498
|
err.code,
|
|
401
|
-
err.stderr
|
|
499
|
+
err.stderr,
|
|
402
500
|
);
|
|
403
501
|
}
|
|
404
|
-
if (result.code === 0)
|
|
502
|
+
if (result.code === 0) {
|
|
503
|
+
// После успешного создания в новой папке убираем возможный дубль из
|
|
504
|
+
// legacy-папки (best-effort: отсутствие дубля — не ошибка).
|
|
505
|
+
await this.removeLegacyDuplicate(name);
|
|
506
|
+
return;
|
|
507
|
+
}
|
|
508
|
+
}
|
|
509
|
+
|
|
510
|
+
/** Удаляет одноимённую задачу из старой папки, если она там осталась. */
|
|
511
|
+
private async removeLegacyDuplicate(name: string): Promise<void> {
|
|
512
|
+
if (this.legacyTaskPrefix === this.taskPrefix) return;
|
|
513
|
+
const legacyFull = this.legacyTaskPrefix + this.shortName(name);
|
|
514
|
+
try {
|
|
515
|
+
await runSchtasks([
|
|
516
|
+
"/delete",
|
|
517
|
+
"/tn",
|
|
518
|
+
legacyFull.replace(/^\\+/, ""),
|
|
519
|
+
"/f",
|
|
520
|
+
]);
|
|
521
|
+
} catch {
|
|
522
|
+
// Дубликата нет или нет прав — создание уже прошло, не мешаем.
|
|
523
|
+
}
|
|
405
524
|
}
|
|
406
525
|
|
|
407
526
|
async listTasks(): Promise<ScheduledTaskInfo[]> {
|
|
@@ -419,22 +538,30 @@ export class WindowsScheduler implements SchedulerBackend {
|
|
|
419
538
|
throw err;
|
|
420
539
|
}
|
|
421
540
|
|
|
422
|
-
if (!result.stdout
|
|
541
|
+
if (!result.stdout?.trim()) {
|
|
423
542
|
return [];
|
|
424
543
|
}
|
|
425
544
|
|
|
426
545
|
const allTasks = parseListOutput(result.stdout).filter((task) =>
|
|
427
|
-
Boolean(task.taskName)
|
|
428
|
-
);
|
|
429
|
-
const filtered = allTasks.filter((task) =>
|
|
430
|
-
(task.taskName || "").startsWith(this.taskPrefix)
|
|
546
|
+
Boolean(task.taskName),
|
|
431
547
|
);
|
|
548
|
+
const filtered = allTasks.filter((task) => {
|
|
549
|
+
const name = task.taskName || "";
|
|
550
|
+
return (
|
|
551
|
+
name.startsWith(this.taskPrefix) ||
|
|
552
|
+
name.startsWith(this.legacyTaskPrefix)
|
|
553
|
+
);
|
|
554
|
+
});
|
|
432
555
|
|
|
433
556
|
// Fallback: если структурный парсер не распознал ключи (нестандартная
|
|
434
557
|
// локаль/кодировка), вытаскиваем имена задач по префиксу папки.
|
|
435
|
-
if (
|
|
558
|
+
if (
|
|
559
|
+
filtered.length === 0 &&
|
|
560
|
+
(result.stdout.includes(this.taskFolderName) ||
|
|
561
|
+
result.stdout.includes(this.legacyTaskFolderName))
|
|
562
|
+
) {
|
|
436
563
|
const names = new Set<string>();
|
|
437
|
-
const folderPattern = `${TASK_FOLDER}[\\\\/]
|
|
564
|
+
const folderPattern = `${TASK_FOLDER}[\\\\/](?:${this.taskFolderName}|${this.legacyTaskFolderName})[\\\\/]`;
|
|
438
565
|
const re = new RegExp(`${folderPattern}([^\\r\\n"']+)`, "gi");
|
|
439
566
|
let m: RegExpExecArray | null;
|
|
440
567
|
while ((m = re.exec(result.stdout)) !== null) {
|
|
@@ -443,86 +570,100 @@ export class WindowsScheduler implements SchedulerBackend {
|
|
|
443
570
|
}
|
|
444
571
|
if (names.size > 0) {
|
|
445
572
|
return Array.from(names).map(
|
|
446
|
-
(nm) => ({ taskName: nm }
|
|
573
|
+
(nm) => ({ taskName: nm }),
|
|
447
574
|
);
|
|
448
575
|
}
|
|
449
576
|
}
|
|
450
577
|
|
|
451
|
-
|
|
452
|
-
|
|
453
|
-
|
|
454
|
-
|
|
455
|
-
|
|
578
|
+
// Если в обеих папках остались задачи с одинаковым коротким именем,
|
|
579
|
+
// показываем одну (новую) — дубликат мог остаться после миграции.
|
|
580
|
+
const seen = new Set<string>();
|
|
581
|
+
const output: ScheduledTaskInfo[] = [];
|
|
582
|
+
for (const task of filtered) {
|
|
583
|
+
const short = this.shortName(task.taskName || "");
|
|
584
|
+
const key = short.toLowerCase();
|
|
585
|
+
if (seen.has(key)) continue;
|
|
586
|
+
seen.add(key);
|
|
587
|
+
output.push({
|
|
588
|
+
...task,
|
|
589
|
+
taskName: short,
|
|
590
|
+
paused: /disabled|отключ|запрещ/i.test(task.status ?? ""),
|
|
591
|
+
});
|
|
592
|
+
}
|
|
593
|
+
return output;
|
|
456
594
|
}
|
|
457
595
|
|
|
458
596
|
async deleteTask(name: string): Promise<void> {
|
|
459
597
|
// schtasks /delete требует имя без ведущего обратного слэша.
|
|
460
|
-
|
|
461
|
-
const
|
|
462
|
-
|
|
463
|
-
|
|
464
|
-
|
|
465
|
-
|
|
466
|
-
|
|
467
|
-
|
|
468
|
-
|
|
469
|
-
|
|
470
|
-
text.includes("не удается найти") ||
|
|
471
|
-
text.includes("не может найти") ||
|
|
472
|
-
text.includes("не найдено") ||
|
|
473
|
-
text.includes("the system cannot find the file specified") ||
|
|
474
|
-
text.includes("no tasks") ||
|
|
475
|
-
text.includes("could not find");
|
|
476
|
-
if (alreadyGone) return;
|
|
598
|
+
let lastError: unknown = null;
|
|
599
|
+
for (const candidate of this.fullNames(name)) {
|
|
600
|
+
const fullName = candidate.replace(/^\\+/, "");
|
|
601
|
+
try {
|
|
602
|
+
await runSchtasks(["/delete", "/tn", fullName, "/f"]);
|
|
603
|
+
return;
|
|
604
|
+
} catch (err) {
|
|
605
|
+
lastError = err;
|
|
606
|
+
// Новая папки нет — пробуем legacy. Прочие ошибки прерывают цикл.
|
|
607
|
+
if (!isTaskNotFoundError(err)) break;
|
|
477
608
|
}
|
|
478
|
-
throw new SchtasksError(
|
|
479
|
-
`Не удалось удалить задачу "${name}"`,
|
|
480
|
-
err.code ?? null,
|
|
481
|
-
err.stderr ?? ""
|
|
482
|
-
);
|
|
483
609
|
}
|
|
610
|
+
if (isTaskNotFoundError(lastError)) return;
|
|
611
|
+
const err = lastError as { code?: number | null; stderr?: string };
|
|
612
|
+
throw new SchtasksError(
|
|
613
|
+
`Не удалось удалить задачу "${name}"`,
|
|
614
|
+
err?.code ?? null,
|
|
615
|
+
err?.stderr ?? "",
|
|
616
|
+
);
|
|
484
617
|
}
|
|
485
618
|
|
|
486
619
|
/** Ставит задачу на паузу (/disable). */
|
|
487
620
|
async pauseTask(name: string): Promise<void> {
|
|
488
|
-
|
|
489
|
-
const
|
|
490
|
-
|
|
491
|
-
|
|
492
|
-
|
|
493
|
-
|
|
494
|
-
|
|
495
|
-
|
|
496
|
-
|
|
497
|
-
|
|
621
|
+
let lastError: unknown = null;
|
|
622
|
+
for (const candidate of this.fullNames(name)) {
|
|
623
|
+
const fullName = candidate.replace(/^\\+/, "");
|
|
624
|
+
try {
|
|
625
|
+
await runSchtasks(["/change", "/tn", fullName, "/disable"]);
|
|
626
|
+
return;
|
|
627
|
+
} catch (err) {
|
|
628
|
+
lastError = err;
|
|
629
|
+
if (err instanceof SchtasksError) {
|
|
630
|
+
const text = `${err.message} ${err.stderr}`.toLowerCase();
|
|
631
|
+
if (text.includes("disabled") || text.includes("запрещена")) return;
|
|
632
|
+
}
|
|
633
|
+
if (!isTaskNotFoundError(err)) break;
|
|
498
634
|
}
|
|
499
|
-
throw new SchtasksError(
|
|
500
|
-
`Не удалось поставить задачу "${name}" на паузу`,
|
|
501
|
-
err.code ?? null,
|
|
502
|
-
err.stderr ?? ""
|
|
503
|
-
);
|
|
504
635
|
}
|
|
636
|
+
const err = lastError as { code?: number | null; stderr?: string };
|
|
637
|
+
throw new SchtasksError(
|
|
638
|
+
`Не удалось поставить задачу "${name}" на паузу`,
|
|
639
|
+
err?.code ?? null,
|
|
640
|
+
err?.stderr ?? "",
|
|
641
|
+
);
|
|
505
642
|
}
|
|
506
643
|
|
|
507
644
|
/** Снимает задачу с паузы (/enable). */
|
|
508
645
|
async resumeTask(name: string): Promise<void> {
|
|
509
|
-
|
|
510
|
-
const
|
|
511
|
-
|
|
512
|
-
|
|
513
|
-
|
|
514
|
-
|
|
515
|
-
|
|
516
|
-
|
|
517
|
-
|
|
518
|
-
|
|
646
|
+
let lastError: unknown = null;
|
|
647
|
+
for (const candidate of this.fullNames(name)) {
|
|
648
|
+
const fullName = candidate.replace(/^\\+/, "");
|
|
649
|
+
try {
|
|
650
|
+
await runSchtasks(["/change", "/tn", fullName, "/enable"]);
|
|
651
|
+
return;
|
|
652
|
+
} catch (err) {
|
|
653
|
+
lastError = err;
|
|
654
|
+
if (err instanceof SchtasksError) {
|
|
655
|
+
const text = `${err.message} ${err.stderr}`.toLowerCase();
|
|
656
|
+
if (text.includes("enabled") || text.includes("включена")) return;
|
|
657
|
+
}
|
|
658
|
+
if (!isTaskNotFoundError(err)) break;
|
|
519
659
|
}
|
|
520
|
-
throw new SchtasksError(
|
|
521
|
-
`Не удалось снять задачу "${name}" с паузы`,
|
|
522
|
-
err.code ?? null,
|
|
523
|
-
err.stderr ?? ""
|
|
524
|
-
);
|
|
525
660
|
}
|
|
661
|
+
const err = lastError as { code?: number | null; stderr?: string };
|
|
662
|
+
throw new SchtasksError(
|
|
663
|
+
`Не удалось снять задачу "${name}" с паузы`,
|
|
664
|
+
err?.code ?? null,
|
|
665
|
+
err?.stderr ?? "",
|
|
666
|
+
);
|
|
526
667
|
}
|
|
527
668
|
|
|
528
669
|
/**
|
|
@@ -533,7 +674,7 @@ export class WindowsScheduler implements SchedulerBackend {
|
|
|
533
674
|
try {
|
|
534
675
|
const tasks = await this.listTasks();
|
|
535
676
|
const task = tasks.find(
|
|
536
|
-
(t) => (t.taskName ?? "").toLowerCase() === name.toLowerCase()
|
|
677
|
+
(t) => (t.taskName ?? "").toLowerCase() === name.toLowerCase(),
|
|
537
678
|
);
|
|
538
679
|
return /running|выполняется/i.test(task?.status ?? "");
|
|
539
680
|
} catch {
|
|
@@ -542,39 +683,51 @@ export class WindowsScheduler implements SchedulerBackend {
|
|
|
542
683
|
}
|
|
543
684
|
|
|
544
685
|
async runTask(name: string): Promise<RunTaskResult> {
|
|
545
|
-
const
|
|
546
|
-
|
|
686
|
+
const candidates = this.fullNames(name);
|
|
687
|
+
for (let i = 0; i < candidates.length; i++) {
|
|
688
|
+
const args = ["/run", "/tn", candidates[i]];
|
|
689
|
+
|
|
690
|
+
// schtasks /run не требует смены кодировки — вызываем напрямую.
|
|
691
|
+
try {
|
|
692
|
+
await execFileAsync("schtasks", args, {
|
|
693
|
+
windowsHide: true,
|
|
694
|
+
encoding: "buffer",
|
|
695
|
+
maxBuffer: MAX_OUTPUT_BUFFER,
|
|
696
|
+
});
|
|
697
|
+
return { alreadyRunning: false };
|
|
698
|
+
} catch (err) {
|
|
699
|
+
const e = err as { message?: string; code?: number | null };
|
|
700
|
+
const stdout = await decodeConsoleOutput(errorBuffer(err, "stdout"));
|
|
701
|
+
const stderr = await decodeConsoleOutput(errorBuffer(err, "stderr"));
|
|
702
|
+
const errorDetails = buildErrorDetails(err, stdout, stderr);
|
|
703
|
+
|
|
704
|
+
const text = errorDetails.toLowerCase();
|
|
705
|
+
const saysAlreadyRunning =
|
|
706
|
+
text.includes("already running") ||
|
|
707
|
+
text.includes("уже выполняется") ||
|
|
708
|
+
text.includes("уже запущена");
|
|
709
|
+
|
|
710
|
+
if (saysAlreadyRunning || (await this.isTaskRunning(name))) {
|
|
711
|
+
return { alreadyRunning: true };
|
|
712
|
+
}
|
|
713
|
+
|
|
714
|
+
// Новая папка пуста — задача могла остаться в legacy-папке.
|
|
715
|
+
if (isTaskNotFoundText(errorDetails) && i < candidates.length - 1) {
|
|
716
|
+
continue;
|
|
717
|
+
}
|
|
547
718
|
|
|
548
|
-
|
|
549
|
-
|
|
550
|
-
|
|
551
|
-
|
|
552
|
-
|
|
553
|
-
maxBuffer: MAX_OUTPUT_BUFFER,
|
|
554
|
-
});
|
|
555
|
-
return { alreadyRunning: false };
|
|
556
|
-
} catch (err) {
|
|
557
|
-
const e = err as { message?: string; code?: number | null };
|
|
558
|
-
const stdout = await decodeConsoleOutput(errorBuffer(err, "stdout"));
|
|
559
|
-
const stderr = await decodeConsoleOutput(errorBuffer(err, "stderr"));
|
|
560
|
-
const errorDetails = buildErrorDetails(err, stdout, stderr);
|
|
561
|
-
|
|
562
|
-
const text = errorDetails.toLowerCase();
|
|
563
|
-
const saysAlreadyRunning =
|
|
564
|
-
text.includes("already running") ||
|
|
565
|
-
text.includes("уже выполняется") ||
|
|
566
|
-
text.includes("уже запущена");
|
|
567
|
-
|
|
568
|
-
if (saysAlreadyRunning || (await this.isTaskRunning(name))) {
|
|
569
|
-
return { alreadyRunning: true };
|
|
719
|
+
throw new SchtasksError(
|
|
720
|
+
`schtasks error: ${errorDetails}`,
|
|
721
|
+
e.code ?? null,
|
|
722
|
+
stderr,
|
|
723
|
+
);
|
|
570
724
|
}
|
|
571
|
-
|
|
572
|
-
throw new SchtasksError(
|
|
573
|
-
`schtasks error: ${errorDetails}`,
|
|
574
|
-
e.code ?? null,
|
|
575
|
-
stderr
|
|
576
|
-
);
|
|
577
725
|
}
|
|
726
|
+
throw new SchtasksError(
|
|
727
|
+
`Не удалось запустить задачу "${name}": задача не найдена`,
|
|
728
|
+
null,
|
|
729
|
+
"",
|
|
730
|
+
);
|
|
578
731
|
}
|
|
579
732
|
}
|
|
580
733
|
|
|
@@ -632,7 +785,7 @@ function parseListOutput(output: string): ScheduledTaskInfo[] {
|
|
|
632
785
|
}
|
|
633
786
|
|
|
634
787
|
/** Сохраняет поле в объект задачи, преобразуя ключи schtasks в camelCase. */
|
|
635
|
-
function setTaskField(task: any, key: string, value: string): void {
|
|
788
|
+
export function setTaskField(task: any, key: string, value: string): void {
|
|
636
789
|
const keyLower = key.toLowerCase();
|
|
637
790
|
|
|
638
791
|
const map: Record<string, string> = {
|
|
@@ -702,9 +855,26 @@ function setTaskField(task: any, key: string, value: string): void {
|
|
|
702
855
|
"tryb logowania": "logonMode",
|
|
703
856
|
"ostatnie uruchomienie": "lastRunTime",
|
|
704
857
|
"ostatni wynik": "lastResult",
|
|
858
|
+
// Chinese (ZH)
|
|
859
|
+
"文件夹": "folder",
|
|
860
|
+
"任务名": "taskName",
|
|
861
|
+
"任务名称": "taskName",
|
|
862
|
+
"要运行的任务": "taskToRun",
|
|
863
|
+
"运行的任务": "taskToRun",
|
|
864
|
+
"下次运行时间": "nextRunTime",
|
|
865
|
+
"下一次运行时间": "nextRunTime",
|
|
866
|
+
"状态": "status",
|
|
867
|
+
"登录模式": "logonMode",
|
|
868
|
+
"登录状态": "logonMode",
|
|
869
|
+
"上次运行时间": "lastRunTime",
|
|
870
|
+
"上一次运行时间": "lastRunTime",
|
|
871
|
+
"上次结果": "lastResult",
|
|
872
|
+
"作者": "author",
|
|
873
|
+
"注释": "comment",
|
|
705
874
|
};
|
|
706
875
|
|
|
707
|
-
const field =
|
|
876
|
+
const field =
|
|
877
|
+
map[keyLower] ?? map[keyLower.replace(/\s+/g, "")];
|
|
708
878
|
if (field) {
|
|
709
879
|
task[field] = value;
|
|
710
880
|
}
|