opencode-windows-scheduler 1.1.0 → 1.2.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +60 -1
- package/README.md +18 -8
- package/README.ru.md +13 -3
- package/ROADMAP-STRATEGY.md +2 -2
- package/ROADMAP.md +51 -18
- package/dist/core/analytics.d.ts +10 -0
- package/dist/core/analytics.d.ts.map +1 -1
- package/dist/core/analytics.js +21 -0
- package/dist/core/dry-run.d.ts +18 -1
- package/dist/core/dry-run.d.ts.map +1 -1
- package/dist/core/dry-run.js +49 -3
- package/dist/core/matrix.d.ts.map +1 -1
- package/dist/core/matrix.js +10 -0
- 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 +36 -2
- package/dist/core/ps-wrapper.d.ts.map +1 -1
- package/dist/core/ps-wrapper.js +124 -4
- package/dist/core/record-history.d.ts.map +1 -1
- package/dist/core/record-history.js +9 -0
- package/dist/core/schedule-gate.d.ts +2 -0
- package/dist/core/schedule-gate.d.ts.map +1 -0
- package/dist/core/schedule-gate.js +182 -0
- package/dist/core/schedule-v2.d.ts +88 -0
- package/dist/core/schedule-v2.d.ts.map +1 -0
- package/dist/core/schedule-v2.js +496 -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 +20 -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 +23 -2
- 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 +24 -0
- package/dist/core/wrappers/bash.d.ts.map +1 -1
- package/dist/core/wrappers/bash.js +70 -3
- 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 +76 -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 +19 -0
- package/dist/gui-experimental.cjs +1 -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 +137 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +1323 -78
- package/dist/integrations.d.ts +64 -0
- package/dist/integrations.d.ts.map +1 -0
- package/dist/integrations.js +205 -0
- package/dist/notifications.d.ts +112 -6
- package/dist/notifications.d.ts.map +1 -1
- package/dist/notifications.js +396 -34
- package/dist/profiles.d.ts +60 -0
- package/dist/profiles.d.ts.map +1 -0
- package/dist/profiles.js +209 -0
- package/dist/rpc.d.ts +592 -4
- package/dist/rpc.d.ts.map +1 -1
- package/dist/rpc.js +233 -6
- package/dist/server.d.ts +2 -0
- package/dist/server.d.ts.map +1 -1
- package/dist/server.js +473 -58
- package/dist/settings.d.ts +95 -0
- package/dist/settings.d.ts.map +1 -1
- package/dist/settings.js +186 -8
- 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 +32 -3
- package/dist/task-transfer.d.ts.map +1 -1
- package/dist/task-transfer.js +101 -3
- package/dist/types.d.ts.map +1 -1
- package/dist/types.js +3 -11
- package/dist/workspaces.d.ts +43 -0
- package/dist/workspaces.d.ts.map +1 -1
- package/dist/workspaces.js +174 -8
- package/docs/ARCHITECTURE.md +32 -12
- package/docs/FEATURES.md +186 -10
- package/gui-experimental.cjs +4 -2
- package/package.json +15 -2
- package/scripts/demo-dashboard.mjs +12 -2
- package/src/core/analytics.ts +36 -0
- package/src/core/dry-run.ts +65 -4
- package/src/core/matrix.ts +10 -0
- 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 +144 -4
- package/src/core/record-history.ts +13 -0
- package/src/core/schedule-gate.ts +213 -0
- package/src/core/schedule-v2.ts +533 -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 +20 -3
- package/src/core/scheduler/windows.ts +24 -2
- package/src/core/session.ts +115 -0
- package/src/core/structured-log.ts +205 -0
- package/src/core/wrappers/bash.ts +98 -2
- package/src/db/history-repo.ts +90 -7
- package/src/db/metrics-repo.ts +19 -7
- package/src/db/migrate.ts +7 -1
- package/src/db/schema.ts +25 -0
- package/src/gui.tsx +3832 -2868
- package/src/history.ts +17 -0
- package/src/index.ts +1670 -117
- package/src/integrations.ts +253 -0
- package/src/notifications.ts +516 -40
- package/src/profiles.ts +236 -0
- package/src/rpc.ts +244 -6
- package/src/server.ts +506 -58
- package/src/settings.ts +336 -9
- package/src/shared/jobs-view.ts +158 -8
- package/src/task-transfer.ts +151 -5
- package/src/tui.tsx +290 -14
- package/src/types.ts +3 -13
- package/src/workspaces.ts +214 -8
package/dist/server.js
CHANGED
|
@@ -9,7 +9,13 @@ import { getSchedulerTitle } from "./core/scheduler/index.js";
|
|
|
9
9
|
import { getPluginVersion } from "./version.js";
|
|
10
10
|
import { checkpointDb, getDbFile, getDbStatus } from "./db/index.js";
|
|
11
11
|
import { listWorkspaces } from "./workspaces.js";
|
|
12
|
+
import { getProfileName, getProfilePort } from "./profiles.js";
|
|
12
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";
|
|
13
19
|
/**
|
|
14
20
|
* Локальный веб-дашборд (Спринт 5).
|
|
15
21
|
* Встроенный модуль http из Node.js — без внешних зависимостей.
|
|
@@ -125,7 +131,8 @@ export async function startDashboardServer(deps, ports) {
|
|
|
125
131
|
return { port: running.port };
|
|
126
132
|
if (starting)
|
|
127
133
|
return starting;
|
|
128
|
-
|
|
134
|
+
// Спринт 21: у профиля может быть свой порт (profile.json / OPENCODE_SCHEDULER_PORT).
|
|
135
|
+
const preferred = ports?.preferred ?? getProfilePort(getProfileName()) ?? PREFERRED_PORT;
|
|
129
136
|
const fallback = ports?.fallback ?? FALLBACK_PORT;
|
|
130
137
|
// Последний кандидат — порт 0: ОС сама выдаст гарантированно свободный порт.
|
|
131
138
|
const candidates = ports
|
|
@@ -333,23 +340,33 @@ async function handleRequest(req, res, deps) {
|
|
|
333
340
|
const knownGet = pathname === "/api/tasks" ||
|
|
334
341
|
pathname === "/api/history" ||
|
|
335
342
|
pathname === "/api/metrics" ||
|
|
343
|
+
pathname === "/api/summary" ||
|
|
336
344
|
pathname === "/api/models-analysis" ||
|
|
337
345
|
pathname === "/api/analytics" ||
|
|
338
346
|
pathname === "/api/history/export" ||
|
|
339
347
|
pathname === "/api/export-db" ||
|
|
340
348
|
pathname === "/api/workspaces" ||
|
|
341
349
|
pathname === "/api/health" ||
|
|
350
|
+
pathname === "/api/logs" ||
|
|
351
|
+
pathname === "/metrics" ||
|
|
342
352
|
/^\/api\/dry-run\//.test(pathname) ||
|
|
343
353
|
/^\/api\/matrix\//.test(pathname);
|
|
344
354
|
if (knownGet && req.method !== "GET") {
|
|
345
355
|
sendJson(res, 405, { error: "Method not allowed" });
|
|
346
356
|
return;
|
|
347
357
|
}
|
|
348
|
-
const knownPost = /^\/api\/(run|delete)\//.test(pathname)
|
|
358
|
+
const knownPost = /^\/api\/(run|delete|hooks|cancel-matrix)\//.test(pathname) ||
|
|
359
|
+
pathname === "/api/matrix-cleanup";
|
|
349
360
|
if (knownPost && req.method !== "POST") {
|
|
350
361
|
sendJson(res, 405, { error: "Method not allowed" });
|
|
351
362
|
return;
|
|
352
363
|
}
|
|
364
|
+
// Браузер всегда просит иконку. Отвечаем 204, чтобы не засорять консоль 404.
|
|
365
|
+
if (req.method === "GET" && pathname === "/favicon.ico") {
|
|
366
|
+
res.writeHead(204);
|
|
367
|
+
res.end();
|
|
368
|
+
return;
|
|
369
|
+
}
|
|
353
370
|
// Статический HTML-файл — страница дашборда.
|
|
354
371
|
if (req.method === "GET" && (pathname === "/" || pathname === "/index.html")) {
|
|
355
372
|
send(res, 200, "text/html; charset=utf-8", renderPage());
|
|
@@ -363,11 +380,51 @@ async function handleRequest(req, res, deps) {
|
|
|
363
380
|
port: getDashboardPort(),
|
|
364
381
|
version: getPluginVersion(),
|
|
365
382
|
scheduler: getSchedulerTitle(),
|
|
383
|
+
profile: getProfileName(),
|
|
366
384
|
queueDepth: countRunningRecords(),
|
|
367
385
|
db: getDbStatus(),
|
|
368
386
|
});
|
|
369
387
|
return;
|
|
370
388
|
}
|
|
389
|
+
if (req.method === "GET" && pathname === "/metrics") {
|
|
390
|
+
send(res, 200, PROMETHEUS_CONTENT_TYPE, renderPrometheusMetrics());
|
|
391
|
+
return;
|
|
392
|
+
}
|
|
393
|
+
// Машиночитаемые логи запусков (Спринт 22): JSONL + фильтры.
|
|
394
|
+
if (req.method === "GET" && pathname === "/api/logs") {
|
|
395
|
+
const task = url.searchParams.get("task") ?? undefined;
|
|
396
|
+
const status = url.searchParams.get("status") ?? undefined;
|
|
397
|
+
const event = url.searchParams.get("event") ?? undefined;
|
|
398
|
+
const since = url.searchParams.get("since") ?? undefined;
|
|
399
|
+
const until = url.searchParams.get("until") ?? undefined;
|
|
400
|
+
const limitRaw = Number(url.searchParams.get("limit") ?? 200);
|
|
401
|
+
if (since && Number.isNaN(Date.parse(since))) {
|
|
402
|
+
sendJson(res, 400, { error: "Некорректный параметр since: ожидается ISO-дата." });
|
|
403
|
+
return;
|
|
404
|
+
}
|
|
405
|
+
if (until && Number.isNaN(Date.parse(until))) {
|
|
406
|
+
sendJson(res, 400, { error: "Некорректный параметр until: ожидается ISO-дата." });
|
|
407
|
+
return;
|
|
408
|
+
}
|
|
409
|
+
const limit = Number.isFinite(limitRaw)
|
|
410
|
+
? Math.max(1, Math.min(5000, Math.floor(limitRaw)))
|
|
411
|
+
: 200;
|
|
412
|
+
const result = readStructuredLogs({ task, status, event, since, until, limit });
|
|
413
|
+
if ((url.searchParams.get("format") || "").toLowerCase() === "jsonl") {
|
|
414
|
+
const body = result.records.map((record) => JSON.stringify(record)).join("\n");
|
|
415
|
+
const stamp = new Date().toISOString().replace(/[:.]/g, "-");
|
|
416
|
+
sendAttachment(res, 200, "application/x-ndjson; charset=utf-8", body ? `${body}\n` : "", `logs-${stamp}.jsonl`);
|
|
417
|
+
return;
|
|
418
|
+
}
|
|
419
|
+
sendJson(res, 200, {
|
|
420
|
+
records: result.records,
|
|
421
|
+
total: result.total,
|
|
422
|
+
malformed: result.malformed,
|
|
423
|
+
limit,
|
|
424
|
+
filters: { task: task ?? null, status: status ?? null, event: event ?? null, since: since ?? null, until: until ?? null },
|
|
425
|
+
});
|
|
426
|
+
return;
|
|
427
|
+
}
|
|
371
428
|
if (req.method === "GET" && pathname === "/api/tasks") {
|
|
372
429
|
const tasks = await collectTasksWithMetrics(deps);
|
|
373
430
|
sendJson(res, 200, { tasks });
|
|
@@ -453,8 +510,24 @@ async function handleRequest(req, res, deps) {
|
|
|
453
510
|
return;
|
|
454
511
|
}
|
|
455
512
|
if (req.method === "GET" && pathname === "/api/history") {
|
|
456
|
-
|
|
457
|
-
|
|
513
|
+
// Фильтры как у RPC get_history: имя задачи и статус. limit — необязательный.
|
|
514
|
+
const taskFilter = (url.searchParams.get("taskName") ?? url.searchParams.get("task") ?? "")
|
|
515
|
+
.trim()
|
|
516
|
+
.toLowerCase();
|
|
517
|
+
const statusFilter = (url.searchParams.get("status") ?? "").trim().toLowerCase();
|
|
518
|
+
const limitRaw = Number(url.searchParams.get("limit") ?? 200);
|
|
519
|
+
const limit = Number.isFinite(limitRaw)
|
|
520
|
+
? Math.max(1, Math.min(10000, Math.floor(limitRaw)))
|
|
521
|
+
: 200;
|
|
522
|
+
let records = await loadHistory();
|
|
523
|
+
if (taskFilter) {
|
|
524
|
+
records = records.filter((record) => record.taskName.toLowerCase() === taskFilter);
|
|
525
|
+
}
|
|
526
|
+
if (statusFilter) {
|
|
527
|
+
records = records.filter((record) => String(record.status).toLowerCase() === statusFilter);
|
|
528
|
+
}
|
|
529
|
+
const total = records.length;
|
|
530
|
+
sendJson(res, 200, { records: records.slice(0, limit), total, limit });
|
|
458
531
|
return;
|
|
459
532
|
}
|
|
460
533
|
if (req.method === "GET" && pathname === "/api/models-analysis") {
|
|
@@ -479,16 +552,21 @@ async function handleRequest(req, res, deps) {
|
|
|
479
552
|
sendJson(res, 200, report);
|
|
480
553
|
return;
|
|
481
554
|
}
|
|
482
|
-
// Экспорт истории: CSV (для Excel)
|
|
555
|
+
// Экспорт истории: CSV (для Excel), JSON (для скриптов) или OTLP/JSON.
|
|
483
556
|
if (req.method === "GET" && pathname === "/api/history/export") {
|
|
484
557
|
const format = (url.searchParams.get("format") || "csv").toLowerCase();
|
|
485
|
-
if (format !== "csv" && format !== "json") {
|
|
486
|
-
sendJson(res, 400, {
|
|
558
|
+
if (format !== "csv" && format !== "json" && format !== "otlp") {
|
|
559
|
+
sendJson(res, 400, {
|
|
560
|
+
error: "Неподдерживаемый формат экспорта. Допустимые: csv, json, otlp.",
|
|
561
|
+
});
|
|
487
562
|
return;
|
|
488
563
|
}
|
|
489
564
|
const records = getHistory(null, 100000);
|
|
490
565
|
const stamp = new Date().toISOString().replace(/[:.]/g, "-");
|
|
491
|
-
if (format === "
|
|
566
|
+
if (format === "otlp") {
|
|
567
|
+
sendAttachment(res, 200, "application/json; charset=utf-8", JSON.stringify(buildOtlpExport(records), null, 2), `history-${stamp}.otlp.json`);
|
|
568
|
+
}
|
|
569
|
+
else if (format === "json") {
|
|
492
570
|
sendAttachment(res, 200, "application/json; charset=utf-8", JSON.stringify({ exportedAt: new Date().toISOString(), records }, null, 2), `history-${stamp}.json`);
|
|
493
571
|
}
|
|
494
572
|
else {
|
|
@@ -533,6 +611,97 @@ async function handleRequest(req, res, deps) {
|
|
|
533
611
|
}
|
|
534
612
|
return;
|
|
535
613
|
}
|
|
614
|
+
// Входящий webhook-триггер (Спринт 22): POST /api/hooks/:task?token=…
|
|
615
|
+
const hookMatch = req.method === "POST" && pathname.match(/^\/api\/hooks\/(.+)$/);
|
|
616
|
+
if (hookMatch) {
|
|
617
|
+
const taskName = hookMatch[1].replace(/\/+$/, "").trim();
|
|
618
|
+
const remote = req.socket.remoteAddress ?? null;
|
|
619
|
+
const declaredBytes = Number(req.headers["content-length"]) || 0;
|
|
620
|
+
const timestampHeader = req.headers["x-scheduler-timestamp"];
|
|
621
|
+
const timestamp = Array.isArray(timestampHeader)
|
|
622
|
+
? timestampHeader[0] ?? null
|
|
623
|
+
: timestampHeader ?? null;
|
|
624
|
+
const logHook = (httpStatus, status, reason, payloadBytes = declaredBytes) => {
|
|
625
|
+
appendStructuredLog({
|
|
626
|
+
event: "hook.received",
|
|
627
|
+
task: taskName || undefined,
|
|
628
|
+
status,
|
|
629
|
+
source: "hook",
|
|
630
|
+
httpStatus,
|
|
631
|
+
remote,
|
|
632
|
+
payloadBytes,
|
|
633
|
+
reason,
|
|
634
|
+
});
|
|
635
|
+
};
|
|
636
|
+
if (!taskName) {
|
|
637
|
+
logHook(400, "rejected", "Не передано имя задачи.");
|
|
638
|
+
sendJson(res, 400, { success: false, error: "Не передано имя задачи." });
|
|
639
|
+
return;
|
|
640
|
+
}
|
|
641
|
+
const settings = await loadSettings();
|
|
642
|
+
const hooks = settings.integrations.hooks;
|
|
643
|
+
if (!hooks.enabled) {
|
|
644
|
+
logHook(403, "rejected", "Входящие webhook-триггеры отключены.");
|
|
645
|
+
sendJson(res, 403, { success: false, error: "Входящие webhook-триггеры отключены." });
|
|
646
|
+
return;
|
|
647
|
+
}
|
|
648
|
+
const bodyResult = await readRequestBody(req, hooks.maxBodyBytes);
|
|
649
|
+
if (!bodyResult.ok) {
|
|
650
|
+
logHook(bodyResult.status, "rejected", bodyResult.error, declaredBytes);
|
|
651
|
+
sendJson(res, bodyResult.status, { success: false, error: bodyResult.error });
|
|
652
|
+
return;
|
|
653
|
+
}
|
|
654
|
+
const token = url.searchParams.get("token") ?? extractHookToken(req.headers);
|
|
655
|
+
const signature = extractHookSignature(req.headers);
|
|
656
|
+
const auth = authenticateHookRequest({
|
|
657
|
+
settings: hooks,
|
|
658
|
+
token,
|
|
659
|
+
signature,
|
|
660
|
+
timestamp,
|
|
661
|
+
body: bodyResult.body,
|
|
662
|
+
});
|
|
663
|
+
if (!auth.ok) {
|
|
664
|
+
logHook(auth.status, "rejected", auth.error, bodyResult.body.length);
|
|
665
|
+
sendJson(res, auth.status, { success: false, error: auth.error });
|
|
666
|
+
return;
|
|
667
|
+
}
|
|
668
|
+
let tasks;
|
|
669
|
+
try {
|
|
670
|
+
tasks = await deps.getTasks();
|
|
671
|
+
}
|
|
672
|
+
catch (err) {
|
|
673
|
+
const message = err instanceof Error ? err.message : String(err);
|
|
674
|
+
logHook(500, "rejected", `Не удалось получить список задач: ${message}`, bodyResult.body.length);
|
|
675
|
+
sendJson(res, 500, { success: false, error: message });
|
|
676
|
+
return;
|
|
677
|
+
}
|
|
678
|
+
const key = taskName.toLowerCase();
|
|
679
|
+
const task = tasks.find((item) => String(item.name).toLowerCase() === key);
|
|
680
|
+
if (!task) {
|
|
681
|
+
logHook(404, "rejected", `Задача "${taskName}" не найдена.`, bodyResult.body.length);
|
|
682
|
+
sendJson(res, 404, { success: false, error: `Задача "${taskName}" не найдена.` });
|
|
683
|
+
return;
|
|
684
|
+
}
|
|
685
|
+
try {
|
|
686
|
+
const result = await deps.runTask(task.name);
|
|
687
|
+
const message = result?.alreadyRunning
|
|
688
|
+
? `Задача "${task.name}" уже выполняется.`
|
|
689
|
+
: `Задача "${task.name}" запущена по webhook.`;
|
|
690
|
+
logHook(202, "accepted", undefined, bodyResult.body.length);
|
|
691
|
+
sendJson(res, 202, {
|
|
692
|
+
success: true,
|
|
693
|
+
task: task.name,
|
|
694
|
+
alreadyRunning: Boolean(result?.alreadyRunning),
|
|
695
|
+
message,
|
|
696
|
+
});
|
|
697
|
+
}
|
|
698
|
+
catch (err) {
|
|
699
|
+
const message = err instanceof Error ? err.message : String(err);
|
|
700
|
+
logHook(500, "rejected", message, bodyResult.body.length);
|
|
701
|
+
sendJson(res, 500, { success: false, error: message });
|
|
702
|
+
}
|
|
703
|
+
return;
|
|
704
|
+
}
|
|
536
705
|
// Запуск задачи: POST /api/run/:name (имя URL-кодируется на клиенте).
|
|
537
706
|
const runMatch = req.method === "POST" && pathname.match(/^\/api\/run\/(.+)$/);
|
|
538
707
|
if (runMatch) {
|
|
@@ -706,17 +875,24 @@ async function collectTasksWithMetrics(deps) {
|
|
|
706
875
|
const key = String(r.taskName || "").toLowerCase();
|
|
707
876
|
if (!key)
|
|
708
877
|
continue;
|
|
709
|
-
const m = byTask.get(key) ?? { total: 0, success: 0, error: 0 };
|
|
878
|
+
const m = byTask.get(key) ?? { total: 0, success: 0, error: 0, partial: 0 };
|
|
710
879
|
m.total += 1;
|
|
711
880
|
if (r.status === "success")
|
|
712
881
|
m.success += 1;
|
|
882
|
+
else if (r.status === "partial")
|
|
883
|
+
m.partial += 1;
|
|
713
884
|
else
|
|
714
885
|
m.error += 1;
|
|
715
886
|
byTask.set(key, m);
|
|
716
887
|
}
|
|
717
888
|
return tasks.map((t) => ({
|
|
718
889
|
...t,
|
|
719
|
-
metrics: byTask.get(String(t.name).toLowerCase()) ?? {
|
|
890
|
+
metrics: byTask.get(String(t.name).toLowerCase()) ?? {
|
|
891
|
+
total: 0,
|
|
892
|
+
success: 0,
|
|
893
|
+
error: 0,
|
|
894
|
+
partial: 0,
|
|
895
|
+
},
|
|
720
896
|
}));
|
|
721
897
|
}
|
|
722
898
|
/**
|
|
@@ -733,11 +909,14 @@ function renderPage() {
|
|
|
733
909
|
<title>${getSchedulerTitle()} — Веб-дашборд</title>
|
|
734
910
|
<style>
|
|
735
911
|
:root {
|
|
912
|
+
color-scheme: dark;
|
|
736
913
|
--bg1: #0f172a; --bg2: #000000; --panel: #141c2b; --panel2: #1b2436;
|
|
737
914
|
--border: #24314a; --text: #e6ecf5; --muted: #8fa0b8;
|
|
738
915
|
--accent: #7ec8fa; --ok: #34c759; --err: #ff5a5f; --run: #f5a623;
|
|
739
916
|
}
|
|
740
917
|
* { box-sizing: border-box; }
|
|
918
|
+
/* Фон задаём и на html: иначе при короткой странице снизу видна белая полоса. */
|
|
919
|
+
html { background: var(--bg2); }
|
|
741
920
|
html, body { margin: 0; padding: 0; }
|
|
742
921
|
body {
|
|
743
922
|
font-family: 'Segoe UI', -apple-system, BlinkMacSystemFont, Roboto, sans-serif;
|
|
@@ -754,16 +933,20 @@ function renderPage() {
|
|
|
754
933
|
}
|
|
755
934
|
.wrap { position: relative; z-index: 1; max-width: 1740px; margin: 0 auto; padding: 28px 20px 60px; }
|
|
756
935
|
.table-scroll { overflow-x: auto; }
|
|
936
|
+
/* Подсказка о горизонтальном скролле: на широких экранах таблица влезает целиком. */
|
|
937
|
+
.scroll-hint { display: none; margin-top: 6px; font-size: 11px; color: var(--muted); }
|
|
938
|
+
@media (max-width: 1000px) { .scroll-hint { display: block; } }
|
|
757
939
|
header { display: flex; align-items: flex-end; justify-content: space-between; gap: 12px; flex-wrap: wrap; margin-bottom: 22px; }
|
|
758
940
|
h1 { margin: 0; font-size: 24px; font-weight: 800; letter-spacing: .2px; }
|
|
759
941
|
.sub { margin-top: 5px; font-size: 11px; font-weight: 600; letter-spacing: 1.2px; text-transform: uppercase; color: var(--muted); }
|
|
760
942
|
.cards { display: grid; grid-template-columns: repeat(3, 1fr); gap: 12px; margin-bottom: 22px; }
|
|
761
|
-
@media (min-width: 900px) { .cards { grid-template-columns: repeat(
|
|
943
|
+
@media (min-width: 900px) { .cards { grid-template-columns: repeat(4, 1fr); } }
|
|
944
|
+
@media (min-width: 1200px) { .cards { grid-template-columns: repeat(7, 1fr); } }
|
|
762
945
|
@media (max-width: 520px) { .cards { grid-template-columns: repeat(2, 1fr); } }
|
|
763
946
|
.card { background: var(--panel); border: 1px solid var(--border); border-radius: 10px; padding: 14px 16px; min-width: 0; }
|
|
764
947
|
.card .num { font-size: 26px; font-weight: 800; }
|
|
765
948
|
.card .lbl { margin-top: 2px; font-size: 11px; color: var(--muted); text-transform: uppercase; letter-spacing: 1px; }
|
|
766
|
-
.ok { color: var(--ok); } .err { color: var(--err); } .neu { color: var(--accent); }
|
|
949
|
+
.ok { color: var(--ok); } .err { color: var(--err); } .neu { color: var(--accent); } .run { color: var(--run); }
|
|
767
950
|
table { width: 100%; border-collapse: collapse; background: var(--panel); border: 1px solid var(--border); border-radius: 10px; overflow: hidden; }
|
|
768
951
|
th, td { padding: 9px 9px; text-align: left; font-size: 13px; border-bottom: 1px solid var(--border); vertical-align: middle; }
|
|
769
952
|
th { background: var(--panel2); color: var(--muted); font-size: 11px; text-transform: uppercase; letter-spacing: .8px; }
|
|
@@ -777,10 +960,10 @@ function renderPage() {
|
|
|
777
960
|
.badge.okb { background: rgba(52, 199, 89, .14); color: var(--ok); }
|
|
778
961
|
.badge.errb { background: rgba(255, 90, 95, .14); color: var(--err); }
|
|
779
962
|
.badge.unk { background: rgba(143, 160, 184, .14); color: var(--muted); }
|
|
780
|
-
.badge.part { background: rgba(255, 159, 10, .14); color:
|
|
963
|
+
.badge.part { background: rgba(255, 159, 10, .14); color: var(--run); }
|
|
781
964
|
.matrix-toggle { background: transparent; border: none; color: var(--muted); cursor: pointer; padding: 0 2px; font-size: 12px; }
|
|
782
965
|
.matrix-toggle:hover { color: var(--accent); }
|
|
783
|
-
.matrix-badge { font-size: 11px; color:
|
|
966
|
+
.matrix-badge { font-size: 11px; color: var(--run); white-space: nowrap; }
|
|
784
967
|
.clone-badge { font-size: 11px; color: var(--muted); white-space: nowrap; }
|
|
785
968
|
tr.clone-row td { background: rgba(126, 200, 250, 0.03); }
|
|
786
969
|
tr.clone-row .name { padding-left: 26px; font-weight: 500; color: #cfd7e3; }
|
|
@@ -797,7 +980,8 @@ function renderPage() {
|
|
|
797
980
|
.an-kpis { display: flex; flex-wrap: wrap; gap: 14px; margin-bottom: 12px; font-size: 12px; color: var(--muted); }
|
|
798
981
|
.an-kpis b { color: var(--text); font-size: 14px; }
|
|
799
982
|
.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; }
|
|
800
|
-
|
|
983
|
+
/* min-width: подпись даты "MM-DD" не наезжает на соседнюю; на узком экране график скроллится. */
|
|
984
|
+
.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; }
|
|
801
985
|
.an-bar-fill { width: 100%; border-radius: 3px 3px 0 0; background: var(--accent); opacity: .85; }
|
|
802
986
|
.an-label { font-size: 9px; color: var(--muted); margin-top: 4px; white-space: nowrap; }
|
|
803
987
|
.an-grid { display: grid; grid-template-columns: repeat(auto-fit, minmax(280px, 1fr)); gap: 16px; margin-top: 14px; }
|
|
@@ -825,6 +1009,17 @@ function renderPage() {
|
|
|
825
1009
|
.wi-table .wi-model { color: #c084fc; }
|
|
826
1010
|
.graph { background: var(--panel); border: 1px solid var(--border); border-radius: 10px; padding: 12px 16px; margin-bottom: 16px; }
|
|
827
1011
|
.graph-title { font-size: 11px; font-weight: 700; letter-spacing: 1px; text-transform: uppercase; color: var(--muted); margin-bottom: 6px; }
|
|
1012
|
+
.graph-hint { font-size: 11px; color: var(--muted); margin-bottom: 8px; }
|
|
1013
|
+
.graph-scroll { overflow-x: auto; overflow-y: hidden; padding-bottom: 4px; }
|
|
1014
|
+
.graph-canvas { position: relative; }
|
|
1015
|
+
.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; }
|
|
1016
|
+
.graph-node .g-name { color: var(--text); font-weight: 600; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
|
|
1017
|
+
.graph-node .g-meta { color: var(--muted); font-size: 10px; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; }
|
|
1018
|
+
.graph-node.okg { border-left-color: #3fb950; }
|
|
1019
|
+
.graph-node.errg { border-left-color: #ff3b30; }
|
|
1020
|
+
.graph-node.partg { border-left-color: #f5a623; }
|
|
1021
|
+
.graph-node.rung { border-left-color: #58a6ff; }
|
|
1022
|
+
.graph-edge { fill: none; stroke: var(--border); stroke-width: 1.5; }
|
|
828
1023
|
.chain-line { font-size: 13px; padding: 3px 0; }
|
|
829
1024
|
.chain-line .dep { color: var(--accent); }
|
|
830
1025
|
.chain-line .arrow { color: var(--muted); margin: 0 6px; }
|
|
@@ -857,6 +1052,28 @@ function renderPage() {
|
|
|
857
1052
|
.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); }
|
|
858
1053
|
.toast.ok2 { border-color: rgba(52,199,89,.5); }
|
|
859
1054
|
.toast.err2 { border-color: rgba(255,90,95,.5); }
|
|
1055
|
+
/* Светлая тема: переменные темы + точечные правки для цветов, которые
|
|
1056
|
+
заданы не через var(). Тёмная остаётся по умолчанию. */
|
|
1057
|
+
@media (prefers-color-scheme: light) {
|
|
1058
|
+
:root {
|
|
1059
|
+
color-scheme: light;
|
|
1060
|
+
--bg1: #f5f8fc; --bg2: #ffffff; --panel: #ffffff; --panel2: #eef3f9;
|
|
1061
|
+
--border: #cbd6e2; --text: #17202b; --muted: #56667a;
|
|
1062
|
+
--accent: #0b6ea8; --ok: #167a37; --err: #bc2c22; --run: #9a5a00;
|
|
1063
|
+
}
|
|
1064
|
+
html { background: var(--bg2); }
|
|
1065
|
+
.snow { color: #9cc7ea; opacity: .4; }
|
|
1066
|
+
tr.clone-row .name { color: #3c4b5e; }
|
|
1067
|
+
.model, .hist-model, .wi-table .wi-model { color: #7b3fb0; }
|
|
1068
|
+
.graph-node { background: var(--panel2); }
|
|
1069
|
+
.toast { box-shadow: 0 6px 18px rgba(20, 40, 70, .18); }
|
|
1070
|
+
}
|
|
1071
|
+
a:focus-visible, button:focus-visible, [tabindex]:focus-visible {
|
|
1072
|
+
outline: 2px solid var(--accent); outline-offset: 2px;
|
|
1073
|
+
}
|
|
1074
|
+
@media (prefers-reduced-motion: reduce) {
|
|
1075
|
+
.snow { display: none; }
|
|
1076
|
+
}
|
|
860
1077
|
</style>
|
|
861
1078
|
</head>
|
|
862
1079
|
<body>
|
|
@@ -864,7 +1081,7 @@ function renderPage() {
|
|
|
864
1081
|
<header>
|
|
865
1082
|
<div>
|
|
866
1083
|
<h1>❄️ ${getSchedulerTitle()} ❄️</h1>
|
|
867
|
-
<div class="sub">Локальный веб-дашборд · Local AI CI/CD Orchestrator</div>
|
|
1084
|
+
<div class="sub">Локальный веб-дашборд · Local AI CI/CD Orchestrator · профиль <b>${getProfileName()}</b></div>
|
|
868
1085
|
</div>
|
|
869
1086
|
<div style="text-align:right">
|
|
870
1087
|
<a class="btn btn-db" href="/api/export-db" download>💾 Скачать БД</a>
|
|
@@ -878,7 +1095,8 @@ function renderPage() {
|
|
|
878
1095
|
<div class="cards">
|
|
879
1096
|
<div class="card"><div class="num neu" id="m-total">—</div><div class="lbl">Всего запусков</div></div>
|
|
880
1097
|
<div class="card"><div class="num ok" id="m-success">—</div><div class="lbl">Успешных</div></div>
|
|
881
|
-
<div class="card"><div class="num err" id="m-error">—</div><div class="lbl"
|
|
1098
|
+
<div class="card" title="Ошибки и таймауты. Частичные выполнения считаются отдельно."><div class="num err" id="m-error">—</div><div class="lbl">Ошибок</div></div>
|
|
1099
|
+
<div class="card" title="Частичные выполнения (partial): ответ получен, но проверка не прошла"><div class="num run" id="m-partial">—</div><div class="lbl">Частичных</div></div>
|
|
882
1100
|
<div class="card"><div class="num" id="m-tasks">—</div><div class="lbl">Задач в системе</div></div>
|
|
883
1101
|
<div class="card"><div class="num neu" id="m-tokens">—</div><div class="lbl">Всего токенов</div></div>
|
|
884
1102
|
<div class="card"><div class="num" id="m-cost">—</div><div class="lbl">Примерная стоимость</div></div>
|
|
@@ -886,26 +1104,30 @@ function renderPage() {
|
|
|
886
1104
|
|
|
887
1105
|
<div class="graph" id="graph" style="display:none">
|
|
888
1106
|
<div class="graph-title">🔗 Граф зависимостей (DAG)</div>
|
|
889
|
-
<div
|
|
1107
|
+
<div class="graph-hint">Слева — задачи без зависимостей, справа — задачи, которые ждут их успешного завершения. Граф можно прокручивать по горизонтали.</div>
|
|
1108
|
+
<div class="graph-scroll" id="graph-scroll" role="region" aria-label="Граф зависимостей задач" tabindex="0">
|
|
1109
|
+
<div id="graph-lines"></div>
|
|
1110
|
+
</div>
|
|
890
1111
|
</div>
|
|
891
1112
|
|
|
892
1113
|
<div class="ws-summary" id="ws-summary">📦 0 workspace · 0 задач</div>
|
|
893
|
-
<div class="ws-tabs" id="ws-tabs"></div>
|
|
1114
|
+
<div class="ws-tabs" id="ws-tabs" role="group" aria-label="Фильтр задач по workspace"></div>
|
|
894
1115
|
|
|
895
1116
|
<div class="table-scroll">
|
|
896
|
-
<table>
|
|
1117
|
+
<table aria-label="Задачи планировщика">
|
|
897
1118
|
<thead>
|
|
898
1119
|
<tr>
|
|
899
|
-
<th>Имя</th><th>Статус</th><th>Cron</th><th>📦 Workspace</th><th>Модель</th><th>Приоритет</th><th>Зависимости</th><th>Метрики</th><th>Действия</th>
|
|
1120
|
+
<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>
|
|
900
1121
|
</tr>
|
|
901
1122
|
</thead>
|
|
902
1123
|
<tbody id="rows"><tr><td colspan="9" class="empty">Загрузка…</td></tr></tbody>
|
|
903
1124
|
</table>
|
|
904
1125
|
</div>
|
|
1126
|
+
<div class="scroll-hint">↔ Таблица шире экрана — прокрутите её влево-вправо.</div>
|
|
905
1127
|
|
|
906
1128
|
<div class="hist">
|
|
907
1129
|
<h2>📜 История выполнений</h2>
|
|
908
|
-
<div id="history"><div class="empty">Загрузка…</div></div>
|
|
1130
|
+
<div id="history" aria-live="polite"><div class="empty">Загрузка…</div></div>
|
|
909
1131
|
</div>
|
|
910
1132
|
|
|
911
1133
|
<div class="hist">
|
|
@@ -932,7 +1154,7 @@ function renderPage() {
|
|
|
932
1154
|
|
|
933
1155
|
<footer>Данные обновляются автоматически каждые 5 секунд · <span id="server-url">http://localhost:3782</span> · <span class="db-badge">БД: ✅ SQLite (WAL)</span></footer>
|
|
934
1156
|
</div>
|
|
935
|
-
<div id="toast"></div>
|
|
1157
|
+
<div id="toast" role="status" aria-live="polite"></div>
|
|
936
1158
|
|
|
937
1159
|
<script>
|
|
938
1160
|
(function () {
|
|
@@ -945,6 +1167,14 @@ function renderPage() {
|
|
|
945
1167
|
var activeWorkspace = 'all';
|
|
946
1168
|
/** Раскрытые родители матриц (имя → true). */
|
|
947
1169
|
var expandedMatrixParents = {};
|
|
1170
|
+
/** История: последний загруженный список и режим «показать все». */
|
|
1171
|
+
var lastHistory = [];
|
|
1172
|
+
var historyExpanded = false;
|
|
1173
|
+
// /api/metrics и /api/summary отдают один и тот же обработчик. По умолчанию
|
|
1174
|
+
// используем summary: некоторые антивирусы блокируют именно /api/metrics
|
|
1175
|
+
// (HTTP 499), и тогда в консоли появляется ошибка при каждой загрузке.
|
|
1176
|
+
var preferSummaryMetrics = true;
|
|
1177
|
+
var metricsFallbackLogged = false;
|
|
948
1178
|
|
|
949
1179
|
function esc(s) {
|
|
950
1180
|
var d = document.createElement('div');
|
|
@@ -1032,11 +1262,24 @@ function renderPage() {
|
|
|
1032
1262
|
});
|
|
1033
1263
|
}
|
|
1034
1264
|
|
|
1035
|
-
function badge(status) {
|
|
1265
|
+
function badge(status, task, historyMode) {
|
|
1266
|
+
if (task && task.orphaned) {
|
|
1267
|
+
return '<span class="badge unk" title="Определение есть в БД, но задачи нет в планировщике ОС">🧟 Нет в планировщике</span>';
|
|
1268
|
+
}
|
|
1269
|
+
if (task && task.paused) {
|
|
1270
|
+
return '<span class="badge unk" title="Задача поставлена на паузу">⏸ Пауза</span>';
|
|
1271
|
+
}
|
|
1036
1272
|
if (status === 'running') return '<span class="badge run">🟡 Выполняется</span>';
|
|
1037
|
-
if (status === 'success')
|
|
1273
|
+
if (status === 'success') {
|
|
1274
|
+
return historyMode
|
|
1275
|
+
? '<span class="badge okb">✅ Успех</span>'
|
|
1276
|
+
: '<span class="badge okb">🟢 Готова</span>';
|
|
1277
|
+
}
|
|
1038
1278
|
if (status === 'error') return '<span class="badge errb">🔴 Ошибка</span>';
|
|
1039
1279
|
if (status === 'partial') return '<span class="badge part">🟠 Частично</span>';
|
|
1280
|
+
if (status === 'idle') {
|
|
1281
|
+
return '<span class="badge unk" title="Задача создана, но ещё ни разу не запускалась">⚪ Не запускалась</span>';
|
|
1282
|
+
}
|
|
1040
1283
|
return '<span class="badge unk">⚪ Неизвестно</span>';
|
|
1041
1284
|
}
|
|
1042
1285
|
|
|
@@ -1046,7 +1289,7 @@ function renderPage() {
|
|
|
1046
1289
|
if (!t.isMatrixParent || !s) return '';
|
|
1047
1290
|
var color = s.status === 'success' ? 'var(--ok)'
|
|
1048
1291
|
: s.status === 'error' ? 'var(--err)'
|
|
1049
|
-
: s.status === 'partial' ? '
|
|
1292
|
+
: s.status === 'partial' ? 'var(--run)'
|
|
1050
1293
|
: 'var(--run)';
|
|
1051
1294
|
return '<div class="matrix-badge" style="color:' + color + '" title="' + esc(s.message) + '">' +
|
|
1052
1295
|
'📦 Matrix: ' + s.successCount + '/' + s.totalCount + ' успешных' +
|
|
@@ -1056,8 +1299,10 @@ function renderPage() {
|
|
|
1056
1299
|
}
|
|
1057
1300
|
|
|
1058
1301
|
function metricsHtml(m) {
|
|
1059
|
-
var mm = m || { total: 0, success: 0, error: 0 };
|
|
1060
|
-
return 'Всего: <b>' + mm.total + '</b> · ✅ <b>' + mm.success + '</b>
|
|
1302
|
+
var mm = m || { total: 0, success: 0, error: 0, partial: 0 };
|
|
1303
|
+
return 'Всего: <b>' + mm.total + '</b> · ✅ <b>' + mm.success + '</b>' +
|
|
1304
|
+
' · <span title="Частичные выполнения (partial)" style="color:var(--run)">🟠 <b>' + (mm.partial || 0) + '</b></span>' +
|
|
1305
|
+
' · <span title="Ошибки и таймауты" style="color:var(--err)">⚠️ <b>' + mm.error + '</b></span>';
|
|
1061
1306
|
}
|
|
1062
1307
|
|
|
1063
1308
|
function depsHtml(t) {
|
|
@@ -1089,19 +1334,19 @@ function renderPage() {
|
|
|
1089
1334
|
function renderHistory(records) {
|
|
1090
1335
|
var box = document.getElementById('history');
|
|
1091
1336
|
if (!box) return;
|
|
1337
|
+
lastHistory = records || [];
|
|
1092
1338
|
if (!records || records.length === 0) {
|
|
1093
1339
|
box.innerHTML = '<div class="empty" style="padding:16px">Запусков пока нет.</div>';
|
|
1094
1340
|
return;
|
|
1095
1341
|
}
|
|
1096
1342
|
var html = '';
|
|
1097
|
-
var limit = Math.min(records.length, 10);
|
|
1343
|
+
var limit = historyExpanded ? records.length : Math.min(records.length, 10);
|
|
1098
1344
|
for (var i = 0; i < limit; i++) {
|
|
1099
1345
|
var r = records[i];
|
|
1100
|
-
var ok = r.status === 'success';
|
|
1101
1346
|
html += '<div class="hist-row">' +
|
|
1102
1347
|
'<span class="hist-time">' + esc(new Date(r.startedAt).toLocaleString('ru-RU')) + '</span>' +
|
|
1103
1348
|
'<span class="hist-task">' + esc(r.taskName) + '</span>' +
|
|
1104
|
-
|
|
1349
|
+
badge(r.status, null, true) +
|
|
1105
1350
|
'<span class="metrics">' + (r.durationMs != null ? r.durationMs + ' мс' : '—') + '</span>' +
|
|
1106
1351
|
(r.model ? '<span class="hist-model" title="Модель">🧠 ' + esc(r.model) + '</span>' : '') +
|
|
1107
1352
|
(r.preFlightStatus && r.preFlightStatus !== 'skipped'
|
|
@@ -1115,6 +1360,11 @@ function renderPage() {
|
|
|
1115
1360
|
(r.error ? '<span class="metrics" title="' + esc(r.error) + '">⚠ ' + esc(String(r.error).slice(0, 80)) + '</span>' : '') +
|
|
1116
1361
|
'</div>';
|
|
1117
1362
|
}
|
|
1363
|
+
if (records.length > 10) {
|
|
1364
|
+
html += '<div style="padding:10px 0 2px"><button class="btn" data-act="history-toggle">' +
|
|
1365
|
+
(historyExpanded ? 'Свернуть историю' : 'Показать все (' + records.length + ')') +
|
|
1366
|
+
'</button></div>';
|
|
1367
|
+
}
|
|
1118
1368
|
box.innerHTML = html;
|
|
1119
1369
|
}
|
|
1120
1370
|
|
|
@@ -1171,20 +1421,24 @@ function renderPage() {
|
|
|
1171
1421
|
for (var j = 0; j < daily.length; j++) {
|
|
1172
1422
|
var d = daily[j];
|
|
1173
1423
|
var h = d.total > 0 ? Math.max(3, Math.round((d.total / max) * 92)) : 2;
|
|
1174
|
-
var
|
|
1175
|
-
var
|
|
1424
|
+
var isPartialOnly = d.error === 0 && d.partial > 0;
|
|
1425
|
+
var color = d.total === 0 ? 'var(--border)' : (d.error > 0 ? 'var(--err)' : (isPartialOnly ? 'var(--run)' : 'var(--ok)'));
|
|
1426
|
+
var tip = d.date + ': всего ' + d.total + ', успех ' + d.success + ', ошибок ' + d.error + ', частично ' + d.partial + ', ' + money(d.costUsd);
|
|
1176
1427
|
bars += '<div class="an-bar" title="' + esc(tip) + '">' +
|
|
1177
1428
|
'<div class="an-bar-fill" style="height:' + h + '%' + ';background:' + esc(color) + '"></div>' +
|
|
1178
1429
|
'<div class="an-label">' + esc(String(d.date).slice(5)) + '</div>' +
|
|
1179
1430
|
'</div>';
|
|
1180
1431
|
}
|
|
1181
1432
|
chart.innerHTML = bars || '<div class="empty" style="padding:10px">Нет данных за период.</div>';
|
|
1433
|
+
// На узком экране график скроллится по горизонтали: показываем свежие дни,
|
|
1434
|
+
// а не пустую левую часть окна.
|
|
1435
|
+
chart.scrollLeft = chart.scrollWidth;
|
|
1182
1436
|
|
|
1183
1437
|
var topRows = an.topByCost || [];
|
|
1184
1438
|
if (topRows.length === 0) {
|
|
1185
1439
|
top.innerHTML = '<div class="empty" style="padding:10px">Нет запусков за период.</div>';
|
|
1186
1440
|
} else {
|
|
1187
|
-
var html = '<table class="an-table"><thead><tr><th>Задача</th><th>Запусков</th><th>Успех</th><th>Стоимость</th></tr></thead><tbody>';
|
|
1441
|
+
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>';
|
|
1188
1442
|
for (var k = 0; k < topRows.length; k++) {
|
|
1189
1443
|
var row = topRows[k];
|
|
1190
1444
|
html += '<tr>' +
|
|
@@ -1201,7 +1455,7 @@ function renderPage() {
|
|
|
1201
1455
|
if (matrixRows.length === 0) {
|
|
1202
1456
|
matrices.innerHTML = '<div class="empty" style="padding:10px">Матриц за период не запускалось.</div>';
|
|
1203
1457
|
} else {
|
|
1204
|
-
var mhtml = '<table class="an-table"><thead><tr><th>Матрица</th><th>Клонов</th><th>Запусков</th><th>Успех</th><th>Стоимость</th></tr></thead><tbody>';
|
|
1458
|
+
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>';
|
|
1205
1459
|
for (var q = 0; q < matrixRows.length; q++) {
|
|
1206
1460
|
var m = matrixRows[q];
|
|
1207
1461
|
mhtml += '<tr>' +
|
|
@@ -1230,7 +1484,7 @@ function renderPage() {
|
|
|
1230
1484
|
}
|
|
1231
1485
|
|
|
1232
1486
|
var html = '<table class="wi-table"><thead><tr>' +
|
|
1233
|
-
'<th>Модель</th><th>Запусков</th><th>Токенов</th><th>Стоимость</th><th>Средняя длительность</th><th>Успешных</th>' +
|
|
1487
|
+
'<th scope="col">Модель</th><th scope="col">Запусков</th><th scope="col">Токенов</th><th scope="col">Стоимость</th><th scope="col">Средняя длительность</th><th scope="col">Успешных</th>' +
|
|
1234
1488
|
'</tr></thead><tbody>';
|
|
1235
1489
|
for (var i = 0; i < models.length; i++) {
|
|
1236
1490
|
var m = models[i];
|
|
@@ -1268,20 +1522,147 @@ function renderPage() {
|
|
|
1268
1522
|
var box = document.getElementById('graph-lines');
|
|
1269
1523
|
if (!graph || !box) return;
|
|
1270
1524
|
if (!tasks || tasks.length === 0) { graph.style.display = 'none'; return; }
|
|
1271
|
-
|
|
1525
|
+
|
|
1526
|
+
var known = {};
|
|
1272
1527
|
for (var i = 0; i < tasks.length; i++) {
|
|
1273
|
-
|
|
1274
|
-
|
|
1275
|
-
|
|
1276
|
-
|
|
1277
|
-
|
|
1278
|
-
|
|
1528
|
+
known[String(tasks[i].name).toLowerCase()] = tasks[i];
|
|
1529
|
+
}
|
|
1530
|
+
|
|
1531
|
+
// В граф включаем только задачи, связанные зависимостями, и все их
|
|
1532
|
+
// транзитивные предки. Одиночные задачи не превращают блок в свалку.
|
|
1533
|
+
var involved = {};
|
|
1534
|
+
function collect(name, depth) {
|
|
1535
|
+
var key = String(name).toLowerCase();
|
|
1536
|
+
if (depth > 40 || involved[key] || !known[key]) return;
|
|
1537
|
+
involved[key] = known[key];
|
|
1538
|
+
var deps = Array.isArray(known[key].dependsOn) ? known[key].dependsOn : [];
|
|
1539
|
+
for (var d = 0; d < deps.length; d++) collect(deps[d], depth + 1);
|
|
1540
|
+
}
|
|
1541
|
+
var hasEdges = false;
|
|
1542
|
+
for (var t = 0; t < tasks.length; t++) {
|
|
1543
|
+
var direct = Array.isArray(tasks[t].dependsOn) ? tasks[t].dependsOn : [];
|
|
1544
|
+
if (direct.length > 0) {
|
|
1545
|
+
hasEdges = true;
|
|
1546
|
+
collect(tasks[t].name, 0);
|
|
1279
1547
|
}
|
|
1280
|
-
html += '<div class="chain-line">' + parts.join(' <span class="arrow">+</span> ') +
|
|
1281
|
-
'<span class="arrow">➔</span><span class="target">[' + esc(t.name) + ']</span></div>';
|
|
1282
1548
|
}
|
|
1283
|
-
if (!
|
|
1284
|
-
|
|
1549
|
+
if (!hasEdges) { graph.style.display = 'none'; return; }
|
|
1550
|
+
|
|
1551
|
+
// Слои: уровень задачи = максимум по уровню зависимостей + 1.
|
|
1552
|
+
// visiting защищает от циклов в ошибочно настроенном DAG.
|
|
1553
|
+
var levels = {};
|
|
1554
|
+
var visiting = {};
|
|
1555
|
+
function levelOf(name) {
|
|
1556
|
+
var key = String(name).toLowerCase();
|
|
1557
|
+
if (levels[key] != null) return levels[key];
|
|
1558
|
+
if (visiting[key]) return 0;
|
|
1559
|
+
visiting[key] = true;
|
|
1560
|
+
var own = 0;
|
|
1561
|
+
var deps = Array.isArray(known[key] && known[key].dependsOn) ? known[key].dependsOn : [];
|
|
1562
|
+
for (var d = 0; d < deps.length; d++) {
|
|
1563
|
+
var depKey = String(deps[d]).toLowerCase();
|
|
1564
|
+
if (!known[depKey]) continue;
|
|
1565
|
+
own = Math.max(own, levelOf(depKey) + 1);
|
|
1566
|
+
}
|
|
1567
|
+
visiting[key] = false;
|
|
1568
|
+
levels[key] = own;
|
|
1569
|
+
return own;
|
|
1570
|
+
}
|
|
1571
|
+
|
|
1572
|
+
var byLevel = {};
|
|
1573
|
+
var maxLevel = 0;
|
|
1574
|
+
for (var key in involved) {
|
|
1575
|
+
if (!Object.prototype.hasOwnProperty.call(involved, key)) continue;
|
|
1576
|
+
var level = levelOf(key);
|
|
1577
|
+
maxLevel = Math.max(maxLevel, level);
|
|
1578
|
+
if (!byLevel[level]) byLevel[level] = [];
|
|
1579
|
+
byLevel[level].push(involved[key]);
|
|
1580
|
+
}
|
|
1581
|
+
for (var l = 0; l <= maxLevel; l++) {
|
|
1582
|
+
if (byLevel[l]) byLevel[l].sort(function (a, b) { return String(a.name).localeCompare(String(b.name)); });
|
|
1583
|
+
}
|
|
1584
|
+
|
|
1585
|
+
var NODE_W = 180;
|
|
1586
|
+
var NODE_H = 46;
|
|
1587
|
+
var GAP_X = 64;
|
|
1588
|
+
var GAP_Y = 18;
|
|
1589
|
+
var PAD = 10;
|
|
1590
|
+
var maxRows = 1;
|
|
1591
|
+
for (var rowLevel in byLevel) {
|
|
1592
|
+
if (byLevel[rowLevel].length > maxRows) maxRows = byLevel[rowLevel].length;
|
|
1593
|
+
}
|
|
1594
|
+
var width = PAD * 2 + (maxLevel + 1) * NODE_W + maxLevel * GAP_X;
|
|
1595
|
+
var height = PAD * 2 + maxRows * (NODE_H + GAP_Y) - GAP_Y;
|
|
1596
|
+
|
|
1597
|
+
var pos = {};
|
|
1598
|
+
for (var lv = 0; lv <= maxLevel; lv++) {
|
|
1599
|
+
var nodes = byLevel[lv] || [];
|
|
1600
|
+
for (var n = 0; n < nodes.length; n++) {
|
|
1601
|
+
pos[String(nodes[n].name).toLowerCase()] = {
|
|
1602
|
+
x: PAD + lv * (NODE_W + GAP_X),
|
|
1603
|
+
y: PAD + n * (NODE_H + GAP_Y),
|
|
1604
|
+
task: nodes[n]
|
|
1605
|
+
};
|
|
1606
|
+
}
|
|
1607
|
+
}
|
|
1608
|
+
|
|
1609
|
+
function shortLabel(value, max) {
|
|
1610
|
+
var text = String(value == null ? '' : value);
|
|
1611
|
+
return text.length > max ? text.slice(0, max - 1) + '…' : text;
|
|
1612
|
+
}
|
|
1613
|
+
function attr(value) {
|
|
1614
|
+
return esc(String(value == null ? '' : value)).replace(/"/g, '"');
|
|
1615
|
+
}
|
|
1616
|
+
function statusClass(status) {
|
|
1617
|
+
if (status === 'success') return ' okg';
|
|
1618
|
+
if (status === 'error' || status === 'timeout') return ' errg';
|
|
1619
|
+
if (status === 'partial') return ' partg';
|
|
1620
|
+
if (status === 'running') return ' rung';
|
|
1621
|
+
return '';
|
|
1622
|
+
}
|
|
1623
|
+
|
|
1624
|
+
var svg = '<svg width="' + width + '" height="' + height + '" style="position:absolute;left:0;top:0;pointer-events:none" aria-hidden="true">' +
|
|
1625
|
+
'<defs><marker id="dag-arrow" markerWidth="8" markerHeight="8" refX="7" refY="4" orient="auto">' +
|
|
1626
|
+
'<path d="M0,0 L8,4 L0,8 z" fill="#8b949e"></path></marker></defs>';
|
|
1627
|
+
for (var targetKey in pos) {
|
|
1628
|
+
if (!Object.prototype.hasOwnProperty.call(pos, targetKey)) continue;
|
|
1629
|
+
var target = pos[targetKey];
|
|
1630
|
+
var deps = Array.isArray(target.task.dependsOn) ? target.task.dependsOn : [];
|
|
1631
|
+
for (var di = 0; di < deps.length; di++) {
|
|
1632
|
+
var from = pos[String(deps[di]).toLowerCase()];
|
|
1633
|
+
if (!from || from.x >= target.x) continue;
|
|
1634
|
+
var x1 = from.x + NODE_W;
|
|
1635
|
+
var y1 = from.y + NODE_H / 2;
|
|
1636
|
+
var x2 = target.x;
|
|
1637
|
+
var y2 = target.y + NODE_H / 2;
|
|
1638
|
+
var bend = Math.max(24, (x2 - x1) / 2);
|
|
1639
|
+
svg += '<path class="graph-edge" d="M' + x1 + ',' + y1 +
|
|
1640
|
+
' C' + (x1 + bend) + ',' + y1 + ' ' + (x2 - bend) + ',' + y2 + ' ' + x2 + ',' + y2 +
|
|
1641
|
+
'" marker-end="url(#dag-arrow)"></path>';
|
|
1642
|
+
}
|
|
1643
|
+
}
|
|
1644
|
+
svg += '</svg>';
|
|
1645
|
+
|
|
1646
|
+
var nodesHtml = '';
|
|
1647
|
+
for (var pKey in pos) {
|
|
1648
|
+
if (!Object.prototype.hasOwnProperty.call(pos, pKey)) continue;
|
|
1649
|
+
var node = pos[pKey];
|
|
1650
|
+
var nodeDeps = Array.isArray(node.task.dependsOn) ? node.task.dependsOn : [];
|
|
1651
|
+
var meta = nodeDeps.length > 0
|
|
1652
|
+
? '← ' + shortLabel(nodeDeps.join(', '), 30)
|
|
1653
|
+
: 'начальная задача';
|
|
1654
|
+
nodesHtml += '<div class="graph-node' + statusClass(node.task.status) + '" style="left:' + node.x +
|
|
1655
|
+
'px;top:' + node.y + 'px;width:' + NODE_W + 'px;height:' + NODE_H + 'px" title="' +
|
|
1656
|
+
attr(node.task.name + (nodeDeps.length ? ' · зависит от: ' + nodeDeps.join(', ') : '')) + '">' +
|
|
1657
|
+
'<span class="g-name">' + esc(shortLabel(node.task.name, 26)) + '</span>' +
|
|
1658
|
+
'<span class="g-meta">' + esc(meta) + '</span></div>';
|
|
1659
|
+
}
|
|
1660
|
+
|
|
1661
|
+
var scroll = document.getElementById('graph-scroll');
|
|
1662
|
+
var scrollLeft = scroll ? scroll.scrollLeft : 0;
|
|
1663
|
+
box.innerHTML = '<div class="graph-canvas" style="width:' + width + 'px;height:' + height + 'px">' +
|
|
1664
|
+
svg + nodesHtml + '</div>';
|
|
1665
|
+
if (scroll) scroll.scrollLeft = scrollLeft;
|
|
1285
1666
|
graph.style.display = 'block';
|
|
1286
1667
|
}
|
|
1287
1668
|
|
|
@@ -1317,14 +1698,14 @@ function renderPage() {
|
|
|
1317
1698
|
(matrixCount ? ' · 📦 матриц: ' + matrixCount : '');
|
|
1318
1699
|
}
|
|
1319
1700
|
if (!box) return;
|
|
1320
|
-
var html = '<button class="ws-tab' + (activeWorkspace === 'all' ? ' active' : '') + '" data-ws="all">Все</button>';
|
|
1701
|
+
var html = '<button class="ws-tab' + (activeWorkspace === 'all' ? ' active' : '') + '" data-ws="all" aria-pressed="' + (activeWorkspace === 'all') + '">Все</button>';
|
|
1321
1702
|
for (var i = 0; i < workspaces.length; i++) {
|
|
1322
1703
|
var w = workspaces[i];
|
|
1323
1704
|
var color = w.color || '#8b949e';
|
|
1324
|
-
html += '<button class="ws-tab' + (activeWorkspace === w.id ? ' active' : '') + '" data-ws="' + esc(w.id) + '" style="color:' + esc(color) + '">📦 ' + esc(w.name) + '</button>';
|
|
1705
|
+
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>';
|
|
1325
1706
|
}
|
|
1326
|
-
html += '<button class="ws-tab' + (activeWorkspace === 'matrix' ? ' active' : '') + '" data-ws="matrix" title="Только родители матриц и их клоны">📦 Матрицы</button>';
|
|
1327
|
-
html += '<button class="ws-tab' + (activeWorkspace === 'none' ? ' active' : '') + '" data-ws="none">Без workspace</button>';
|
|
1707
|
+
html += '<button class="ws-tab' + (activeWorkspace === 'matrix' ? ' active' : '') + '" data-ws="matrix" aria-pressed="' + (activeWorkspace === 'matrix') + '" title="Только родители матриц и их клоны">📦 Матрицы</button>';
|
|
1708
|
+
html += '<button class="ws-tab' + (activeWorkspace === 'none' ? ' active' : '') + '" data-ws="none" aria-pressed="' + (activeWorkspace === 'none') + '">Без workspace</button>';
|
|
1328
1709
|
box.innerHTML = html;
|
|
1329
1710
|
}
|
|
1330
1711
|
|
|
@@ -1386,10 +1767,23 @@ function renderPage() {
|
|
|
1386
1767
|
|
|
1387
1768
|
/** Строка таблицы задач; клоны матрицы помечаются ↳ matrix <parent>. */
|
|
1388
1769
|
function taskRow(t, isClone, cloneCount, expanded) {
|
|
1770
|
+
var sessionBadge = t.session === 'reuse' || t.session === 'last'
|
|
1771
|
+
? '<span title="' + (t.session === 'reuse'
|
|
1772
|
+
? 'Переиспользуемая сессия OpenCode' + (t.sessionId ? ': ' + t.sessionId : '')
|
|
1773
|
+
: 'Продолжение последней сессии OpenCode (--continue)') +
|
|
1774
|
+
'" style="margin-left:6px;padding:1px 6px;border-radius:999px;border:1px solid #30d158;color:#30d158;font-size:11px">' +
|
|
1775
|
+
(t.session === 'reuse' ? '⟳ сессия' : '↪ продолжение') + '</span>'
|
|
1776
|
+
: '';
|
|
1389
1777
|
var cron = t.triggerType === 'file'
|
|
1390
1778
|
? '👁️ файл: ' + (t.watchPath || '')
|
|
1391
1779
|
: t.triggerType === 'mcp-event'
|
|
1392
1780
|
? '📡 ' + ((t.mcpEvent && t.mcpEvent.event) || 'MCP Event')
|
|
1781
|
+
: t.triggerType === 'once'
|
|
1782
|
+
? '⏱ ' + (function () {
|
|
1783
|
+
if (!t.runAt) return '—';
|
|
1784
|
+
var d = new Date(t.runAt);
|
|
1785
|
+
return isNaN(d.getTime()) ? t.runAt : d.toLocaleString('ru-RU');
|
|
1786
|
+
})()
|
|
1393
1787
|
: (t.schedule || '—');
|
|
1394
1788
|
var nameHtml = esc(t.name);
|
|
1395
1789
|
var matrixLimit = t.matrix && t.matrix.concurrency
|
|
@@ -1407,14 +1801,14 @@ function renderPage() {
|
|
|
1407
1801
|
if (isClone) {
|
|
1408
1802
|
nameHtml = '<span class="clone-badge">↳ matrix ' + esc(t.matrixParentId || '') + '</span><br>' + esc(t.name);
|
|
1409
1803
|
} else if (cloneCount > 0) {
|
|
1410
|
-
nameHtml = '<button class="matrix-toggle" data-matrix="' + esc(t.name) + '" title="Показать/скрыть клоны">' +
|
|
1804
|
+
nameHtml = '<button class="matrix-toggle" data-matrix="' + esc(t.name) + '" title="Показать/скрыть клоны" aria-label="Показать/скрыть клоны матрицы ' + esc(t.name) + '" aria-expanded="' + (!!expanded) + '">' +
|
|
1411
1805
|
(expanded ? '▾' : '▸') + '</button> ' + esc(t.name) +
|
|
1412
1806
|
'<div class="matrix-badge" title="' + esc(matrixTitle) + '">📦 Matrix (' + cloneCount + ')' + matrixLimit + '</div>';
|
|
1413
1807
|
}
|
|
1414
1808
|
return '<tr' + (isClone ? ' class="clone-row"' : '') + '>' +
|
|
1415
1809
|
'<td class="name" title="' + esc(t.name) + '">' + nameHtml + '</td>' +
|
|
1416
|
-
'<td>' + badge(t.status) + matrixSummaryHtml(t) + '</td>' +
|
|
1417
|
-
'<td class="cron">' + esc(cron) + '</td>' +
|
|
1810
|
+
'<td>' + badge(t.status, t) + matrixSummaryHtml(t) + '</td>' +
|
|
1811
|
+
'<td class="cron">' + esc(cron) + sessionBadge + '</td>' +
|
|
1418
1812
|
'<td>' + workspaceHtml(t) + '</td>' +
|
|
1419
1813
|
'<td>' + modelHtml(t) + '</td>' +
|
|
1420
1814
|
'<td>' + priorityHtml(t) + '</td>' +
|
|
@@ -1439,13 +1833,26 @@ function renderPage() {
|
|
|
1439
1833
|
// /api/metrics может быть перехвачен антивирусом; /api/summary — тот же
|
|
1440
1834
|
// обработчик на случай, если блокировка привязана к имени URL.
|
|
1441
1835
|
function loadMetricsJson() {
|
|
1442
|
-
|
|
1836
|
+
var primary = preferSummaryMetrics ? '/api/summary' : '/api/metrics';
|
|
1837
|
+
var fallback = preferSummaryMetrics ? '/api/metrics' : '/api/summary';
|
|
1838
|
+
return fetch(primary, { cache: 'no-store' })
|
|
1443
1839
|
.then(readJson)
|
|
1444
1840
|
.catch(function () {
|
|
1445
|
-
|
|
1841
|
+
// Переключаемся на второй URL того же обработчика и запоминаем выбор,
|
|
1842
|
+
// чтобы следующие обновления не повторяли заблокированный запрос.
|
|
1843
|
+
preferSummaryMetrics = !preferSummaryMetrics;
|
|
1844
|
+
if (!metricsFallbackLogged) {
|
|
1845
|
+
metricsFallbackLogged = true;
|
|
1846
|
+
console.info('Дашборд: ' + primary + ' недоступен, использую ' + fallback);
|
|
1847
|
+
}
|
|
1848
|
+
return fetch(fallback, { cache: 'no-store' })
|
|
1446
1849
|
.then(readJson)
|
|
1447
1850
|
.catch(function (err) {
|
|
1448
|
-
|
|
1851
|
+
// Логируем только первый сбой, чтобы не засорять консоль каждые 5 секунд.
|
|
1852
|
+
if (!metricsFallbackLogged) {
|
|
1853
|
+
metricsFallbackLogged = true;
|
|
1854
|
+
console.error('Дашборд: метрики недоступны', err);
|
|
1855
|
+
}
|
|
1449
1856
|
return {};
|
|
1450
1857
|
});
|
|
1451
1858
|
});
|
|
@@ -1471,6 +1878,7 @@ function renderPage() {
|
|
|
1471
1878
|
document.getElementById('m-total').textContent = m.total != null ? m.total : '—';
|
|
1472
1879
|
document.getElementById('m-success').textContent = m.success != null ? m.success : '—';
|
|
1473
1880
|
document.getElementById('m-error').textContent = m.error != null ? m.error : '—';
|
|
1881
|
+
document.getElementById('m-partial').textContent = m.partial != null ? m.partial : '—';
|
|
1474
1882
|
document.getElementById('m-tasks').textContent = String(tasks.length);
|
|
1475
1883
|
document.getElementById('m-tokens').textContent = m.tokens != null ? Number(m.tokens).toLocaleString('ru-RU') : '—';
|
|
1476
1884
|
document.getElementById('m-cost').textContent = m.costUsd != null ? '$' + Number(m.costUsd).toFixed(2) : '—';
|
|
@@ -1527,6 +1935,13 @@ function renderPage() {
|
|
|
1527
1935
|
return;
|
|
1528
1936
|
}
|
|
1529
1937
|
|
|
1938
|
+
// История: развернуть/свернуть список (по умолчанию показываем последние 10).
|
|
1939
|
+
if (act === 'history-toggle') {
|
|
1940
|
+
historyExpanded = !historyExpanded;
|
|
1941
|
+
renderHistory(lastHistory);
|
|
1942
|
+
return;
|
|
1943
|
+
}
|
|
1944
|
+
|
|
1530
1945
|
if (!name) return;
|
|
1531
1946
|
if (act === 'simulate') {
|
|
1532
1947
|
await showDryRun(name);
|
|
@@ -1606,7 +2021,7 @@ function renderPage() {
|
|
|
1606
2021
|
if (report.warnings && report.warnings.length) {
|
|
1607
2022
|
html += '<div class="warn" style="margin-bottom:8px">⚠ Предупреждения:<br>' + report.warnings.map(function (w) { return '· ' + esc(w); }).join('<br>') + '</div>';
|
|
1608
2023
|
}
|
|
1609
|
-
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>';
|
|
2024
|
+
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>';
|
|
1610
2025
|
for (var i = 0; i < report.tasks.length; i++) {
|
|
1611
2026
|
var t = report.tasks[i];
|
|
1612
2027
|
var est = '—';
|