opencode-windows-scheduler 1.2.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 +16 -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/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 +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 +468 -56
- 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 +3832 -3613
- 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 +501 -56
- package/src/settings.ts +122 -0
- package/src/shared/jobs-view.ts +158 -8
- package/src/task-transfer.ts +107 -5
- package/src/tui.tsx +290 -14
package/src/server.ts
CHANGED
|
@@ -11,6 +11,16 @@ 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 {
|
|
16
|
+
authenticateHookRequest,
|
|
17
|
+
extractHookSignature,
|
|
18
|
+
extractHookToken,
|
|
19
|
+
readRequestBody,
|
|
20
|
+
} from "./integrations.js";
|
|
21
|
+
import { appendStructuredLog, readStructuredLogs } from "./core/structured-log.js";
|
|
22
|
+
import { PROMETHEUS_CONTENT_TYPE, renderPrometheusMetrics } from "./core/prometheus.js";
|
|
23
|
+
import { buildOtlpExport } from "./core/otel.js";
|
|
14
24
|
|
|
15
25
|
/**
|
|
16
26
|
* Локальный веб-дашборд (Спринт 5).
|
|
@@ -118,6 +128,8 @@ export interface TaskMetrics {
|
|
|
118
128
|
total: number;
|
|
119
129
|
success: number;
|
|
120
130
|
error: number;
|
|
131
|
+
/** Частичные выполнения: ответ получен, но проверка не прошла. */
|
|
132
|
+
partial: number;
|
|
121
133
|
}
|
|
122
134
|
|
|
123
135
|
/** Агрегированная статистика по одной LLM-модели. */
|
|
@@ -495,24 +507,36 @@ async function handleRequest(
|
|
|
495
507
|
pathname === "/api/tasks" ||
|
|
496
508
|
pathname === "/api/history" ||
|
|
497
509
|
pathname === "/api/metrics" ||
|
|
510
|
+
pathname === "/api/summary" ||
|
|
498
511
|
pathname === "/api/models-analysis" ||
|
|
499
512
|
pathname === "/api/analytics" ||
|
|
500
513
|
pathname === "/api/history/export" ||
|
|
501
514
|
pathname === "/api/export-db" ||
|
|
502
515
|
pathname === "/api/workspaces" ||
|
|
503
516
|
pathname === "/api/health" ||
|
|
517
|
+
pathname === "/api/logs" ||
|
|
518
|
+
pathname === "/metrics" ||
|
|
504
519
|
/^\/api\/dry-run\//.test(pathname) ||
|
|
505
520
|
/^\/api\/matrix\//.test(pathname);
|
|
506
521
|
if (knownGet && req.method !== "GET") {
|
|
507
522
|
sendJson(res, 405, { error: "Method not allowed" });
|
|
508
523
|
return;
|
|
509
524
|
}
|
|
510
|
-
const knownPost =
|
|
525
|
+
const knownPost =
|
|
526
|
+
/^\/api\/(run|delete|hooks|cancel-matrix)\//.test(pathname) ||
|
|
527
|
+
pathname === "/api/matrix-cleanup";
|
|
511
528
|
if (knownPost && req.method !== "POST") {
|
|
512
529
|
sendJson(res, 405, { error: "Method not allowed" });
|
|
513
530
|
return;
|
|
514
531
|
}
|
|
515
532
|
|
|
533
|
+
// Браузер всегда просит иконку. Отвечаем 204, чтобы не засорять консоль 404.
|
|
534
|
+
if (req.method === "GET" && pathname === "/favicon.ico") {
|
|
535
|
+
res.writeHead(204);
|
|
536
|
+
res.end();
|
|
537
|
+
return;
|
|
538
|
+
}
|
|
539
|
+
|
|
516
540
|
// Статический HTML-файл — страница дашборда.
|
|
517
541
|
if (req.method === "GET" && (pathname === "/" || pathname === "/index.html")) {
|
|
518
542
|
send(res, 200, "text/html; charset=utf-8", renderPage());
|
|
@@ -534,6 +558,53 @@ async function handleRequest(
|
|
|
534
558
|
return;
|
|
535
559
|
}
|
|
536
560
|
|
|
561
|
+
if (req.method === "GET" && pathname === "/metrics") {
|
|
562
|
+
send(res, 200, PROMETHEUS_CONTENT_TYPE, renderPrometheusMetrics());
|
|
563
|
+
return;
|
|
564
|
+
}
|
|
565
|
+
|
|
566
|
+
// Машиночитаемые логи запусков (Спринт 22): JSONL + фильтры.
|
|
567
|
+
if (req.method === "GET" && pathname === "/api/logs") {
|
|
568
|
+
const task = url.searchParams.get("task") ?? undefined;
|
|
569
|
+
const status = url.searchParams.get("status") ?? undefined;
|
|
570
|
+
const event = url.searchParams.get("event") ?? undefined;
|
|
571
|
+
const since = url.searchParams.get("since") ?? undefined;
|
|
572
|
+
const until = url.searchParams.get("until") ?? undefined;
|
|
573
|
+
const limitRaw = Number(url.searchParams.get("limit") ?? 200);
|
|
574
|
+
if (since && Number.isNaN(Date.parse(since))) {
|
|
575
|
+
sendJson(res, 400, { error: "Некорректный параметр since: ожидается ISO-дата." });
|
|
576
|
+
return;
|
|
577
|
+
}
|
|
578
|
+
if (until && Number.isNaN(Date.parse(until))) {
|
|
579
|
+
sendJson(res, 400, { error: "Некорректный параметр until: ожидается ISO-дата." });
|
|
580
|
+
return;
|
|
581
|
+
}
|
|
582
|
+
const limit = Number.isFinite(limitRaw)
|
|
583
|
+
? Math.max(1, Math.min(5000, Math.floor(limitRaw)))
|
|
584
|
+
: 200;
|
|
585
|
+
const result = readStructuredLogs({ task, status, event, since, until, limit });
|
|
586
|
+
if ((url.searchParams.get("format") || "").toLowerCase() === "jsonl") {
|
|
587
|
+
const body = result.records.map((record) => JSON.stringify(record)).join("\n");
|
|
588
|
+
const stamp = new Date().toISOString().replace(/[:.]/g, "-");
|
|
589
|
+
sendAttachment(
|
|
590
|
+
res,
|
|
591
|
+
200,
|
|
592
|
+
"application/x-ndjson; charset=utf-8",
|
|
593
|
+
body ? `${body}\n` : "",
|
|
594
|
+
`logs-${stamp}.jsonl`
|
|
595
|
+
);
|
|
596
|
+
return;
|
|
597
|
+
}
|
|
598
|
+
sendJson(res, 200, {
|
|
599
|
+
records: result.records,
|
|
600
|
+
total: result.total,
|
|
601
|
+
malformed: result.malformed,
|
|
602
|
+
limit,
|
|
603
|
+
filters: { task: task ?? null, status: status ?? null, event: event ?? null, since: since ?? null, until: until ?? null },
|
|
604
|
+
});
|
|
605
|
+
return;
|
|
606
|
+
}
|
|
607
|
+
|
|
537
608
|
if (req.method === "GET" && pathname === "/api/tasks") {
|
|
538
609
|
const tasks = await collectTasksWithMetrics(deps);
|
|
539
610
|
sendJson(res, 200, { tasks });
|
|
@@ -618,8 +689,26 @@ async function handleRequest(
|
|
|
618
689
|
}
|
|
619
690
|
|
|
620
691
|
if (req.method === "GET" && pathname === "/api/history") {
|
|
621
|
-
|
|
622
|
-
|
|
692
|
+
// Фильтры как у RPC get_history: имя задачи и статус. limit — необязательный.
|
|
693
|
+
const taskFilter = (url.searchParams.get("taskName") ?? url.searchParams.get("task") ?? "")
|
|
694
|
+
.trim()
|
|
695
|
+
.toLowerCase();
|
|
696
|
+
const statusFilter = (url.searchParams.get("status") ?? "").trim().toLowerCase();
|
|
697
|
+
const limitRaw = Number(url.searchParams.get("limit") ?? 200);
|
|
698
|
+
const limit = Number.isFinite(limitRaw)
|
|
699
|
+
? Math.max(1, Math.min(10000, Math.floor(limitRaw)))
|
|
700
|
+
: 200;
|
|
701
|
+
let records = await loadHistory();
|
|
702
|
+
if (taskFilter) {
|
|
703
|
+
records = records.filter((record) => record.taskName.toLowerCase() === taskFilter);
|
|
704
|
+
}
|
|
705
|
+
if (statusFilter) {
|
|
706
|
+
records = records.filter(
|
|
707
|
+
(record) => String(record.status).toLowerCase() === statusFilter
|
|
708
|
+
);
|
|
709
|
+
}
|
|
710
|
+
const total = records.length;
|
|
711
|
+
sendJson(res, 200, { records: records.slice(0, limit), total, limit });
|
|
623
712
|
return;
|
|
624
713
|
}
|
|
625
714
|
|
|
@@ -653,16 +742,26 @@ async function handleRequest(
|
|
|
653
742
|
return;
|
|
654
743
|
}
|
|
655
744
|
|
|
656
|
-
// Экспорт истории: CSV (для Excel)
|
|
745
|
+
// Экспорт истории: CSV (для Excel), JSON (для скриптов) или OTLP/JSON.
|
|
657
746
|
if (req.method === "GET" && pathname === "/api/history/export") {
|
|
658
747
|
const format = (url.searchParams.get("format") || "csv").toLowerCase();
|
|
659
|
-
if (format !== "csv" && format !== "json") {
|
|
660
|
-
sendJson(res, 400, {
|
|
748
|
+
if (format !== "csv" && format !== "json" && format !== "otlp") {
|
|
749
|
+
sendJson(res, 400, {
|
|
750
|
+
error: "Неподдерживаемый формат экспорта. Допустимые: csv, json, otlp.",
|
|
751
|
+
});
|
|
661
752
|
return;
|
|
662
753
|
}
|
|
663
754
|
const records = getHistory(null, 100000);
|
|
664
755
|
const stamp = new Date().toISOString().replace(/[:.]/g, "-");
|
|
665
|
-
if (format === "
|
|
756
|
+
if (format === "otlp") {
|
|
757
|
+
sendAttachment(
|
|
758
|
+
res,
|
|
759
|
+
200,
|
|
760
|
+
"application/json; charset=utf-8",
|
|
761
|
+
JSON.stringify(buildOtlpExport(records), null, 2),
|
|
762
|
+
`history-${stamp}.otlp.json`
|
|
763
|
+
);
|
|
764
|
+
} else if (format === "json") {
|
|
666
765
|
sendAttachment(
|
|
667
766
|
res,
|
|
668
767
|
200,
|
|
@@ -728,6 +827,107 @@ async function handleRequest(
|
|
|
728
827
|
return;
|
|
729
828
|
}
|
|
730
829
|
|
|
830
|
+
// Входящий webhook-триггер (Спринт 22): POST /api/hooks/:task?token=…
|
|
831
|
+
const hookMatch = req.method === "POST" && pathname.match(/^\/api\/hooks\/(.+)$/);
|
|
832
|
+
if (hookMatch) {
|
|
833
|
+
const taskName = hookMatch[1].replace(/\/+$/, "").trim();
|
|
834
|
+
const remote = req.socket.remoteAddress ?? null;
|
|
835
|
+
const declaredBytes = Number(req.headers["content-length"]) || 0;
|
|
836
|
+
const timestampHeader = req.headers["x-scheduler-timestamp"];
|
|
837
|
+
const timestamp = Array.isArray(timestampHeader)
|
|
838
|
+
? timestampHeader[0] ?? null
|
|
839
|
+
: timestampHeader ?? null;
|
|
840
|
+
const logHook = (
|
|
841
|
+
httpStatus: number,
|
|
842
|
+
status: "accepted" | "rejected",
|
|
843
|
+
reason?: string,
|
|
844
|
+
payloadBytes = declaredBytes
|
|
845
|
+
) => {
|
|
846
|
+
appendStructuredLog({
|
|
847
|
+
event: "hook.received",
|
|
848
|
+
task: taskName || undefined,
|
|
849
|
+
status,
|
|
850
|
+
source: "hook",
|
|
851
|
+
httpStatus,
|
|
852
|
+
remote,
|
|
853
|
+
payloadBytes,
|
|
854
|
+
reason,
|
|
855
|
+
});
|
|
856
|
+
};
|
|
857
|
+
|
|
858
|
+
if (!taskName) {
|
|
859
|
+
logHook(400, "rejected", "Не передано имя задачи.");
|
|
860
|
+
sendJson(res, 400, { success: false, error: "Не передано имя задачи." });
|
|
861
|
+
return;
|
|
862
|
+
}
|
|
863
|
+
|
|
864
|
+
const settings = await loadSettings();
|
|
865
|
+
const hooks = settings.integrations.hooks;
|
|
866
|
+
if (!hooks.enabled) {
|
|
867
|
+
logHook(403, "rejected", "Входящие webhook-триггеры отключены.");
|
|
868
|
+
sendJson(res, 403, { success: false, error: "Входящие webhook-триггеры отключены." });
|
|
869
|
+
return;
|
|
870
|
+
}
|
|
871
|
+
|
|
872
|
+
const bodyResult = await readRequestBody(req, hooks.maxBodyBytes);
|
|
873
|
+
if (!bodyResult.ok) {
|
|
874
|
+
logHook(bodyResult.status, "rejected", bodyResult.error, declaredBytes);
|
|
875
|
+
sendJson(res, bodyResult.status, { success: false, error: bodyResult.error });
|
|
876
|
+
return;
|
|
877
|
+
}
|
|
878
|
+
|
|
879
|
+
const token = url.searchParams.get("token") ?? extractHookToken(req.headers);
|
|
880
|
+
const signature = extractHookSignature(req.headers);
|
|
881
|
+
const auth = authenticateHookRequest({
|
|
882
|
+
settings: hooks,
|
|
883
|
+
token,
|
|
884
|
+
signature,
|
|
885
|
+
timestamp,
|
|
886
|
+
body: bodyResult.body,
|
|
887
|
+
});
|
|
888
|
+
if (!auth.ok) {
|
|
889
|
+
logHook(auth.status, "rejected", auth.error, bodyResult.body.length);
|
|
890
|
+
sendJson(res, auth.status, { success: false, error: auth.error });
|
|
891
|
+
return;
|
|
892
|
+
}
|
|
893
|
+
|
|
894
|
+
let tasks: Awaited<ReturnType<DashboardDeps["getTasks"]>>;
|
|
895
|
+
try {
|
|
896
|
+
tasks = await deps.getTasks();
|
|
897
|
+
} catch (err: any) {
|
|
898
|
+
const message = err instanceof Error ? err.message : String(err);
|
|
899
|
+
logHook(500, "rejected", `Не удалось получить список задач: ${message}`, bodyResult.body.length);
|
|
900
|
+
sendJson(res, 500, { success: false, error: message });
|
|
901
|
+
return;
|
|
902
|
+
}
|
|
903
|
+
const key = taskName.toLowerCase();
|
|
904
|
+
const task = tasks.find((item) => String(item.name).toLowerCase() === key);
|
|
905
|
+
if (!task) {
|
|
906
|
+
logHook(404, "rejected", `Задача "${taskName}" не найдена.`, bodyResult.body.length);
|
|
907
|
+
sendJson(res, 404, { success: false, error: `Задача "${taskName}" не найдена.` });
|
|
908
|
+
return;
|
|
909
|
+
}
|
|
910
|
+
|
|
911
|
+
try {
|
|
912
|
+
const result = await deps.runTask(task.name);
|
|
913
|
+
const message = result?.alreadyRunning
|
|
914
|
+
? `Задача "${task.name}" уже выполняется.`
|
|
915
|
+
: `Задача "${task.name}" запущена по webhook.`;
|
|
916
|
+
logHook(202, "accepted", undefined, bodyResult.body.length);
|
|
917
|
+
sendJson(res, 202, {
|
|
918
|
+
success: true,
|
|
919
|
+
task: task.name,
|
|
920
|
+
alreadyRunning: Boolean(result?.alreadyRunning),
|
|
921
|
+
message,
|
|
922
|
+
});
|
|
923
|
+
} catch (err: any) {
|
|
924
|
+
const message = err instanceof Error ? err.message : String(err);
|
|
925
|
+
logHook(500, "rejected", message, bodyResult.body.length);
|
|
926
|
+
sendJson(res, 500, { success: false, error: message });
|
|
927
|
+
}
|
|
928
|
+
return;
|
|
929
|
+
}
|
|
930
|
+
|
|
731
931
|
// Запуск задачи: POST /api/run/:name (имя URL-кодируется на клиенте).
|
|
732
932
|
const runMatch = req.method === "POST" && pathname.match(/^\/api\/run\/(.+)$/);
|
|
733
933
|
if (runMatch) {
|
|
@@ -920,16 +1120,22 @@ async function collectTasksWithMetrics(deps: DashboardDeps) {
|
|
|
920
1120
|
for (const r of history) {
|
|
921
1121
|
const key = String(r.taskName || "").toLowerCase();
|
|
922
1122
|
if (!key) continue;
|
|
923
|
-
const m = byTask.get(key) ?? { total: 0, success: 0, error: 0 };
|
|
1123
|
+
const m = byTask.get(key) ?? { total: 0, success: 0, error: 0, partial: 0 };
|
|
924
1124
|
m.total += 1;
|
|
925
1125
|
if (r.status === "success") m.success += 1;
|
|
1126
|
+
else if (r.status === "partial") m.partial += 1;
|
|
926
1127
|
else m.error += 1;
|
|
927
1128
|
byTask.set(key, m);
|
|
928
1129
|
}
|
|
929
1130
|
|
|
930
1131
|
return tasks.map((t) => ({
|
|
931
1132
|
...t,
|
|
932
|
-
metrics: byTask.get(String(t.name).toLowerCase()) ?? {
|
|
1133
|
+
metrics: byTask.get(String(t.name).toLowerCase()) ?? {
|
|
1134
|
+
total: 0,
|
|
1135
|
+
success: 0,
|
|
1136
|
+
error: 0,
|
|
1137
|
+
partial: 0,
|
|
1138
|
+
},
|
|
933
1139
|
}));
|
|
934
1140
|
}
|
|
935
1141
|
|
|
@@ -947,11 +1153,14 @@ function renderPage(): string {
|
|
|
947
1153
|
<title>${getSchedulerTitle()} — Веб-дашборд</title>
|
|
948
1154
|
<style>
|
|
949
1155
|
:root {
|
|
1156
|
+
color-scheme: dark;
|
|
950
1157
|
--bg1: #0f172a; --bg2: #000000; --panel: #141c2b; --panel2: #1b2436;
|
|
951
1158
|
--border: #24314a; --text: #e6ecf5; --muted: #8fa0b8;
|
|
952
1159
|
--accent: #7ec8fa; --ok: #34c759; --err: #ff5a5f; --run: #f5a623;
|
|
953
1160
|
}
|
|
954
1161
|
* { box-sizing: border-box; }
|
|
1162
|
+
/* Фон задаём и на html: иначе при короткой странице снизу видна белая полоса. */
|
|
1163
|
+
html { background: var(--bg2); }
|
|
955
1164
|
html, body { margin: 0; padding: 0; }
|
|
956
1165
|
body {
|
|
957
1166
|
font-family: 'Segoe UI', -apple-system, BlinkMacSystemFont, Roboto, sans-serif;
|
|
@@ -968,16 +1177,20 @@ function renderPage(): string {
|
|
|
968
1177
|
}
|
|
969
1178
|
.wrap { position: relative; z-index: 1; max-width: 1740px; margin: 0 auto; padding: 28px 20px 60px; }
|
|
970
1179
|
.table-scroll { overflow-x: auto; }
|
|
1180
|
+
/* Подсказка о горизонтальном скролле: на широких экранах таблица влезает целиком. */
|
|
1181
|
+
.scroll-hint { display: none; margin-top: 6px; font-size: 11px; color: var(--muted); }
|
|
1182
|
+
@media (max-width: 1000px) { .scroll-hint { display: block; } }
|
|
971
1183
|
header { display: flex; align-items: flex-end; justify-content: space-between; gap: 12px; flex-wrap: wrap; margin-bottom: 22px; }
|
|
972
1184
|
h1 { margin: 0; font-size: 24px; font-weight: 800; letter-spacing: .2px; }
|
|
973
1185
|
.sub { margin-top: 5px; font-size: 11px; font-weight: 600; letter-spacing: 1.2px; text-transform: uppercase; color: var(--muted); }
|
|
974
1186
|
.cards { display: grid; grid-template-columns: repeat(3, 1fr); gap: 12px; margin-bottom: 22px; }
|
|
975
|
-
@media (min-width: 900px) { .cards { grid-template-columns: repeat(
|
|
1187
|
+
@media (min-width: 900px) { .cards { grid-template-columns: repeat(4, 1fr); } }
|
|
1188
|
+
@media (min-width: 1200px) { .cards { grid-template-columns: repeat(7, 1fr); } }
|
|
976
1189
|
@media (max-width: 520px) { .cards { grid-template-columns: repeat(2, 1fr); } }
|
|
977
1190
|
.card { background: var(--panel); border: 1px solid var(--border); border-radius: 10px; padding: 14px 16px; min-width: 0; }
|
|
978
1191
|
.card .num { font-size: 26px; font-weight: 800; }
|
|
979
1192
|
.card .lbl { margin-top: 2px; font-size: 11px; color: var(--muted); text-transform: uppercase; letter-spacing: 1px; }
|
|
980
|
-
.ok { color: var(--ok); } .err { color: var(--err); } .neu { color: var(--accent); }
|
|
1193
|
+
.ok { color: var(--ok); } .err { color: var(--err); } .neu { color: var(--accent); } .run { color: var(--run); }
|
|
981
1194
|
table { width: 100%; border-collapse: collapse; background: var(--panel); border: 1px solid var(--border); border-radius: 10px; overflow: hidden; }
|
|
982
1195
|
th, td { padding: 9px 9px; text-align: left; font-size: 13px; border-bottom: 1px solid var(--border); vertical-align: middle; }
|
|
983
1196
|
th { background: var(--panel2); color: var(--muted); font-size: 11px; text-transform: uppercase; letter-spacing: .8px; }
|
|
@@ -991,10 +1204,10 @@ function renderPage(): string {
|
|
|
991
1204
|
.badge.okb { background: rgba(52, 199, 89, .14); color: var(--ok); }
|
|
992
1205
|
.badge.errb { background: rgba(255, 90, 95, .14); color: var(--err); }
|
|
993
1206
|
.badge.unk { background: rgba(143, 160, 184, .14); color: var(--muted); }
|
|
994
|
-
.badge.part { background: rgba(255, 159, 10, .14); color:
|
|
1207
|
+
.badge.part { background: rgba(255, 159, 10, .14); color: var(--run); }
|
|
995
1208
|
.matrix-toggle { background: transparent; border: none; color: var(--muted); cursor: pointer; padding: 0 2px; font-size: 12px; }
|
|
996
1209
|
.matrix-toggle:hover { color: var(--accent); }
|
|
997
|
-
.matrix-badge { font-size: 11px; color:
|
|
1210
|
+
.matrix-badge { font-size: 11px; color: var(--run); white-space: nowrap; }
|
|
998
1211
|
.clone-badge { font-size: 11px; color: var(--muted); white-space: nowrap; }
|
|
999
1212
|
tr.clone-row td { background: rgba(126, 200, 250, 0.03); }
|
|
1000
1213
|
tr.clone-row .name { padding-left: 26px; font-weight: 500; color: #cfd7e3; }
|
|
@@ -1011,7 +1224,8 @@ function renderPage(): string {
|
|
|
1011
1224
|
.an-kpis { display: flex; flex-wrap: wrap; gap: 14px; margin-bottom: 12px; font-size: 12px; color: var(--muted); }
|
|
1012
1225
|
.an-kpis b { color: var(--text); font-size: 14px; }
|
|
1013
1226
|
.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; }
|
|
1014
|
-
|
|
1227
|
+
/* min-width: подпись даты "MM-DD" не наезжает на соседнюю; на узком экране график скроллится. */
|
|
1228
|
+
.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; }
|
|
1015
1229
|
.an-bar-fill { width: 100%; border-radius: 3px 3px 0 0; background: var(--accent); opacity: .85; }
|
|
1016
1230
|
.an-label { font-size: 9px; color: var(--muted); margin-top: 4px; white-space: nowrap; }
|
|
1017
1231
|
.an-grid { display: grid; grid-template-columns: repeat(auto-fit, minmax(280px, 1fr)); gap: 16px; margin-top: 14px; }
|
|
@@ -1039,6 +1253,17 @@ function renderPage(): string {
|
|
|
1039
1253
|
.wi-table .wi-model { color: #c084fc; }
|
|
1040
1254
|
.graph { background: var(--panel); border: 1px solid var(--border); border-radius: 10px; padding: 12px 16px; margin-bottom: 16px; }
|
|
1041
1255
|
.graph-title { font-size: 11px; font-weight: 700; letter-spacing: 1px; text-transform: uppercase; color: var(--muted); margin-bottom: 6px; }
|
|
1256
|
+
.graph-hint { font-size: 11px; color: var(--muted); margin-bottom: 8px; }
|
|
1257
|
+
.graph-scroll { overflow-x: auto; overflow-y: hidden; padding-bottom: 4px; }
|
|
1258
|
+
.graph-canvas { position: relative; }
|
|
1259
|
+
.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; }
|
|
1260
|
+
.graph-node .g-name { color: var(--text); font-weight: 600; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
|
|
1261
|
+
.graph-node .g-meta { color: var(--muted); font-size: 10px; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; }
|
|
1262
|
+
.graph-node.okg { border-left-color: #3fb950; }
|
|
1263
|
+
.graph-node.errg { border-left-color: #ff3b30; }
|
|
1264
|
+
.graph-node.partg { border-left-color: #f5a623; }
|
|
1265
|
+
.graph-node.rung { border-left-color: #58a6ff; }
|
|
1266
|
+
.graph-edge { fill: none; stroke: var(--border); stroke-width: 1.5; }
|
|
1042
1267
|
.chain-line { font-size: 13px; padding: 3px 0; }
|
|
1043
1268
|
.chain-line .dep { color: var(--accent); }
|
|
1044
1269
|
.chain-line .arrow { color: var(--muted); margin: 0 6px; }
|
|
@@ -1071,6 +1296,28 @@ function renderPage(): string {
|
|
|
1071
1296
|
.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); }
|
|
1072
1297
|
.toast.ok2 { border-color: rgba(52,199,89,.5); }
|
|
1073
1298
|
.toast.err2 { border-color: rgba(255,90,95,.5); }
|
|
1299
|
+
/* Светлая тема: переменные темы + точечные правки для цветов, которые
|
|
1300
|
+
заданы не через var(). Тёмная остаётся по умолчанию. */
|
|
1301
|
+
@media (prefers-color-scheme: light) {
|
|
1302
|
+
:root {
|
|
1303
|
+
color-scheme: light;
|
|
1304
|
+
--bg1: #f5f8fc; --bg2: #ffffff; --panel: #ffffff; --panel2: #eef3f9;
|
|
1305
|
+
--border: #cbd6e2; --text: #17202b; --muted: #56667a;
|
|
1306
|
+
--accent: #0b6ea8; --ok: #167a37; --err: #bc2c22; --run: #9a5a00;
|
|
1307
|
+
}
|
|
1308
|
+
html { background: var(--bg2); }
|
|
1309
|
+
.snow { color: #9cc7ea; opacity: .4; }
|
|
1310
|
+
tr.clone-row .name { color: #3c4b5e; }
|
|
1311
|
+
.model, .hist-model, .wi-table .wi-model { color: #7b3fb0; }
|
|
1312
|
+
.graph-node { background: var(--panel2); }
|
|
1313
|
+
.toast { box-shadow: 0 6px 18px rgba(20, 40, 70, .18); }
|
|
1314
|
+
}
|
|
1315
|
+
a:focus-visible, button:focus-visible, [tabindex]:focus-visible {
|
|
1316
|
+
outline: 2px solid var(--accent); outline-offset: 2px;
|
|
1317
|
+
}
|
|
1318
|
+
@media (prefers-reduced-motion: reduce) {
|
|
1319
|
+
.snow { display: none; }
|
|
1320
|
+
}
|
|
1074
1321
|
</style>
|
|
1075
1322
|
</head>
|
|
1076
1323
|
<body>
|
|
@@ -1092,7 +1339,8 @@ function renderPage(): string {
|
|
|
1092
1339
|
<div class="cards">
|
|
1093
1340
|
<div class="card"><div class="num neu" id="m-total">—</div><div class="lbl">Всего запусков</div></div>
|
|
1094
1341
|
<div class="card"><div class="num ok" id="m-success">—</div><div class="lbl">Успешных</div></div>
|
|
1095
|
-
<div class="card"><div class="num err" id="m-error">—</div><div class="lbl"
|
|
1342
|
+
<div class="card" title="Ошибки и таймауты. Частичные выполнения считаются отдельно."><div class="num err" id="m-error">—</div><div class="lbl">Ошибок</div></div>
|
|
1343
|
+
<div class="card" title="Частичные выполнения (partial): ответ получен, но проверка не прошла"><div class="num run" id="m-partial">—</div><div class="lbl">Частичных</div></div>
|
|
1096
1344
|
<div class="card"><div class="num" id="m-tasks">—</div><div class="lbl">Задач в системе</div></div>
|
|
1097
1345
|
<div class="card"><div class="num neu" id="m-tokens">—</div><div class="lbl">Всего токенов</div></div>
|
|
1098
1346
|
<div class="card"><div class="num" id="m-cost">—</div><div class="lbl">Примерная стоимость</div></div>
|
|
@@ -1100,26 +1348,30 @@ function renderPage(): string {
|
|
|
1100
1348
|
|
|
1101
1349
|
<div class="graph" id="graph" style="display:none">
|
|
1102
1350
|
<div class="graph-title">🔗 Граф зависимостей (DAG)</div>
|
|
1103
|
-
<div
|
|
1351
|
+
<div class="graph-hint">Слева — задачи без зависимостей, справа — задачи, которые ждут их успешного завершения. Граф можно прокручивать по горизонтали.</div>
|
|
1352
|
+
<div class="graph-scroll" id="graph-scroll" role="region" aria-label="Граф зависимостей задач" tabindex="0">
|
|
1353
|
+
<div id="graph-lines"></div>
|
|
1354
|
+
</div>
|
|
1104
1355
|
</div>
|
|
1105
1356
|
|
|
1106
1357
|
<div class="ws-summary" id="ws-summary">📦 0 workspace · 0 задач</div>
|
|
1107
|
-
<div class="ws-tabs" id="ws-tabs"></div>
|
|
1358
|
+
<div class="ws-tabs" id="ws-tabs" role="group" aria-label="Фильтр задач по workspace"></div>
|
|
1108
1359
|
|
|
1109
1360
|
<div class="table-scroll">
|
|
1110
|
-
<table>
|
|
1361
|
+
<table aria-label="Задачи планировщика">
|
|
1111
1362
|
<thead>
|
|
1112
1363
|
<tr>
|
|
1113
|
-
<th>Имя</th><th>Статус</th><th>Cron</th><th>📦 Workspace</th><th>Модель</th><th>Приоритет</th><th>Зависимости</th><th>Метрики</th><th>Действия</th>
|
|
1364
|
+
<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>
|
|
1114
1365
|
</tr>
|
|
1115
1366
|
</thead>
|
|
1116
1367
|
<tbody id="rows"><tr><td colspan="9" class="empty">Загрузка…</td></tr></tbody>
|
|
1117
1368
|
</table>
|
|
1118
1369
|
</div>
|
|
1370
|
+
<div class="scroll-hint">↔ Таблица шире экрана — прокрутите её влево-вправо.</div>
|
|
1119
1371
|
|
|
1120
1372
|
<div class="hist">
|
|
1121
1373
|
<h2>📜 История выполнений</h2>
|
|
1122
|
-
<div id="history"><div class="empty">Загрузка…</div></div>
|
|
1374
|
+
<div id="history" aria-live="polite"><div class="empty">Загрузка…</div></div>
|
|
1123
1375
|
</div>
|
|
1124
1376
|
|
|
1125
1377
|
<div class="hist">
|
|
@@ -1146,7 +1398,7 @@ function renderPage(): string {
|
|
|
1146
1398
|
|
|
1147
1399
|
<footer>Данные обновляются автоматически каждые 5 секунд · <span id="server-url">http://localhost:3782</span> · <span class="db-badge">БД: ✅ SQLite (WAL)</span></footer>
|
|
1148
1400
|
</div>
|
|
1149
|
-
<div id="toast"></div>
|
|
1401
|
+
<div id="toast" role="status" aria-live="polite"></div>
|
|
1150
1402
|
|
|
1151
1403
|
<script>
|
|
1152
1404
|
(function () {
|
|
@@ -1159,6 +1411,14 @@ function renderPage(): string {
|
|
|
1159
1411
|
var activeWorkspace = 'all';
|
|
1160
1412
|
/** Раскрытые родители матриц (имя → true). */
|
|
1161
1413
|
var expandedMatrixParents = {};
|
|
1414
|
+
/** История: последний загруженный список и режим «показать все». */
|
|
1415
|
+
var lastHistory = [];
|
|
1416
|
+
var historyExpanded = false;
|
|
1417
|
+
// /api/metrics и /api/summary отдают один и тот же обработчик. По умолчанию
|
|
1418
|
+
// используем summary: некоторые антивирусы блокируют именно /api/metrics
|
|
1419
|
+
// (HTTP 499), и тогда в консоли появляется ошибка при каждой загрузке.
|
|
1420
|
+
var preferSummaryMetrics = true;
|
|
1421
|
+
var metricsFallbackLogged = false;
|
|
1162
1422
|
|
|
1163
1423
|
function esc(s) {
|
|
1164
1424
|
var d = document.createElement('div');
|
|
@@ -1246,11 +1506,24 @@ function renderPage(): string {
|
|
|
1246
1506
|
});
|
|
1247
1507
|
}
|
|
1248
1508
|
|
|
1249
|
-
function badge(status) {
|
|
1509
|
+
function badge(status, task, historyMode) {
|
|
1510
|
+
if (task && task.orphaned) {
|
|
1511
|
+
return '<span class="badge unk" title="Определение есть в БД, но задачи нет в планировщике ОС">🧟 Нет в планировщике</span>';
|
|
1512
|
+
}
|
|
1513
|
+
if (task && task.paused) {
|
|
1514
|
+
return '<span class="badge unk" title="Задача поставлена на паузу">⏸ Пауза</span>';
|
|
1515
|
+
}
|
|
1250
1516
|
if (status === 'running') return '<span class="badge run">🟡 Выполняется</span>';
|
|
1251
|
-
if (status === 'success')
|
|
1517
|
+
if (status === 'success') {
|
|
1518
|
+
return historyMode
|
|
1519
|
+
? '<span class="badge okb">✅ Успех</span>'
|
|
1520
|
+
: '<span class="badge okb">🟢 Готова</span>';
|
|
1521
|
+
}
|
|
1252
1522
|
if (status === 'error') return '<span class="badge errb">🔴 Ошибка</span>';
|
|
1253
1523
|
if (status === 'partial') return '<span class="badge part">🟠 Частично</span>';
|
|
1524
|
+
if (status === 'idle') {
|
|
1525
|
+
return '<span class="badge unk" title="Задача создана, но ещё ни разу не запускалась">⚪ Не запускалась</span>';
|
|
1526
|
+
}
|
|
1254
1527
|
return '<span class="badge unk">⚪ Неизвестно</span>';
|
|
1255
1528
|
}
|
|
1256
1529
|
|
|
@@ -1260,7 +1533,7 @@ function renderPage(): string {
|
|
|
1260
1533
|
if (!t.isMatrixParent || !s) return '';
|
|
1261
1534
|
var color = s.status === 'success' ? 'var(--ok)'
|
|
1262
1535
|
: s.status === 'error' ? 'var(--err)'
|
|
1263
|
-
: s.status === 'partial' ? '
|
|
1536
|
+
: s.status === 'partial' ? 'var(--run)'
|
|
1264
1537
|
: 'var(--run)';
|
|
1265
1538
|
return '<div class="matrix-badge" style="color:' + color + '" title="' + esc(s.message) + '">' +
|
|
1266
1539
|
'📦 Matrix: ' + s.successCount + '/' + s.totalCount + ' успешных' +
|
|
@@ -1270,8 +1543,10 @@ function renderPage(): string {
|
|
|
1270
1543
|
}
|
|
1271
1544
|
|
|
1272
1545
|
function metricsHtml(m) {
|
|
1273
|
-
var mm = m || { total: 0, success: 0, error: 0 };
|
|
1274
|
-
return 'Всего: <b>' + mm.total + '</b> · ✅ <b>' + mm.success + '</b>
|
|
1546
|
+
var mm = m || { total: 0, success: 0, error: 0, partial: 0 };
|
|
1547
|
+
return 'Всего: <b>' + mm.total + '</b> · ✅ <b>' + mm.success + '</b>' +
|
|
1548
|
+
' · <span title="Частичные выполнения (partial)" style="color:var(--run)">🟠 <b>' + (mm.partial || 0) + '</b></span>' +
|
|
1549
|
+
' · <span title="Ошибки и таймауты" style="color:var(--err)">⚠️ <b>' + mm.error + '</b></span>';
|
|
1275
1550
|
}
|
|
1276
1551
|
|
|
1277
1552
|
function depsHtml(t) {
|
|
@@ -1303,19 +1578,19 @@ function renderPage(): string {
|
|
|
1303
1578
|
function renderHistory(records) {
|
|
1304
1579
|
var box = document.getElementById('history');
|
|
1305
1580
|
if (!box) return;
|
|
1581
|
+
lastHistory = records || [];
|
|
1306
1582
|
if (!records || records.length === 0) {
|
|
1307
1583
|
box.innerHTML = '<div class="empty" style="padding:16px">Запусков пока нет.</div>';
|
|
1308
1584
|
return;
|
|
1309
1585
|
}
|
|
1310
1586
|
var html = '';
|
|
1311
|
-
var limit = Math.min(records.length, 10);
|
|
1587
|
+
var limit = historyExpanded ? records.length : Math.min(records.length, 10);
|
|
1312
1588
|
for (var i = 0; i < limit; i++) {
|
|
1313
1589
|
var r = records[i];
|
|
1314
|
-
var ok = r.status === 'success';
|
|
1315
1590
|
html += '<div class="hist-row">' +
|
|
1316
1591
|
'<span class="hist-time">' + esc(new Date(r.startedAt).toLocaleString('ru-RU')) + '</span>' +
|
|
1317
1592
|
'<span class="hist-task">' + esc(r.taskName) + '</span>' +
|
|
1318
|
-
|
|
1593
|
+
badge(r.status, null, true) +
|
|
1319
1594
|
'<span class="metrics">' + (r.durationMs != null ? r.durationMs + ' мс' : '—') + '</span>' +
|
|
1320
1595
|
(r.model ? '<span class="hist-model" title="Модель">🧠 ' + esc(r.model) + '</span>' : '') +
|
|
1321
1596
|
(r.preFlightStatus && r.preFlightStatus !== 'skipped'
|
|
@@ -1329,6 +1604,11 @@ function renderPage(): string {
|
|
|
1329
1604
|
(r.error ? '<span class="metrics" title="' + esc(r.error) + '">⚠ ' + esc(String(r.error).slice(0, 80)) + '</span>' : '') +
|
|
1330
1605
|
'</div>';
|
|
1331
1606
|
}
|
|
1607
|
+
if (records.length > 10) {
|
|
1608
|
+
html += '<div style="padding:10px 0 2px"><button class="btn" data-act="history-toggle">' +
|
|
1609
|
+
(historyExpanded ? 'Свернуть историю' : 'Показать все (' + records.length + ')') +
|
|
1610
|
+
'</button></div>';
|
|
1611
|
+
}
|
|
1332
1612
|
box.innerHTML = html;
|
|
1333
1613
|
}
|
|
1334
1614
|
|
|
@@ -1385,20 +1665,24 @@ function renderPage(): string {
|
|
|
1385
1665
|
for (var j = 0; j < daily.length; j++) {
|
|
1386
1666
|
var d = daily[j];
|
|
1387
1667
|
var h = d.total > 0 ? Math.max(3, Math.round((d.total / max) * 92)) : 2;
|
|
1388
|
-
var
|
|
1389
|
-
var
|
|
1668
|
+
var isPartialOnly = d.error === 0 && d.partial > 0;
|
|
1669
|
+
var color = d.total === 0 ? 'var(--border)' : (d.error > 0 ? 'var(--err)' : (isPartialOnly ? 'var(--run)' : 'var(--ok)'));
|
|
1670
|
+
var tip = d.date + ': всего ' + d.total + ', успех ' + d.success + ', ошибок ' + d.error + ', частично ' + d.partial + ', ' + money(d.costUsd);
|
|
1390
1671
|
bars += '<div class="an-bar" title="' + esc(tip) + '">' +
|
|
1391
1672
|
'<div class="an-bar-fill" style="height:' + h + '%' + ';background:' + esc(color) + '"></div>' +
|
|
1392
1673
|
'<div class="an-label">' + esc(String(d.date).slice(5)) + '</div>' +
|
|
1393
1674
|
'</div>';
|
|
1394
1675
|
}
|
|
1395
1676
|
chart.innerHTML = bars || '<div class="empty" style="padding:10px">Нет данных за период.</div>';
|
|
1677
|
+
// На узком экране график скроллится по горизонтали: показываем свежие дни,
|
|
1678
|
+
// а не пустую левую часть окна.
|
|
1679
|
+
chart.scrollLeft = chart.scrollWidth;
|
|
1396
1680
|
|
|
1397
1681
|
var topRows = an.topByCost || [];
|
|
1398
1682
|
if (topRows.length === 0) {
|
|
1399
1683
|
top.innerHTML = '<div class="empty" style="padding:10px">Нет запусков за период.</div>';
|
|
1400
1684
|
} else {
|
|
1401
|
-
var html = '<table class="an-table"><thead><tr><th>Задача</th><th>Запусков</th><th>Успех</th><th>Стоимость</th></tr></thead><tbody>';
|
|
1685
|
+
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>';
|
|
1402
1686
|
for (var k = 0; k < topRows.length; k++) {
|
|
1403
1687
|
var row = topRows[k];
|
|
1404
1688
|
html += '<tr>' +
|
|
@@ -1415,7 +1699,7 @@ function renderPage(): string {
|
|
|
1415
1699
|
if (matrixRows.length === 0) {
|
|
1416
1700
|
matrices.innerHTML = '<div class="empty" style="padding:10px">Матриц за период не запускалось.</div>';
|
|
1417
1701
|
} else {
|
|
1418
|
-
var mhtml = '<table class="an-table"><thead><tr><th>Матрица</th><th>Клонов</th><th>Запусков</th><th>Успех</th><th>Стоимость</th></tr></thead><tbody>';
|
|
1702
|
+
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>';
|
|
1419
1703
|
for (var q = 0; q < matrixRows.length; q++) {
|
|
1420
1704
|
var m = matrixRows[q];
|
|
1421
1705
|
mhtml += '<tr>' +
|
|
@@ -1444,7 +1728,7 @@ function renderPage(): string {
|
|
|
1444
1728
|
}
|
|
1445
1729
|
|
|
1446
1730
|
var html = '<table class="wi-table"><thead><tr>' +
|
|
1447
|
-
'<th>Модель</th><th>Запусков</th><th>Токенов</th><th>Стоимость</th><th>Средняя длительность</th><th>Успешных</th>' +
|
|
1731
|
+
'<th scope="col">Модель</th><th scope="col">Запусков</th><th scope="col">Токенов</th><th scope="col">Стоимость</th><th scope="col">Средняя длительность</th><th scope="col">Успешных</th>' +
|
|
1448
1732
|
'</tr></thead><tbody>';
|
|
1449
1733
|
for (var i = 0; i < models.length; i++) {
|
|
1450
1734
|
var m = models[i];
|
|
@@ -1482,20 +1766,147 @@ function renderPage(): string {
|
|
|
1482
1766
|
var box = document.getElementById('graph-lines');
|
|
1483
1767
|
if (!graph || !box) return;
|
|
1484
1768
|
if (!tasks || tasks.length === 0) { graph.style.display = 'none'; return; }
|
|
1485
|
-
|
|
1769
|
+
|
|
1770
|
+
var known = {};
|
|
1486
1771
|
for (var i = 0; i < tasks.length; i++) {
|
|
1487
|
-
|
|
1488
|
-
|
|
1489
|
-
|
|
1490
|
-
|
|
1491
|
-
|
|
1492
|
-
|
|
1772
|
+
known[String(tasks[i].name).toLowerCase()] = tasks[i];
|
|
1773
|
+
}
|
|
1774
|
+
|
|
1775
|
+
// В граф включаем только задачи, связанные зависимостями, и все их
|
|
1776
|
+
// транзитивные предки. Одиночные задачи не превращают блок в свалку.
|
|
1777
|
+
var involved = {};
|
|
1778
|
+
function collect(name, depth) {
|
|
1779
|
+
var key = String(name).toLowerCase();
|
|
1780
|
+
if (depth > 40 || involved[key] || !known[key]) return;
|
|
1781
|
+
involved[key] = known[key];
|
|
1782
|
+
var deps = Array.isArray(known[key].dependsOn) ? known[key].dependsOn : [];
|
|
1783
|
+
for (var d = 0; d < deps.length; d++) collect(deps[d], depth + 1);
|
|
1784
|
+
}
|
|
1785
|
+
var hasEdges = false;
|
|
1786
|
+
for (var t = 0; t < tasks.length; t++) {
|
|
1787
|
+
var direct = Array.isArray(tasks[t].dependsOn) ? tasks[t].dependsOn : [];
|
|
1788
|
+
if (direct.length > 0) {
|
|
1789
|
+
hasEdges = true;
|
|
1790
|
+
collect(tasks[t].name, 0);
|
|
1493
1791
|
}
|
|
1494
|
-
html += '<div class="chain-line">' + parts.join(' <span class="arrow">+</span> ') +
|
|
1495
|
-
'<span class="arrow">➔</span><span class="target">[' + esc(t.name) + ']</span></div>';
|
|
1496
1792
|
}
|
|
1497
|
-
if (!
|
|
1498
|
-
|
|
1793
|
+
if (!hasEdges) { graph.style.display = 'none'; return; }
|
|
1794
|
+
|
|
1795
|
+
// Слои: уровень задачи = максимум по уровню зависимостей + 1.
|
|
1796
|
+
// visiting защищает от циклов в ошибочно настроенном DAG.
|
|
1797
|
+
var levels = {};
|
|
1798
|
+
var visiting = {};
|
|
1799
|
+
function levelOf(name) {
|
|
1800
|
+
var key = String(name).toLowerCase();
|
|
1801
|
+
if (levels[key] != null) return levels[key];
|
|
1802
|
+
if (visiting[key]) return 0;
|
|
1803
|
+
visiting[key] = true;
|
|
1804
|
+
var own = 0;
|
|
1805
|
+
var deps = Array.isArray(known[key] && known[key].dependsOn) ? known[key].dependsOn : [];
|
|
1806
|
+
for (var d = 0; d < deps.length; d++) {
|
|
1807
|
+
var depKey = String(deps[d]).toLowerCase();
|
|
1808
|
+
if (!known[depKey]) continue;
|
|
1809
|
+
own = Math.max(own, levelOf(depKey) + 1);
|
|
1810
|
+
}
|
|
1811
|
+
visiting[key] = false;
|
|
1812
|
+
levels[key] = own;
|
|
1813
|
+
return own;
|
|
1814
|
+
}
|
|
1815
|
+
|
|
1816
|
+
var byLevel = {};
|
|
1817
|
+
var maxLevel = 0;
|
|
1818
|
+
for (var key in involved) {
|
|
1819
|
+
if (!Object.prototype.hasOwnProperty.call(involved, key)) continue;
|
|
1820
|
+
var level = levelOf(key);
|
|
1821
|
+
maxLevel = Math.max(maxLevel, level);
|
|
1822
|
+
if (!byLevel[level]) byLevel[level] = [];
|
|
1823
|
+
byLevel[level].push(involved[key]);
|
|
1824
|
+
}
|
|
1825
|
+
for (var l = 0; l <= maxLevel; l++) {
|
|
1826
|
+
if (byLevel[l]) byLevel[l].sort(function (a, b) { return String(a.name).localeCompare(String(b.name)); });
|
|
1827
|
+
}
|
|
1828
|
+
|
|
1829
|
+
var NODE_W = 180;
|
|
1830
|
+
var NODE_H = 46;
|
|
1831
|
+
var GAP_X = 64;
|
|
1832
|
+
var GAP_Y = 18;
|
|
1833
|
+
var PAD = 10;
|
|
1834
|
+
var maxRows = 1;
|
|
1835
|
+
for (var rowLevel in byLevel) {
|
|
1836
|
+
if (byLevel[rowLevel].length > maxRows) maxRows = byLevel[rowLevel].length;
|
|
1837
|
+
}
|
|
1838
|
+
var width = PAD * 2 + (maxLevel + 1) * NODE_W + maxLevel * GAP_X;
|
|
1839
|
+
var height = PAD * 2 + maxRows * (NODE_H + GAP_Y) - GAP_Y;
|
|
1840
|
+
|
|
1841
|
+
var pos = {};
|
|
1842
|
+
for (var lv = 0; lv <= maxLevel; lv++) {
|
|
1843
|
+
var nodes = byLevel[lv] || [];
|
|
1844
|
+
for (var n = 0; n < nodes.length; n++) {
|
|
1845
|
+
pos[String(nodes[n].name).toLowerCase()] = {
|
|
1846
|
+
x: PAD + lv * (NODE_W + GAP_X),
|
|
1847
|
+
y: PAD + n * (NODE_H + GAP_Y),
|
|
1848
|
+
task: nodes[n]
|
|
1849
|
+
};
|
|
1850
|
+
}
|
|
1851
|
+
}
|
|
1852
|
+
|
|
1853
|
+
function shortLabel(value, max) {
|
|
1854
|
+
var text = String(value == null ? '' : value);
|
|
1855
|
+
return text.length > max ? text.slice(0, max - 1) + '…' : text;
|
|
1856
|
+
}
|
|
1857
|
+
function attr(value) {
|
|
1858
|
+
return esc(String(value == null ? '' : value)).replace(/"/g, '"');
|
|
1859
|
+
}
|
|
1860
|
+
function statusClass(status) {
|
|
1861
|
+
if (status === 'success') return ' okg';
|
|
1862
|
+
if (status === 'error' || status === 'timeout') return ' errg';
|
|
1863
|
+
if (status === 'partial') return ' partg';
|
|
1864
|
+
if (status === 'running') return ' rung';
|
|
1865
|
+
return '';
|
|
1866
|
+
}
|
|
1867
|
+
|
|
1868
|
+
var svg = '<svg width="' + width + '" height="' + height + '" style="position:absolute;left:0;top:0;pointer-events:none" aria-hidden="true">' +
|
|
1869
|
+
'<defs><marker id="dag-arrow" markerWidth="8" markerHeight="8" refX="7" refY="4" orient="auto">' +
|
|
1870
|
+
'<path d="M0,0 L8,4 L0,8 z" fill="#8b949e"></path></marker></defs>';
|
|
1871
|
+
for (var targetKey in pos) {
|
|
1872
|
+
if (!Object.prototype.hasOwnProperty.call(pos, targetKey)) continue;
|
|
1873
|
+
var target = pos[targetKey];
|
|
1874
|
+
var deps = Array.isArray(target.task.dependsOn) ? target.task.dependsOn : [];
|
|
1875
|
+
for (var di = 0; di < deps.length; di++) {
|
|
1876
|
+
var from = pos[String(deps[di]).toLowerCase()];
|
|
1877
|
+
if (!from || from.x >= target.x) continue;
|
|
1878
|
+
var x1 = from.x + NODE_W;
|
|
1879
|
+
var y1 = from.y + NODE_H / 2;
|
|
1880
|
+
var x2 = target.x;
|
|
1881
|
+
var y2 = target.y + NODE_H / 2;
|
|
1882
|
+
var bend = Math.max(24, (x2 - x1) / 2);
|
|
1883
|
+
svg += '<path class="graph-edge" d="M' + x1 + ',' + y1 +
|
|
1884
|
+
' C' + (x1 + bend) + ',' + y1 + ' ' + (x2 - bend) + ',' + y2 + ' ' + x2 + ',' + y2 +
|
|
1885
|
+
'" marker-end="url(#dag-arrow)"></path>';
|
|
1886
|
+
}
|
|
1887
|
+
}
|
|
1888
|
+
svg += '</svg>';
|
|
1889
|
+
|
|
1890
|
+
var nodesHtml = '';
|
|
1891
|
+
for (var pKey in pos) {
|
|
1892
|
+
if (!Object.prototype.hasOwnProperty.call(pos, pKey)) continue;
|
|
1893
|
+
var node = pos[pKey];
|
|
1894
|
+
var nodeDeps = Array.isArray(node.task.dependsOn) ? node.task.dependsOn : [];
|
|
1895
|
+
var meta = nodeDeps.length > 0
|
|
1896
|
+
? '← ' + shortLabel(nodeDeps.join(', '), 30)
|
|
1897
|
+
: 'начальная задача';
|
|
1898
|
+
nodesHtml += '<div class="graph-node' + statusClass(node.task.status) + '" style="left:' + node.x +
|
|
1899
|
+
'px;top:' + node.y + 'px;width:' + NODE_W + 'px;height:' + NODE_H + 'px" title="' +
|
|
1900
|
+
attr(node.task.name + (nodeDeps.length ? ' · зависит от: ' + nodeDeps.join(', ') : '')) + '">' +
|
|
1901
|
+
'<span class="g-name">' + esc(shortLabel(node.task.name, 26)) + '</span>' +
|
|
1902
|
+
'<span class="g-meta">' + esc(meta) + '</span></div>';
|
|
1903
|
+
}
|
|
1904
|
+
|
|
1905
|
+
var scroll = document.getElementById('graph-scroll');
|
|
1906
|
+
var scrollLeft = scroll ? scroll.scrollLeft : 0;
|
|
1907
|
+
box.innerHTML = '<div class="graph-canvas" style="width:' + width + 'px;height:' + height + 'px">' +
|
|
1908
|
+
svg + nodesHtml + '</div>';
|
|
1909
|
+
if (scroll) scroll.scrollLeft = scrollLeft;
|
|
1499
1910
|
graph.style.display = 'block';
|
|
1500
1911
|
}
|
|
1501
1912
|
|
|
@@ -1531,14 +1942,14 @@ function renderPage(): string {
|
|
|
1531
1942
|
(matrixCount ? ' · 📦 матриц: ' + matrixCount : '');
|
|
1532
1943
|
}
|
|
1533
1944
|
if (!box) return;
|
|
1534
|
-
var html = '<button class="ws-tab' + (activeWorkspace === 'all' ? ' active' : '') + '" data-ws="all">Все</button>';
|
|
1945
|
+
var html = '<button class="ws-tab' + (activeWorkspace === 'all' ? ' active' : '') + '" data-ws="all" aria-pressed="' + (activeWorkspace === 'all') + '">Все</button>';
|
|
1535
1946
|
for (var i = 0; i < workspaces.length; i++) {
|
|
1536
1947
|
var w = workspaces[i];
|
|
1537
1948
|
var color = w.color || '#8b949e';
|
|
1538
|
-
html += '<button class="ws-tab' + (activeWorkspace === w.id ? ' active' : '') + '" data-ws="' + esc(w.id) + '" style="color:' + esc(color) + '">📦 ' + esc(w.name) + '</button>';
|
|
1949
|
+
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>';
|
|
1539
1950
|
}
|
|
1540
|
-
html += '<button class="ws-tab' + (activeWorkspace === 'matrix' ? ' active' : '') + '" data-ws="matrix" title="Только родители матриц и их клоны">📦 Матрицы</button>';
|
|
1541
|
-
html += '<button class="ws-tab' + (activeWorkspace === 'none' ? ' active' : '') + '" data-ws="none">Без workspace</button>';
|
|
1951
|
+
html += '<button class="ws-tab' + (activeWorkspace === 'matrix' ? ' active' : '') + '" data-ws="matrix" aria-pressed="' + (activeWorkspace === 'matrix') + '" title="Только родители матриц и их клоны">📦 Матрицы</button>';
|
|
1952
|
+
html += '<button class="ws-tab' + (activeWorkspace === 'none' ? ' active' : '') + '" data-ws="none" aria-pressed="' + (activeWorkspace === 'none') + '">Без workspace</button>';
|
|
1542
1953
|
box.innerHTML = html;
|
|
1543
1954
|
}
|
|
1544
1955
|
|
|
@@ -1600,10 +2011,23 @@ function renderPage(): string {
|
|
|
1600
2011
|
|
|
1601
2012
|
/** Строка таблицы задач; клоны матрицы помечаются ↳ matrix <parent>. */
|
|
1602
2013
|
function taskRow(t, isClone, cloneCount, expanded) {
|
|
2014
|
+
var sessionBadge = t.session === 'reuse' || t.session === 'last'
|
|
2015
|
+
? '<span title="' + (t.session === 'reuse'
|
|
2016
|
+
? 'Переиспользуемая сессия OpenCode' + (t.sessionId ? ': ' + t.sessionId : '')
|
|
2017
|
+
: 'Продолжение последней сессии OpenCode (--continue)') +
|
|
2018
|
+
'" style="margin-left:6px;padding:1px 6px;border-radius:999px;border:1px solid #30d158;color:#30d158;font-size:11px">' +
|
|
2019
|
+
(t.session === 'reuse' ? '⟳ сессия' : '↪ продолжение') + '</span>'
|
|
2020
|
+
: '';
|
|
1603
2021
|
var cron = t.triggerType === 'file'
|
|
1604
2022
|
? '👁️ файл: ' + (t.watchPath || '')
|
|
1605
2023
|
: t.triggerType === 'mcp-event'
|
|
1606
2024
|
? '📡 ' + ((t.mcpEvent && t.mcpEvent.event) || 'MCP Event')
|
|
2025
|
+
: t.triggerType === 'once'
|
|
2026
|
+
? '⏱ ' + (function () {
|
|
2027
|
+
if (!t.runAt) return '—';
|
|
2028
|
+
var d = new Date(t.runAt);
|
|
2029
|
+
return isNaN(d.getTime()) ? t.runAt : d.toLocaleString('ru-RU');
|
|
2030
|
+
})()
|
|
1607
2031
|
: (t.schedule || '—');
|
|
1608
2032
|
var nameHtml = esc(t.name);
|
|
1609
2033
|
var matrixLimit = t.matrix && t.matrix.concurrency
|
|
@@ -1621,14 +2045,14 @@ function renderPage(): string {
|
|
|
1621
2045
|
if (isClone) {
|
|
1622
2046
|
nameHtml = '<span class="clone-badge">↳ matrix ' + esc(t.matrixParentId || '') + '</span><br>' + esc(t.name);
|
|
1623
2047
|
} else if (cloneCount > 0) {
|
|
1624
|
-
nameHtml = '<button class="matrix-toggle" data-matrix="' + esc(t.name) + '" title="Показать/скрыть клоны">' +
|
|
2048
|
+
nameHtml = '<button class="matrix-toggle" data-matrix="' + esc(t.name) + '" title="Показать/скрыть клоны" aria-label="Показать/скрыть клоны матрицы ' + esc(t.name) + '" aria-expanded="' + (!!expanded) + '">' +
|
|
1625
2049
|
(expanded ? '▾' : '▸') + '</button> ' + esc(t.name) +
|
|
1626
2050
|
'<div class="matrix-badge" title="' + esc(matrixTitle) + '">📦 Matrix (' + cloneCount + ')' + matrixLimit + '</div>';
|
|
1627
2051
|
}
|
|
1628
2052
|
return '<tr' + (isClone ? ' class="clone-row"' : '') + '>' +
|
|
1629
2053
|
'<td class="name" title="' + esc(t.name) + '">' + nameHtml + '</td>' +
|
|
1630
|
-
'<td>' + badge(t.status) + matrixSummaryHtml(t) + '</td>' +
|
|
1631
|
-
'<td class="cron">' + esc(cron) + '</td>' +
|
|
2054
|
+
'<td>' + badge(t.status, t) + matrixSummaryHtml(t) + '</td>' +
|
|
2055
|
+
'<td class="cron">' + esc(cron) + sessionBadge + '</td>' +
|
|
1632
2056
|
'<td>' + workspaceHtml(t) + '</td>' +
|
|
1633
2057
|
'<td>' + modelHtml(t) + '</td>' +
|
|
1634
2058
|
'<td>' + priorityHtml(t) + '</td>' +
|
|
@@ -1653,13 +2077,26 @@ function renderPage(): string {
|
|
|
1653
2077
|
// /api/metrics может быть перехвачен антивирусом; /api/summary — тот же
|
|
1654
2078
|
// обработчик на случай, если блокировка привязана к имени URL.
|
|
1655
2079
|
function loadMetricsJson() {
|
|
1656
|
-
|
|
2080
|
+
var primary = preferSummaryMetrics ? '/api/summary' : '/api/metrics';
|
|
2081
|
+
var fallback = preferSummaryMetrics ? '/api/metrics' : '/api/summary';
|
|
2082
|
+
return fetch(primary, { cache: 'no-store' })
|
|
1657
2083
|
.then(readJson)
|
|
1658
2084
|
.catch(function () {
|
|
1659
|
-
|
|
2085
|
+
// Переключаемся на второй URL того же обработчика и запоминаем выбор,
|
|
2086
|
+
// чтобы следующие обновления не повторяли заблокированный запрос.
|
|
2087
|
+
preferSummaryMetrics = !preferSummaryMetrics;
|
|
2088
|
+
if (!metricsFallbackLogged) {
|
|
2089
|
+
metricsFallbackLogged = true;
|
|
2090
|
+
console.info('Дашборд: ' + primary + ' недоступен, использую ' + fallback);
|
|
2091
|
+
}
|
|
2092
|
+
return fetch(fallback, { cache: 'no-store' })
|
|
1660
2093
|
.then(readJson)
|
|
1661
2094
|
.catch(function (err) {
|
|
1662
|
-
|
|
2095
|
+
// Логируем только первый сбой, чтобы не засорять консоль каждые 5 секунд.
|
|
2096
|
+
if (!metricsFallbackLogged) {
|
|
2097
|
+
metricsFallbackLogged = true;
|
|
2098
|
+
console.error('Дашборд: метрики недоступны', err);
|
|
2099
|
+
}
|
|
1663
2100
|
return {};
|
|
1664
2101
|
});
|
|
1665
2102
|
});
|
|
@@ -1685,6 +2122,7 @@ function renderPage(): string {
|
|
|
1685
2122
|
document.getElementById('m-total').textContent = m.total != null ? m.total : '—';
|
|
1686
2123
|
document.getElementById('m-success').textContent = m.success != null ? m.success : '—';
|
|
1687
2124
|
document.getElementById('m-error').textContent = m.error != null ? m.error : '—';
|
|
2125
|
+
document.getElementById('m-partial').textContent = m.partial != null ? m.partial : '—';
|
|
1688
2126
|
document.getElementById('m-tasks').textContent = String(tasks.length);
|
|
1689
2127
|
document.getElementById('m-tokens').textContent = m.tokens != null ? Number(m.tokens).toLocaleString('ru-RU') : '—';
|
|
1690
2128
|
document.getElementById('m-cost').textContent = m.costUsd != null ? '$' + Number(m.costUsd).toFixed(2) : '—';
|
|
@@ -1741,6 +2179,13 @@ function renderPage(): string {
|
|
|
1741
2179
|
return;
|
|
1742
2180
|
}
|
|
1743
2181
|
|
|
2182
|
+
// История: развернуть/свернуть список (по умолчанию показываем последние 10).
|
|
2183
|
+
if (act === 'history-toggle') {
|
|
2184
|
+
historyExpanded = !historyExpanded;
|
|
2185
|
+
renderHistory(lastHistory);
|
|
2186
|
+
return;
|
|
2187
|
+
}
|
|
2188
|
+
|
|
1744
2189
|
if (!name) return;
|
|
1745
2190
|
if (act === 'simulate') {
|
|
1746
2191
|
await showDryRun(name);
|
|
@@ -1820,7 +2265,7 @@ function renderPage(): string {
|
|
|
1820
2265
|
if (report.warnings && report.warnings.length) {
|
|
1821
2266
|
html += '<div class="warn" style="margin-bottom:8px">⚠ Предупреждения:<br>' + report.warnings.map(function (w) { return '· ' + esc(w); }).join('<br>') + '</div>';
|
|
1822
2267
|
}
|
|
1823
|
-
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>';
|
|
2268
|
+
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>';
|
|
1824
2269
|
for (var i = 0; i < report.tasks.length; i++) {
|
|
1825
2270
|
var t = report.tasks[i];
|
|
1826
2271
|
var est = '—';
|