opencode-windows-scheduler 1.2.0 → 1.2.2
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 +24 -1
- package/README.md +5 -5
- package/ROADMAP-STRATEGY.md +2 -2
- package/ROADMAP.md +31 -5
- package/dist/core/dry-run.d.ts +5 -1
- package/dist/core/dry-run.d.ts.map +1 -1
- package/dist/core/dry-run.js +20 -4
- package/dist/core/one-shot.d.ts +62 -0
- package/dist/core/one-shot.d.ts.map +1 -0
- package/dist/core/one-shot.js +126 -0
- package/dist/core/otel.d.ts +4 -0
- package/dist/core/otel.d.ts.map +1 -0
- package/dist/core/otel.js +98 -0
- package/dist/core/prometheus.d.ts +23 -0
- package/dist/core/prometheus.d.ts.map +1 -0
- package/dist/core/prometheus.js +146 -0
- package/dist/core/ps-wrapper.d.ts +6 -2
- package/dist/core/ps-wrapper.d.ts.map +1 -1
- package/dist/core/ps-wrapper.js +25 -3
- package/dist/core/record-history.d.ts.map +1 -1
- package/dist/core/record-history.js +9 -0
- package/dist/core/scheduler/linux.d.ts +12 -3
- package/dist/core/scheduler/linux.d.ts.map +1 -1
- package/dist/core/scheduler/linux.js +80 -3
- package/dist/core/scheduler/mac.d.ts.map +1 -1
- package/dist/core/scheduler/mac.js +17 -3
- package/dist/core/scheduler/posix.d.ts.map +1 -1
- package/dist/core/scheduler/posix.js +3 -0
- package/dist/core/scheduler/registry.d.ts +4 -0
- package/dist/core/scheduler/registry.d.ts.map +1 -1
- package/dist/core/scheduler/types.d.ts +5 -3
- package/dist/core/scheduler/types.d.ts.map +1 -1
- package/dist/core/scheduler/windows.d.ts.map +1 -1
- package/dist/core/scheduler/windows.js +10 -1
- package/dist/core/session.d.ts +34 -0
- package/dist/core/session.d.ts.map +1 -0
- package/dist/core/session.js +105 -0
- package/dist/core/structured-log.d.ts +84 -0
- package/dist/core/structured-log.d.ts.map +1 -0
- package/dist/core/structured-log.js +137 -0
- package/dist/core/wrappers/bash.d.ts +9 -0
- package/dist/core/wrappers/bash.d.ts.map +1 -1
- package/dist/core/wrappers/bash.js +27 -3
- package/dist/db/history-repo.d.ts.map +1 -1
- package/dist/db/history-repo.js +63 -6
- package/dist/db/metrics-repo.d.ts +3 -0
- package/dist/db/metrics-repo.d.ts.map +1 -1
- package/dist/db/metrics-repo.js +16 -8
- package/dist/db/migrate.d.ts.map +1 -1
- package/dist/db/migrate.js +8 -1
- package/dist/db/schema.d.ts +1 -1
- package/dist/db/schema.d.ts.map +1 -1
- package/dist/db/schema.js +8 -0
- package/dist/history.d.ts +7 -0
- package/dist/history.d.ts.map +1 -1
- package/dist/history.js +13 -0
- package/dist/index.d.ts +22 -3
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +330 -41
- package/dist/integrations.d.ts +64 -0
- package/dist/integrations.d.ts.map +1 -0
- package/dist/integrations.js +205 -0
- package/dist/rpc.d.ts +81 -4
- package/dist/rpc.d.ts.map +1 -1
- package/dist/rpc.js +43 -4
- package/dist/server.d.ts +2 -0
- package/dist/server.d.ts.map +1 -1
- package/dist/server.js +582 -70
- package/dist/settings.d.ts +38 -0
- package/dist/settings.d.ts.map +1 -1
- package/dist/settings.js +68 -0
- package/dist/shared/jobs-view.d.ts +43 -5
- package/dist/shared/jobs-view.d.ts.map +1 -1
- package/dist/shared/jobs-view.js +125 -7
- package/dist/task-transfer.d.ts +19 -3
- package/dist/task-transfer.d.ts.map +1 -1
- package/dist/task-transfer.js +75 -3
- package/docs/FEATURES.md +101 -4
- package/gui-experimental.cjs +4 -4
- package/package.json +11 -2
- package/scripts/demo-dashboard.mjs +12 -2
- package/src/core/dry-run.ts +24 -5
- package/src/core/one-shot.ts +173 -0
- package/src/core/otel.ts +128 -0
- package/src/core/prometheus.ts +215 -0
- package/src/core/ps-wrapper.ts +29 -3
- package/src/core/record-history.ts +13 -0
- package/src/core/scheduler/linux.ts +90 -3
- package/src/core/scheduler/mac.ts +35 -4
- package/src/core/scheduler/posix.ts +3 -0
- package/src/core/scheduler/registry.ts +4 -0
- package/src/core/scheduler/types.ts +5 -3
- package/src/core/scheduler/windows.ts +11 -1
- package/src/core/session.ts +115 -0
- package/src/core/structured-log.ts +205 -0
- package/src/core/wrappers/bash.ts +38 -2
- package/src/db/history-repo.ts +67 -7
- package/src/db/metrics-repo.ts +19 -7
- package/src/db/migrate.ts +7 -1
- package/src/db/schema.ts +11 -0
- package/src/gui.tsx +237 -18
- package/src/history.ts +17 -0
- package/src/index.ts +426 -47
- package/src/integrations.ts +253 -0
- package/src/rpc.ts +43 -4
- package/src/server.ts +622 -69
- package/src/settings.ts +122 -0
- package/src/shared/jobs-view.ts +158 -8
- package/src/task-transfer.ts +107 -5
- package/src/tui.tsx +290 -14
package/src/settings.ts
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import crypto from "node:crypto";
|
|
1
2
|
import fs from "node:fs/promises";
|
|
2
3
|
import path from "node:path";
|
|
3
4
|
import { PLUGIN_DIR } from "./types.js";
|
|
@@ -100,6 +101,34 @@ export interface HistorySettings {
|
|
|
100
101
|
lastCleanupDeleted: number;
|
|
101
102
|
}
|
|
102
103
|
|
|
104
|
+
/**
|
|
105
|
+
* Входящие webhook-триггеры (Спринт 22).
|
|
106
|
+
*
|
|
107
|
+
* Запрос: `POST /api/hooks/<task>?token=<token>` с заголовком
|
|
108
|
+
* `X-Scheduler-Signature: sha256=<hmac>` (совместим с `X-Hub-Signature-256`).
|
|
109
|
+
* Токен подтверждает, кто вызывает хук, HMAC — целостность тела запроса.
|
|
110
|
+
*/
|
|
111
|
+
export interface HookSettings {
|
|
112
|
+
/** Включены ли входящие webhook-триггеры. */
|
|
113
|
+
enabled: boolean;
|
|
114
|
+
/** Общий токен в query-параметре `token` (сравнивается timing-safe). */
|
|
115
|
+
token: string;
|
|
116
|
+
/** Секрет для HMAC-SHA256 по сырому телу запроса. */
|
|
117
|
+
secret: string;
|
|
118
|
+
/** Требовать HMAC-подпись. Выключение допустимо только для локальных тестов. */
|
|
119
|
+
requireSignature: boolean;
|
|
120
|
+
/** Максимальный размер тела запроса в байтах (1 KiB..5 MiB). */
|
|
121
|
+
maxBodyBytes: number;
|
|
122
|
+
/** Допустимое расхождение `X-Scheduler-Timestamp` с текущим временем, секунды. 0 — не проверять. */
|
|
123
|
+
timestampToleranceSeconds: number;
|
|
124
|
+
}
|
|
125
|
+
|
|
126
|
+
/** Настройки внешних интеграций (Спринт 22). */
|
|
127
|
+
export interface IntegrationSettings {
|
|
128
|
+
/** Входящие webhook-триггеры из CI/CD. */
|
|
129
|
+
hooks: HookSettings;
|
|
130
|
+
}
|
|
131
|
+
|
|
103
132
|
/**
|
|
104
133
|
* Глобальные настройки плагина, которые меняются из GUI.
|
|
105
134
|
* Хранятся в settings.json рядом с tasks.json / history.json.
|
|
@@ -113,6 +142,8 @@ export interface SchedulerSettings {
|
|
|
113
142
|
notifications: NotificationSettings;
|
|
114
143
|
/** Ретеншн истории запусков. */
|
|
115
144
|
history: HistorySettings;
|
|
145
|
+
/** Внешние интеграции: входящие webhook-триггеры. */
|
|
146
|
+
integrations: IntegrationSettings;
|
|
116
147
|
}
|
|
117
148
|
|
|
118
149
|
export const SETTINGS_FILE = path.join(PLUGIN_DIR, "settings.json");
|
|
@@ -127,6 +158,34 @@ export const DEFAULT_WEBHOOK_RETRY_COUNT = 2;
|
|
|
127
158
|
export const DEFAULT_WEBHOOK_RETRY_DELAY_MS = 1_000;
|
|
128
159
|
export const DEFAULT_STUCK_AFTER_MINUTES = 60;
|
|
129
160
|
|
|
161
|
+
/** Входящие хуки (Спринт 22): тело до 256 KiB, timestamp ±5 минут. */
|
|
162
|
+
export const DEFAULT_HOOK_MAX_BODY_BYTES = 256 * 1024;
|
|
163
|
+
export const DEFAULT_HOOK_TIMESTAMP_TOLERANCE_SECONDS = 300;
|
|
164
|
+
const MAX_HOOK_BODY_BYTES = 5 * 1024 * 1024;
|
|
165
|
+
const MAX_HOOK_CREDENTIAL_LENGTH = 512;
|
|
166
|
+
|
|
167
|
+
/** Значения интеграций по умолчанию: хуки выключены, подпись обязательна. */
|
|
168
|
+
export function defaultIntegrations(): IntegrationSettings {
|
|
169
|
+
return {
|
|
170
|
+
hooks: {
|
|
171
|
+
enabled: false,
|
|
172
|
+
token: "",
|
|
173
|
+
secret: "",
|
|
174
|
+
requireSignature: true,
|
|
175
|
+
maxBodyBytes: DEFAULT_HOOK_MAX_BODY_BYTES,
|
|
176
|
+
timestampToleranceSeconds: DEFAULT_HOOK_TIMESTAMP_TOLERANCE_SECONDS,
|
|
177
|
+
},
|
|
178
|
+
};
|
|
179
|
+
}
|
|
180
|
+
|
|
181
|
+
/** Генерирует криптостойкие учётные данные для входящего хука. */
|
|
182
|
+
export function generateHookCredentials(): { token: string; secret: string } {
|
|
183
|
+
return {
|
|
184
|
+
token: crypto.randomBytes(24).toString("hex"),
|
|
185
|
+
secret: crypto.randomBytes(32).toString("hex"),
|
|
186
|
+
};
|
|
187
|
+
}
|
|
188
|
+
|
|
130
189
|
/** Ретеншн по умолчанию: 30 дней и не больше 5000 записей. */
|
|
131
190
|
export function defaultHistorySettings(): HistorySettings {
|
|
132
191
|
return {
|
|
@@ -372,10 +431,53 @@ function normalizeNotifications(
|
|
|
372
431
|
};
|
|
373
432
|
}
|
|
374
433
|
|
|
434
|
+
/** Приводит настройки интеграций к безопасному виду. */
|
|
435
|
+
function normalizeIntegrations(
|
|
436
|
+
value: unknown,
|
|
437
|
+
fallback: IntegrationSettings
|
|
438
|
+
): IntegrationSettings {
|
|
439
|
+
const fallbackHooks = fallback.hooks ?? defaultIntegrations().hooks;
|
|
440
|
+
const raw = asRecord(value);
|
|
441
|
+
const rawHooks = asRecord(raw?.hooks);
|
|
442
|
+
|
|
443
|
+
const readCredential = (input: unknown, previous: string): string => {
|
|
444
|
+
if (typeof input !== "string") return previous;
|
|
445
|
+
return input.trim().slice(0, MAX_HOOK_CREDENTIAL_LENGTH);
|
|
446
|
+
};
|
|
447
|
+
|
|
448
|
+
return {
|
|
449
|
+
hooks: {
|
|
450
|
+
enabled:
|
|
451
|
+
typeof rawHooks?.enabled === "boolean"
|
|
452
|
+
? rawHooks.enabled
|
|
453
|
+
: fallbackHooks.enabled,
|
|
454
|
+
token: readCredential(rawHooks?.token, fallbackHooks.token),
|
|
455
|
+
secret: readCredential(rawHooks?.secret, fallbackHooks.secret),
|
|
456
|
+
requireSignature:
|
|
457
|
+
typeof rawHooks?.requireSignature === "boolean"
|
|
458
|
+
? rawHooks.requireSignature
|
|
459
|
+
: fallbackHooks.requireSignature,
|
|
460
|
+
maxBodyBytes: normalizeIntInRange(
|
|
461
|
+
rawHooks?.maxBodyBytes,
|
|
462
|
+
fallbackHooks.maxBodyBytes,
|
|
463
|
+
1_024,
|
|
464
|
+
MAX_HOOK_BODY_BYTES
|
|
465
|
+
),
|
|
466
|
+
timestampToleranceSeconds: normalizeIntInRange(
|
|
467
|
+
rawHooks?.timestampToleranceSeconds,
|
|
468
|
+
fallbackHooks.timestampToleranceSeconds,
|
|
469
|
+
0,
|
|
470
|
+
86_400
|
|
471
|
+
),
|
|
472
|
+
},
|
|
473
|
+
};
|
|
474
|
+
}
|
|
475
|
+
|
|
375
476
|
/** Читает настройки. Битый/отсутствующий файл — значения по умолчанию. */
|
|
376
477
|
export async function loadSettings(): Promise<SchedulerSettings> {
|
|
377
478
|
const fallbackNotifications = defaultNotifications();
|
|
378
479
|
const fallbackHistory = defaultHistorySettings();
|
|
480
|
+
const fallbackIntegrations = defaultIntegrations();
|
|
379
481
|
try {
|
|
380
482
|
const raw = await fs.readFile(SETTINGS_FILE, "utf8");
|
|
381
483
|
const parsed = JSON.parse(raw) as Partial<SchedulerSettings> | null;
|
|
@@ -393,6 +495,10 @@ export async function loadSettings(): Promise<SchedulerSettings> {
|
|
|
393
495
|
fallbackNotifications
|
|
394
496
|
),
|
|
395
497
|
history: normalizeHistorySettings(parsed?.history, fallbackHistory),
|
|
498
|
+
integrations: normalizeIntegrations(
|
|
499
|
+
parsed?.integrations,
|
|
500
|
+
fallbackIntegrations
|
|
501
|
+
),
|
|
396
502
|
};
|
|
397
503
|
} catch {
|
|
398
504
|
return {
|
|
@@ -400,6 +506,7 @@ export async function loadSettings(): Promise<SchedulerSettings> {
|
|
|
400
506
|
winterMode: DEFAULT_WINTER_MODE,
|
|
401
507
|
notifications: fallbackNotifications,
|
|
402
508
|
history: fallbackHistory,
|
|
509
|
+
integrations: fallbackIntegrations,
|
|
403
510
|
};
|
|
404
511
|
}
|
|
405
512
|
}
|
|
@@ -426,7 +533,22 @@ export async function saveSettings(
|
|
|
426
533
|
patch.history !== undefined
|
|
427
534
|
? normalizeHistorySettings(patch.history, current.history)
|
|
428
535
|
: current.history,
|
|
536
|
+
integrations:
|
|
537
|
+
patch.integrations !== undefined
|
|
538
|
+
? normalizeIntegrations(patch.integrations, current.integrations)
|
|
539
|
+
: current.integrations,
|
|
429
540
|
};
|
|
541
|
+
|
|
542
|
+
// Удобство: при включении хуков без явных учётных данных генерируем их,
|
|
543
|
+
// чтобы функция сразу работала, а секреты не приходилось придумывать вручную.
|
|
544
|
+
if (next.integrations.hooks.enabled) {
|
|
545
|
+
if (!next.integrations.hooks.token || !next.integrations.hooks.secret) {
|
|
546
|
+
const generated = generateHookCredentials();
|
|
547
|
+
if (!next.integrations.hooks.token) next.integrations.hooks.token = generated.token;
|
|
548
|
+
if (!next.integrations.hooks.secret) next.integrations.hooks.secret = generated.secret;
|
|
549
|
+
}
|
|
550
|
+
}
|
|
551
|
+
|
|
430
552
|
await fs.mkdir(PLUGIN_DIR, { recursive: true });
|
|
431
553
|
await fs.writeFile(SETTINGS_FILE, JSON.stringify(next, null, 2), "utf8");
|
|
432
554
|
return next;
|
package/src/shared/jobs-view.ts
CHANGED
|
@@ -1,10 +1,106 @@
|
|
|
1
|
-
|
|
1
|
+
import { getSchedulerBackend } from "../core/scheduler/index.js"
|
|
2
|
+
import { latestHistoryByTask, loadHistory, type HistoryRecord } from "../history.js"
|
|
3
|
+
import {
|
|
4
|
+
loadTaskDefinitions,
|
|
5
|
+
type TaskDefinition,
|
|
6
|
+
} from "../task-transfer.js"
|
|
7
|
+
import type { ScheduledTaskInfo } from "../types.js"
|
|
8
|
+
|
|
9
|
+
export type JobStatus = "running" | "success" | "error" | "partial" | "idle" | "unknown"
|
|
2
10
|
|
|
3
11
|
export interface JobView {
|
|
4
12
|
name: string
|
|
5
13
|
status: JobStatus
|
|
14
|
+
/** Задача поставлена на паузу в планировщике ОС. */
|
|
15
|
+
paused?: boolean
|
|
6
16
|
nextRun?: string
|
|
7
17
|
lastRun?: string
|
|
18
|
+
/** Для клона матрицы — имя родительской задачи. */
|
|
19
|
+
matrixParentId?: string
|
|
20
|
+
/** true — задача является родителем матрицы (шаблоном fan-out). */
|
|
21
|
+
isMatrixParent?: boolean
|
|
22
|
+
}
|
|
23
|
+
|
|
24
|
+
/** Строка панели: задача и её отступ в дереве матрицы. */
|
|
25
|
+
export interface JobDisplayRow {
|
|
26
|
+
job: JobView
|
|
27
|
+
/** 0 — корневая задача, 1 — клон матрицы. */
|
|
28
|
+
depth: number
|
|
29
|
+
}
|
|
30
|
+
|
|
31
|
+
/**
|
|
32
|
+
* Упорядочивает задачи для TUI: родитель матрицы идёт первым, сразу за ним —
|
|
33
|
+
* его клоны с отступом. Клоны без родителя (осиротевшие) остаются корневыми,
|
|
34
|
+
* чтобы задача не исчезла из панели.
|
|
35
|
+
*/
|
|
36
|
+
export function groupJobsForDisplay(jobs: readonly JobView[]): JobDisplayRow[] {
|
|
37
|
+
const byName = new Map<string, JobView[]>()
|
|
38
|
+
for (const job of jobs) {
|
|
39
|
+
const key = job.name.toLowerCase()
|
|
40
|
+
const list = byName.get(key) ?? []
|
|
41
|
+
list.push(job)
|
|
42
|
+
byName.set(key, list)
|
|
43
|
+
}
|
|
44
|
+
|
|
45
|
+
const children = new Map<string, JobView[]>()
|
|
46
|
+
const roots: JobView[] = []
|
|
47
|
+
for (const job of jobs) {
|
|
48
|
+
const parent = job.matrixParentId?.trim().toLowerCase()
|
|
49
|
+
if (parent && byName.has(parent) && parent !== job.name.toLowerCase()) {
|
|
50
|
+
const list = children.get(parent) ?? []
|
|
51
|
+
list.push(job)
|
|
52
|
+
children.set(parent, list)
|
|
53
|
+
} else {
|
|
54
|
+
roots.push(job)
|
|
55
|
+
}
|
|
56
|
+
}
|
|
57
|
+
|
|
58
|
+
const byNameAsc = (a: JobView, b: JobView) => a.name.localeCompare(b.name)
|
|
59
|
+
roots.sort(byNameAsc)
|
|
60
|
+
for (const list of children.values()) list.sort(byNameAsc)
|
|
61
|
+
|
|
62
|
+
const rows: JobDisplayRow[] = []
|
|
63
|
+
for (const root of roots) {
|
|
64
|
+
rows.push({ job: root, depth: 0 })
|
|
65
|
+
for (const child of children.get(root.name.toLowerCase()) ?? []) {
|
|
66
|
+
rows.push({ job: child, depth: 1 })
|
|
67
|
+
}
|
|
68
|
+
}
|
|
69
|
+
return rows
|
|
70
|
+
}
|
|
71
|
+
|
|
72
|
+
/**
|
|
73
|
+
* Перемещает выбор по строкам панели с зацикливанием.
|
|
74
|
+
* Возвращает имя задачи, которое нужно выделить, либо undefined для пустого списка.
|
|
75
|
+
*/
|
|
76
|
+
export function nextJobSelection(
|
|
77
|
+
rows: readonly JobDisplayRow[],
|
|
78
|
+
currentName: string | undefined,
|
|
79
|
+
delta: number
|
|
80
|
+
): string | undefined {
|
|
81
|
+
if (rows.length === 0) return undefined
|
|
82
|
+
const current = currentName?.trim().toLowerCase()
|
|
83
|
+
let index = rows.findIndex((row) => row.job.name.toLowerCase() === current)
|
|
84
|
+
if (index === -1) index = delta > 0 ? -1 : 0
|
|
85
|
+
const step = delta === 0 ? 1 : delta
|
|
86
|
+
index = ((index + step) % rows.length + rows.length) % rows.length
|
|
87
|
+
return rows[index]?.job.name
|
|
88
|
+
}
|
|
89
|
+
|
|
90
|
+
/**
|
|
91
|
+
* Готовит текст лога для диалога TUI: оставляет последние строки и
|
|
92
|
+
* подставляет пояснение, если лога ещё нет.
|
|
93
|
+
*/
|
|
94
|
+
export function formatJobLog(
|
|
95
|
+
logs: string | undefined,
|
|
96
|
+
error: string | undefined,
|
|
97
|
+
maxLines = 40
|
|
98
|
+
): string {
|
|
99
|
+
const source = logs?.trim() ? logs : error?.trim()
|
|
100
|
+
if (!source) return "Лог пуст."
|
|
101
|
+
const limit = Math.max(1, Math.min(Math.floor(maxLines), 200))
|
|
102
|
+
const lines = source.replace(/\r\n/g, "\n").split("\n")
|
|
103
|
+
return lines.slice(-limit).join("\n")
|
|
8
104
|
}
|
|
9
105
|
|
|
10
106
|
/**
|
|
@@ -19,20 +115,74 @@ export function statusIcon(status: JobStatus): string {
|
|
|
19
115
|
return "✗"
|
|
20
116
|
case "success":
|
|
21
117
|
return "✓"
|
|
118
|
+
case "partial":
|
|
119
|
+
return "◐"
|
|
120
|
+
case "idle":
|
|
121
|
+
// Задача создана, но ещё ни разу не запускалась.
|
|
122
|
+
return "○"
|
|
22
123
|
default:
|
|
23
124
|
return "?"
|
|
24
125
|
}
|
|
25
126
|
}
|
|
26
127
|
|
|
128
|
+
/** Переводит запись истории в статус панели (timeout считаем ошибкой). */
|
|
129
|
+
function historyStatus(record: HistoryRecord | undefined): JobStatus {
|
|
130
|
+
if (!record) return "idle"
|
|
131
|
+
if (record.status === "timeout") return "error"
|
|
132
|
+
return record.status
|
|
133
|
+
}
|
|
134
|
+
|
|
135
|
+
/**
|
|
136
|
+
* Собирает панельное представление из уже прочитанных данных.
|
|
137
|
+
* Вынесено отдельно, чтобы логику статусов и матричных связей можно было
|
|
138
|
+
* проверить без реального планировщика.
|
|
139
|
+
*/
|
|
140
|
+
export function buildJobsView(
|
|
141
|
+
tasks: readonly ScheduledTaskInfo[],
|
|
142
|
+
history: readonly HistoryRecord[],
|
|
143
|
+
definitions: readonly TaskDefinition[]
|
|
144
|
+
): JobView[] {
|
|
145
|
+
const latest = latestHistoryByTask(history)
|
|
146
|
+
const defs = new Map(
|
|
147
|
+
definitions.map((definition) => [definition.name.toLowerCase(), definition])
|
|
148
|
+
)
|
|
149
|
+
return tasks.map((task) => {
|
|
150
|
+
const name = task.taskName
|
|
151
|
+
const record = latest.get(name.toLowerCase())
|
|
152
|
+
const definition = defs.get(name.toLowerCase())
|
|
153
|
+
const matrixParentId = definition?.matrixParentId?.trim()
|
|
154
|
+
return {
|
|
155
|
+
name,
|
|
156
|
+
status: historyStatus(record),
|
|
157
|
+
paused: Boolean(task.paused),
|
|
158
|
+
nextRun: task.nextRunTime,
|
|
159
|
+
lastRun: task.lastRunTime,
|
|
160
|
+
...(matrixParentId ? { matrixParentId } : {}),
|
|
161
|
+
...(definition?.matrix || definition?.isMatrixParent
|
|
162
|
+
? { isMatrixParent: true }
|
|
163
|
+
: {}),
|
|
164
|
+
}
|
|
165
|
+
})
|
|
166
|
+
}
|
|
167
|
+
|
|
27
168
|
/**
|
|
28
169
|
* Возвращает список задач планировщика в едином формате для TUI и GUI.
|
|
29
170
|
*
|
|
30
|
-
*
|
|
31
|
-
*
|
|
32
|
-
*
|
|
171
|
+
* Читает реальные задачи из бэкенда планировщика и последнюю запись истории
|
|
172
|
+
* по каждой задаче. Если бэкенд недоступен (например, нет прав на schtasks),
|
|
173
|
+
* возвращает пустой список — панель покажет честное «нет данных», а не
|
|
174
|
+
* выдуманные задачи.
|
|
33
175
|
*/
|
|
34
|
-
export async function getJobsView(
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
176
|
+
export async function getJobsView(_context: unknown): Promise<JobView[]> {
|
|
177
|
+
try {
|
|
178
|
+
const backend = getSchedulerBackend()
|
|
179
|
+
const [tasks, history, definitions] = await Promise.all([
|
|
180
|
+
backend.listTasks(),
|
|
181
|
+
loadHistory(),
|
|
182
|
+
loadTaskDefinitions(),
|
|
183
|
+
])
|
|
184
|
+
return buildJobsView(tasks, history, definitions)
|
|
185
|
+
} catch {
|
|
186
|
+
return []
|
|
187
|
+
}
|
|
38
188
|
}
|
package/src/task-transfer.ts
CHANGED
|
@@ -7,7 +7,9 @@ import {
|
|
|
7
7
|
saveTask,
|
|
8
8
|
deleteTask,
|
|
9
9
|
} from "./db/tasks-repo.js";
|
|
10
|
+
import { normalizeOneShotRunAt } from "./core/one-shot.js";
|
|
10
11
|
import { isValidIanaTimeZone, validateLaunchWindow } from "./core/schedule-v2.js";
|
|
12
|
+
import { isValidSessionId } from "./core/session.js";
|
|
11
13
|
|
|
12
14
|
/** Триггер задачи по событию из MCP-шины. */
|
|
13
15
|
export interface McpEventTrigger {
|
|
@@ -112,10 +114,26 @@ export interface TaskDefinition {
|
|
|
112
114
|
*/
|
|
113
115
|
dependsOn?: string[];
|
|
114
116
|
/**
|
|
115
|
-
* Чем запускается задача: по расписанию ("cron", по умолчанию)
|
|
116
|
-
* при изменении файла ("file")
|
|
117
|
+
* Чем запускается задача: по расписанию ("cron", по умолчанию),
|
|
118
|
+
* при изменении файла ("file"), по MCP-событию ("mcp-event") или
|
|
119
|
+
* однократно в runAt ("once"). Для file/mcp-event/once расписание не нужно.
|
|
117
120
|
*/
|
|
118
|
-
triggerType?: "cron" | "file" | "mcp-event";
|
|
121
|
+
triggerType?: "cron" | "file" | "mcp-event" | "once";
|
|
122
|
+
/** Абсолютное время однократного запуска (ISO-8601, triggerType "once"). */
|
|
123
|
+
runAt?: string;
|
|
124
|
+
/**
|
|
125
|
+
* Режим сессии OpenCode для запусков задачи (Спринт 24):
|
|
126
|
+
* "new" (по умолчанию — свежая сессия на каждый запуск),
|
|
127
|
+
* "reuse" — переиспользовать сохранённую сессию (`sessionId`),
|
|
128
|
+
* "last" — продолжать последнюю сессию рабочего каталога (`--continue`).
|
|
129
|
+
*/
|
|
130
|
+
session?: "new" | "reuse" | "last";
|
|
131
|
+
/** Идентификатор переиспользуемой сессии (генерируется плагином для режима "reuse"). */
|
|
132
|
+
sessionId?: string;
|
|
133
|
+
/** Сколько запусков переживает сессия до ротации (удаление и чистый старт). 0/undefined — без ограничения. */
|
|
134
|
+
sessionMaxRuns?: number;
|
|
135
|
+
/** Внутренний счётчик запусков текущей сессии (не экспортируется). */
|
|
136
|
+
sessionRunCount?: number;
|
|
119
137
|
/** Путь к файлу/папке, изменения которого запускают задачу (для triggerType === "file"). */
|
|
120
138
|
watchPath?: string;
|
|
121
139
|
/** Параметры MCP-события (для triggerType === "mcp-event"). */
|
|
@@ -279,6 +297,22 @@ export async function buildExportJson(
|
|
|
279
297
|
...(definition?.triggerType === "mcp-event"
|
|
280
298
|
? { triggerType: "mcp-event" as const }
|
|
281
299
|
: {}),
|
|
300
|
+
...(definition?.triggerType === "once"
|
|
301
|
+
? {
|
|
302
|
+
triggerType: "once" as const,
|
|
303
|
+
...(definition.runAt ? { runAt: definition.runAt } : {}),
|
|
304
|
+
}
|
|
305
|
+
: {}),
|
|
306
|
+
// Спринт 24: сессии. sessionId экспортируется только для reuse; счётчик не экспортируем.
|
|
307
|
+
...(definition?.session
|
|
308
|
+
? { session: definition.session }
|
|
309
|
+
: {}),
|
|
310
|
+
...(definition?.session === "reuse" && definition.sessionId
|
|
311
|
+
? { sessionId: definition.sessionId }
|
|
312
|
+
: {}),
|
|
313
|
+
...(definition?.sessionMaxRuns !== undefined
|
|
314
|
+
? { sessionMaxRuns: definition.sessionMaxRuns }
|
|
315
|
+
: {}),
|
|
282
316
|
...(definition?.watchPath ? { watchPath: definition.watchPath } : {}),
|
|
283
317
|
...(definition?.timezone ? { timezone: definition.timezone } : {}),
|
|
284
318
|
...(definition?.notBefore ? { notBefore: definition.notBefore } : {}),
|
|
@@ -368,14 +402,20 @@ export function parseImportJson(raw: string): ParsedImport {
|
|
|
368
402
|
const schedule =
|
|
369
403
|
typeof source.schedule === "string" ? source.schedule.trim() : "";
|
|
370
404
|
const prompt = typeof source.prompt === "string" ? source.prompt.trim() : "";
|
|
371
|
-
const triggerType: "cron" | "file" | "mcp-event" =
|
|
405
|
+
const triggerType: "cron" | "file" | "mcp-event" | "once" =
|
|
372
406
|
source.triggerType === "file"
|
|
373
407
|
? "file"
|
|
374
408
|
: source.triggerType === "mcp-event"
|
|
375
409
|
? "mcp-event"
|
|
410
|
+
: source.triggerType === "once"
|
|
411
|
+
? "once"
|
|
376
412
|
: "cron";
|
|
377
413
|
const watchPath =
|
|
378
414
|
typeof source.watchPath === "string" ? source.watchPath.trim() : "";
|
|
415
|
+
const rawRunAt =
|
|
416
|
+
typeof source.runAt === "string" ? source.runAt.trim() : "";
|
|
417
|
+
const rawDelaySeconds =
|
|
418
|
+
typeof source.delaySeconds === "number" ? source.delaySeconds : undefined;
|
|
379
419
|
|
|
380
420
|
const rawMcpEvent =
|
|
381
421
|
source.mcpEvent && typeof source.mcpEvent === "object"
|
|
@@ -406,19 +446,77 @@ export function parseImportJson(raw: string): ParsedImport {
|
|
|
406
446
|
const watchOk =
|
|
407
447
|
triggerType === "file" ? Boolean(watchPath) || Boolean(matrixParentHint) : true;
|
|
408
448
|
const eventOk = triggerType === "mcp-event" ? Boolean(mcpEvent?.event) : true;
|
|
449
|
+
const onceOk =
|
|
450
|
+
triggerType === "once" ? Boolean(rawRunAt) || rawDelaySeconds !== undefined : true;
|
|
409
451
|
|
|
410
|
-
if (!name || !scheduleOk || !watchOk || !eventOk || !prompt) {
|
|
452
|
+
if (!name || !scheduleOk || !watchOk || !eventOk || !onceOk || !prompt) {
|
|
411
453
|
errors.push(
|
|
412
454
|
`Запись ${position}${name ? ` (${name})` : ""}: нужны непустые поля name и prompt` +
|
|
413
455
|
(triggerType === "file"
|
|
414
456
|
? ", а также watchPath для файлового триггера."
|
|
415
457
|
: triggerType === "mcp-event"
|
|
416
458
|
? ", а также mcpEvent.event для MCP-триггера."
|
|
459
|
+
: triggerType === "once"
|
|
460
|
+
? ", а также runAt или delaySeconds для one-shot."
|
|
417
461
|
: ", а также schedule.")
|
|
418
462
|
);
|
|
419
463
|
return;
|
|
420
464
|
}
|
|
421
465
|
|
|
466
|
+
let runAt: string | undefined;
|
|
467
|
+
if (triggerType === "once") {
|
|
468
|
+
const normalized = normalizeOneShotRunAt({
|
|
469
|
+
runAt: rawRunAt || undefined,
|
|
470
|
+
delaySeconds: rawDelaySeconds,
|
|
471
|
+
});
|
|
472
|
+
if (!normalized.ok) {
|
|
473
|
+
errors.push(
|
|
474
|
+
`Запись ${position}${name ? ` (${name})` : ""}: ${normalized.error}`
|
|
475
|
+
);
|
|
476
|
+
return;
|
|
477
|
+
}
|
|
478
|
+
runAt = normalized.runAt;
|
|
479
|
+
}
|
|
480
|
+
|
|
481
|
+
// Спринт 24: режим сессии. Отсутствие полей — "new" (совместимость со старыми экспортами).
|
|
482
|
+
let session: "new" | "reuse" | "last" = "new";
|
|
483
|
+
if (source.session !== undefined) {
|
|
484
|
+
if (
|
|
485
|
+
source.session === "new" ||
|
|
486
|
+
source.session === "reuse" ||
|
|
487
|
+
source.session === "last"
|
|
488
|
+
) {
|
|
489
|
+
session = source.session;
|
|
490
|
+
} else {
|
|
491
|
+
errors.push(
|
|
492
|
+
`Запись ${position}${name ? ` (${name})` : ""}: неизвестный session «${String(source.session)}» (ожидается new, reuse или last).`
|
|
493
|
+
);
|
|
494
|
+
return;
|
|
495
|
+
}
|
|
496
|
+
}
|
|
497
|
+
const sessionId =
|
|
498
|
+
typeof source.sessionId === "string" && source.sessionId.trim()
|
|
499
|
+
? source.sessionId.trim()
|
|
500
|
+
: undefined;
|
|
501
|
+
if (sessionId && !isValidSessionId(sessionId)) {
|
|
502
|
+
errors.push(
|
|
503
|
+
`Запись ${position}${name ? ` (${name})` : ""}: некорректный sessionId «${sessionId}».`
|
|
504
|
+
);
|
|
505
|
+
return;
|
|
506
|
+
}
|
|
507
|
+
let sessionMaxRuns: number | undefined;
|
|
508
|
+
if (source.sessionMaxRuns !== undefined) {
|
|
509
|
+
const raw = source.sessionMaxRuns;
|
|
510
|
+
if (typeof raw === "number" && Number.isFinite(raw) && raw >= 1) {
|
|
511
|
+
sessionMaxRuns = Math.floor(raw);
|
|
512
|
+
} else {
|
|
513
|
+
errors.push(
|
|
514
|
+
`Запись ${position}${name ? ` (${name})` : ""}: sessionMaxRuns должен быть целым числом ≥ 1.`
|
|
515
|
+
);
|
|
516
|
+
return;
|
|
517
|
+
}
|
|
518
|
+
}
|
|
519
|
+
|
|
422
520
|
const timeoutSeconds =
|
|
423
521
|
typeof source.timeoutSeconds === "number" &&
|
|
424
522
|
Number.isFinite(source.timeoutSeconds) &&
|
|
@@ -675,6 +773,10 @@ export function parseImportJson(raw: string): ParsedImport {
|
|
|
675
773
|
...(nextTaskOnError !== undefined ? { nextTaskOnError } : {}),
|
|
676
774
|
...(dependsOn !== undefined ? { dependsOn } : {}),
|
|
677
775
|
...(triggerType === "cron" ? {} : { triggerType }),
|
|
776
|
+
...(runAt ? { runAt } : {}),
|
|
777
|
+
...(session !== "new" ? { session } : {}),
|
|
778
|
+
...(session === "reuse" && sessionId ? { sessionId } : {}),
|
|
779
|
+
...(sessionMaxRuns !== undefined ? { sessionMaxRuns } : {}),
|
|
678
780
|
...(watchPath ? { watchPath } : {}),
|
|
679
781
|
...(timezone !== undefined ? { timezone } : {}),
|
|
680
782
|
...(notBefore !== undefined ? { notBefore } : {}),
|