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/dist/server.js
CHANGED
|
@@ -11,6 +11,11 @@ import { checkpointDb, getDbFile, getDbStatus } from "./db/index.js";
|
|
|
11
11
|
import { listWorkspaces } from "./workspaces.js";
|
|
12
12
|
import { getProfileName, getProfilePort } from "./profiles.js";
|
|
13
13
|
import { simulatePipeline } from "./core/dry-run.js";
|
|
14
|
+
import { loadSettings } from "./settings.js";
|
|
15
|
+
import { authenticateHookRequest, extractHookSignature, extractHookToken, readRequestBody, } from "./integrations.js";
|
|
16
|
+
import { appendStructuredLog, readStructuredLogs } from "./core/structured-log.js";
|
|
17
|
+
import { PROMETHEUS_CONTENT_TYPE, renderPrometheusMetrics } from "./core/prometheus.js";
|
|
18
|
+
import { buildOtlpExport } from "./core/otel.js";
|
|
14
19
|
/**
|
|
15
20
|
* Локальный веб-дашборд (Спринт 5).
|
|
16
21
|
* Встроенный модуль http из Node.js — без внешних зависимостей.
|
|
@@ -24,8 +29,12 @@ const PREFERRED_PORT = 3782;
|
|
|
24
29
|
const FALLBACK_PORT = 4782;
|
|
25
30
|
/** Дополнительный порт, если и 3782, и 4782 заняты чужими процессами. */
|
|
26
31
|
const EXTRA_PORTS = [5782];
|
|
27
|
-
|
|
28
|
-
|
|
32
|
+
const IS_WINDOWS = process.platform === "win32";
|
|
33
|
+
/**
|
|
34
|
+
* Имена процессов, которые считаем «зомби» от прошлых запусков плагина.
|
|
35
|
+
* На Windows процессы называются node.exe / bun.exe, на POSIX — node / bun.
|
|
36
|
+
*/
|
|
37
|
+
const ZOMBIE_IMAGE_NAMES = new Set(["node", "nodejs", "node.exe", "bun", "bun.exe"]);
|
|
29
38
|
/** Маркер-заголовок: по нему узнаём «свой» дашборд, уже слушающий порт. */
|
|
30
39
|
const DASHBOARD_HEADER = "x-plugin-dashboard";
|
|
31
40
|
const DASHBOARD_MARKER = "opencode-windows-scheduler";
|
|
@@ -154,16 +163,21 @@ export async function startDashboardServer(deps, ports) {
|
|
|
154
163
|
return { port };
|
|
155
164
|
}
|
|
156
165
|
// Порт занят чужим или старым процессом: пробуем снять зомби
|
|
157
|
-
// (только node/bun этого плагина) и
|
|
166
|
+
// (только node/bun этого плагина) и повторить bind.
|
|
158
167
|
if (port !== 0 && (await tryFreeZombiePort(port))) {
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
168
|
+
// SIGKILL асинхронный: на POSIX процесс может ещё какое-то время
|
|
169
|
+
// держать сокет, поэтому сначала ждём освобождения порта.
|
|
170
|
+
const freed = await waitForPortFree(port, 3000);
|
|
171
|
+
if (freed) {
|
|
172
|
+
try {
|
|
173
|
+
const server = await listenOn(port, deps);
|
|
174
|
+
running = { server, port };
|
|
175
|
+
console.log(`[windows-scheduler] Веб-дашборд запущен: http://localhost:${port}`);
|
|
176
|
+
return { port };
|
|
177
|
+
}
|
|
178
|
+
catch {
|
|
179
|
+
// Не вышло — идём к следующему порту.
|
|
180
|
+
}
|
|
167
181
|
}
|
|
168
182
|
}
|
|
169
183
|
// Чужой сервис — пробуем запасной порт.
|
|
@@ -209,7 +223,12 @@ async function tryFreeZombiePort(port) {
|
|
|
209
223
|
continue;
|
|
210
224
|
}
|
|
211
225
|
try {
|
|
212
|
-
|
|
226
|
+
if (IS_WINDOWS) {
|
|
227
|
+
await execFileAsync("taskkill", ["/PID", String(pid), "/T", "/F"], { windowsHide: true });
|
|
228
|
+
}
|
|
229
|
+
else {
|
|
230
|
+
process.kill(pid, "SIGKILL");
|
|
231
|
+
}
|
|
213
232
|
console.log(`[windows-scheduler] Снят зомби-процесс ${info.name} (PID ${pid}), державший порт ${port}.`);
|
|
214
233
|
killed = true;
|
|
215
234
|
}
|
|
@@ -219,8 +238,25 @@ async function tryFreeZombiePort(port) {
|
|
|
219
238
|
}
|
|
220
239
|
return killed;
|
|
221
240
|
}
|
|
222
|
-
/**
|
|
241
|
+
/** Ждёт, пока порт освободится (POSIX: убитый процесс отпускает сокет не синхронно). */
|
|
242
|
+
async function waitForPortFree(port, timeoutMs) {
|
|
243
|
+
const deadline = Date.now() + timeoutMs;
|
|
244
|
+
while (Date.now() < deadline) {
|
|
245
|
+
const pids = await findListeningPids(port);
|
|
246
|
+
if (pids.length === 0)
|
|
247
|
+
return true;
|
|
248
|
+
await new Promise((resolve) => setTimeout(resolve, 150));
|
|
249
|
+
}
|
|
250
|
+
return false;
|
|
251
|
+
}
|
|
252
|
+
/** Возвращает PID'ы процессов, слушающих указанный TCP-порт. */
|
|
223
253
|
async function findListeningPids(port) {
|
|
254
|
+
if (IS_WINDOWS)
|
|
255
|
+
return findListeningPidsWindows(port);
|
|
256
|
+
return findListeningPidsPosix(port);
|
|
257
|
+
}
|
|
258
|
+
/** Windows: netstat -ano, состояния LISTENING. */
|
|
259
|
+
async function findListeningPidsWindows(port) {
|
|
224
260
|
try {
|
|
225
261
|
const { stdout } = await execFileAsync("netstat", ["-ano", "-p", "TCP"], {
|
|
226
262
|
windowsHide: true,
|
|
@@ -247,8 +283,50 @@ async function findListeningPids(port) {
|
|
|
247
283
|
return [];
|
|
248
284
|
}
|
|
249
285
|
}
|
|
250
|
-
/**
|
|
286
|
+
/**
|
|
287
|
+
* macOS/Linux: lsof (есть в macOS и на большинстве Linux-образов),
|
|
288
|
+
* на Linux — запасной вариант через ss из iproute2.
|
|
289
|
+
*/
|
|
290
|
+
async function findListeningPidsPosix(port) {
|
|
291
|
+
try {
|
|
292
|
+
const { stdout } = await execFileAsync("lsof", ["-nP", `-iTCP:${port}`, "-sTCP:LISTEN", "-t"], { windowsHide: true });
|
|
293
|
+
const pids = stdout
|
|
294
|
+
.split(/\s+/)
|
|
295
|
+
.map(Number)
|
|
296
|
+
.filter((pid) => Number.isInteger(pid) && pid > 0);
|
|
297
|
+
if (pids.length > 0)
|
|
298
|
+
return Array.from(new Set(pids));
|
|
299
|
+
}
|
|
300
|
+
catch {
|
|
301
|
+
// lsof может отсутствовать или не быть в PATH — пробуем ss.
|
|
302
|
+
}
|
|
303
|
+
if (process.platform === "linux") {
|
|
304
|
+
try {
|
|
305
|
+
const { stdout } = await execFileAsync("ss", ["-ltnp", `sport = :${port}`], {
|
|
306
|
+
windowsHide: true,
|
|
307
|
+
});
|
|
308
|
+
const pids = new Set();
|
|
309
|
+
for (const match of stdout.matchAll(/pid=(\d+)/g)) {
|
|
310
|
+
const pid = Number(match[1]);
|
|
311
|
+
if (Number.isInteger(pid) && pid > 0)
|
|
312
|
+
pids.add(pid);
|
|
313
|
+
}
|
|
314
|
+
return Array.from(pids);
|
|
315
|
+
}
|
|
316
|
+
catch {
|
|
317
|
+
// ss тоже недоступен — считаем, что владельца порта не знаем.
|
|
318
|
+
}
|
|
319
|
+
}
|
|
320
|
+
return [];
|
|
321
|
+
}
|
|
322
|
+
/** Имя процесса и командная строка. */
|
|
251
323
|
async function getProcessInfo(pid) {
|
|
324
|
+
if (IS_WINDOWS)
|
|
325
|
+
return getProcessInfoWindows(pid);
|
|
326
|
+
return getProcessInfoPosix(pid);
|
|
327
|
+
}
|
|
328
|
+
/** Имя процесса и командная строка через CIM (Windows PowerShell). */
|
|
329
|
+
async function getProcessInfoWindows(pid) {
|
|
252
330
|
try {
|
|
253
331
|
const script = '$p = Get-CimInstance Win32_Process -Filter "ProcessId=' +
|
|
254
332
|
pid +
|
|
@@ -266,6 +344,33 @@ async function getProcessInfo(pid) {
|
|
|
266
344
|
return null;
|
|
267
345
|
}
|
|
268
346
|
}
|
|
347
|
+
/** Имя процесса и командная строка через ps (macOS/Linux). */
|
|
348
|
+
async function getProcessInfoPosix(pid) {
|
|
349
|
+
try {
|
|
350
|
+
// NOTE: на Linux у Node главный поток помечен как "MainThread", поэтому
|
|
351
|
+
// имя берём из argv[0] командной строки (это полный путь к бинарнику),
|
|
352
|
+
// а comm используем только как запасной вариант.
|
|
353
|
+
const { stdout: argsOut } = await execFileAsync("ps", ["-p", String(pid), "-o", "args="], {
|
|
354
|
+
windowsHide: true,
|
|
355
|
+
});
|
|
356
|
+
const args = argsOut.trim();
|
|
357
|
+
const argv0 = args.split(/\s+/)[0]?.replace(/^["']|["']$/g, "") ?? "";
|
|
358
|
+
let name = argv0.split(/[\\/]/).pop() ?? "";
|
|
359
|
+
if (!name) {
|
|
360
|
+
const { stdout: commOut } = await execFileAsync("ps", ["-p", String(pid), "-o", "comm="], {
|
|
361
|
+
windowsHide: true,
|
|
362
|
+
});
|
|
363
|
+
const comm = commOut.trim();
|
|
364
|
+
if (!comm)
|
|
365
|
+
return null;
|
|
366
|
+
name = comm.split(/[\\/]/).pop() || comm;
|
|
367
|
+
}
|
|
368
|
+
return { name, commandLine: args };
|
|
369
|
+
}
|
|
370
|
+
catch {
|
|
371
|
+
return null;
|
|
372
|
+
}
|
|
373
|
+
}
|
|
269
374
|
/** Проверяет по маркер-заголовку, что на порту отвечает наш дашборд. */
|
|
270
375
|
async function isOwnDashboardOn(port) {
|
|
271
376
|
try {
|
|
@@ -335,23 +440,33 @@ async function handleRequest(req, res, deps) {
|
|
|
335
440
|
const knownGet = pathname === "/api/tasks" ||
|
|
336
441
|
pathname === "/api/history" ||
|
|
337
442
|
pathname === "/api/metrics" ||
|
|
443
|
+
pathname === "/api/summary" ||
|
|
338
444
|
pathname === "/api/models-analysis" ||
|
|
339
445
|
pathname === "/api/analytics" ||
|
|
340
446
|
pathname === "/api/history/export" ||
|
|
341
447
|
pathname === "/api/export-db" ||
|
|
342
448
|
pathname === "/api/workspaces" ||
|
|
343
449
|
pathname === "/api/health" ||
|
|
450
|
+
pathname === "/api/logs" ||
|
|
451
|
+
pathname === "/metrics" ||
|
|
344
452
|
/^\/api\/dry-run\//.test(pathname) ||
|
|
345
453
|
/^\/api\/matrix\//.test(pathname);
|
|
346
454
|
if (knownGet && req.method !== "GET") {
|
|
347
455
|
sendJson(res, 405, { error: "Method not allowed" });
|
|
348
456
|
return;
|
|
349
457
|
}
|
|
350
|
-
const knownPost = /^\/api\/(run|delete)\//.test(pathname)
|
|
458
|
+
const knownPost = /^\/api\/(run|delete|hooks|cancel-matrix)\//.test(pathname) ||
|
|
459
|
+
pathname === "/api/matrix-cleanup";
|
|
351
460
|
if (knownPost && req.method !== "POST") {
|
|
352
461
|
sendJson(res, 405, { error: "Method not allowed" });
|
|
353
462
|
return;
|
|
354
463
|
}
|
|
464
|
+
// Браузер всегда просит иконку. Отвечаем 204, чтобы не засорять консоль 404.
|
|
465
|
+
if (req.method === "GET" && pathname === "/favicon.ico") {
|
|
466
|
+
res.writeHead(204);
|
|
467
|
+
res.end();
|
|
468
|
+
return;
|
|
469
|
+
}
|
|
355
470
|
// Статический HTML-файл — страница дашборда.
|
|
356
471
|
if (req.method === "GET" && (pathname === "/" || pathname === "/index.html")) {
|
|
357
472
|
send(res, 200, "text/html; charset=utf-8", renderPage());
|
|
@@ -371,6 +486,45 @@ async function handleRequest(req, res, deps) {
|
|
|
371
486
|
});
|
|
372
487
|
return;
|
|
373
488
|
}
|
|
489
|
+
if (req.method === "GET" && pathname === "/metrics") {
|
|
490
|
+
send(res, 200, PROMETHEUS_CONTENT_TYPE, renderPrometheusMetrics());
|
|
491
|
+
return;
|
|
492
|
+
}
|
|
493
|
+
// Машиночитаемые логи запусков (Спринт 22): JSONL + фильтры.
|
|
494
|
+
if (req.method === "GET" && pathname === "/api/logs") {
|
|
495
|
+
const task = url.searchParams.get("task") ?? undefined;
|
|
496
|
+
const status = url.searchParams.get("status") ?? undefined;
|
|
497
|
+
const event = url.searchParams.get("event") ?? undefined;
|
|
498
|
+
const since = url.searchParams.get("since") ?? undefined;
|
|
499
|
+
const until = url.searchParams.get("until") ?? undefined;
|
|
500
|
+
const limitRaw = Number(url.searchParams.get("limit") ?? 200);
|
|
501
|
+
if (since && Number.isNaN(Date.parse(since))) {
|
|
502
|
+
sendJson(res, 400, { error: "Некорректный параметр since: ожидается ISO-дата." });
|
|
503
|
+
return;
|
|
504
|
+
}
|
|
505
|
+
if (until && Number.isNaN(Date.parse(until))) {
|
|
506
|
+
sendJson(res, 400, { error: "Некорректный параметр until: ожидается ISO-дата." });
|
|
507
|
+
return;
|
|
508
|
+
}
|
|
509
|
+
const limit = Number.isFinite(limitRaw)
|
|
510
|
+
? Math.max(1, Math.min(5000, Math.floor(limitRaw)))
|
|
511
|
+
: 200;
|
|
512
|
+
const result = readStructuredLogs({ task, status, event, since, until, limit });
|
|
513
|
+
if ((url.searchParams.get("format") || "").toLowerCase() === "jsonl") {
|
|
514
|
+
const body = result.records.map((record) => JSON.stringify(record)).join("\n");
|
|
515
|
+
const stamp = new Date().toISOString().replace(/[:.]/g, "-");
|
|
516
|
+
sendAttachment(res, 200, "application/x-ndjson; charset=utf-8", body ? `${body}\n` : "", `logs-${stamp}.jsonl`);
|
|
517
|
+
return;
|
|
518
|
+
}
|
|
519
|
+
sendJson(res, 200, {
|
|
520
|
+
records: result.records,
|
|
521
|
+
total: result.total,
|
|
522
|
+
malformed: result.malformed,
|
|
523
|
+
limit,
|
|
524
|
+
filters: { task: task ?? null, status: status ?? null, event: event ?? null, since: since ?? null, until: until ?? null },
|
|
525
|
+
});
|
|
526
|
+
return;
|
|
527
|
+
}
|
|
374
528
|
if (req.method === "GET" && pathname === "/api/tasks") {
|
|
375
529
|
const tasks = await collectTasksWithMetrics(deps);
|
|
376
530
|
sendJson(res, 200, { tasks });
|
|
@@ -456,8 +610,24 @@ async function handleRequest(req, res, deps) {
|
|
|
456
610
|
return;
|
|
457
611
|
}
|
|
458
612
|
if (req.method === "GET" && pathname === "/api/history") {
|
|
459
|
-
|
|
460
|
-
|
|
613
|
+
// Фильтры как у RPC get_history: имя задачи и статус. limit — необязательный.
|
|
614
|
+
const taskFilter = (url.searchParams.get("taskName") ?? url.searchParams.get("task") ?? "")
|
|
615
|
+
.trim()
|
|
616
|
+
.toLowerCase();
|
|
617
|
+
const statusFilter = (url.searchParams.get("status") ?? "").trim().toLowerCase();
|
|
618
|
+
const limitRaw = Number(url.searchParams.get("limit") ?? 200);
|
|
619
|
+
const limit = Number.isFinite(limitRaw)
|
|
620
|
+
? Math.max(1, Math.min(10000, Math.floor(limitRaw)))
|
|
621
|
+
: 200;
|
|
622
|
+
let records = await loadHistory();
|
|
623
|
+
if (taskFilter) {
|
|
624
|
+
records = records.filter((record) => record.taskName.toLowerCase() === taskFilter);
|
|
625
|
+
}
|
|
626
|
+
if (statusFilter) {
|
|
627
|
+
records = records.filter((record) => String(record.status).toLowerCase() === statusFilter);
|
|
628
|
+
}
|
|
629
|
+
const total = records.length;
|
|
630
|
+
sendJson(res, 200, { records: records.slice(0, limit), total, limit });
|
|
461
631
|
return;
|
|
462
632
|
}
|
|
463
633
|
if (req.method === "GET" && pathname === "/api/models-analysis") {
|
|
@@ -482,16 +652,21 @@ async function handleRequest(req, res, deps) {
|
|
|
482
652
|
sendJson(res, 200, report);
|
|
483
653
|
return;
|
|
484
654
|
}
|
|
485
|
-
// Экспорт истории: CSV (для Excel)
|
|
655
|
+
// Экспорт истории: CSV (для Excel), JSON (для скриптов) или OTLP/JSON.
|
|
486
656
|
if (req.method === "GET" && pathname === "/api/history/export") {
|
|
487
657
|
const format = (url.searchParams.get("format") || "csv").toLowerCase();
|
|
488
|
-
if (format !== "csv" && format !== "json") {
|
|
489
|
-
sendJson(res, 400, {
|
|
658
|
+
if (format !== "csv" && format !== "json" && format !== "otlp") {
|
|
659
|
+
sendJson(res, 400, {
|
|
660
|
+
error: "Неподдерживаемый формат экспорта. Допустимые: csv, json, otlp.",
|
|
661
|
+
});
|
|
490
662
|
return;
|
|
491
663
|
}
|
|
492
664
|
const records = getHistory(null, 100000);
|
|
493
665
|
const stamp = new Date().toISOString().replace(/[:.]/g, "-");
|
|
494
|
-
if (format === "
|
|
666
|
+
if (format === "otlp") {
|
|
667
|
+
sendAttachment(res, 200, "application/json; charset=utf-8", JSON.stringify(buildOtlpExport(records), null, 2), `history-${stamp}.otlp.json`);
|
|
668
|
+
}
|
|
669
|
+
else if (format === "json") {
|
|
495
670
|
sendAttachment(res, 200, "application/json; charset=utf-8", JSON.stringify({ exportedAt: new Date().toISOString(), records }, null, 2), `history-${stamp}.json`);
|
|
496
671
|
}
|
|
497
672
|
else {
|
|
@@ -536,6 +711,97 @@ async function handleRequest(req, res, deps) {
|
|
|
536
711
|
}
|
|
537
712
|
return;
|
|
538
713
|
}
|
|
714
|
+
// Входящий webhook-триггер (Спринт 22): POST /api/hooks/:task?token=…
|
|
715
|
+
const hookMatch = req.method === "POST" && pathname.match(/^\/api\/hooks\/(.+)$/);
|
|
716
|
+
if (hookMatch) {
|
|
717
|
+
const taskName = hookMatch[1].replace(/\/+$/, "").trim();
|
|
718
|
+
const remote = req.socket.remoteAddress ?? null;
|
|
719
|
+
const declaredBytes = Number(req.headers["content-length"]) || 0;
|
|
720
|
+
const timestampHeader = req.headers["x-scheduler-timestamp"];
|
|
721
|
+
const timestamp = Array.isArray(timestampHeader)
|
|
722
|
+
? timestampHeader[0] ?? null
|
|
723
|
+
: timestampHeader ?? null;
|
|
724
|
+
const logHook = (httpStatus, status, reason, payloadBytes = declaredBytes) => {
|
|
725
|
+
appendStructuredLog({
|
|
726
|
+
event: "hook.received",
|
|
727
|
+
task: taskName || undefined,
|
|
728
|
+
status,
|
|
729
|
+
source: "hook",
|
|
730
|
+
httpStatus,
|
|
731
|
+
remote,
|
|
732
|
+
payloadBytes,
|
|
733
|
+
reason,
|
|
734
|
+
});
|
|
735
|
+
};
|
|
736
|
+
if (!taskName) {
|
|
737
|
+
logHook(400, "rejected", "Не передано имя задачи.");
|
|
738
|
+
sendJson(res, 400, { success: false, error: "Не передано имя задачи." });
|
|
739
|
+
return;
|
|
740
|
+
}
|
|
741
|
+
const settings = await loadSettings();
|
|
742
|
+
const hooks = settings.integrations.hooks;
|
|
743
|
+
if (!hooks.enabled) {
|
|
744
|
+
logHook(403, "rejected", "Входящие webhook-триггеры отключены.");
|
|
745
|
+
sendJson(res, 403, { success: false, error: "Входящие webhook-триггеры отключены." });
|
|
746
|
+
return;
|
|
747
|
+
}
|
|
748
|
+
const bodyResult = await readRequestBody(req, hooks.maxBodyBytes);
|
|
749
|
+
if (!bodyResult.ok) {
|
|
750
|
+
logHook(bodyResult.status, "rejected", bodyResult.error, declaredBytes);
|
|
751
|
+
sendJson(res, bodyResult.status, { success: false, error: bodyResult.error });
|
|
752
|
+
return;
|
|
753
|
+
}
|
|
754
|
+
const token = url.searchParams.get("token") ?? extractHookToken(req.headers);
|
|
755
|
+
const signature = extractHookSignature(req.headers);
|
|
756
|
+
const auth = authenticateHookRequest({
|
|
757
|
+
settings: hooks,
|
|
758
|
+
token,
|
|
759
|
+
signature,
|
|
760
|
+
timestamp,
|
|
761
|
+
body: bodyResult.body,
|
|
762
|
+
});
|
|
763
|
+
if (!auth.ok) {
|
|
764
|
+
logHook(auth.status, "rejected", auth.error, bodyResult.body.length);
|
|
765
|
+
sendJson(res, auth.status, { success: false, error: auth.error });
|
|
766
|
+
return;
|
|
767
|
+
}
|
|
768
|
+
let tasks;
|
|
769
|
+
try {
|
|
770
|
+
tasks = await deps.getTasks();
|
|
771
|
+
}
|
|
772
|
+
catch (err) {
|
|
773
|
+
const message = err instanceof Error ? err.message : String(err);
|
|
774
|
+
logHook(500, "rejected", `Не удалось получить список задач: ${message}`, bodyResult.body.length);
|
|
775
|
+
sendJson(res, 500, { success: false, error: message });
|
|
776
|
+
return;
|
|
777
|
+
}
|
|
778
|
+
const key = taskName.toLowerCase();
|
|
779
|
+
const task = tasks.find((item) => String(item.name).toLowerCase() === key);
|
|
780
|
+
if (!task) {
|
|
781
|
+
logHook(404, "rejected", `Задача "${taskName}" не найдена.`, bodyResult.body.length);
|
|
782
|
+
sendJson(res, 404, { success: false, error: `Задача "${taskName}" не найдена.` });
|
|
783
|
+
return;
|
|
784
|
+
}
|
|
785
|
+
try {
|
|
786
|
+
const result = await deps.runTask(task.name);
|
|
787
|
+
const message = result?.alreadyRunning
|
|
788
|
+
? `Задача "${task.name}" уже выполняется.`
|
|
789
|
+
: `Задача "${task.name}" запущена по webhook.`;
|
|
790
|
+
logHook(202, "accepted", undefined, bodyResult.body.length);
|
|
791
|
+
sendJson(res, 202, {
|
|
792
|
+
success: true,
|
|
793
|
+
task: task.name,
|
|
794
|
+
alreadyRunning: Boolean(result?.alreadyRunning),
|
|
795
|
+
message,
|
|
796
|
+
});
|
|
797
|
+
}
|
|
798
|
+
catch (err) {
|
|
799
|
+
const message = err instanceof Error ? err.message : String(err);
|
|
800
|
+
logHook(500, "rejected", message, bodyResult.body.length);
|
|
801
|
+
sendJson(res, 500, { success: false, error: message });
|
|
802
|
+
}
|
|
803
|
+
return;
|
|
804
|
+
}
|
|
539
805
|
// Запуск задачи: POST /api/run/:name (имя URL-кодируется на клиенте).
|
|
540
806
|
const runMatch = req.method === "POST" && pathname.match(/^\/api\/run\/(.+)$/);
|
|
541
807
|
if (runMatch) {
|
|
@@ -709,17 +975,24 @@ async function collectTasksWithMetrics(deps) {
|
|
|
709
975
|
const key = String(r.taskName || "").toLowerCase();
|
|
710
976
|
if (!key)
|
|
711
977
|
continue;
|
|
712
|
-
const m = byTask.get(key) ?? { total: 0, success: 0, error: 0 };
|
|
978
|
+
const m = byTask.get(key) ?? { total: 0, success: 0, error: 0, partial: 0 };
|
|
713
979
|
m.total += 1;
|
|
714
980
|
if (r.status === "success")
|
|
715
981
|
m.success += 1;
|
|
982
|
+
else if (r.status === "partial")
|
|
983
|
+
m.partial += 1;
|
|
716
984
|
else
|
|
717
985
|
m.error += 1;
|
|
718
986
|
byTask.set(key, m);
|
|
719
987
|
}
|
|
720
988
|
return tasks.map((t) => ({
|
|
721
989
|
...t,
|
|
722
|
-
metrics: byTask.get(String(t.name).toLowerCase()) ?? {
|
|
990
|
+
metrics: byTask.get(String(t.name).toLowerCase()) ?? {
|
|
991
|
+
total: 0,
|
|
992
|
+
success: 0,
|
|
993
|
+
error: 0,
|
|
994
|
+
partial: 0,
|
|
995
|
+
},
|
|
723
996
|
}));
|
|
724
997
|
}
|
|
725
998
|
/**
|
|
@@ -736,11 +1009,14 @@ function renderPage() {
|
|
|
736
1009
|
<title>${getSchedulerTitle()} — Веб-дашборд</title>
|
|
737
1010
|
<style>
|
|
738
1011
|
:root {
|
|
1012
|
+
color-scheme: dark;
|
|
739
1013
|
--bg1: #0f172a; --bg2: #000000; --panel: #141c2b; --panel2: #1b2436;
|
|
740
1014
|
--border: #24314a; --text: #e6ecf5; --muted: #8fa0b8;
|
|
741
1015
|
--accent: #7ec8fa; --ok: #34c759; --err: #ff5a5f; --run: #f5a623;
|
|
742
1016
|
}
|
|
743
1017
|
* { box-sizing: border-box; }
|
|
1018
|
+
/* Фон задаём и на html: иначе при короткой странице снизу видна белая полоса. */
|
|
1019
|
+
html { background: var(--bg2); }
|
|
744
1020
|
html, body { margin: 0; padding: 0; }
|
|
745
1021
|
body {
|
|
746
1022
|
font-family: 'Segoe UI', -apple-system, BlinkMacSystemFont, Roboto, sans-serif;
|
|
@@ -757,16 +1033,20 @@ function renderPage() {
|
|
|
757
1033
|
}
|
|
758
1034
|
.wrap { position: relative; z-index: 1; max-width: 1740px; margin: 0 auto; padding: 28px 20px 60px; }
|
|
759
1035
|
.table-scroll { overflow-x: auto; }
|
|
1036
|
+
/* Подсказка о горизонтальном скролле: на широких экранах таблица влезает целиком. */
|
|
1037
|
+
.scroll-hint { display: none; margin-top: 6px; font-size: 11px; color: var(--muted); }
|
|
1038
|
+
@media (max-width: 1000px) { .scroll-hint { display: block; } }
|
|
760
1039
|
header { display: flex; align-items: flex-end; justify-content: space-between; gap: 12px; flex-wrap: wrap; margin-bottom: 22px; }
|
|
761
1040
|
h1 { margin: 0; font-size: 24px; font-weight: 800; letter-spacing: .2px; }
|
|
762
1041
|
.sub { margin-top: 5px; font-size: 11px; font-weight: 600; letter-spacing: 1.2px; text-transform: uppercase; color: var(--muted); }
|
|
763
1042
|
.cards { display: grid; grid-template-columns: repeat(3, 1fr); gap: 12px; margin-bottom: 22px; }
|
|
764
|
-
@media (min-width: 900px) { .cards { grid-template-columns: repeat(
|
|
1043
|
+
@media (min-width: 900px) { .cards { grid-template-columns: repeat(4, 1fr); } }
|
|
1044
|
+
@media (min-width: 1200px) { .cards { grid-template-columns: repeat(7, 1fr); } }
|
|
765
1045
|
@media (max-width: 520px) { .cards { grid-template-columns: repeat(2, 1fr); } }
|
|
766
1046
|
.card { background: var(--panel); border: 1px solid var(--border); border-radius: 10px; padding: 14px 16px; min-width: 0; }
|
|
767
1047
|
.card .num { font-size: 26px; font-weight: 800; }
|
|
768
1048
|
.card .lbl { margin-top: 2px; font-size: 11px; color: var(--muted); text-transform: uppercase; letter-spacing: 1px; }
|
|
769
|
-
.ok { color: var(--ok); } .err { color: var(--err); } .neu { color: var(--accent); }
|
|
1049
|
+
.ok { color: var(--ok); } .err { color: var(--err); } .neu { color: var(--accent); } .run { color: var(--run); }
|
|
770
1050
|
table { width: 100%; border-collapse: collapse; background: var(--panel); border: 1px solid var(--border); border-radius: 10px; overflow: hidden; }
|
|
771
1051
|
th, td { padding: 9px 9px; text-align: left; font-size: 13px; border-bottom: 1px solid var(--border); vertical-align: middle; }
|
|
772
1052
|
th { background: var(--panel2); color: var(--muted); font-size: 11px; text-transform: uppercase; letter-spacing: .8px; }
|
|
@@ -780,10 +1060,10 @@ function renderPage() {
|
|
|
780
1060
|
.badge.okb { background: rgba(52, 199, 89, .14); color: var(--ok); }
|
|
781
1061
|
.badge.errb { background: rgba(255, 90, 95, .14); color: var(--err); }
|
|
782
1062
|
.badge.unk { background: rgba(143, 160, 184, .14); color: var(--muted); }
|
|
783
|
-
.badge.part { background: rgba(255, 159, 10, .14); color:
|
|
1063
|
+
.badge.part { background: rgba(255, 159, 10, .14); color: var(--run); }
|
|
784
1064
|
.matrix-toggle { background: transparent; border: none; color: var(--muted); cursor: pointer; padding: 0 2px; font-size: 12px; }
|
|
785
1065
|
.matrix-toggle:hover { color: var(--accent); }
|
|
786
|
-
.matrix-badge { font-size: 11px; color:
|
|
1066
|
+
.matrix-badge { font-size: 11px; color: var(--run); white-space: nowrap; }
|
|
787
1067
|
.clone-badge { font-size: 11px; color: var(--muted); white-space: nowrap; }
|
|
788
1068
|
tr.clone-row td { background: rgba(126, 200, 250, 0.03); }
|
|
789
1069
|
tr.clone-row .name { padding-left: 26px; font-weight: 500; color: #cfd7e3; }
|
|
@@ -800,7 +1080,8 @@ function renderPage() {
|
|
|
800
1080
|
.an-kpis { display: flex; flex-wrap: wrap; gap: 14px; margin-bottom: 12px; font-size: 12px; color: var(--muted); }
|
|
801
1081
|
.an-kpis b { color: var(--text); font-size: 14px; }
|
|
802
1082
|
.an-chart { display: flex; align-items: flex-end; gap: 4px; height: 120px; padding: 6px 0 0; border-bottom: 1px solid var(--border); overflow-x: auto; }
|
|
803
|
-
|
|
1083
|
+
/* min-width: подпись даты "MM-DD" не наезжает на соседнюю; на узком экране график скроллится. */
|
|
1084
|
+
.an-bar { flex: 1 1 0; min-width: 34px; display: flex; flex-direction: column; align-items: center; justify-content: flex-end; height: 100%; cursor: default; }
|
|
804
1085
|
.an-bar-fill { width: 100%; border-radius: 3px 3px 0 0; background: var(--accent); opacity: .85; }
|
|
805
1086
|
.an-label { font-size: 9px; color: var(--muted); margin-top: 4px; white-space: nowrap; }
|
|
806
1087
|
.an-grid { display: grid; grid-template-columns: repeat(auto-fit, minmax(280px, 1fr)); gap: 16px; margin-top: 14px; }
|
|
@@ -828,6 +1109,17 @@ function renderPage() {
|
|
|
828
1109
|
.wi-table .wi-model { color: #c084fc; }
|
|
829
1110
|
.graph { background: var(--panel); border: 1px solid var(--border); border-radius: 10px; padding: 12px 16px; margin-bottom: 16px; }
|
|
830
1111
|
.graph-title { font-size: 11px; font-weight: 700; letter-spacing: 1px; text-transform: uppercase; color: var(--muted); margin-bottom: 6px; }
|
|
1112
|
+
.graph-hint { font-size: 11px; color: var(--muted); margin-bottom: 8px; }
|
|
1113
|
+
.graph-scroll { overflow-x: auto; overflow-y: hidden; padding-bottom: 4px; }
|
|
1114
|
+
.graph-canvas { position: relative; }
|
|
1115
|
+
.graph-node { position: absolute; box-sizing: border-box; display: flex; flex-direction: column; justify-content: center; gap: 2px; padding: 6px 9px; background: var(--bg2); border: 1px solid var(--border); border-left: 3px solid var(--muted); border-radius: 8px; font-size: 12px; }
|
|
1116
|
+
.graph-node .g-name { color: var(--text); font-weight: 600; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
|
|
1117
|
+
.graph-node .g-meta { color: var(--muted); font-size: 10px; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; }
|
|
1118
|
+
.graph-node.okg { border-left-color: #3fb950; }
|
|
1119
|
+
.graph-node.errg { border-left-color: #ff3b30; }
|
|
1120
|
+
.graph-node.partg { border-left-color: #f5a623; }
|
|
1121
|
+
.graph-node.rung { border-left-color: #58a6ff; }
|
|
1122
|
+
.graph-edge { fill: none; stroke: var(--border); stroke-width: 1.5; }
|
|
831
1123
|
.chain-line { font-size: 13px; padding: 3px 0; }
|
|
832
1124
|
.chain-line .dep { color: var(--accent); }
|
|
833
1125
|
.chain-line .arrow { color: var(--muted); margin: 0 6px; }
|
|
@@ -860,6 +1152,28 @@ function renderPage() {
|
|
|
860
1152
|
.toast { background: var(--panel2); border: 1px solid var(--border); border-radius: 8px; padding: 10px 14px; font-size: 12px; box-shadow: 0 6px 18px rgba(0,0,0,.4); }
|
|
861
1153
|
.toast.ok2 { border-color: rgba(52,199,89,.5); }
|
|
862
1154
|
.toast.err2 { border-color: rgba(255,90,95,.5); }
|
|
1155
|
+
/* Светлая тема: переменные темы + точечные правки для цветов, которые
|
|
1156
|
+
заданы не через var(). Тёмная остаётся по умолчанию. */
|
|
1157
|
+
@media (prefers-color-scheme: light) {
|
|
1158
|
+
:root {
|
|
1159
|
+
color-scheme: light;
|
|
1160
|
+
--bg1: #f5f8fc; --bg2: #ffffff; --panel: #ffffff; --panel2: #eef3f9;
|
|
1161
|
+
--border: #cbd6e2; --text: #17202b; --muted: #56667a;
|
|
1162
|
+
--accent: #0b6ea8; --ok: #167a37; --err: #bc2c22; --run: #9a5a00;
|
|
1163
|
+
}
|
|
1164
|
+
html { background: var(--bg2); }
|
|
1165
|
+
.snow { color: #9cc7ea; opacity: .4; }
|
|
1166
|
+
tr.clone-row .name { color: #3c4b5e; }
|
|
1167
|
+
.model, .hist-model, .wi-table .wi-model { color: #7b3fb0; }
|
|
1168
|
+
.graph-node { background: var(--panel2); }
|
|
1169
|
+
.toast { box-shadow: 0 6px 18px rgba(20, 40, 70, .18); }
|
|
1170
|
+
}
|
|
1171
|
+
a:focus-visible, button:focus-visible, [tabindex]:focus-visible {
|
|
1172
|
+
outline: 2px solid var(--accent); outline-offset: 2px;
|
|
1173
|
+
}
|
|
1174
|
+
@media (prefers-reduced-motion: reduce) {
|
|
1175
|
+
.snow { display: none; }
|
|
1176
|
+
}
|
|
863
1177
|
</style>
|
|
864
1178
|
</head>
|
|
865
1179
|
<body>
|
|
@@ -881,7 +1195,8 @@ function renderPage() {
|
|
|
881
1195
|
<div class="cards">
|
|
882
1196
|
<div class="card"><div class="num neu" id="m-total">—</div><div class="lbl">Всего запусков</div></div>
|
|
883
1197
|
<div class="card"><div class="num ok" id="m-success">—</div><div class="lbl">Успешных</div></div>
|
|
884
|
-
<div class="card"><div class="num err" id="m-error">—</div><div class="lbl"
|
|
1198
|
+
<div class="card" title="Ошибки и таймауты. Частичные выполнения считаются отдельно."><div class="num err" id="m-error">—</div><div class="lbl">Ошибок</div></div>
|
|
1199
|
+
<div class="card" title="Частичные выполнения (partial): ответ получен, но проверка не прошла"><div class="num run" id="m-partial">—</div><div class="lbl">Частичных</div></div>
|
|
885
1200
|
<div class="card"><div class="num" id="m-tasks">—</div><div class="lbl">Задач в системе</div></div>
|
|
886
1201
|
<div class="card"><div class="num neu" id="m-tokens">—</div><div class="lbl">Всего токенов</div></div>
|
|
887
1202
|
<div class="card"><div class="num" id="m-cost">—</div><div class="lbl">Примерная стоимость</div></div>
|
|
@@ -889,26 +1204,30 @@ function renderPage() {
|
|
|
889
1204
|
|
|
890
1205
|
<div class="graph" id="graph" style="display:none">
|
|
891
1206
|
<div class="graph-title">🔗 Граф зависимостей (DAG)</div>
|
|
892
|
-
<div
|
|
1207
|
+
<div class="graph-hint">Слева — задачи без зависимостей, справа — задачи, которые ждут их успешного завершения. Граф можно прокручивать по горизонтали.</div>
|
|
1208
|
+
<div class="graph-scroll" id="graph-scroll" role="region" aria-label="Граф зависимостей задач" tabindex="0">
|
|
1209
|
+
<div id="graph-lines"></div>
|
|
1210
|
+
</div>
|
|
893
1211
|
</div>
|
|
894
1212
|
|
|
895
1213
|
<div class="ws-summary" id="ws-summary">📦 0 workspace · 0 задач</div>
|
|
896
|
-
<div class="ws-tabs" id="ws-tabs"></div>
|
|
1214
|
+
<div class="ws-tabs" id="ws-tabs" role="group" aria-label="Фильтр задач по workspace"></div>
|
|
897
1215
|
|
|
898
1216
|
<div class="table-scroll">
|
|
899
|
-
<table>
|
|
1217
|
+
<table aria-label="Задачи планировщика">
|
|
900
1218
|
<thead>
|
|
901
1219
|
<tr>
|
|
902
|
-
<th>Имя</th><th>Статус</th><th>Cron</th><th>📦 Workspace</th><th>Модель</th><th>Приоритет</th><th>Зависимости</th><th>Метрики</th><th>Действия</th>
|
|
1220
|
+
<th scope="col">Имя</th><th scope="col">Статус</th><th scope="col">Cron</th><th scope="col">📦 Workspace</th><th scope="col">Модель</th><th scope="col">Приоритет</th><th scope="col">Зависимости</th><th scope="col">Метрики</th><th scope="col">Действия</th>
|
|
903
1221
|
</tr>
|
|
904
1222
|
</thead>
|
|
905
1223
|
<tbody id="rows"><tr><td colspan="9" class="empty">Загрузка…</td></tr></tbody>
|
|
906
1224
|
</table>
|
|
907
1225
|
</div>
|
|
1226
|
+
<div class="scroll-hint">↔ Таблица шире экрана — прокрутите её влево-вправо.</div>
|
|
908
1227
|
|
|
909
1228
|
<div class="hist">
|
|
910
1229
|
<h2>📜 История выполнений</h2>
|
|
911
|
-
<div id="history"><div class="empty">Загрузка…</div></div>
|
|
1230
|
+
<div id="history" aria-live="polite"><div class="empty">Загрузка…</div></div>
|
|
912
1231
|
</div>
|
|
913
1232
|
|
|
914
1233
|
<div class="hist">
|
|
@@ -935,7 +1254,7 @@ function renderPage() {
|
|
|
935
1254
|
|
|
936
1255
|
<footer>Данные обновляются автоматически каждые 5 секунд · <span id="server-url">http://localhost:3782</span> · <span class="db-badge">БД: ✅ SQLite (WAL)</span></footer>
|
|
937
1256
|
</div>
|
|
938
|
-
<div id="toast"></div>
|
|
1257
|
+
<div id="toast" role="status" aria-live="polite"></div>
|
|
939
1258
|
|
|
940
1259
|
<script>
|
|
941
1260
|
(function () {
|
|
@@ -948,6 +1267,14 @@ function renderPage() {
|
|
|
948
1267
|
var activeWorkspace = 'all';
|
|
949
1268
|
/** Раскрытые родители матриц (имя → true). */
|
|
950
1269
|
var expandedMatrixParents = {};
|
|
1270
|
+
/** История: последний загруженный список и режим «показать все». */
|
|
1271
|
+
var lastHistory = [];
|
|
1272
|
+
var historyExpanded = false;
|
|
1273
|
+
// /api/metrics и /api/summary отдают один и тот же обработчик. По умолчанию
|
|
1274
|
+
// используем summary: некоторые антивирусы блокируют именно /api/metrics
|
|
1275
|
+
// (HTTP 499), и тогда в консоли появляется ошибка при каждой загрузке.
|
|
1276
|
+
var preferSummaryMetrics = true;
|
|
1277
|
+
var metricsFallbackLogged = false;
|
|
951
1278
|
|
|
952
1279
|
function esc(s) {
|
|
953
1280
|
var d = document.createElement('div');
|
|
@@ -1035,11 +1362,24 @@ function renderPage() {
|
|
|
1035
1362
|
});
|
|
1036
1363
|
}
|
|
1037
1364
|
|
|
1038
|
-
function badge(status) {
|
|
1365
|
+
function badge(status, task, historyMode) {
|
|
1366
|
+
if (task && task.orphaned) {
|
|
1367
|
+
return '<span class="badge unk" title="Определение есть в БД, но задачи нет в планировщике ОС">🧟 Нет в планировщике</span>';
|
|
1368
|
+
}
|
|
1369
|
+
if (task && task.paused) {
|
|
1370
|
+
return '<span class="badge unk" title="Задача поставлена на паузу">⏸ Пауза</span>';
|
|
1371
|
+
}
|
|
1039
1372
|
if (status === 'running') return '<span class="badge run">🟡 Выполняется</span>';
|
|
1040
|
-
if (status === 'success')
|
|
1373
|
+
if (status === 'success') {
|
|
1374
|
+
return historyMode
|
|
1375
|
+
? '<span class="badge okb">✅ Успех</span>'
|
|
1376
|
+
: '<span class="badge okb">🟢 Готова</span>';
|
|
1377
|
+
}
|
|
1041
1378
|
if (status === 'error') return '<span class="badge errb">🔴 Ошибка</span>';
|
|
1042
1379
|
if (status === 'partial') return '<span class="badge part">🟠 Частично</span>';
|
|
1380
|
+
if (status === 'idle') {
|
|
1381
|
+
return '<span class="badge unk" title="Задача создана, но ещё ни разу не запускалась">⚪ Не запускалась</span>';
|
|
1382
|
+
}
|
|
1043
1383
|
return '<span class="badge unk">⚪ Неизвестно</span>';
|
|
1044
1384
|
}
|
|
1045
1385
|
|
|
@@ -1049,7 +1389,7 @@ function renderPage() {
|
|
|
1049
1389
|
if (!t.isMatrixParent || !s) return '';
|
|
1050
1390
|
var color = s.status === 'success' ? 'var(--ok)'
|
|
1051
1391
|
: s.status === 'error' ? 'var(--err)'
|
|
1052
|
-
: s.status === 'partial' ? '
|
|
1392
|
+
: s.status === 'partial' ? 'var(--run)'
|
|
1053
1393
|
: 'var(--run)';
|
|
1054
1394
|
return '<div class="matrix-badge" style="color:' + color + '" title="' + esc(s.message) + '">' +
|
|
1055
1395
|
'📦 Matrix: ' + s.successCount + '/' + s.totalCount + ' успешных' +
|
|
@@ -1059,8 +1399,10 @@ function renderPage() {
|
|
|
1059
1399
|
}
|
|
1060
1400
|
|
|
1061
1401
|
function metricsHtml(m) {
|
|
1062
|
-
var mm = m || { total: 0, success: 0, error: 0 };
|
|
1063
|
-
return 'Всего: <b>' + mm.total + '</b> · ✅ <b>' + mm.success + '</b>
|
|
1402
|
+
var mm = m || { total: 0, success: 0, error: 0, partial: 0 };
|
|
1403
|
+
return 'Всего: <b>' + mm.total + '</b> · ✅ <b>' + mm.success + '</b>' +
|
|
1404
|
+
' · <span title="Частичные выполнения (partial)" style="color:var(--run)">🟠 <b>' + (mm.partial || 0) + '</b></span>' +
|
|
1405
|
+
' · <span title="Ошибки и таймауты" style="color:var(--err)">⚠️ <b>' + mm.error + '</b></span>';
|
|
1064
1406
|
}
|
|
1065
1407
|
|
|
1066
1408
|
function depsHtml(t) {
|
|
@@ -1092,19 +1434,19 @@ function renderPage() {
|
|
|
1092
1434
|
function renderHistory(records) {
|
|
1093
1435
|
var box = document.getElementById('history');
|
|
1094
1436
|
if (!box) return;
|
|
1437
|
+
lastHistory = records || [];
|
|
1095
1438
|
if (!records || records.length === 0) {
|
|
1096
1439
|
box.innerHTML = '<div class="empty" style="padding:16px">Запусков пока нет.</div>';
|
|
1097
1440
|
return;
|
|
1098
1441
|
}
|
|
1099
1442
|
var html = '';
|
|
1100
|
-
var limit = Math.min(records.length, 10);
|
|
1443
|
+
var limit = historyExpanded ? records.length : Math.min(records.length, 10);
|
|
1101
1444
|
for (var i = 0; i < limit; i++) {
|
|
1102
1445
|
var r = records[i];
|
|
1103
|
-
var ok = r.status === 'success';
|
|
1104
1446
|
html += '<div class="hist-row">' +
|
|
1105
1447
|
'<span class="hist-time">' + esc(new Date(r.startedAt).toLocaleString('ru-RU')) + '</span>' +
|
|
1106
1448
|
'<span class="hist-task">' + esc(r.taskName) + '</span>' +
|
|
1107
|
-
|
|
1449
|
+
badge(r.status, null, true) +
|
|
1108
1450
|
'<span class="metrics">' + (r.durationMs != null ? r.durationMs + ' мс' : '—') + '</span>' +
|
|
1109
1451
|
(r.model ? '<span class="hist-model" title="Модель">🧠 ' + esc(r.model) + '</span>' : '') +
|
|
1110
1452
|
(r.preFlightStatus && r.preFlightStatus !== 'skipped'
|
|
@@ -1118,6 +1460,11 @@ function renderPage() {
|
|
|
1118
1460
|
(r.error ? '<span class="metrics" title="' + esc(r.error) + '">⚠ ' + esc(String(r.error).slice(0, 80)) + '</span>' : '') +
|
|
1119
1461
|
'</div>';
|
|
1120
1462
|
}
|
|
1463
|
+
if (records.length > 10) {
|
|
1464
|
+
html += '<div style="padding:10px 0 2px"><button class="btn" data-act="history-toggle">' +
|
|
1465
|
+
(historyExpanded ? 'Свернуть историю' : 'Показать все (' + records.length + ')') +
|
|
1466
|
+
'</button></div>';
|
|
1467
|
+
}
|
|
1121
1468
|
box.innerHTML = html;
|
|
1122
1469
|
}
|
|
1123
1470
|
|
|
@@ -1174,20 +1521,24 @@ function renderPage() {
|
|
|
1174
1521
|
for (var j = 0; j < daily.length; j++) {
|
|
1175
1522
|
var d = daily[j];
|
|
1176
1523
|
var h = d.total > 0 ? Math.max(3, Math.round((d.total / max) * 92)) : 2;
|
|
1177
|
-
var
|
|
1178
|
-
var
|
|
1524
|
+
var isPartialOnly = d.error === 0 && d.partial > 0;
|
|
1525
|
+
var color = d.total === 0 ? 'var(--border)' : (d.error > 0 ? 'var(--err)' : (isPartialOnly ? 'var(--run)' : 'var(--ok)'));
|
|
1526
|
+
var tip = d.date + ': всего ' + d.total + ', успех ' + d.success + ', ошибок ' + d.error + ', частично ' + d.partial + ', ' + money(d.costUsd);
|
|
1179
1527
|
bars += '<div class="an-bar" title="' + esc(tip) + '">' +
|
|
1180
1528
|
'<div class="an-bar-fill" style="height:' + h + '%' + ';background:' + esc(color) + '"></div>' +
|
|
1181
1529
|
'<div class="an-label">' + esc(String(d.date).slice(5)) + '</div>' +
|
|
1182
1530
|
'</div>';
|
|
1183
1531
|
}
|
|
1184
1532
|
chart.innerHTML = bars || '<div class="empty" style="padding:10px">Нет данных за период.</div>';
|
|
1533
|
+
// На узком экране график скроллится по горизонтали: показываем свежие дни,
|
|
1534
|
+
// а не пустую левую часть окна.
|
|
1535
|
+
chart.scrollLeft = chart.scrollWidth;
|
|
1185
1536
|
|
|
1186
1537
|
var topRows = an.topByCost || [];
|
|
1187
1538
|
if (topRows.length === 0) {
|
|
1188
1539
|
top.innerHTML = '<div class="empty" style="padding:10px">Нет запусков за период.</div>';
|
|
1189
1540
|
} else {
|
|
1190
|
-
var html = '<table class="an-table"><thead><tr><th>Задача</th><th>Запусков</th><th>Успех</th><th>Стоимость</th></tr></thead><tbody>';
|
|
1541
|
+
var html = '<table class="an-table"><thead><tr><th scope="col">Задача</th><th scope="col">Запусков</th><th scope="col">Успех</th><th scope="col">Стоимость</th></tr></thead><tbody>';
|
|
1191
1542
|
for (var k = 0; k < topRows.length; k++) {
|
|
1192
1543
|
var row = topRows[k];
|
|
1193
1544
|
html += '<tr>' +
|
|
@@ -1204,7 +1555,7 @@ function renderPage() {
|
|
|
1204
1555
|
if (matrixRows.length === 0) {
|
|
1205
1556
|
matrices.innerHTML = '<div class="empty" style="padding:10px">Матриц за период не запускалось.</div>';
|
|
1206
1557
|
} else {
|
|
1207
|
-
var mhtml = '<table class="an-table"><thead><tr><th>Матрица</th><th>Клонов</th><th>Запусков</th><th>Успех</th><th>Стоимость</th></tr></thead><tbody>';
|
|
1558
|
+
var mhtml = '<table class="an-table"><thead><tr><th scope="col">Матрица</th><th scope="col">Клонов</th><th scope="col">Запусков</th><th scope="col">Успех</th><th scope="col">Стоимость</th></tr></thead><tbody>';
|
|
1208
1559
|
for (var q = 0; q < matrixRows.length; q++) {
|
|
1209
1560
|
var m = matrixRows[q];
|
|
1210
1561
|
mhtml += '<tr>' +
|
|
@@ -1233,7 +1584,7 @@ function renderPage() {
|
|
|
1233
1584
|
}
|
|
1234
1585
|
|
|
1235
1586
|
var html = '<table class="wi-table"><thead><tr>' +
|
|
1236
|
-
'<th>Модель</th><th>Запусков</th><th>Токенов</th><th>Стоимость</th><th>Средняя длительность</th><th>Успешных</th>' +
|
|
1587
|
+
'<th scope="col">Модель</th><th scope="col">Запусков</th><th scope="col">Токенов</th><th scope="col">Стоимость</th><th scope="col">Средняя длительность</th><th scope="col">Успешных</th>' +
|
|
1237
1588
|
'</tr></thead><tbody>';
|
|
1238
1589
|
for (var i = 0; i < models.length; i++) {
|
|
1239
1590
|
var m = models[i];
|
|
@@ -1271,20 +1622,147 @@ function renderPage() {
|
|
|
1271
1622
|
var box = document.getElementById('graph-lines');
|
|
1272
1623
|
if (!graph || !box) return;
|
|
1273
1624
|
if (!tasks || tasks.length === 0) { graph.style.display = 'none'; return; }
|
|
1274
|
-
|
|
1625
|
+
|
|
1626
|
+
var known = {};
|
|
1275
1627
|
for (var i = 0; i < tasks.length; i++) {
|
|
1276
|
-
|
|
1277
|
-
|
|
1278
|
-
|
|
1279
|
-
|
|
1280
|
-
|
|
1281
|
-
|
|
1628
|
+
known[String(tasks[i].name).toLowerCase()] = tasks[i];
|
|
1629
|
+
}
|
|
1630
|
+
|
|
1631
|
+
// В граф включаем только задачи, связанные зависимостями, и все их
|
|
1632
|
+
// транзитивные предки. Одиночные задачи не превращают блок в свалку.
|
|
1633
|
+
var involved = {};
|
|
1634
|
+
function collect(name, depth) {
|
|
1635
|
+
var key = String(name).toLowerCase();
|
|
1636
|
+
if (depth > 40 || involved[key] || !known[key]) return;
|
|
1637
|
+
involved[key] = known[key];
|
|
1638
|
+
var deps = Array.isArray(known[key].dependsOn) ? known[key].dependsOn : [];
|
|
1639
|
+
for (var d = 0; d < deps.length; d++) collect(deps[d], depth + 1);
|
|
1640
|
+
}
|
|
1641
|
+
var hasEdges = false;
|
|
1642
|
+
for (var t = 0; t < tasks.length; t++) {
|
|
1643
|
+
var direct = Array.isArray(tasks[t].dependsOn) ? tasks[t].dependsOn : [];
|
|
1644
|
+
if (direct.length > 0) {
|
|
1645
|
+
hasEdges = true;
|
|
1646
|
+
collect(tasks[t].name, 0);
|
|
1282
1647
|
}
|
|
1283
|
-
html += '<div class="chain-line">' + parts.join(' <span class="arrow">+</span> ') +
|
|
1284
|
-
'<span class="arrow">➔</span><span class="target">[' + esc(t.name) + ']</span></div>';
|
|
1285
1648
|
}
|
|
1286
|
-
if (!
|
|
1287
|
-
|
|
1649
|
+
if (!hasEdges) { graph.style.display = 'none'; return; }
|
|
1650
|
+
|
|
1651
|
+
// Слои: уровень задачи = максимум по уровню зависимостей + 1.
|
|
1652
|
+
// visiting защищает от циклов в ошибочно настроенном DAG.
|
|
1653
|
+
var levels = {};
|
|
1654
|
+
var visiting = {};
|
|
1655
|
+
function levelOf(name) {
|
|
1656
|
+
var key = String(name).toLowerCase();
|
|
1657
|
+
if (levels[key] != null) return levels[key];
|
|
1658
|
+
if (visiting[key]) return 0;
|
|
1659
|
+
visiting[key] = true;
|
|
1660
|
+
var own = 0;
|
|
1661
|
+
var deps = Array.isArray(known[key] && known[key].dependsOn) ? known[key].dependsOn : [];
|
|
1662
|
+
for (var d = 0; d < deps.length; d++) {
|
|
1663
|
+
var depKey = String(deps[d]).toLowerCase();
|
|
1664
|
+
if (!known[depKey]) continue;
|
|
1665
|
+
own = Math.max(own, levelOf(depKey) + 1);
|
|
1666
|
+
}
|
|
1667
|
+
visiting[key] = false;
|
|
1668
|
+
levels[key] = own;
|
|
1669
|
+
return own;
|
|
1670
|
+
}
|
|
1671
|
+
|
|
1672
|
+
var byLevel = {};
|
|
1673
|
+
var maxLevel = 0;
|
|
1674
|
+
for (var key in involved) {
|
|
1675
|
+
if (!Object.prototype.hasOwnProperty.call(involved, key)) continue;
|
|
1676
|
+
var level = levelOf(key);
|
|
1677
|
+
maxLevel = Math.max(maxLevel, level);
|
|
1678
|
+
if (!byLevel[level]) byLevel[level] = [];
|
|
1679
|
+
byLevel[level].push(involved[key]);
|
|
1680
|
+
}
|
|
1681
|
+
for (var l = 0; l <= maxLevel; l++) {
|
|
1682
|
+
if (byLevel[l]) byLevel[l].sort(function (a, b) { return String(a.name).localeCompare(String(b.name)); });
|
|
1683
|
+
}
|
|
1684
|
+
|
|
1685
|
+
var NODE_W = 180;
|
|
1686
|
+
var NODE_H = 46;
|
|
1687
|
+
var GAP_X = 64;
|
|
1688
|
+
var GAP_Y = 18;
|
|
1689
|
+
var PAD = 10;
|
|
1690
|
+
var maxRows = 1;
|
|
1691
|
+
for (var rowLevel in byLevel) {
|
|
1692
|
+
if (byLevel[rowLevel].length > maxRows) maxRows = byLevel[rowLevel].length;
|
|
1693
|
+
}
|
|
1694
|
+
var width = PAD * 2 + (maxLevel + 1) * NODE_W + maxLevel * GAP_X;
|
|
1695
|
+
var height = PAD * 2 + maxRows * (NODE_H + GAP_Y) - GAP_Y;
|
|
1696
|
+
|
|
1697
|
+
var pos = {};
|
|
1698
|
+
for (var lv = 0; lv <= maxLevel; lv++) {
|
|
1699
|
+
var nodes = byLevel[lv] || [];
|
|
1700
|
+
for (var n = 0; n < nodes.length; n++) {
|
|
1701
|
+
pos[String(nodes[n].name).toLowerCase()] = {
|
|
1702
|
+
x: PAD + lv * (NODE_W + GAP_X),
|
|
1703
|
+
y: PAD + n * (NODE_H + GAP_Y),
|
|
1704
|
+
task: nodes[n]
|
|
1705
|
+
};
|
|
1706
|
+
}
|
|
1707
|
+
}
|
|
1708
|
+
|
|
1709
|
+
function shortLabel(value, max) {
|
|
1710
|
+
var text = String(value == null ? '' : value);
|
|
1711
|
+
return text.length > max ? text.slice(0, max - 1) + '…' : text;
|
|
1712
|
+
}
|
|
1713
|
+
function attr(value) {
|
|
1714
|
+
return esc(String(value == null ? '' : value)).replace(/"/g, '"');
|
|
1715
|
+
}
|
|
1716
|
+
function statusClass(status) {
|
|
1717
|
+
if (status === 'success') return ' okg';
|
|
1718
|
+
if (status === 'error' || status === 'timeout') return ' errg';
|
|
1719
|
+
if (status === 'partial') return ' partg';
|
|
1720
|
+
if (status === 'running') return ' rung';
|
|
1721
|
+
return '';
|
|
1722
|
+
}
|
|
1723
|
+
|
|
1724
|
+
var svg = '<svg width="' + width + '" height="' + height + '" style="position:absolute;left:0;top:0;pointer-events:none" aria-hidden="true">' +
|
|
1725
|
+
'<defs><marker id="dag-arrow" markerWidth="8" markerHeight="8" refX="7" refY="4" orient="auto">' +
|
|
1726
|
+
'<path d="M0,0 L8,4 L0,8 z" fill="#8b949e"></path></marker></defs>';
|
|
1727
|
+
for (var targetKey in pos) {
|
|
1728
|
+
if (!Object.prototype.hasOwnProperty.call(pos, targetKey)) continue;
|
|
1729
|
+
var target = pos[targetKey];
|
|
1730
|
+
var deps = Array.isArray(target.task.dependsOn) ? target.task.dependsOn : [];
|
|
1731
|
+
for (var di = 0; di < deps.length; di++) {
|
|
1732
|
+
var from = pos[String(deps[di]).toLowerCase()];
|
|
1733
|
+
if (!from || from.x >= target.x) continue;
|
|
1734
|
+
var x1 = from.x + NODE_W;
|
|
1735
|
+
var y1 = from.y + NODE_H / 2;
|
|
1736
|
+
var x2 = target.x;
|
|
1737
|
+
var y2 = target.y + NODE_H / 2;
|
|
1738
|
+
var bend = Math.max(24, (x2 - x1) / 2);
|
|
1739
|
+
svg += '<path class="graph-edge" d="M' + x1 + ',' + y1 +
|
|
1740
|
+
' C' + (x1 + bend) + ',' + y1 + ' ' + (x2 - bend) + ',' + y2 + ' ' + x2 + ',' + y2 +
|
|
1741
|
+
'" marker-end="url(#dag-arrow)"></path>';
|
|
1742
|
+
}
|
|
1743
|
+
}
|
|
1744
|
+
svg += '</svg>';
|
|
1745
|
+
|
|
1746
|
+
var nodesHtml = '';
|
|
1747
|
+
for (var pKey in pos) {
|
|
1748
|
+
if (!Object.prototype.hasOwnProperty.call(pos, pKey)) continue;
|
|
1749
|
+
var node = pos[pKey];
|
|
1750
|
+
var nodeDeps = Array.isArray(node.task.dependsOn) ? node.task.dependsOn : [];
|
|
1751
|
+
var meta = nodeDeps.length > 0
|
|
1752
|
+
? '← ' + shortLabel(nodeDeps.join(', '), 30)
|
|
1753
|
+
: 'начальная задача';
|
|
1754
|
+
nodesHtml += '<div class="graph-node' + statusClass(node.task.status) + '" style="left:' + node.x +
|
|
1755
|
+
'px;top:' + node.y + 'px;width:' + NODE_W + 'px;height:' + NODE_H + 'px" title="' +
|
|
1756
|
+
attr(node.task.name + (nodeDeps.length ? ' · зависит от: ' + nodeDeps.join(', ') : '')) + '">' +
|
|
1757
|
+
'<span class="g-name">' + esc(shortLabel(node.task.name, 26)) + '</span>' +
|
|
1758
|
+
'<span class="g-meta">' + esc(meta) + '</span></div>';
|
|
1759
|
+
}
|
|
1760
|
+
|
|
1761
|
+
var scroll = document.getElementById('graph-scroll');
|
|
1762
|
+
var scrollLeft = scroll ? scroll.scrollLeft : 0;
|
|
1763
|
+
box.innerHTML = '<div class="graph-canvas" style="width:' + width + 'px;height:' + height + 'px">' +
|
|
1764
|
+
svg + nodesHtml + '</div>';
|
|
1765
|
+
if (scroll) scroll.scrollLeft = scrollLeft;
|
|
1288
1766
|
graph.style.display = 'block';
|
|
1289
1767
|
}
|
|
1290
1768
|
|
|
@@ -1320,14 +1798,14 @@ function renderPage() {
|
|
|
1320
1798
|
(matrixCount ? ' · 📦 матриц: ' + matrixCount : '');
|
|
1321
1799
|
}
|
|
1322
1800
|
if (!box) return;
|
|
1323
|
-
var html = '<button class="ws-tab' + (activeWorkspace === 'all' ? ' active' : '') + '" data-ws="all">Все</button>';
|
|
1801
|
+
var html = '<button class="ws-tab' + (activeWorkspace === 'all' ? ' active' : '') + '" data-ws="all" aria-pressed="' + (activeWorkspace === 'all') + '">Все</button>';
|
|
1324
1802
|
for (var i = 0; i < workspaces.length; i++) {
|
|
1325
1803
|
var w = workspaces[i];
|
|
1326
1804
|
var color = w.color || '#8b949e';
|
|
1327
|
-
html += '<button class="ws-tab' + (activeWorkspace === w.id ? ' active' : '') + '" data-ws="' + esc(w.id) + '" style="color:' + esc(color) + '">📦 ' + esc(w.name) + '</button>';
|
|
1805
|
+
html += '<button class="ws-tab' + (activeWorkspace === w.id ? ' active' : '') + '" data-ws="' + esc(w.id) + '" aria-pressed="' + (activeWorkspace === w.id) + '" style="color:' + esc(color) + '">📦 ' + esc(w.name) + '</button>';
|
|
1328
1806
|
}
|
|
1329
|
-
html += '<button class="ws-tab' + (activeWorkspace === 'matrix' ? ' active' : '') + '" data-ws="matrix" title="Только родители матриц и их клоны">📦 Матрицы</button>';
|
|
1330
|
-
html += '<button class="ws-tab' + (activeWorkspace === 'none' ? ' active' : '') + '" data-ws="none">Без workspace</button>';
|
|
1807
|
+
html += '<button class="ws-tab' + (activeWorkspace === 'matrix' ? ' active' : '') + '" data-ws="matrix" aria-pressed="' + (activeWorkspace === 'matrix') + '" title="Только родители матриц и их клоны">📦 Матрицы</button>';
|
|
1808
|
+
html += '<button class="ws-tab' + (activeWorkspace === 'none' ? ' active' : '') + '" data-ws="none" aria-pressed="' + (activeWorkspace === 'none') + '">Без workspace</button>';
|
|
1331
1809
|
box.innerHTML = html;
|
|
1332
1810
|
}
|
|
1333
1811
|
|
|
@@ -1389,10 +1867,23 @@ function renderPage() {
|
|
|
1389
1867
|
|
|
1390
1868
|
/** Строка таблицы задач; клоны матрицы помечаются ↳ matrix <parent>. */
|
|
1391
1869
|
function taskRow(t, isClone, cloneCount, expanded) {
|
|
1870
|
+
var sessionBadge = t.session === 'reuse' || t.session === 'last'
|
|
1871
|
+
? '<span title="' + (t.session === 'reuse'
|
|
1872
|
+
? 'Переиспользуемая сессия OpenCode' + (t.sessionId ? ': ' + t.sessionId : '')
|
|
1873
|
+
: 'Продолжение последней сессии OpenCode (--continue)') +
|
|
1874
|
+
'" style="margin-left:6px;padding:1px 6px;border-radius:999px;border:1px solid #30d158;color:#30d158;font-size:11px">' +
|
|
1875
|
+
(t.session === 'reuse' ? '⟳ сессия' : '↪ продолжение') + '</span>'
|
|
1876
|
+
: '';
|
|
1392
1877
|
var cron = t.triggerType === 'file'
|
|
1393
1878
|
? '👁️ файл: ' + (t.watchPath || '')
|
|
1394
1879
|
: t.triggerType === 'mcp-event'
|
|
1395
1880
|
? '📡 ' + ((t.mcpEvent && t.mcpEvent.event) || 'MCP Event')
|
|
1881
|
+
: t.triggerType === 'once'
|
|
1882
|
+
? '⏱ ' + (function () {
|
|
1883
|
+
if (!t.runAt) return '—';
|
|
1884
|
+
var d = new Date(t.runAt);
|
|
1885
|
+
return isNaN(d.getTime()) ? t.runAt : d.toLocaleString('ru-RU');
|
|
1886
|
+
})()
|
|
1396
1887
|
: (t.schedule || '—');
|
|
1397
1888
|
var nameHtml = esc(t.name);
|
|
1398
1889
|
var matrixLimit = t.matrix && t.matrix.concurrency
|
|
@@ -1410,14 +1901,14 @@ function renderPage() {
|
|
|
1410
1901
|
if (isClone) {
|
|
1411
1902
|
nameHtml = '<span class="clone-badge">↳ matrix ' + esc(t.matrixParentId || '') + '</span><br>' + esc(t.name);
|
|
1412
1903
|
} else if (cloneCount > 0) {
|
|
1413
|
-
nameHtml = '<button class="matrix-toggle" data-matrix="' + esc(t.name) + '" title="Показать/скрыть клоны">' +
|
|
1904
|
+
nameHtml = '<button class="matrix-toggle" data-matrix="' + esc(t.name) + '" title="Показать/скрыть клоны" aria-label="Показать/скрыть клоны матрицы ' + esc(t.name) + '" aria-expanded="' + (!!expanded) + '">' +
|
|
1414
1905
|
(expanded ? '▾' : '▸') + '</button> ' + esc(t.name) +
|
|
1415
1906
|
'<div class="matrix-badge" title="' + esc(matrixTitle) + '">📦 Matrix (' + cloneCount + ')' + matrixLimit + '</div>';
|
|
1416
1907
|
}
|
|
1417
1908
|
return '<tr' + (isClone ? ' class="clone-row"' : '') + '>' +
|
|
1418
1909
|
'<td class="name" title="' + esc(t.name) + '">' + nameHtml + '</td>' +
|
|
1419
|
-
'<td>' + badge(t.status) + matrixSummaryHtml(t) + '</td>' +
|
|
1420
|
-
'<td class="cron">' + esc(cron) + '</td>' +
|
|
1910
|
+
'<td>' + badge(t.status, t) + matrixSummaryHtml(t) + '</td>' +
|
|
1911
|
+
'<td class="cron">' + esc(cron) + sessionBadge + '</td>' +
|
|
1421
1912
|
'<td>' + workspaceHtml(t) + '</td>' +
|
|
1422
1913
|
'<td>' + modelHtml(t) + '</td>' +
|
|
1423
1914
|
'<td>' + priorityHtml(t) + '</td>' +
|
|
@@ -1442,13 +1933,26 @@ function renderPage() {
|
|
|
1442
1933
|
// /api/metrics может быть перехвачен антивирусом; /api/summary — тот же
|
|
1443
1934
|
// обработчик на случай, если блокировка привязана к имени URL.
|
|
1444
1935
|
function loadMetricsJson() {
|
|
1445
|
-
|
|
1936
|
+
var primary = preferSummaryMetrics ? '/api/summary' : '/api/metrics';
|
|
1937
|
+
var fallback = preferSummaryMetrics ? '/api/metrics' : '/api/summary';
|
|
1938
|
+
return fetch(primary, { cache: 'no-store' })
|
|
1446
1939
|
.then(readJson)
|
|
1447
1940
|
.catch(function () {
|
|
1448
|
-
|
|
1941
|
+
// Переключаемся на второй URL того же обработчика и запоминаем выбор,
|
|
1942
|
+
// чтобы следующие обновления не повторяли заблокированный запрос.
|
|
1943
|
+
preferSummaryMetrics = !preferSummaryMetrics;
|
|
1944
|
+
if (!metricsFallbackLogged) {
|
|
1945
|
+
metricsFallbackLogged = true;
|
|
1946
|
+
console.info('Дашборд: ' + primary + ' недоступен, использую ' + fallback);
|
|
1947
|
+
}
|
|
1948
|
+
return fetch(fallback, { cache: 'no-store' })
|
|
1449
1949
|
.then(readJson)
|
|
1450
1950
|
.catch(function (err) {
|
|
1451
|
-
|
|
1951
|
+
// Логируем только первый сбой, чтобы не засорять консоль каждые 5 секунд.
|
|
1952
|
+
if (!metricsFallbackLogged) {
|
|
1953
|
+
metricsFallbackLogged = true;
|
|
1954
|
+
console.error('Дашборд: метрики недоступны', err);
|
|
1955
|
+
}
|
|
1452
1956
|
return {};
|
|
1453
1957
|
});
|
|
1454
1958
|
});
|
|
@@ -1474,6 +1978,7 @@ function renderPage() {
|
|
|
1474
1978
|
document.getElementById('m-total').textContent = m.total != null ? m.total : '—';
|
|
1475
1979
|
document.getElementById('m-success').textContent = m.success != null ? m.success : '—';
|
|
1476
1980
|
document.getElementById('m-error').textContent = m.error != null ? m.error : '—';
|
|
1981
|
+
document.getElementById('m-partial').textContent = m.partial != null ? m.partial : '—';
|
|
1477
1982
|
document.getElementById('m-tasks').textContent = String(tasks.length);
|
|
1478
1983
|
document.getElementById('m-tokens').textContent = m.tokens != null ? Number(m.tokens).toLocaleString('ru-RU') : '—';
|
|
1479
1984
|
document.getElementById('m-cost').textContent = m.costUsd != null ? '$' + Number(m.costUsd).toFixed(2) : '—';
|
|
@@ -1530,6 +2035,13 @@ function renderPage() {
|
|
|
1530
2035
|
return;
|
|
1531
2036
|
}
|
|
1532
2037
|
|
|
2038
|
+
// История: развернуть/свернуть список (по умолчанию показываем последние 10).
|
|
2039
|
+
if (act === 'history-toggle') {
|
|
2040
|
+
historyExpanded = !historyExpanded;
|
|
2041
|
+
renderHistory(lastHistory);
|
|
2042
|
+
return;
|
|
2043
|
+
}
|
|
2044
|
+
|
|
1533
2045
|
if (!name) return;
|
|
1534
2046
|
if (act === 'simulate') {
|
|
1535
2047
|
await showDryRun(name);
|
|
@@ -1609,7 +2121,7 @@ function renderPage() {
|
|
|
1609
2121
|
if (report.warnings && report.warnings.length) {
|
|
1610
2122
|
html += '<div class="warn" style="margin-bottom:8px">⚠ Предупреждения:<br>' + report.warnings.map(function (w) { return '· ' + esc(w); }).join('<br>') + '</div>';
|
|
1611
2123
|
}
|
|
1612
|
-
html += '<table class="wi-table"><thead><tr><th>#</th><th>Задача</th><th>Триггер</th><th>Workspace</th><th>cwd</th><th>Команда</th><th>Оценка</th></tr></thead><tbody>';
|
|
2124
|
+
html += '<table class="wi-table"><thead><tr><th scope="col">#</th><th scope="col">Задача</th><th scope="col">Триггер</th><th scope="col">Workspace</th><th scope="col">cwd</th><th scope="col">Команда</th><th scope="col">Оценка</th></tr></thead><tbody>';
|
|
1613
2125
|
for (var i = 0; i < report.tasks.length; i++) {
|
|
1614
2126
|
var t = report.tasks[i];
|
|
1615
2127
|
var est = '—';
|