opencode-windows-scheduler 1.5.0 → 1.5.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +47 -1
- package/LICENSE +21 -21
- package/README.md +24 -2
- package/ROADMAP-STRATEGY.md +16 -16
- package/ROADMAP.md +649 -160
- package/dist/core/audit.d.ts +27 -0
- package/dist/core/audit.d.ts.map +1 -1
- package/dist/core/audit.js +60 -0
- package/dist/core/dry-run.d.ts +10 -0
- package/dist/core/dry-run.d.ts.map +1 -1
- package/dist/core/dry-run.js +55 -34
- package/dist/core/git-trigger.d.ts.map +1 -1
- package/dist/core/git-trigger.js +15 -9
- package/dist/core/matrix.d.ts.map +1 -1
- package/dist/core/matrix.js +48 -22
- package/dist/core/ps-wrapper.d.ts +1 -1
- package/dist/core/ps-wrapper.d.ts.map +1 -1
- package/dist/core/ps-wrapper.js +47 -10
- package/dist/core/schedule-v2.d.ts.map +1 -1
- package/dist/core/schedule-v2.js +29 -17
- package/dist/core/scheduler/types.d.ts +6 -0
- package/dist/core/scheduler/types.d.ts.map +1 -1
- package/dist/core/scheduler/windows.d.ts +6 -2
- package/dist/core/scheduler/windows.d.ts.map +1 -1
- package/dist/core/scheduler/windows.js +25 -10
- package/dist/core/secrets.d.ts +10 -3
- package/dist/core/secrets.d.ts.map +1 -1
- package/dist/core/secrets.js +28 -4
- package/dist/core/telegram.d.ts.map +1 -1
- package/dist/core/telegram.js +13 -10
- package/dist/core/wrappers/bash.d.ts +1 -0
- package/dist/core/wrappers/bash.d.ts.map +1 -1
- package/dist/core/wrappers/bash.js +91 -5
- package/dist/i18n.d.ts +52 -0
- package/dist/i18n.d.ts.map +1 -0
- package/dist/i18n.js +292 -0
- package/dist/index.d.ts +6 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +788 -183
- package/dist/notifications.d.ts.map +1 -1
- package/dist/notifications.js +74 -40
- package/dist/rpc.d.ts +15 -2
- package/dist/rpc.d.ts.map +1 -1
- package/dist/rpc.js +6 -2
- package/dist/server.d.ts.map +1 -1
- package/dist/server.js +89 -48
- package/dist/settings.d.ts +3 -0
- package/dist/settings.d.ts.map +1 -1
- package/dist/settings.js +20 -8
- package/dist/task-transfer.d.ts +13 -0
- package/dist/task-transfer.d.ts.map +1 -1
- package/dist/task-transfer.js +11 -0
- package/dist/types.d.ts +11 -0
- package/dist/types.d.ts.map +1 -1
- package/dist/types.js +32 -0
- package/dist/workspaces.d.ts +2 -2
- package/dist/workspaces.d.ts.map +1 -1
- package/dist/workspaces.js +6 -4
- package/docs/ARCHITECTURE.md +96 -4
- package/docs/FEATURES.md +34 -5
- package/docs/README.ru.md +17 -1
- package/gui-experimental.cjs +9 -9
- package/locales/en.json +695 -0
- package/locales/ru.json +695 -0
- package/package.json +6 -3
- package/scripts/test-locale.mjs +44 -0
- package/src/core/audit.ts +89 -0
- package/src/core/dry-run.ts +76 -38
- package/src/core/git-trigger.ts +15 -9
- package/src/core/matrix.ts +52 -26
- package/src/core/ps-wrapper.ts +47 -10
- package/src/core/schedule-v2.ts +47 -17
- package/src/core/scheduler/types.ts +6 -0
- package/src/core/scheduler/windows.ts +25 -10
- package/src/core/secrets.ts +34 -10
- package/src/core/telegram.ts +16 -10
- package/src/core/wrappers/bash.ts +112 -5
- package/src/gui.tsx +575 -480
- package/src/i18n.ts +339 -0
- package/src/index.ts +960 -193
- package/src/notifications.ts +83 -42
- package/src/rpc.ts +6 -2
- package/src/server.ts +89 -48
- package/src/settings.ts +38 -10
- package/src/task-transfer.ts +24 -0
- package/src/types.ts +37 -0
- package/src/workspaces.ts +9 -4
package/dist/server.js
CHANGED
|
@@ -17,6 +17,7 @@ import { appendStructuredLog, readStructuredLogs } from "./core/structured-log.j
|
|
|
17
17
|
import { PROMETHEUS_CONTENT_TYPE, renderPrometheusMetrics } from "./core/prometheus.js";
|
|
18
18
|
import { buildOtlpExport } from "./core/otel.js";
|
|
19
19
|
import { readAuditLog, recordAudit } from "./core/audit.js";
|
|
20
|
+
import { getLocale, t } from "./i18n.js";
|
|
20
21
|
/**
|
|
21
22
|
* Локальный веб-дашборд (Спринт 5).
|
|
22
23
|
* Встроенный модуль http из Node.js — без внешних зависимостей.
|
|
@@ -454,13 +455,13 @@ async function handleRequest(req, res, deps) {
|
|
|
454
455
|
/^\/api\/dry-run\//.test(pathname) ||
|
|
455
456
|
/^\/api\/matrix\//.test(pathname);
|
|
456
457
|
if (knownGet && req.method !== "GET") {
|
|
457
|
-
sendJson(res, 405, { error: "
|
|
458
|
+
sendJson(res, 405, { error: t("server.methodNotAllowed") });
|
|
458
459
|
return;
|
|
459
460
|
}
|
|
460
461
|
const knownPost = /^\/api\/(run|delete|hooks|cancel-matrix)\//.test(pathname) ||
|
|
461
462
|
pathname === "/api/matrix-cleanup";
|
|
462
463
|
if (knownPost && req.method !== "POST") {
|
|
463
|
-
sendJson(res, 405, { error: "
|
|
464
|
+
sendJson(res, 405, { error: t("server.methodNotAllowed") });
|
|
464
465
|
return;
|
|
465
466
|
}
|
|
466
467
|
// Браузер всегда просит иконку. Отвечаем 204, чтобы не засорять консоль 404.
|
|
@@ -547,7 +548,7 @@ async function handleRequest(req, res, deps) {
|
|
|
547
548
|
const key = parentId.toLowerCase();
|
|
548
549
|
const parent = tasks.find((t) => String(t.name).toLowerCase() === key);
|
|
549
550
|
if (!parent) {
|
|
550
|
-
sendJson(res, 404, { error:
|
|
551
|
+
sendJson(res, 404, { error: t("server.matrixNotFound", { parentId }) });
|
|
551
552
|
return;
|
|
552
553
|
}
|
|
553
554
|
const clones = tasks
|
|
@@ -801,8 +802,11 @@ async function handleRequest(req, res, deps) {
|
|
|
801
802
|
const key = taskName.toLowerCase();
|
|
802
803
|
const task = tasks.find((item) => String(item.name).toLowerCase() === key);
|
|
803
804
|
if (!task) {
|
|
804
|
-
logHook(404, "rejected",
|
|
805
|
-
sendJson(res, 404, {
|
|
805
|
+
logHook(404, "rejected", t("server.hookTaskMissing", { task: taskName }), bodyResult.body.length);
|
|
806
|
+
sendJson(res, 404, {
|
|
807
|
+
success: false,
|
|
808
|
+
error: t("server.taskNotFound", { task: taskName }),
|
|
809
|
+
});
|
|
806
810
|
return;
|
|
807
811
|
}
|
|
808
812
|
try {
|
|
@@ -968,7 +972,7 @@ async function handleRequest(req, res, deps) {
|
|
|
968
972
|
}
|
|
969
973
|
// Любой неизвестный путь — строго JSON, чтобы клиент не пытался
|
|
970
974
|
// разобрать HTML/картинку как JSON.
|
|
971
|
-
sendJson(res, 404, { error: "
|
|
975
|
+
sendJson(res, 404, { error: t("server.notFound") });
|
|
972
976
|
}
|
|
973
977
|
catch (err) {
|
|
974
978
|
const message = err instanceof Error ? err.message : String(err);
|
|
@@ -1069,11 +1073,11 @@ async function collectTasksWithMetrics(deps) {
|
|
|
1069
1073
|
*/
|
|
1070
1074
|
function renderPage() {
|
|
1071
1075
|
return `<!DOCTYPE html>
|
|
1072
|
-
<html lang="
|
|
1076
|
+
<html lang="${getLocale()}">
|
|
1073
1077
|
<head>
|
|
1074
1078
|
<meta charset="utf-8">
|
|
1075
1079
|
<meta name="viewport" content="width=device-width, initial-scale=1">
|
|
1076
|
-
<title>${getSchedulerTitle()} —
|
|
1080
|
+
<title>${getSchedulerTitle()} — ${t("app.dashboardTitle")}</title>
|
|
1077
1081
|
<style>
|
|
1078
1082
|
:root {
|
|
1079
1083
|
color-scheme: dark;
|
|
@@ -1099,22 +1103,46 @@ function renderPage() {
|
|
|
1099
1103
|
100% { transform: translateY(110vh) rotate(360deg); }
|
|
1100
1104
|
}
|
|
1101
1105
|
.wrap { position: relative; z-index: 1; max-width: 1740px; margin: 0 auto; padding: 28px 20px 60px; }
|
|
1102
|
-
.table-scroll {
|
|
1103
|
-
|
|
1104
|
-
|
|
1105
|
-
|
|
1106
|
+
.table-scroll {
|
|
1107
|
+
overflow-x: auto;
|
|
1108
|
+
border: 1px solid var(--border);
|
|
1109
|
+
border-radius: 10px;
|
|
1110
|
+
scrollbar-width: thin;
|
|
1111
|
+
scrollbar-color: var(--border) transparent;
|
|
1112
|
+
}
|
|
1113
|
+
/* Полоса прокрутки всегда видна (в overlay-режиме её не замечают):
|
|
1114
|
+
подсказываем, что справа есть ещё колонки. */
|
|
1115
|
+
.table-scroll::-webkit-scrollbar { height: 10px; }
|
|
1116
|
+
.table-scroll::-webkit-scrollbar-track { background: transparent; }
|
|
1117
|
+
.table-scroll::-webkit-scrollbar-thumb {
|
|
1118
|
+
background: var(--border);
|
|
1119
|
+
border-radius: 6px;
|
|
1120
|
+
}
|
|
1121
|
+
.table-scroll::-webkit-scrollbar-thumb:hover { background: var(--muted); }
|
|
1122
|
+
/* Рамку и скругление держит контейнер: overflow:hidden на самой таблице
|
|
1123
|
+
ломает position:sticky у первой колонки. */
|
|
1124
|
+
/* Первая колонка (имя задачи) закреплена: при горизонтальной прокрутке
|
|
1125
|
+
видно, к какой задаче относятся остальные ячейки. */
|
|
1126
|
+
.table-scroll thead th:first-child,
|
|
1127
|
+
.table-scroll tbody td:first-child {
|
|
1128
|
+
position: sticky; left: 0; z-index: 2;
|
|
1129
|
+
background: var(--panel);
|
|
1130
|
+
box-shadow: 1px 0 0 var(--border);
|
|
1131
|
+
}
|
|
1132
|
+
.table-scroll thead th:first-child { background: var(--panel2); z-index: 3; }
|
|
1133
|
+
/* Подсказка о горизонтальном скролле: скрываем только на очень широких экранах. */
|
|
1134
|
+
.scroll-hint { margin-top: 6px; font-size: 11px; color: var(--muted); }
|
|
1135
|
+
@media (min-width: 1320px) { .scroll-hint { display: none; } }
|
|
1106
1136
|
header { display: flex; align-items: flex-end; justify-content: space-between; gap: 12px; flex-wrap: wrap; margin-bottom: 22px; }
|
|
1107
1137
|
h1 { margin: 0; font-size: 24px; font-weight: 800; letter-spacing: .2px; }
|
|
1108
1138
|
.sub { margin-top: 5px; font-size: 11px; font-weight: 600; letter-spacing: 1.2px; text-transform: uppercase; color: var(--muted); }
|
|
1109
|
-
|
|
1110
|
-
|
|
1111
|
-
@media (min-width: 1200px) { .cards { grid-template-columns: repeat(7, 1fr); } }
|
|
1112
|
-
@media (max-width: 520px) { .cards { grid-template-columns: repeat(2, 1fr); } }
|
|
1139
|
+
/* auto-fill: карточки одинаковой ширины, последний ряд не растягивается. */
|
|
1140
|
+
.cards { display: grid; grid-template-columns: repeat(auto-fill, minmax(160px, 1fr)); gap: 12px; margin-bottom: 22px; }
|
|
1113
1141
|
.card { background: var(--panel); border: 1px solid var(--border); border-radius: 10px; padding: 14px 16px; min-width: 0; }
|
|
1114
1142
|
.card .num { font-size: 26px; font-weight: 800; }
|
|
1115
1143
|
.card .lbl { margin-top: 2px; font-size: 11px; color: var(--muted); text-transform: uppercase; letter-spacing: 1px; }
|
|
1116
1144
|
.ok { color: var(--ok); } .err { color: var(--err); } .neu { color: var(--accent); } .run { color: var(--run); }
|
|
1117
|
-
table { width: 100%; border-collapse: collapse; background: var(--panel);
|
|
1145
|
+
table { width: 100%; border-collapse: collapse; background: var(--panel); }
|
|
1118
1146
|
th, td { padding: 9px 9px; text-align: left; font-size: 13px; border-bottom: 1px solid var(--border); vertical-align: middle; }
|
|
1119
1147
|
th { background: var(--panel2); color: var(--muted); font-size: 11px; text-transform: uppercase; letter-spacing: .8px; }
|
|
1120
1148
|
tr:last-child td { border-bottom: none; }
|
|
@@ -1144,18 +1172,23 @@ function renderPage() {
|
|
|
1144
1172
|
.an-head { display: flex; align-items: center; justify-content: space-between; gap: 10px; }
|
|
1145
1173
|
.an-actions { display: flex; gap: 6px; }
|
|
1146
1174
|
.an-actions .btn { padding: 3px 8px; font-size: 11px; }
|
|
1147
|
-
.an-kpis { display: flex; flex-wrap: wrap; gap:
|
|
1175
|
+
.an-kpis { display: flex; flex-wrap: wrap; gap: 10px; margin-bottom: 12px; font-size: 12px; color: var(--muted); }
|
|
1148
1176
|
.an-kpis b { color: var(--text); font-size: 14px; }
|
|
1149
|
-
.an-
|
|
1177
|
+
.an-partial { font-size: 11px; color: var(--muted); }
|
|
1178
|
+
.an-chart { display: flex; align-items: flex-end; gap: 4px; height: 132px; padding: 6px 0 0; border-bottom: 1px solid var(--border); overflow-x: auto; }
|
|
1150
1179
|
/* min-width: подпись даты "MM-DD" не наезжает на соседнюю; на узком экране график скроллится. */
|
|
1151
1180
|
.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; }
|
|
1152
1181
|
.an-bar-fill { width: 100%; border-radius: 3px 3px 0 0; background: var(--accent); opacity: .85; }
|
|
1182
|
+
/* Значение над столбцом: график читается без наведения на tooltip. */
|
|
1183
|
+
.an-value { font-size: 9px; line-height: 1; color: var(--muted); margin-bottom: 2px; min-height: 9px; }
|
|
1153
1184
|
.an-label { font-size: 9px; color: var(--muted); margin-top: 4px; white-space: nowrap; }
|
|
1154
|
-
.an-grid { display: grid; grid-template-columns: repeat(auto-fit, minmax(
|
|
1185
|
+
.an-grid { display: grid; grid-template-columns: repeat(auto-fit, minmax(420px, 1fr)); gap: 16px; margin-top: 14px; }
|
|
1155
1186
|
.an-grid h3 { margin: 0 0 6px; font-size: 12px; font-weight: 600; color: var(--muted); text-transform: uppercase; letter-spacing: .5px; }
|
|
1156
|
-
|
|
1187
|
+
/* table-layout: fixed + ellipsis: длинные имена не рвутся посреди слова. */
|
|
1188
|
+
.an-table { width: 100%; border-collapse: collapse; table-layout: fixed; font-size: 12px; }
|
|
1157
1189
|
.an-table th { text-align: left; color: var(--muted); font-weight: 600; padding: 3px 6px; border-bottom: 1px solid var(--border); }
|
|
1158
1190
|
.an-table td { padding: 3px 6px; border-bottom: 1px solid var(--border); color: var(--text); }
|
|
1191
|
+
.an-table td:first-child { overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
|
|
1159
1192
|
.an-table tr:last-child td { border-bottom: none; }
|
|
1160
1193
|
.an-rate.okr { color: var(--ok); }
|
|
1161
1194
|
.an-rate.midr { color: var(--run); }
|
|
@@ -1179,9 +1212,9 @@ function renderPage() {
|
|
|
1179
1212
|
.graph-hint { font-size: 11px; color: var(--muted); margin-bottom: 8px; }
|
|
1180
1213
|
.graph-scroll { overflow-x: auto; overflow-y: hidden; padding-bottom: 4px; }
|
|
1181
1214
|
.graph-canvas { position: relative; }
|
|
1182
|
-
.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; }
|
|
1183
|
-
.graph-node .g-name { color: var(--text); font-weight: 600; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
|
|
1184
|
-
.graph-node .g-meta { color: var(--muted); font-size: 10px; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; }
|
|
1215
|
+
.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; overflow: hidden; }
|
|
1216
|
+
.graph-node .g-name { max-width: 100%; color: var(--text); font-weight: 600; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
|
|
1217
|
+
.graph-node .g-meta { max-width: 100%; color: var(--muted); font-size: 10px; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; }
|
|
1185
1218
|
.graph-node.okg { border-left-color: #3fb950; }
|
|
1186
1219
|
.graph-node.errg { border-left-color: #ff3b30; }
|
|
1187
1220
|
.graph-node.partg { border-left-color: #f5a623; }
|
|
@@ -1306,7 +1339,7 @@ function renderPage() {
|
|
|
1306
1339
|
</div>
|
|
1307
1340
|
</div>
|
|
1308
1341
|
<div class="an-kpis" id="an-kpis"><span>Загрузка…</span></div>
|
|
1309
|
-
<div class="an-chart" id="an-chart"></div>
|
|
1342
|
+
<div class="an-chart" id="an-chart" role="img" aria-label="Количество запусков по дням за период"></div>
|
|
1310
1343
|
<div class="an-grid">
|
|
1311
1344
|
<div><h3>Топ задач по стоимости</h3><div id="an-top"></div></div>
|
|
1312
1345
|
<div><h3>Матрицы</h3><div id="an-matrices"></div></div>
|
|
@@ -1460,8 +1493,8 @@ function renderPage() {
|
|
|
1460
1493
|
: 'var(--run)';
|
|
1461
1494
|
return '<div class="matrix-badge" style="color:' + color + '" title="' + esc(s.message) + '">' +
|
|
1462
1495
|
'📦 Matrix: ' + s.successCount + '/' + s.totalCount + ' успешных' +
|
|
1463
|
-
(s.errorCount ? ' · ❌ ' + s.errorCount : '') +
|
|
1464
|
-
(s.pendingCount ? ' · ⏳ ' + s.pendingCount : '') +
|
|
1496
|
+
(s.errorCount ? ' · ❌ ошибок: ' + s.errorCount : '') +
|
|
1497
|
+
(s.pendingCount ? ' · ⏳ в работе: ' + s.pendingCount : '') +
|
|
1465
1498
|
'</div>';
|
|
1466
1499
|
}
|
|
1467
1500
|
|
|
@@ -1514,7 +1547,7 @@ function renderPage() {
|
|
|
1514
1547
|
'<span class="hist-time">' + esc(new Date(r.startedAt).toLocaleString('ru-RU')) + '</span>' +
|
|
1515
1548
|
'<span class="hist-task">' + esc(r.taskName) + '</span>' +
|
|
1516
1549
|
badge(r.status, null, true) +
|
|
1517
|
-
'<span class="metrics">' + (r.durationMs
|
|
1550
|
+
'<span class="metrics">' + durationText(r.durationMs) + '</span>' +
|
|
1518
1551
|
(r.model ? '<span class="hist-model" title="Модель">🧠 ' + esc(r.model) + '</span>' : '') +
|
|
1519
1552
|
(r.preFlightStatus && r.preFlightStatus !== 'skipped'
|
|
1520
1553
|
? '<span class="hist-hook ' + (r.preFlightStatus === 'success' ? 'okh' : 'errh') + '" title="Pre-flight: ' + esc(r.preFlightStatus) + '">⚡ pre: ' + (r.preFlightStatus === 'success' ? '✅' : '❌') + '</span>'
|
|
@@ -1543,15 +1576,21 @@ function renderPage() {
|
|
|
1543
1576
|
|
|
1544
1577
|
function money(value) {
|
|
1545
1578
|
var n = Number(value) || 0;
|
|
1546
|
-
return '$' + n.toFixed(n >=
|
|
1579
|
+
return '$' + n.toFixed(n >= 0.01 ? 2 : 4);
|
|
1547
1580
|
}
|
|
1548
1581
|
|
|
1549
1582
|
function durationText(ms) {
|
|
1550
1583
|
var n = Number(ms) || 0;
|
|
1551
1584
|
if (n <= 0) return '—';
|
|
1552
|
-
if (n < 1000) return n + ' мс';
|
|
1553
|
-
if (n < 60000)
|
|
1554
|
-
|
|
1585
|
+
if (n < 1000) return Math.round(n) + ' мс';
|
|
1586
|
+
if (n < 60000) {
|
|
1587
|
+
// 46.0 с → «46 с», но 31.5 с остаётся «31.5 с».
|
|
1588
|
+
return (n / 1000).toFixed(1).replace(/\.0$/, '') + ' с';
|
|
1589
|
+
}
|
|
1590
|
+
var minutes = n / 60000;
|
|
1591
|
+
// До 10 минут показываем десятые (76125 мс → 1.3 мин), дальше — целые.
|
|
1592
|
+
if (minutes < 10) return minutes.toFixed(1).replace(/\.0$/, '') + ' мин';
|
|
1593
|
+
return Math.round(minutes) + ' мин';
|
|
1555
1594
|
}
|
|
1556
1595
|
|
|
1557
1596
|
function renderAnalytics(an) {
|
|
@@ -1572,12 +1611,12 @@ function renderPage() {
|
|
|
1572
1611
|
var t = an.totals;
|
|
1573
1612
|
kpis.innerHTML =
|
|
1574
1613
|
'<span>Запусков: <b>' + t.total + '</b></span>' +
|
|
1575
|
-
'<span>Успех: <b class="an-rate ' + rateClass(t.successRate) + '">' + t.successRate + '%</b
|
|
1576
|
-
|
|
1614
|
+
'<span>Успех: <b class="an-rate ' + rateClass(t.successRate) + '">' + t.successRate + '%</b>' +
|
|
1615
|
+
(t.partial ? ' <span class="an-partial">· частично: ' + t.partial + '</span>' : '') + '</span>' +
|
|
1616
|
+
'<span>Ср. длительность: <b>' + durationText(t.avgDurationMs) + '</b></span>' +
|
|
1577
1617
|
'<span>Токены: <b>' + Number(t.tokens || 0).toLocaleString('ru-RU') + '</b></span>' +
|
|
1578
1618
|
'<span>Стоимость: <b>' + money(t.costUsd) + '</b></span>' +
|
|
1579
|
-
'<span>Окно: <b>' + an.windowDays + ' дн.</b></span>'
|
|
1580
|
-
(t.partial ? '<span>Частично: <b>' + t.partial + '</b></span>' : '');
|
|
1619
|
+
'<span>Окно: <b>' + an.windowDays + ' дн.</b></span>';
|
|
1581
1620
|
|
|
1582
1621
|
var daily = an.daily || [];
|
|
1583
1622
|
var max = 1;
|
|
@@ -1587,11 +1626,13 @@ function renderPage() {
|
|
|
1587
1626
|
var bars = '';
|
|
1588
1627
|
for (var j = 0; j < daily.length; j++) {
|
|
1589
1628
|
var d = daily[j];
|
|
1590
|
-
|
|
1629
|
+
// 78% — оставляем место под значение и подпись даты внутри 132px.
|
|
1630
|
+
var h = d.total > 0 ? Math.max(3, Math.round((d.total / max) * 78)) : 2;
|
|
1591
1631
|
var isPartialOnly = d.error === 0 && d.partial > 0;
|
|
1592
1632
|
var color = d.total === 0 ? 'var(--border)' : (d.error > 0 ? 'var(--err)' : (isPartialOnly ? 'var(--run)' : 'var(--ok)'));
|
|
1593
1633
|
var tip = d.date + ': всего ' + d.total + ', успех ' + d.success + ', ошибок ' + d.error + ', частично ' + d.partial + ', ' + money(d.costUsd);
|
|
1594
1634
|
bars += '<div class="an-bar" title="' + esc(tip) + '">' +
|
|
1635
|
+
'<div class="an-value">' + (d.total > 0 ? d.total : '') + '</div>' +
|
|
1595
1636
|
'<div class="an-bar-fill" style="height:' + h + '%' + ';background:' + esc(color) + '"></div>' +
|
|
1596
1637
|
'<div class="an-label">' + esc(String(d.date).slice(5)) + '</div>' +
|
|
1597
1638
|
'</div>';
|
|
@@ -1605,11 +1646,11 @@ function renderPage() {
|
|
|
1605
1646
|
if (topRows.length === 0) {
|
|
1606
1647
|
top.innerHTML = '<div class="empty" style="padding:10px">Нет запусков за период.</div>';
|
|
1607
1648
|
} else {
|
|
1608
|
-
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>';
|
|
1649
|
+
var html = '<table class="an-table"><thead><tr><th scope="col" style="width:46%">Задача</th><th scope="col" style="width:18%">Запусков</th><th scope="col" style="width:18%">Успех</th><th scope="col" style="width:18%">Стоимость</th></tr></thead><tbody>';
|
|
1609
1650
|
for (var k = 0; k < topRows.length; k++) {
|
|
1610
1651
|
var row = topRows[k];
|
|
1611
1652
|
html += '<tr>' +
|
|
1612
|
-
'<td>' + (row.isMatrixClone ? '↳ ' : '') + esc(row.taskName) + '</td>' +
|
|
1653
|
+
'<td title="' + esc(row.taskName) + '">' + (row.isMatrixClone ? '↳ ' : '') + esc(row.taskName) + '</td>' +
|
|
1613
1654
|
'<td>' + row.total + '</td>' +
|
|
1614
1655
|
'<td class="an-rate ' + rateClass(row.successRate) + '">' + row.successRate + '%</td>' +
|
|
1615
1656
|
'<td>' + money(row.costUsd) + '</td>' +
|
|
@@ -1622,11 +1663,11 @@ function renderPage() {
|
|
|
1622
1663
|
if (matrixRows.length === 0) {
|
|
1623
1664
|
matrices.innerHTML = '<div class="empty" style="padding:10px">Матриц за период не запускалось.</div>';
|
|
1624
1665
|
} else {
|
|
1625
|
-
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>';
|
|
1666
|
+
var mhtml = '<table class="an-table"><thead><tr><th scope="col" style="width:40%">Матрица</th><th scope="col" style="width:15%">Клонов</th><th scope="col" style="width:15%">Запусков</th><th scope="col" style="width:15%">Успех</th><th scope="col" style="width:15%">Стоимость</th></tr></thead><tbody>';
|
|
1626
1667
|
for (var q = 0; q < matrixRows.length; q++) {
|
|
1627
1668
|
var m = matrixRows[q];
|
|
1628
1669
|
mhtml += '<tr>' +
|
|
1629
|
-
'<td>📦 ' + esc(m.parentId) + '</td>' +
|
|
1670
|
+
'<td title="' + esc(m.parentId) + '">📦 ' + esc(m.parentId) + '</td>' +
|
|
1630
1671
|
'<td>' + m.clones + '</td>' +
|
|
1631
1672
|
'<td>' + m.total + '</td>' +
|
|
1632
1673
|
'<td class="an-rate ' + rateClass(m.successRate) + '">' + m.successRate + '%</td>' +
|
|
@@ -1659,8 +1700,8 @@ function renderPage() {
|
|
|
1659
1700
|
'<td class="wi-model">🧠 ' + esc(m.model) + '</td>' +
|
|
1660
1701
|
'<td>' + m.totalRuns + '</td>' +
|
|
1661
1702
|
'<td>' + Number(m.totalTokens || 0).toLocaleString('ru-RU') + '</td>' +
|
|
1662
|
-
'<td
|
|
1663
|
-
'<td>' + (m.avgDuration
|
|
1703
|
+
'<td>' + money(m.totalCost) + '</td>' +
|
|
1704
|
+
'<td>' + durationText(m.avgDuration) + '</td>' +
|
|
1664
1705
|
'<td>' + (m.successRate != null ? m.successRate + '%' : '—') + '</td>' +
|
|
1665
1706
|
'</tr>';
|
|
1666
1707
|
}
|
|
@@ -1675,12 +1716,12 @@ function renderPage() {
|
|
|
1675
1716
|
}
|
|
1676
1717
|
var parts = [];
|
|
1677
1718
|
if (gpt) {
|
|
1678
|
-
parts.push('Если бы все запуски выполнялись через <b>openai/gpt-4o</b>, это стоило бы ~<b
|
|
1719
|
+
parts.push('Если бы все запуски выполнялись через <b>openai/gpt-4o</b>, это стоило бы ~<b>' + money(gpt.cost) + '</b> (' + gpt.pricePerMillion + ' $/1M токенов).');
|
|
1679
1720
|
}
|
|
1680
1721
|
if (deepseek) {
|
|
1681
|
-
parts.push('Если через <b>deepseek/deepseek-coder</b> — <b
|
|
1722
|
+
parts.push('Если через <b>deepseek/deepseek-coder</b> — <b>' + money(deepseek.cost) + '</b> (' + deepseek.pricePerMillion + ' $/1M токенов).');
|
|
1682
1723
|
}
|
|
1683
|
-
parts.push('Всего запусков: <b>' + totals.totalRuns + '</b>, токенов: <b>' + Number(totals.totalTokens || 0).toLocaleString('ru-RU') + '</b>, фактическая стоимость: <b
|
|
1724
|
+
parts.push('Всего запусков: <b>' + totals.totalRuns + '</b>, токенов: <b>' + Number(totals.totalTokens || 0).toLocaleString('ru-RU') + '</b>, фактическая стоимость: <b>' + money(totals.totalCost) + '</b>.');
|
|
1684
1725
|
text.innerHTML = parts.join(' ');
|
|
1685
1726
|
}
|
|
1686
1727
|
|
|
@@ -2195,7 +2236,7 @@ function renderPage() {
|
|
|
2195
2236
|
if (t.estimatedDurationSec != null || t.estimatedTokens != null) {
|
|
2196
2237
|
est = (t.estimatedDurationSec != null ? t.estimatedDurationSec + ' с' : '') +
|
|
2197
2238
|
(t.estimatedTokens != null ? ' · ' + t.estimatedTokens + ' ток.' : '') +
|
|
2198
|
-
(t.estimatedCostUsd != null ? ' ·
|
|
2239
|
+
(t.estimatedCostUsd != null ? ' · ' + money(t.estimatedCostUsd) : '');
|
|
2199
2240
|
}
|
|
2200
2241
|
var ws = t.workspace ? '📦 ' + esc(t.workspace.name) : '—';
|
|
2201
2242
|
var matrixParent = t.matrixParent ? '<div class="matrix-badge">↳ matrix ' + esc(t.matrixParent) + '</div>' : '';
|
|
@@ -2214,7 +2255,7 @@ function renderPage() {
|
|
|
2214
2255
|
html += '<div class="metrics" style="margin-top:8px">Σ Оценка конвейера: ' +
|
|
2215
2256
|
(totals.estimatedDurationSec != null ? totals.estimatedDurationSec + ' с · ' : '') +
|
|
2216
2257
|
(totals.estimatedTokens != null ? totals.estimatedTokens + ' токенов · ' : '') +
|
|
2217
|
-
(totals.estimatedCostUsd != null ? '
|
|
2258
|
+
(totals.estimatedCostUsd != null ? '~' + money(totals.estimatedCostUsd) : '') + '</div>';
|
|
2218
2259
|
}
|
|
2219
2260
|
if (body) body.innerHTML = html;
|
|
2220
2261
|
} catch (err) {
|
package/dist/settings.d.ts
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { type Locale } from "./i18n.js";
|
|
1
2
|
/** Настройки webhook-уведомлений (Discord/Slack/generic). */
|
|
2
3
|
export interface WebhookNotificationSettings {
|
|
3
4
|
/** Включён ли канал. */
|
|
@@ -175,6 +176,8 @@ export interface AuditSettings {
|
|
|
175
176
|
export interface SchedulerSettings {
|
|
176
177
|
/** Максимум одновременно выполняющихся задач. 0 — без ограничения. */
|
|
177
178
|
maxConcurrent: number;
|
|
179
|
+
/** Язык интерфейса (Спринт 28): ru по умолчанию, en — опционально. */
|
|
180
|
+
locale: Locale;
|
|
178
181
|
/** Зимняя тема оформления GUI (снежинки, морозные рамки, градиент). */
|
|
179
182
|
winterMode: boolean;
|
|
180
183
|
/** Уведомления о завершении задач. */
|
package/dist/settings.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"settings.d.ts","sourceRoot":"","sources":["../src/settings.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"settings.d.ts","sourceRoot":"","sources":["../src/settings.ts"],"names":[],"mappings":"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"}
|
package/dist/settings.js
CHANGED
|
@@ -2,6 +2,7 @@ import crypto from "node:crypto";
|
|
|
2
2
|
import fs from "node:fs/promises";
|
|
3
3
|
import path from "node:path";
|
|
4
4
|
import { PLUGIN_DIR } from "./types.js";
|
|
5
|
+
import { DEFAULT_LOCALE, normalizeLocale, SUPPORTED_LOCALES, messageIn, t } from "./i18n.js";
|
|
5
6
|
export const SETTINGS_FILE = path.join(PLUGIN_DIR, "settings.json");
|
|
6
7
|
export const DEFAULT_MAX_CONCURRENT = 1;
|
|
7
8
|
export const DEFAULT_WINTER_MODE = false;
|
|
@@ -106,8 +107,8 @@ export function defaultNotifications() {
|
|
|
106
107
|
retryDelayMs: DEFAULT_WEBHOOK_RETRY_DELAY_MS,
|
|
107
108
|
},
|
|
108
109
|
templates: {
|
|
109
|
-
success:
|
|
110
|
-
error:
|
|
110
|
+
success: t("notify.task.success"),
|
|
111
|
+
error: t("notify.task.error"),
|
|
111
112
|
},
|
|
112
113
|
filters: { include: [], exclude: [] },
|
|
113
114
|
telegram: {
|
|
@@ -213,6 +214,16 @@ function normalizeHttpBase(value, fallback) {
|
|
|
213
214
|
return fallback;
|
|
214
215
|
}
|
|
215
216
|
}
|
|
217
|
+
/**
|
|
218
|
+
* Встроенный шаблон (ru или en) заменяется текущим переводом; пользовательский
|
|
219
|
+
* текст остаётся как есть. Иначе сохранённые при первой установке дефолты
|
|
220
|
+
* навсегда застывали бы на языке установки.
|
|
221
|
+
*/
|
|
222
|
+
function localizedTemplate(value, key, fallback) {
|
|
223
|
+
const raw = typeof value === "string" && value.trim() ? value : fallback;
|
|
224
|
+
const builtin = SUPPORTED_LOCALES.some((locale) => messageIn(locale, key) === raw);
|
|
225
|
+
return builtin ? t(key) : raw;
|
|
226
|
+
}
|
|
216
227
|
/** Приводит настройки уведомлений к безопасному виду. */
|
|
217
228
|
function normalizeNotifications(value, fallback) {
|
|
218
229
|
const fallbackWebhook = fallback.webhook ?? defaultNotifications().webhook;
|
|
@@ -270,12 +281,8 @@ function normalizeNotifications(value, fallback) {
|
|
|
270
281
|
retryDelayMs: normalizeIntInRange(rawWebhook?.retryDelayMs, fallbackWebhook.retryDelayMs, 100, 60000),
|
|
271
282
|
},
|
|
272
283
|
templates: {
|
|
273
|
-
success:
|
|
274
|
-
|
|
275
|
-
: fallbackTemplates.success,
|
|
276
|
-
error: typeof rawTemplates?.error === "string" && rawTemplates.error.trim()
|
|
277
|
-
? rawTemplates.error
|
|
278
|
-
: fallbackTemplates.error,
|
|
284
|
+
success: localizedTemplate(rawTemplates?.success, "notify.task.success", fallbackTemplates.success),
|
|
285
|
+
error: localizedTemplate(rawTemplates?.error, "notify.task.error", fallbackTemplates.error),
|
|
279
286
|
},
|
|
280
287
|
filters: {
|
|
281
288
|
include: normalizeNameList(rawFilters?.include, fallbackFilters.include),
|
|
@@ -381,6 +388,7 @@ export async function loadSettings() {
|
|
|
381
388
|
const parsed = JSON.parse(raw);
|
|
382
389
|
return {
|
|
383
390
|
maxConcurrent: normalizeMaxConcurrent(parsed?.maxConcurrent, DEFAULT_MAX_CONCURRENT),
|
|
391
|
+
locale: normalizeLocale(parsed?.locale, DEFAULT_LOCALE),
|
|
384
392
|
winterMode: normalizeWinterMode(parsed?.winterMode, DEFAULT_WINTER_MODE),
|
|
385
393
|
notifications: normalizeNotifications(parsed?.notifications, fallbackNotifications),
|
|
386
394
|
history: normalizeHistorySettings(parsed?.history, fallbackHistory),
|
|
@@ -391,6 +399,7 @@ export async function loadSettings() {
|
|
|
391
399
|
catch {
|
|
392
400
|
return {
|
|
393
401
|
maxConcurrent: DEFAULT_MAX_CONCURRENT,
|
|
402
|
+
locale: DEFAULT_LOCALE,
|
|
394
403
|
winterMode: DEFAULT_WINTER_MODE,
|
|
395
404
|
notifications: fallbackNotifications,
|
|
396
405
|
history: fallbackHistory,
|
|
@@ -406,6 +415,9 @@ export async function saveSettings(patch) {
|
|
|
406
415
|
maxConcurrent: patch.maxConcurrent !== undefined
|
|
407
416
|
? normalizeMaxConcurrent(patch.maxConcurrent, current.maxConcurrent)
|
|
408
417
|
: current.maxConcurrent,
|
|
418
|
+
locale: patch.locale !== undefined
|
|
419
|
+
? normalizeLocale(patch.locale, current.locale)
|
|
420
|
+
: current.locale,
|
|
409
421
|
winterMode: patch.winterMode !== undefined
|
|
410
422
|
? normalizeWinterMode(patch.winterMode, current.winterMode)
|
|
411
423
|
: current.winterMode,
|
package/dist/task-transfer.d.ts
CHANGED
|
@@ -184,6 +184,19 @@ export interface TaskDefinition {
|
|
|
184
184
|
watchIgnore?: string[];
|
|
185
185
|
/** Пауза до даты (ISO, Спринт 19): плагин включит задачу автоматически. */
|
|
186
186
|
pausedUntil?: string;
|
|
187
|
+
/**
|
|
188
|
+
* Бессрочная пауза (Спринт 27.5.8): true — задача отключена в планировщике
|
|
189
|
+
* без даты автовозобновления. Флаг переживает update (пересоздание) и
|
|
190
|
+
* degraded-режим, когда список задач ОС недоступен.
|
|
191
|
+
*/
|
|
192
|
+
paused?: boolean;
|
|
193
|
+
/**
|
|
194
|
+
* Windows-режим входа (Спринт 27.5.4): true — задача запускается и без входа
|
|
195
|
+
* пользователя (schtasks /ru SYSTEM, session 0). По умолчанию false —
|
|
196
|
+
* интерактивная задача (Interactive only, только при активном входе).
|
|
197
|
+
* На Linux/macOS игнорируется: cron работает без входа, launchd — при входе.
|
|
198
|
+
*/
|
|
199
|
+
runWhenLoggedOff?: boolean;
|
|
187
200
|
/** Когда задача была создана — защита от ложного catch-up сразу после создания. */
|
|
188
201
|
createdAt?: string;
|
|
189
202
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"task-transfer.d.ts","sourceRoot":"","sources":["../src/task-transfer.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"task-transfer.d.ts","sourceRoot":"","sources":["../src/task-transfer.ts"],"names":[],"mappings":"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"}
|
package/dist/task-transfer.js
CHANGED
|
@@ -154,6 +154,9 @@ export async function buildExportJson(tasks) {
|
|
|
154
154
|
? { watchIgnore: definition.watchIgnore }
|
|
155
155
|
: {}),
|
|
156
156
|
...(definition?.pausedUntil ? { pausedUntil: definition.pausedUntil } : {}),
|
|
157
|
+
...(definition?.paused === true ? { paused: true } : {}),
|
|
158
|
+
// Спринт 27.5.10: режим входа переживает перенос между профилями.
|
|
159
|
+
...(definition?.runWhenLoggedOff === true ? { runWhenLoggedOff: true } : {}),
|
|
157
160
|
...(Array.isArray(definition?.allowedTools) && definition.allowedTools.length > 0
|
|
158
161
|
? { allowedTools: definition.allowedTools }
|
|
159
162
|
: {}),
|
|
@@ -405,6 +408,11 @@ export function parseImportJson(raw) {
|
|
|
405
408
|
errors.push(`Запись ${position}${name ? ` (${name})` : ""}: pausedUntil должен быть ` +
|
|
406
409
|
`датой в формате ISO (например 2026-12-01T09:00:00Z).`);
|
|
407
410
|
}
|
|
411
|
+
// Спринт 27.5.8: бессрочная пауза импортируется вместе с задачей.
|
|
412
|
+
const pausedFlag = source.paused === true;
|
|
413
|
+
// Спринт 27.5.10: режим входа. Только явный `true` делает задачу фоновой;
|
|
414
|
+
// всё остальное (false, null, строка) означает интерактивную задачу.
|
|
415
|
+
const runWhenLoggedOffFlag = source.runWhenLoggedOff === true;
|
|
408
416
|
// Ограничения инструментов (Спринт 14): массив непустых строк без дублей.
|
|
409
417
|
// Пустой allowedTools отклоняется с явной ошибкой (избегаем «запрещено всё»).
|
|
410
418
|
const readToolList = (raw, fieldLabel) => {
|
|
@@ -606,6 +614,9 @@ export function parseImportJson(raw) {
|
|
|
606
614
|
...(watchGlobs !== undefined ? { watchGlobs } : {}),
|
|
607
615
|
...(watchIgnore !== undefined ? { watchIgnore } : {}),
|
|
608
616
|
...(pausedUntil !== undefined ? { pausedUntil } : {}),
|
|
617
|
+
...(pausedFlag ? { paused: true } : {}),
|
|
618
|
+
// Спринт 27.5.10: сохраняем режим входа при переносе задачи.
|
|
619
|
+
...(runWhenLoggedOffFlag ? { runWhenLoggedOff: true } : {}),
|
|
609
620
|
...(mcpEvent ? { mcpEvent } : {}),
|
|
610
621
|
...(allowedTools !== undefined ? { allowedTools } : {}),
|
|
611
622
|
...(deniedTools !== undefined ? { deniedTools } : {}),
|
package/dist/types.d.ts
CHANGED
|
@@ -18,6 +18,17 @@ export declare const STALE_LOCK_MAX_AGE_MS: number;
|
|
|
18
18
|
* Используется единообразно при создании задачи (index.ts) и при чтении логов (schtasks.ts).
|
|
19
19
|
*/
|
|
20
20
|
export declare function sanitizeName(name: string): string;
|
|
21
|
+
/**
|
|
22
|
+
* Проверяет имя задачи до создания файлов и записи в БД.
|
|
23
|
+
*
|
|
24
|
+
* Разрешены буквы (включая кириллицу), цифры, пробел, «_», «-» и «.».
|
|
25
|
+
* Спецсимволы оболочки (`& | < > ^ % " ' ; ( ) \``, обратный слэш, слэш)
|
|
26
|
+
* и управляющие символы запрещены: даже при безопасном вызове schtasks
|
|
27
|
+
* такие имена ломают пути файлов и переносимы между платформами.
|
|
28
|
+
*
|
|
29
|
+
* @returns текст ошибки или null, если имя допустимо.
|
|
30
|
+
*/
|
|
31
|
+
export declare function validateTaskName(raw: string): string | null;
|
|
21
32
|
/**
|
|
22
33
|
* Схема аргументов для schedule_job.
|
|
23
34
|
* schedule принимает только 5-полевые cron-выражения.
|
package/dist/types.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAGxB,oFAAoF;AACpF,eAAO,MAAM,WAAW,gCAAgC,CAAC;AAEzD,uDAAuD;AACvD,eAAO,MAAM,WAAW,aAAa,CAAC;AACtC,eAAO,MAAM,gBAAgB,sBAAsB,CAAC;AAcpD,eAAO,MAAM,UAAU,QAAqB,CAAC;AAE7C,eAAO,MAAM,QAAQ,QAAiC,CAAC;AACvD,eAAO,MAAM,OAAO,QAAgC,CAAC;AACrD,eAAO,MAAM,WAAW,QAAoC,CAAC;AAE7D,4CAA4C;AAC5C,eAAO,MAAM,UAAU,SAA+B,CAAC;AAEvD,iFAAiF;AACjF,eAAO,MAAM,qBAAqB,QAAsB,CAAC;AAEzD;;;;GAIG;AACH,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAcjD;AAED;;;GAGG;AACH,eAAO,MAAM,eAAe;;;;;;iBAsB1B,CAAC;AAEH,MAAM,MAAM,eAAe,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,eAAe,CAAC,CAAC;AAE9D,eAAO,MAAM,aAAa;;iBAExB,CAAC;AACH,MAAM,MAAM,aAAa,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,aAAa,CAAC,CAAC;AAE1D,eAAO,MAAM,aAAa;;iBAExB,CAAC;AACH,MAAM,MAAM,aAAa,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,aAAa,CAAC,CAAC;AAE1D,eAAO,MAAM,YAAY,gCAAe,CAAC;AACzC,MAAM,MAAM,YAAY,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,YAAY,CAAC,CAAC;AAExD;;GAEG;AACH,MAAM,WAAW,cAAc;IAC7B,yDAAyD;IACzD,EAAE,EAAE,QAAQ,GAAG,QAAQ,GAAG,OAAO,GAAG,QAAQ,CAAC;IAC7C,sEAAsE;IACtE,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,kDAAkD;IAClD,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,sCAAsC;IACtC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,+CAA+C;IAC/C,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED;;GAEG;AACH,MAAM,WAAW,iBAAiB;IAChC,oDAAoD;IACpD,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,oDAAoD;IACpD,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB"}
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAGxB,oFAAoF;AACpF,eAAO,MAAM,WAAW,gCAAgC,CAAC;AAEzD,uDAAuD;AACvD,eAAO,MAAM,WAAW,aAAa,CAAC;AACtC,eAAO,MAAM,gBAAgB,sBAAsB,CAAC;AAcpD,eAAO,MAAM,UAAU,QAAqB,CAAC;AAE7C,eAAO,MAAM,QAAQ,QAAiC,CAAC;AACvD,eAAO,MAAM,OAAO,QAAgC,CAAC;AACrD,eAAO,MAAM,WAAW,QAAoC,CAAC;AAE7D,4CAA4C;AAC5C,eAAO,MAAM,UAAU,SAA+B,CAAC;AAEvD,iFAAiF;AACjF,eAAO,MAAM,qBAAqB,QAAsB,CAAC;AAEzD;;;;GAIG;AACH,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAcjD;AAED;;;;;;;;;GASG;AACH,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAyB3D;AAED;;;GAGG;AACH,eAAO,MAAM,eAAe;;;;;;iBAsB1B,CAAC;AAEH,MAAM,MAAM,eAAe,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,eAAe,CAAC,CAAC;AAE9D,eAAO,MAAM,aAAa;;iBAExB,CAAC;AACH,MAAM,MAAM,aAAa,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,aAAa,CAAC,CAAC;AAE1D,eAAO,MAAM,aAAa;;iBAExB,CAAC;AACH,MAAM,MAAM,aAAa,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,aAAa,CAAC,CAAC;AAE1D,eAAO,MAAM,YAAY,gCAAe,CAAC;AACzC,MAAM,MAAM,YAAY,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,YAAY,CAAC,CAAC;AAExD;;GAEG;AACH,MAAM,WAAW,cAAc;IAC7B,yDAAyD;IACzD,EAAE,EAAE,QAAQ,GAAG,QAAQ,GAAG,OAAO,GAAG,QAAQ,CAAC;IAC7C,sEAAsE;IACtE,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,kDAAkD;IAClD,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,sCAAsC;IACtC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,+CAA+C;IAC/C,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED;;GAEG;AACH,MAAM,WAAW,iBAAiB;IAChC,oDAAoD;IACpD,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,oDAAoD;IACpD,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB"}
|
package/dist/types.js
CHANGED
|
@@ -44,6 +44,38 @@ export function sanitizeName(name) {
|
|
|
44
44
|
result = result.replace(/-+/g, "-").replace(/^-+|-+$/g, "");
|
|
45
45
|
return result || "task";
|
|
46
46
|
}
|
|
47
|
+
/**
|
|
48
|
+
* Проверяет имя задачи до создания файлов и записи в БД.
|
|
49
|
+
*
|
|
50
|
+
* Разрешены буквы (включая кириллицу), цифры, пробел, «_», «-» и «.».
|
|
51
|
+
* Спецсимволы оболочки (`& | < > ^ % " ' ; ( ) \``, обратный слэш, слэш)
|
|
52
|
+
* и управляющие символы запрещены: даже при безопасном вызове schtasks
|
|
53
|
+
* такие имена ломают пути файлов и переносимы между платформами.
|
|
54
|
+
*
|
|
55
|
+
* @returns текст ошибки или null, если имя допустимо.
|
|
56
|
+
*/
|
|
57
|
+
export function validateTaskName(raw) {
|
|
58
|
+
const name = raw.trim();
|
|
59
|
+
if (!name) {
|
|
60
|
+
return "Имя задачи не может быть пустым.";
|
|
61
|
+
}
|
|
62
|
+
if (/[\u0000-\u001f\u007f]/.test(name)) {
|
|
63
|
+
return "Имя задачи не должно содержать управляющие символы.";
|
|
64
|
+
}
|
|
65
|
+
const invalid = name.match(/[^\p{L}\p{N}_\-. ]/u);
|
|
66
|
+
if (invalid) {
|
|
67
|
+
return (`Имя задачи содержит недопустимый символ «${invalid[0]}». ` +
|
|
68
|
+
"Разрешены буквы (включая кириллицу), цифры, пробел, «_», «-» и «.».");
|
|
69
|
+
}
|
|
70
|
+
// schtasks ограничивает /tn в 237 символов вместе с папкой планировщика.
|
|
71
|
+
// Префикс "\OpenCode\windows-scheduler\" занимает 28 символов, остаётся 209 на имя задачи.
|
|
72
|
+
const MAX_TASK_NAME_LENGTH = 209;
|
|
73
|
+
if (name.length > MAX_TASK_NAME_LENGTH) {
|
|
74
|
+
return (`Имя задачи "${name}" слишком длинное (${name.length} символов, максимум ${MAX_TASK_NAME_LENGTH} ` +
|
|
75
|
+
`с учётом папки планировщика). Сократите имя или имя workspace (для клонов матрицы).`);
|
|
76
|
+
}
|
|
77
|
+
return null;
|
|
78
|
+
}
|
|
47
79
|
/**
|
|
48
80
|
* Схема аргументов для schedule_job.
|
|
49
81
|
* schedule принимает только 5-полевые cron-выражения.
|
package/dist/workspaces.d.ts
CHANGED
|
@@ -54,7 +54,7 @@ export declare function readWorkspaceEnvFile(envFile?: string): Record<string, s
|
|
|
54
54
|
* зашифрованного хранилища (Спринт 26); отсутствующий секрет даёт пустую
|
|
55
55
|
* строку и предупреждение с именем — без значения. Никогда не бросает.
|
|
56
56
|
*/
|
|
57
|
-
export declare function resolveWorkspaceEnv(workspace: Workspace | undefined): Record<string, string>;
|
|
57
|
+
export declare function resolveWorkspaceEnv(workspace: Workspace | undefined, allowedSecretNames?: string[]): Record<string, string>;
|
|
58
58
|
/** Маскирует значение секрета для логов. */
|
|
59
59
|
export declare function maskSecretValue(): string;
|
|
60
60
|
/**
|
|
@@ -74,7 +74,7 @@ export declare function workspaceEnvDir(pluginDir: string): string;
|
|
|
74
74
|
* Возвращает путь к файлу или undefined, если у workspace нет переменных.
|
|
75
75
|
* Пустой env удаляет ранее созданный файл. На POSIX права 0600.
|
|
76
76
|
*/
|
|
77
|
-
export declare function writeWorkspaceEnvFile(workspace: Workspace | undefined, pluginDir: string, sanitizedName: string): string | undefined;
|
|
77
|
+
export declare function writeWorkspaceEnvFile(workspace: Workspace | undefined, pluginDir: string, sanitizedName: string, allowedSecretNames?: string[]): string | undefined;
|
|
78
78
|
/** Проверяет, что путь существует и является директорией. */
|
|
79
79
|
export declare function validateWorkspacePath(workspacePath: string): void;
|
|
80
80
|
/**
|