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
|
@@ -1,20 +1,48 @@
|
|
|
1
1
|
import { execFile } from "node:child_process";
|
|
2
2
|
import { promisify } from "node:util";
|
|
3
3
|
import iconv from "iconv-lite";
|
|
4
|
-
import { TASK_FOLDER, TASK_FOLDER_NAME, taskFolderNameForProfile } from "../../types.js";
|
|
4
|
+
import { TASK_FOLDER, TASK_FOLDER_NAME, LEGACY_TASK_FOLDER_NAME, taskFolderNameForProfile, legacyTaskFolderNameForProfile } from "../../types.js";
|
|
5
5
|
import { getProfileName } from "../../profiles.js";
|
|
6
6
|
import { buildScheduleFlags, convertCronToSchTasks } from "../cron-to-schtasks.js";
|
|
7
7
|
import { buildWindowsOneShotFlags } from "../one-shot.js";
|
|
8
8
|
import { needsPollMode } from "../schedule-v2.js";
|
|
9
9
|
const execFileAsync = promisify(execFile);
|
|
10
|
+
/** Кэш формата даты локали Windows (ShortDatePattern), полученного через PowerShell. */
|
|
11
|
+
let windowsDateFormatCache = null;
|
|
12
|
+
/** Определяет формат даты системной локали через PowerShell (P1-8). */
|
|
13
|
+
async function getWindowsDateFormat() {
|
|
14
|
+
if (windowsDateFormatCache !== null)
|
|
15
|
+
return windowsDateFormatCache;
|
|
16
|
+
try {
|
|
17
|
+
const { stdout } = await execFileAsync("powershell.exe", ["-NoProfile", "-Command", "(Get-Culture).DateTimeFormat.ShortDatePattern"], { maxBuffer: MAX_OUTPUT_BUFFER });
|
|
18
|
+
const pattern = String(stdout).trim();
|
|
19
|
+
windowsDateFormatCache = pattern || "dd.MM.yyyy";
|
|
20
|
+
return windowsDateFormatCache;
|
|
21
|
+
}
|
|
22
|
+
catch {
|
|
23
|
+
windowsDateFormatCache = "dd.MM.yyyy";
|
|
24
|
+
return windowsDateFormatCache;
|
|
25
|
+
}
|
|
26
|
+
}
|
|
27
|
+
/** Форматирует дату «никогда» (заглушка для file/git/mcp-триггеров) в формате локали. */
|
|
28
|
+
async function buildNeverDate(format) {
|
|
29
|
+
const { formatDateByLocalePattern } = await import("../one-shot.js");
|
|
30
|
+
return formatDateByLocalePattern(new Date("2099-12-31T00:00:00Z"), format);
|
|
31
|
+
}
|
|
10
32
|
/** Максимальный размер вывода schtasks (обычно хватает с большим запасом). */
|
|
11
33
|
const MAX_OUTPUT_BUFFER = 10 * 1024 * 1024;
|
|
12
34
|
/** Префикс папки задач плагина в Планировщике заданий Windows. */
|
|
13
35
|
export const WINDOWS_TASK_PREFIX = `\\${TASK_FOLDER}\\${TASK_FOLDER_NAME}\\`;
|
|
14
|
-
/** Префикс папки
|
|
36
|
+
/** Префикс старой папки (до переименования) — поддерживается для миграции. */
|
|
37
|
+
export const LEGACY_WINDOWS_TASK_PREFIX = `\\${TASK_FOLDER}\\${LEGACY_TASK_FOLDER_NAME}\\`;
|
|
38
|
+
/** Префикс папки конкретного профиля (для удаления неактивного профиля). */
|
|
15
39
|
export function windowsTaskPrefixForProfile(profile) {
|
|
16
40
|
return `\\${TASK_FOLDER}\\${taskFolderNameForProfile(profile)}\\`;
|
|
17
41
|
}
|
|
42
|
+
/** Префикс старой папки конкретного профиля. */
|
|
43
|
+
export function legacyWindowsTaskPrefixForProfile(profile) {
|
|
44
|
+
return `\\${TASK_FOLDER}\\${legacyTaskFolderNameForProfile(profile)}\\`;
|
|
45
|
+
}
|
|
18
46
|
/** Полное имя задачи в папке конкретного профиля. */
|
|
19
47
|
export function taskFullNameForProfile(name, profile) {
|
|
20
48
|
const prefix = windowsTaskPrefixForProfile(profile);
|
|
@@ -55,8 +83,8 @@ export async function getOemCodePage() {
|
|
|
55
83
|
// поэтому декодировать можно через cp866/utf8 — цифры не пострадают.
|
|
56
84
|
const text = decodeConsoleOutputSync(stdout);
|
|
57
85
|
// Значение может быть REG_DWORD (0x362) или REG_SZ (866 / "866").
|
|
58
|
-
const hexMatch =
|
|
59
|
-
const decMatch =
|
|
86
|
+
const hexMatch = /0x([0-9A-Fa-f]{1,8})/i.exec(text);
|
|
87
|
+
const decMatch = /\b(\d{2,5})\b/.exec(text);
|
|
60
88
|
let cp = null;
|
|
61
89
|
if (hexMatch) {
|
|
62
90
|
cp = parseInt(hexMatch[1], 16);
|
|
@@ -228,16 +256,41 @@ export async function runSchtasks(args) {
|
|
|
228
256
|
}
|
|
229
257
|
/** Формирует полное имя задачи с папкой плагина. */
|
|
230
258
|
export function taskFullName(name) {
|
|
231
|
-
if (name.startsWith(WINDOWS_TASK_PREFIX)
|
|
259
|
+
if (name.startsWith(WINDOWS_TASK_PREFIX) ||
|
|
260
|
+
name.startsWith(LEGACY_WINDOWS_TASK_PREFIX)) {
|
|
232
261
|
return name;
|
|
233
262
|
}
|
|
234
263
|
return WINDOWS_TASK_PREFIX + name;
|
|
235
264
|
}
|
|
236
|
-
/** Убирает папку плагина из полного имени задачи. */
|
|
265
|
+
/** Убирает папку плагина (новую или старую) из полного имени задачи. */
|
|
237
266
|
function shortTaskName(fullName) {
|
|
238
|
-
|
|
239
|
-
|
|
240
|
-
|
|
267
|
+
if (fullName.startsWith(WINDOWS_TASK_PREFIX)) {
|
|
268
|
+
return fullName.slice(WINDOWS_TASK_PREFIX.length);
|
|
269
|
+
}
|
|
270
|
+
if (fullName.startsWith(LEGACY_WINDOWS_TASK_PREFIX)) {
|
|
271
|
+
return fullName.slice(LEGACY_WINDOWS_TASK_PREFIX.length);
|
|
272
|
+
}
|
|
273
|
+
return fullName;
|
|
274
|
+
}
|
|
275
|
+
/**
|
|
276
|
+
* Признак того, что schtasks не нашёл задачу (локаль-независимый набор фраз).
|
|
277
|
+
* Используется для fallback на старую папку windows-scheduler.
|
|
278
|
+
*/
|
|
279
|
+
function isTaskNotFoundText(text) {
|
|
280
|
+
const t = text.toLowerCase();
|
|
281
|
+
return (t.includes("cannot find") ||
|
|
282
|
+
t.includes("не удалось найти") ||
|
|
283
|
+
t.includes("не удается найти") ||
|
|
284
|
+
t.includes("не может найти") ||
|
|
285
|
+
t.includes("не найдено") ||
|
|
286
|
+
t.includes("the system cannot find the file specified") ||
|
|
287
|
+
t.includes("no tasks") ||
|
|
288
|
+
t.includes("could not find"));
|
|
289
|
+
}
|
|
290
|
+
function isTaskNotFoundError(err) {
|
|
291
|
+
if (!(err instanceof SchtasksError))
|
|
292
|
+
return false;
|
|
293
|
+
return isTaskNotFoundText(`${err.message} ${err.stderr}`);
|
|
241
294
|
}
|
|
242
295
|
/**
|
|
243
296
|
* Бэкенд Планировщика заданий Windows (schtasks).
|
|
@@ -248,19 +301,36 @@ function shortTaskName(fullName) {
|
|
|
248
301
|
export class WindowsScheduler {
|
|
249
302
|
constructor(profile = getProfileName()) {
|
|
250
303
|
this.platform = "win32";
|
|
251
|
-
this.title = "
|
|
304
|
+
this.title = "agent-steward by DeadSno";
|
|
252
305
|
this.taskFolderName = taskFolderNameForProfile(profile);
|
|
253
306
|
this.taskPrefix = windowsTaskPrefixForProfile(profile);
|
|
307
|
+
this.legacyTaskFolderName = legacyTaskFolderNameForProfile(profile);
|
|
308
|
+
this.legacyTaskPrefix = legacyWindowsTaskPrefixForProfile(profile);
|
|
254
309
|
}
|
|
255
310
|
/** Полное имя задачи (\OpenCode\<профиль>\<name>) для этого бэкенда. */
|
|
256
311
|
fullName(name) {
|
|
257
|
-
return name.startsWith(this.taskPrefix)
|
|
312
|
+
return name.startsWith(this.taskPrefix) || name.startsWith(this.legacyTaskPrefix)
|
|
313
|
+
? name
|
|
314
|
+
: this.taskPrefix + name;
|
|
315
|
+
}
|
|
316
|
+
/** Оба возможных полных имени: новое и старое (для поиска legacy-задач). */
|
|
317
|
+
fullNames(name) {
|
|
318
|
+
const candidate = this.fullName(name);
|
|
319
|
+
const names = [candidate];
|
|
320
|
+
if (!candidate.startsWith(this.legacyTaskPrefix)) {
|
|
321
|
+
names.push(this.legacyTaskPrefix + name);
|
|
322
|
+
}
|
|
323
|
+
return names;
|
|
258
324
|
}
|
|
259
|
-
/** Убирает папку профиля из полного имени задачи. */
|
|
325
|
+
/** Убирает папку профиля (новую или старую) из полного имени задачи. */
|
|
260
326
|
shortName(fullName) {
|
|
261
|
-
|
|
262
|
-
|
|
263
|
-
|
|
327
|
+
if (fullName.startsWith(this.taskPrefix)) {
|
|
328
|
+
return fullName.slice(this.taskPrefix.length);
|
|
329
|
+
}
|
|
330
|
+
if (fullName.startsWith(this.legacyTaskPrefix)) {
|
|
331
|
+
return fullName.slice(this.legacyTaskPrefix.length);
|
|
332
|
+
}
|
|
333
|
+
return fullName;
|
|
264
334
|
}
|
|
265
335
|
async createTask(options) {
|
|
266
336
|
const { name, command, schedule, triggerType } = options;
|
|
@@ -271,12 +341,23 @@ export class WindowsScheduler {
|
|
|
271
341
|
if (!options.runAt) {
|
|
272
342
|
throw new Error(`Задача "${name}": для triggerType=once не передано время runAt.`);
|
|
273
343
|
}
|
|
274
|
-
|
|
344
|
+
const dateFormat = await getWindowsDateFormat();
|
|
345
|
+
scheduleFlags = buildWindowsOneShotFlags(options.runAt, dateFormat);
|
|
275
346
|
}
|
|
276
347
|
else if (triggerType && triggerType !== "cron") {
|
|
277
348
|
// Файловый или MCP-триггер: однократный запуск в далёком будущем.
|
|
278
349
|
// Активация — только вручную (runTask / файловый watcher / emit_event).
|
|
279
|
-
|
|
350
|
+
// Дата форматируется в формате системной локали (P1-8), а не захардкожена
|
|
351
|
+
// под русскую DD.MM.YYYY.
|
|
352
|
+
const dateFormat = await getWindowsDateFormat();
|
|
353
|
+
scheduleFlags = [
|
|
354
|
+
"/sc",
|
|
355
|
+
"ONCE",
|
|
356
|
+
"/sd",
|
|
357
|
+
await buildNeverDate(dateFormat),
|
|
358
|
+
"/st",
|
|
359
|
+
"00:00",
|
|
360
|
+
];
|
|
280
361
|
}
|
|
281
362
|
else {
|
|
282
363
|
// Выражения, которые Windows не выражает нативно (список через запятую, L, #,
|
|
@@ -292,7 +373,8 @@ export class WindowsScheduler {
|
|
|
292
373
|
scheduleFlags = buildScheduleFlags(native);
|
|
293
374
|
}
|
|
294
375
|
}
|
|
295
|
-
|
|
376
|
+
// Создаём всегда в новой папке, даже если передано полное legacy-имя.
|
|
377
|
+
const fullName = this.taskPrefix + this.shortName(name);
|
|
296
378
|
// Спринт 27.5.4: по умолчанию задача интерактивная — schtasks запускает её
|
|
297
379
|
// только при активном входе пользователя (Interactive only). Для работы без
|
|
298
380
|
// входа нужен SYSTEM: он не требует пароля, но работает в session 0 без
|
|
@@ -331,8 +413,29 @@ export class WindowsScheduler {
|
|
|
331
413
|
}
|
|
332
414
|
throw new SchtasksError(`Не удалось создать задачу "${name}": ${err.stderr || err.message || "неизвестная ошибка schtasks"}`, err.code, err.stderr);
|
|
333
415
|
}
|
|
334
|
-
if (result.code === 0)
|
|
416
|
+
if (result.code === 0) {
|
|
417
|
+
// После успешного создания в новой папке убираем возможный дубль из
|
|
418
|
+
// legacy-папки (best-effort: отсутствие дубля — не ошибка).
|
|
419
|
+
await this.removeLegacyDuplicate(name);
|
|
420
|
+
return;
|
|
421
|
+
}
|
|
422
|
+
}
|
|
423
|
+
/** Удаляет одноимённую задачу из старой папки, если она там осталась. */
|
|
424
|
+
async removeLegacyDuplicate(name) {
|
|
425
|
+
if (this.legacyTaskPrefix === this.taskPrefix)
|
|
335
426
|
return;
|
|
427
|
+
const legacyFull = this.legacyTaskPrefix + this.shortName(name);
|
|
428
|
+
try {
|
|
429
|
+
await runSchtasks([
|
|
430
|
+
"/delete",
|
|
431
|
+
"/tn",
|
|
432
|
+
legacyFull.replace(/^\\+/, ""),
|
|
433
|
+
"/f",
|
|
434
|
+
]);
|
|
435
|
+
}
|
|
436
|
+
catch {
|
|
437
|
+
// Дубликата нет или нет прав — создание уже прошло, не мешаем.
|
|
438
|
+
}
|
|
336
439
|
}
|
|
337
440
|
async listTasks() {
|
|
338
441
|
// /v нужен, чтобы ОС отдала «Режим входа» (Logon Mode): без него
|
|
@@ -348,16 +451,22 @@ export class WindowsScheduler {
|
|
|
348
451
|
}
|
|
349
452
|
throw err;
|
|
350
453
|
}
|
|
351
|
-
if (!result.stdout
|
|
454
|
+
if (!result.stdout?.trim()) {
|
|
352
455
|
return [];
|
|
353
456
|
}
|
|
354
457
|
const allTasks = parseListOutput(result.stdout).filter((task) => Boolean(task.taskName));
|
|
355
|
-
const filtered = allTasks.filter((task) =>
|
|
458
|
+
const filtered = allTasks.filter((task) => {
|
|
459
|
+
const name = task.taskName || "";
|
|
460
|
+
return (name.startsWith(this.taskPrefix) ||
|
|
461
|
+
name.startsWith(this.legacyTaskPrefix));
|
|
462
|
+
});
|
|
356
463
|
// Fallback: если структурный парсер не распознал ключи (нестандартная
|
|
357
464
|
// локаль/кодировка), вытаскиваем имена задач по префиксу папки.
|
|
358
|
-
if (filtered.length === 0 &&
|
|
465
|
+
if (filtered.length === 0 &&
|
|
466
|
+
(result.stdout.includes(this.taskFolderName) ||
|
|
467
|
+
result.stdout.includes(this.legacyTaskFolderName))) {
|
|
359
468
|
const names = new Set();
|
|
360
|
-
const folderPattern = `${TASK_FOLDER}[\\\\/]
|
|
469
|
+
const folderPattern = `${TASK_FOLDER}[\\\\/](?:${this.taskFolderName}|${this.legacyTaskFolderName})[\\\\/]`;
|
|
361
470
|
const re = new RegExp(`${folderPattern}([^\\r\\n"']+)`, "gi");
|
|
362
471
|
let m;
|
|
363
472
|
while ((m = re.exec(result.stdout)) !== null) {
|
|
@@ -369,69 +478,90 @@ export class WindowsScheduler {
|
|
|
369
478
|
return Array.from(names).map((nm) => ({ taskName: nm }));
|
|
370
479
|
}
|
|
371
480
|
}
|
|
372
|
-
|
|
373
|
-
|
|
374
|
-
|
|
375
|
-
|
|
376
|
-
|
|
481
|
+
// Если в обеих папках остались задачи с одинаковым коротким именем,
|
|
482
|
+
// показываем одну (новую) — дубликат мог остаться после миграции.
|
|
483
|
+
const seen = new Set();
|
|
484
|
+
const output = [];
|
|
485
|
+
for (const task of filtered) {
|
|
486
|
+
const short = this.shortName(task.taskName || "");
|
|
487
|
+
const key = short.toLowerCase();
|
|
488
|
+
if (seen.has(key))
|
|
489
|
+
continue;
|
|
490
|
+
seen.add(key);
|
|
491
|
+
output.push({
|
|
492
|
+
...task,
|
|
493
|
+
taskName: short,
|
|
494
|
+
paused: /disabled|отключ|запрещ/i.test(task.status ?? ""),
|
|
495
|
+
});
|
|
496
|
+
}
|
|
497
|
+
return output;
|
|
377
498
|
}
|
|
378
499
|
async deleteTask(name) {
|
|
379
500
|
// schtasks /delete требует имя без ведущего обратного слэша.
|
|
380
|
-
|
|
381
|
-
const
|
|
382
|
-
|
|
383
|
-
|
|
384
|
-
|
|
385
|
-
|
|
386
|
-
|
|
387
|
-
|
|
388
|
-
|
|
389
|
-
|
|
390
|
-
|
|
391
|
-
|
|
392
|
-
text.includes("не найдено") ||
|
|
393
|
-
text.includes("the system cannot find the file specified") ||
|
|
394
|
-
text.includes("no tasks") ||
|
|
395
|
-
text.includes("could not find");
|
|
396
|
-
if (alreadyGone)
|
|
397
|
-
return;
|
|
501
|
+
let lastError = null;
|
|
502
|
+
for (const candidate of this.fullNames(name)) {
|
|
503
|
+
const fullName = candidate.replace(/^\\+/, "");
|
|
504
|
+
try {
|
|
505
|
+
await runSchtasks(["/delete", "/tn", fullName, "/f"]);
|
|
506
|
+
return;
|
|
507
|
+
}
|
|
508
|
+
catch (err) {
|
|
509
|
+
lastError = err;
|
|
510
|
+
// Новая папки нет — пробуем legacy. Прочие ошибки прерывают цикл.
|
|
511
|
+
if (!isTaskNotFoundError(err))
|
|
512
|
+
break;
|
|
398
513
|
}
|
|
399
|
-
throw new SchtasksError(`Не удалось удалить задачу "${name}"`, err.code ?? null, err.stderr ?? "");
|
|
400
514
|
}
|
|
515
|
+
if (isTaskNotFoundError(lastError))
|
|
516
|
+
return;
|
|
517
|
+
const err = lastError;
|
|
518
|
+
throw new SchtasksError(`Не удалось удалить задачу "${name}"`, err?.code ?? null, err?.stderr ?? "");
|
|
401
519
|
}
|
|
402
520
|
/** Ставит задачу на паузу (/disable). */
|
|
403
521
|
async pauseTask(name) {
|
|
404
|
-
|
|
405
|
-
const
|
|
406
|
-
|
|
407
|
-
|
|
408
|
-
|
|
409
|
-
|
|
410
|
-
|
|
411
|
-
|
|
412
|
-
|
|
413
|
-
if (
|
|
414
|
-
|
|
522
|
+
let lastError = null;
|
|
523
|
+
for (const candidate of this.fullNames(name)) {
|
|
524
|
+
const fullName = candidate.replace(/^\\+/, "");
|
|
525
|
+
try {
|
|
526
|
+
await runSchtasks(["/change", "/tn", fullName, "/disable"]);
|
|
527
|
+
return;
|
|
528
|
+
}
|
|
529
|
+
catch (err) {
|
|
530
|
+
lastError = err;
|
|
531
|
+
if (err instanceof SchtasksError) {
|
|
532
|
+
const text = `${err.message} ${err.stderr}`.toLowerCase();
|
|
533
|
+
if (text.includes("disabled") || text.includes("запрещена"))
|
|
534
|
+
return;
|
|
535
|
+
}
|
|
536
|
+
if (!isTaskNotFoundError(err))
|
|
537
|
+
break;
|
|
415
538
|
}
|
|
416
|
-
throw new SchtasksError(`Не удалось поставить задачу "${name}" на паузу`, err.code ?? null, err.stderr ?? "");
|
|
417
539
|
}
|
|
540
|
+
const err = lastError;
|
|
541
|
+
throw new SchtasksError(`Не удалось поставить задачу "${name}" на паузу`, err?.code ?? null, err?.stderr ?? "");
|
|
418
542
|
}
|
|
419
543
|
/** Снимает задачу с паузы (/enable). */
|
|
420
544
|
async resumeTask(name) {
|
|
421
|
-
|
|
422
|
-
const
|
|
423
|
-
|
|
424
|
-
|
|
425
|
-
|
|
426
|
-
|
|
427
|
-
|
|
428
|
-
|
|
429
|
-
|
|
430
|
-
if (
|
|
431
|
-
|
|
545
|
+
let lastError = null;
|
|
546
|
+
for (const candidate of this.fullNames(name)) {
|
|
547
|
+
const fullName = candidate.replace(/^\\+/, "");
|
|
548
|
+
try {
|
|
549
|
+
await runSchtasks(["/change", "/tn", fullName, "/enable"]);
|
|
550
|
+
return;
|
|
551
|
+
}
|
|
552
|
+
catch (err) {
|
|
553
|
+
lastError = err;
|
|
554
|
+
if (err instanceof SchtasksError) {
|
|
555
|
+
const text = `${err.message} ${err.stderr}`.toLowerCase();
|
|
556
|
+
if (text.includes("enabled") || text.includes("включена"))
|
|
557
|
+
return;
|
|
558
|
+
}
|
|
559
|
+
if (!isTaskNotFoundError(err))
|
|
560
|
+
break;
|
|
432
561
|
}
|
|
433
|
-
throw new SchtasksError(`Не удалось снять задачу "${name}" с паузы`, err.code ?? null, err.stderr ?? "");
|
|
434
562
|
}
|
|
563
|
+
const err = lastError;
|
|
564
|
+
throw new SchtasksError(`Не удалось снять задачу "${name}" с паузы`, err?.code ?? null, err?.stderr ?? "");
|
|
435
565
|
}
|
|
436
566
|
/**
|
|
437
567
|
* Проверяет, находится ли задача в состоянии Running.
|
|
@@ -448,31 +578,38 @@ export class WindowsScheduler {
|
|
|
448
578
|
}
|
|
449
579
|
}
|
|
450
580
|
async runTask(name) {
|
|
451
|
-
const
|
|
452
|
-
|
|
453
|
-
|
|
454
|
-
|
|
455
|
-
|
|
456
|
-
|
|
457
|
-
|
|
458
|
-
|
|
459
|
-
|
|
460
|
-
|
|
461
|
-
|
|
462
|
-
|
|
463
|
-
|
|
464
|
-
|
|
465
|
-
|
|
466
|
-
|
|
467
|
-
|
|
468
|
-
|
|
469
|
-
text.includes("
|
|
470
|
-
|
|
471
|
-
|
|
472
|
-
|
|
581
|
+
const candidates = this.fullNames(name);
|
|
582
|
+
for (let i = 0; i < candidates.length; i++) {
|
|
583
|
+
const args = ["/run", "/tn", candidates[i]];
|
|
584
|
+
// schtasks /run не требует смены кодировки — вызываем напрямую.
|
|
585
|
+
try {
|
|
586
|
+
await execFileAsync("schtasks", args, {
|
|
587
|
+
windowsHide: true,
|
|
588
|
+
encoding: "buffer",
|
|
589
|
+
maxBuffer: MAX_OUTPUT_BUFFER,
|
|
590
|
+
});
|
|
591
|
+
return { alreadyRunning: false };
|
|
592
|
+
}
|
|
593
|
+
catch (err) {
|
|
594
|
+
const e = err;
|
|
595
|
+
const stdout = await decodeConsoleOutput(errorBuffer(err, "stdout"));
|
|
596
|
+
const stderr = await decodeConsoleOutput(errorBuffer(err, "stderr"));
|
|
597
|
+
const errorDetails = buildErrorDetails(err, stdout, stderr);
|
|
598
|
+
const text = errorDetails.toLowerCase();
|
|
599
|
+
const saysAlreadyRunning = text.includes("already running") ||
|
|
600
|
+
text.includes("уже выполняется") ||
|
|
601
|
+
text.includes("уже запущена");
|
|
602
|
+
if (saysAlreadyRunning || (await this.isTaskRunning(name))) {
|
|
603
|
+
return { alreadyRunning: true };
|
|
604
|
+
}
|
|
605
|
+
// Новая папка пуста — задача могла остаться в legacy-папке.
|
|
606
|
+
if (isTaskNotFoundText(errorDetails) && i < candidates.length - 1) {
|
|
607
|
+
continue;
|
|
608
|
+
}
|
|
609
|
+
throw new SchtasksError(`schtasks error: ${errorDetails}`, e.code ?? null, stderr);
|
|
473
610
|
}
|
|
474
|
-
throw new SchtasksError(`schtasks error: ${errorDetails}`, e.code ?? null, stderr);
|
|
475
611
|
}
|
|
612
|
+
throw new SchtasksError(`Не удалось запустить задачу "${name}": задача не найдена`, null, "");
|
|
476
613
|
}
|
|
477
614
|
}
|
|
478
615
|
/** Определяет, что ошибка schtasks означает «задач не найдено». */
|
|
@@ -519,7 +656,7 @@ function parseListOutput(output) {
|
|
|
519
656
|
return tasks;
|
|
520
657
|
}
|
|
521
658
|
/** Сохраняет поле в объект задачи, преобразуя ключи schtasks в camelCase. */
|
|
522
|
-
function setTaskField(task, key, value) {
|
|
659
|
+
export function setTaskField(task, key, value) {
|
|
523
660
|
const keyLower = key.toLowerCase();
|
|
524
661
|
const map = {
|
|
525
662
|
// English keys (US locale)
|
|
@@ -588,8 +725,24 @@ function setTaskField(task, key, value) {
|
|
|
588
725
|
"tryb logowania": "logonMode",
|
|
589
726
|
"ostatnie uruchomienie": "lastRunTime",
|
|
590
727
|
"ostatni wynik": "lastResult",
|
|
728
|
+
// Chinese (ZH)
|
|
729
|
+
"文件夹": "folder",
|
|
730
|
+
"任务名": "taskName",
|
|
731
|
+
"任务名称": "taskName",
|
|
732
|
+
"要运行的任务": "taskToRun",
|
|
733
|
+
"运行的任务": "taskToRun",
|
|
734
|
+
"下次运行时间": "nextRunTime",
|
|
735
|
+
"下一次运行时间": "nextRunTime",
|
|
736
|
+
"状态": "status",
|
|
737
|
+
"登录模式": "logonMode",
|
|
738
|
+
"登录状态": "logonMode",
|
|
739
|
+
"上次运行时间": "lastRunTime",
|
|
740
|
+
"上一次运行时间": "lastRunTime",
|
|
741
|
+
"上次结果": "lastResult",
|
|
742
|
+
"作者": "author",
|
|
743
|
+
"注释": "comment",
|
|
591
744
|
};
|
|
592
|
-
const field = map[keyLower];
|
|
745
|
+
const field = map[keyLower] ?? map[keyLower.replace(/\s+/g, "")];
|
|
593
746
|
if (field) {
|
|
594
747
|
task[field] = value;
|
|
595
748
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"secrets.d.ts","sourceRoot":"","sources":["../../src/core/secrets.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"secrets.d.ts","sourceRoot":"","sources":["../../src/core/secrets.ts"],"names":[],"mappings":"AAQA;;;;;;;;;;;;;GAaG;AAEH,eAAO,MAAM,YAAY,QAAwC,CAAC;AAClE,eAAO,MAAM,gBAAgB,QAAuC,CAAC;AACrE,eAAO,MAAM,aAAa,QAAyC,CAAC;AAkGpE,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,qEAAqE;IACrE,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;CACnB;AAoBD,0DAA0D;AAC1D,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAQvD;AAED,wEAAwE;AACxE,wBAAgB,YAAY,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAIpD;AAoOD,qEAAqE;AACrE,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,cAAc,CAoBrE;AAED,yEAAyE;AACzE,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAW1D;AAED,uDAAuD;AACvD,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAE/C;AAED,0CAA0C;AAC1C,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CASlD;AASD,6EAA6E;AAC7E,wBAAgB,WAAW,IAAI,cAAc,EAAE,CAc9C;AAED,kMAAkM;AAClM,wBAAgB,gBAAgB,CAC9B,KAAK,EAAE,MAAM,EACb,kBAAkB,CAAC,EAAE,MAAM,EAAE,GAC5B;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,EAAE,CAAA;CAAE,CAkBtC;AAED;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAC/B,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAC3B,kBAAkB,CAAC,EAAE,MAAM,EAAE,GAC5B;IAAE,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAAC,OAAO,EAAE,MAAM,EAAE,CAAA;CAAE,CASpD;AA8BD;;;GAGG;AACH,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,OAAO,GAAG,MAAM,CA+BzD;AAED,qEAAqE;AACrE,wBAAgB,iBAAiB,IAAI,IAAI,CAIxC;AAED;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,GAAG,MAAM,EAAE,CAAC,MAAM,GAAG,SAAS,CAAC,EAAE,GAAG,MAAM,EAAE,CAW9E"}
|