agent-steward 0.0.5 → 0.0.6
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 +176 -1
- package/README.md +9 -7
- package/ROADMAP-STRATEGY.md +5 -5
- package/ROADMAP.md +107 -17
- package/dist/cli.js +5 -0
- package/dist/core/analytics.d.ts +6 -0
- package/dist/core/analytics.d.ts.map +1 -1
- package/dist/core/analytics.js +20 -3
- package/dist/core/audit.d.ts +6 -0
- package/dist/core/audit.d.ts.map +1 -1
- package/dist/core/audit.js +24 -0
- package/dist/core/budget.d.ts +118 -0
- package/dist/core/budget.d.ts.map +1 -0
- package/dist/core/budget.js +206 -0
- package/dist/core/cron-to-schtasks.d.ts.map +1 -1
- package/dist/core/cron-to-schtasks.js +38 -0
- package/dist/core/dry-run.d.ts +26 -1
- package/dist/core/dry-run.d.ts.map +1 -1
- package/dist/core/dry-run.js +199 -8
- package/dist/core/feedback.d.ts +192 -0
- package/dist/core/feedback.d.ts.map +1 -0
- package/dist/core/feedback.js +426 -0
- package/dist/core/gate-integrity.d.ts +36 -0
- package/dist/core/gate-integrity.d.ts.map +1 -1
- package/dist/core/gate-integrity.js +144 -1
- package/dist/core/local-ai.d.ts.map +1 -1
- package/dist/core/local-ai.js +7 -3
- package/dist/core/matrix.d.ts +8 -0
- package/dist/core/matrix.d.ts.map +1 -1
- package/dist/core/matrix.js +57 -2
- package/dist/core/mission.d.ts +20 -0
- package/dist/core/mission.d.ts.map +1 -1
- package/dist/core/mission.js +45 -5
- package/dist/core/opencode-models.d.ts +2 -2
- package/dist/core/opencode-models.d.ts.map +1 -1
- package/dist/core/opencode-models.js +28 -21
- package/dist/core/opencode-usage.d.ts +35 -0
- package/dist/core/opencode-usage.d.ts.map +1 -0
- package/dist/core/opencode-usage.js +132 -0
- package/dist/core/pipeline-io.d.ts +1 -1
- package/dist/core/pipeline-io.d.ts.map +1 -1
- package/dist/core/pipeline-io.js +26 -12
- package/dist/core/pipeline-map.d.ts +6 -0
- package/dist/core/pipeline-map.d.ts.map +1 -1
- package/dist/core/pipeline-map.js +12 -0
- package/dist/core/ps-wrapper.d.ts +10 -2
- package/dist/core/ps-wrapper.d.ts.map +1 -1
- package/dist/core/ps-wrapper.js +176 -5
- package/dist/core/record-history.d.ts.map +1 -1
- package/dist/core/record-history.js +76 -4
- package/dist/core/run-mode.d.ts +12 -0
- package/dist/core/run-mode.d.ts.map +1 -0
- package/dist/core/run-mode.js +17 -0
- package/dist/core/scheduler/logs.d.ts +4 -0
- package/dist/core/scheduler/logs.d.ts.map +1 -1
- package/dist/core/scheduler/logs.js +25 -1
- package/dist/core/secrets.d.ts.map +1 -1
- package/dist/core/secrets.js +18 -8
- package/dist/core/self-analysis.d.ts +32 -2
- package/dist/core/self-analysis.d.ts.map +1 -1
- package/dist/core/self-analysis.js +38 -27
- package/dist/core/shutdown.d.ts +33 -2
- package/dist/core/shutdown.d.ts.map +1 -1
- package/dist/core/shutdown.js +58 -2
- package/dist/core/structured-log.d.ts +30 -0
- package/dist/core/structured-log.d.ts.map +1 -1
- package/dist/core/structured-log.js +37 -0
- package/dist/core/usage-surface.d.ts +25 -0
- package/dist/core/usage-surface.d.ts.map +1 -0
- package/dist/core/usage-surface.js +41 -0
- package/dist/core/wrappers/bash.d.ts +2 -0
- package/dist/core/wrappers/bash.d.ts.map +1 -1
- package/dist/core/wrappers/bash.js +58 -6
- package/dist/db/history-repo.d.ts +32 -0
- package/dist/db/history-repo.d.ts.map +1 -1
- package/dist/db/history-repo.js +85 -7
- package/dist/db/metrics-repo.d.ts +20 -2
- package/dist/db/metrics-repo.d.ts.map +1 -1
- package/dist/db/metrics-repo.js +33 -11
- package/dist/db/migrate.d.ts.map +1 -1
- package/dist/db/migrate.js +37 -17
- package/dist/db/recovery.d.ts +3 -1
- package/dist/db/recovery.d.ts.map +1 -1
- package/dist/db/recovery.js +9 -4
- package/dist/db/runs-repo.d.ts.map +1 -1
- package/dist/db/runs-repo.js +71 -56
- package/dist/db/schema.d.ts +2 -2
- package/dist/db/schema.d.ts.map +1 -1
- package/dist/db/schema.js +70 -1
- package/dist/db/templates-repo.d.ts +2 -2
- package/dist/db/templates-repo.d.ts.map +1 -1
- package/dist/db/templates-repo.js +5 -3
- package/dist/history.d.ts +6 -1
- package/dist/history.d.ts.map +1 -1
- package/dist/history.js +4 -2
- package/dist/hook-output.d.ts +2 -0
- package/dist/hook-output.d.ts.map +1 -0
- package/dist/hook-output.js +31 -0
- package/dist/index.d.ts +247 -53
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +999 -211
- package/dist/notifications.d.ts +31 -2
- package/dist/notifications.d.ts.map +1 -1
- package/dist/notifications.js +132 -13
- package/dist/profiles.d.ts.map +1 -1
- package/dist/profiles.js +66 -15
- package/dist/rpc.d.ts +108 -0
- package/dist/rpc.d.ts.map +1 -1
- package/dist/rpc.js +28 -0
- package/dist/server.d.ts +17 -2
- package/dist/server.d.ts.map +1 -1
- package/dist/server.js +77 -12
- package/dist/settings.d.ts +42 -0
- package/dist/settings.d.ts.map +1 -1
- package/dist/settings.js +82 -0
- package/dist/task-transfer.d.ts +5 -0
- package/dist/task-transfer.d.ts.map +1 -1
- package/dist/task-transfer.js +48 -3
- package/dist/templates.d.ts +2 -2
- package/dist/templates.d.ts.map +1 -1
- package/dist/templates.js +3 -3
- package/dist/types.d.ts +22 -2
- package/dist/types.d.ts.map +1 -1
- package/dist/workspaces.d.ts.map +1 -1
- package/dist/workspaces.js +34 -11
- package/docs/ARCHITECTURE.md +49 -12
- package/docs/COMPATIBILITY.md +2 -2
- package/docs/EXECUTION-LOOP.md +6 -3
- package/docs/FEATURES.md +65 -4
- package/docs/FEATURES.zh.md +45 -2
- package/docs/QA-A2-GUI-TUI.md +205 -0
- package/docs/README.ru.md +3 -3
- package/docs/README.zh.md +2 -2
- package/gui-experimental.cjs +9 -9
- package/locales/en.json +42 -3
- package/locales/ru.json +42 -3
- package/locales/zh.json +42 -3
- package/package.json +15 -2
- package/scripts/check-eslint-baseline.mjs +139 -0
- package/scripts/gen-test-plan-counters.mjs +117 -0
- package/scripts/github-ci-fetch.ps1 +37 -0
- package/scripts/pl-commit.ps1 +112 -0
- package/scripts/qa-a2-commit.ps1 +104 -0
- package/scripts/test-home.mjs +26 -2
- package/skills/scheduled-job-best-practices/SKILL.md +95 -1
- package/skills/scheduled-job-best-practices/references/recipes.md +139 -0
- package/src/cli.ts +5 -0
- package/src/core/analytics.ts +27 -4
- package/src/core/audit.ts +25 -0
- package/src/core/budget.ts +340 -0
- package/src/core/cron-to-schtasks.ts +42 -0
- package/src/core/dry-run.ts +233 -10
- package/src/core/feedback.ts +582 -0
- package/src/core/gate-integrity.ts +171 -1
- package/src/core/local-ai.ts +7 -3
- package/src/core/matrix.ts +63 -2
- package/src/core/mission.ts +51 -5
- package/src/core/opencode-models.ts +30 -21
- package/src/core/opencode-usage.ts +182 -0
- package/src/core/pipeline-io.ts +28 -11
- package/src/core/pipeline-map.ts +19 -0
- package/src/core/ps-wrapper.ts +173 -4
- package/src/core/record-history.ts +94 -4
- package/src/core/run-mode.ts +19 -0
- package/src/core/scheduler/logs.ts +32 -1
- package/src/core/secrets.ts +18 -11
- package/src/core/self-analysis.ts +75 -29
- package/src/core/shutdown.ts +90 -4
- package/src/core/structured-log.ts +67 -0
- package/src/core/usage-surface.ts +70 -0
- package/src/core/wrappers/bash.ts +60 -5
- package/src/db/history-repo.ts +153 -19
- package/src/db/metrics-repo.ts +38 -11
- package/src/db/migrate.ts +57 -32
- package/src/db/recovery.ts +10 -4
- package/src/db/runs-repo.ts +113 -61
- package/src/db/schema.ts +70 -1
- package/src/db/templates-repo.ts +5 -3
- package/src/gui.tsx +261 -5
- package/src/history.ts +10 -3
- package/src/hook-output.ts +39 -0
- package/src/index.ts +1407 -345
- package/src/notifications.ts +189 -39
- package/src/profiles.ts +72 -16
- package/src/rpc.ts +30 -0
- package/src/server.ts +107 -23
- package/src/settings.ts +120 -0
- package/src/task-transfer.ts +59 -6
- package/src/templates.ts +3 -3
- package/src/types.ts +23 -2
- package/src/workspaces.ts +37 -14
package/dist/server.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"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"}
|
package/dist/server.js
CHANGED
|
@@ -4,7 +4,7 @@ import fs from "node:fs/promises";
|
|
|
4
4
|
import { execFile } from "node:child_process";
|
|
5
5
|
import { promisify } from "node:util";
|
|
6
6
|
import { loadHistory, loadMetrics } from "./history.js";
|
|
7
|
-
import { getHistory, countRunningRecords } from "./db/history-repo.js";
|
|
7
|
+
import { getHistory, getHistoryForAnalytics, countRunningRecords, } from "./db/history-repo.js";
|
|
8
8
|
import { buildAnalytics, historyToCsv } from "./core/analytics.js";
|
|
9
9
|
import { getSchedulerTitle } from "./core/scheduler/index.js";
|
|
10
10
|
import { getPluginVersion } from "./version.js";
|
|
@@ -13,12 +13,12 @@ import { listWorkspaces } from "./workspaces.js";
|
|
|
13
13
|
import { DEFAULT_PROFILE, getProfileName, getProfilePort } from "./profiles.js";
|
|
14
14
|
import { simulatePipeline } from "./core/dry-run.js";
|
|
15
15
|
import { loadSettings } from "./settings.js";
|
|
16
|
-
import { DEFAULT_MODEL_PRICE_PER_MILLION, DEFAULT_PRICE_PER_MILLION, catalogPricePerMillion, normalizeModelId, resolveWhatIfModels, } from "./core/opencode-models.js";
|
|
16
|
+
import { DEFAULT_MODEL_PRICE_PER_MILLION, DEFAULT_PRICE_PER_MILLION, catalogPricePerMillion, normalizeModelId, resolveWhatIfModels, selectWhatIfModels, } from "./core/opencode-models.js";
|
|
17
17
|
import { authenticateHookRequest, extractHookSignature, extractHookToken, readRequestBody, } from "./integrations.js";
|
|
18
18
|
import { appendStructuredLog, readStructuredLogs } from "./core/structured-log.js";
|
|
19
19
|
import { PROMETHEUS_CONTENT_TYPE, renderPrometheusMetrics } from "./core/prometheus.js";
|
|
20
20
|
import { buildOtlpExport } from "./core/otel.js";
|
|
21
|
-
import { readAuditLog, recordAudit } from "./core/audit.js";
|
|
21
|
+
import { auditDateFilterError, readAuditLog, recordAudit } from "./core/audit.js";
|
|
22
22
|
import { getLocale, t } from "./i18n.js";
|
|
23
23
|
/**
|
|
24
24
|
* Локальный веб-дашборд (Спринт 5).
|
|
@@ -49,6 +49,15 @@ function normalizeProcessName(name) {
|
|
|
49
49
|
return "bun";
|
|
50
50
|
return name;
|
|
51
51
|
}
|
|
52
|
+
/**
|
|
53
|
+
* Type guard для ошибок с полем `code` (например, `EADDRINUSE` от listen()).
|
|
54
|
+
* Сужает `unknown` из catch до безопасного чтения поля без `as any`.
|
|
55
|
+
*/
|
|
56
|
+
function hasErrorCode(err) {
|
|
57
|
+
return err !== null &&
|
|
58
|
+
(typeof err === "object" || typeof err === "function") &&
|
|
59
|
+
"code" in err;
|
|
60
|
+
}
|
|
52
61
|
/** Маркер-заголовок: по нему узнаём «свой» дашборд, уже слушающий порт. */
|
|
53
62
|
const DASHBOARD_HEADER = "x-plugin-dashboard";
|
|
54
63
|
const DASHBOARD_MARKER = "agent-steward";
|
|
@@ -98,7 +107,9 @@ function estimateCost(tokens, model) {
|
|
|
98
107
|
* Агрегирует историю по моделям и считает сценарии What-If.
|
|
99
108
|
* Возвращает данные для GET /api/models-analysis и блока дашборда.
|
|
100
109
|
*/
|
|
101
|
-
export function aggregateModels(history
|
|
110
|
+
export function aggregateModels(history,
|
|
111
|
+
/** Готовая What-If выборка. Без неё CLI не вызывается: только история и встроенный список. */
|
|
112
|
+
whatIfSelection) {
|
|
102
113
|
const map = new Map();
|
|
103
114
|
let totalTokens = 0;
|
|
104
115
|
let totalCost = 0;
|
|
@@ -141,7 +152,7 @@ export function aggregateModels(history) {
|
|
|
141
152
|
const envWhatIfModels = envJson("OPENCODE_SCHEDULER_WHAT_IF_MODELS", null);
|
|
142
153
|
const selection = Array.isArray(envWhatIfModels) && envWhatIfModels.length > 0
|
|
143
154
|
? { models: envWhatIfModels, source: "env" }
|
|
144
|
-
:
|
|
155
|
+
: (whatIfSelection ?? selectWhatIfModels(usedModels, []));
|
|
145
156
|
const whatIf = selection.models.map((model) => ({
|
|
146
157
|
model,
|
|
147
158
|
pricePerMillion: modelPrice(model),
|
|
@@ -161,15 +172,45 @@ export function aggregateModels(history) {
|
|
|
161
172
|
const ESTIMATED_COST_PER_1K_TOKENS_USD = 0.003;
|
|
162
173
|
/** Единственный активный экземпляр сервера (защита от двойного запуска). */
|
|
163
174
|
let running = null;
|
|
175
|
+
/**
|
|
176
|
+
* QA-P3.5: порт дашборда, найденного в другом экземпляре плагина/процессе.
|
|
177
|
+
* При переиспользовании чужого дашборда у нас нет его `http.Server`, но
|
|
178
|
+
* reporting-инструменты должны видеть реальный порт, а не null.
|
|
179
|
+
*/
|
|
180
|
+
let observedPort = null;
|
|
164
181
|
/** Незавершённый запуск стартовой логики — повторные вызовы делят его между собой. */
|
|
165
182
|
let starting = null;
|
|
166
|
-
/** Запущен ли дашборд прямо
|
|
183
|
+
/** Запущен ли дашборд прямо сейчас (локальный сервер этого процесса). */
|
|
167
184
|
export function isDashboardRunning() {
|
|
168
185
|
return running !== null;
|
|
169
186
|
}
|
|
170
187
|
/** Порт, на котором слушает дашборд (или null, если не запущен). */
|
|
171
188
|
export function getDashboardPort() {
|
|
172
|
-
return running?.port ?? null;
|
|
189
|
+
return running?.port ?? observedPort ?? null;
|
|
190
|
+
}
|
|
191
|
+
/** Запоминает порт найденного дашборда (используется и при переиспользовании). */
|
|
192
|
+
function rememberDashboardPort(port) {
|
|
193
|
+
if (Number.isInteger(port) && port > 0)
|
|
194
|
+
observedPort = port;
|
|
195
|
+
}
|
|
196
|
+
/**
|
|
197
|
+
* QA-P3.5: кандидаты для поиска живого дашборда. Порт профиля может быть
|
|
198
|
+
* «бумажным» (например, 4782 в env/profile.json), а реально сервер слушает
|
|
199
|
+
* 3782 — поэтому проверяем все стандартные порты зондированием маркера.
|
|
200
|
+
*/
|
|
201
|
+
export function dashboardPortCandidates() {
|
|
202
|
+
const preferred = getProfilePort(getProfileName());
|
|
203
|
+
return Array.from(new Set([getDashboardPort(), preferred, PREFERRED_PORT, FALLBACK_PORT, ...EXTRA_PORTS].filter((port) => Number.isInteger(port) && port > 0)));
|
|
204
|
+
}
|
|
205
|
+
/** Находит живой дашборд среди стандартных портов и запоминает его порт. */
|
|
206
|
+
export async function discoverDashboardPort() {
|
|
207
|
+
for (const port of dashboardPortCandidates()) {
|
|
208
|
+
if ((await probeDashboardOn(port)).dashboard) {
|
|
209
|
+
rememberDashboardPort(port);
|
|
210
|
+
return port;
|
|
211
|
+
}
|
|
212
|
+
}
|
|
213
|
+
return null;
|
|
173
214
|
}
|
|
174
215
|
/** Локальные имена, которым разрешено обращаться к дашборду. */
|
|
175
216
|
const LOCAL_HOSTNAMES = new Set(["127.0.0.1", "localhost", "::1", "[::1]"]);
|
|
@@ -274,7 +315,7 @@ export async function startDashboardServer(deps, ports) {
|
|
|
274
315
|
return { port: actualPort };
|
|
275
316
|
}
|
|
276
317
|
catch (err) {
|
|
277
|
-
if (err
|
|
318
|
+
if (!(hasErrorCode(err) && err.code === "EADDRINUSE")) {
|
|
278
319
|
console.error(`[agent-steward] Не удалось запустить дашборд на порту ${port}: ${err instanceof Error ? err.message : String(err)}`);
|
|
279
320
|
return null;
|
|
280
321
|
}
|
|
@@ -284,6 +325,9 @@ export async function startDashboardServer(deps, ports) {
|
|
|
284
325
|
// ни переиспользовать (покажет чужие данные), ни снимать как зомби.
|
|
285
326
|
const probe = port !== 0 ? await probeDashboardOn(port) : null;
|
|
286
327
|
if (probe?.dashboard && probe.profile === getProfileName()) {
|
|
328
|
+
// QA-P3.5: чужой дашборд не даёт нам http.Server, но его порт должен
|
|
329
|
+
// быть виден через getDashboardPort()/get_dashboard_info.
|
|
330
|
+
rememberDashboardPort(port);
|
|
287
331
|
console.log(`[agent-steward] Дашборд уже запущен на http://localhost:${port} — переиспользуем его.`);
|
|
288
332
|
return { port };
|
|
289
333
|
}
|
|
@@ -533,8 +577,11 @@ export async function probeDashboardOn(port) {
|
|
|
533
577
|
export async function closeDashboardServer() {
|
|
534
578
|
if (!running)
|
|
535
579
|
return false;
|
|
536
|
-
const { server } = running;
|
|
580
|
+
const { server, port } = running;
|
|
537
581
|
running = null;
|
|
582
|
+
// QA-P3.5: не оставлять «фантомный» порт после закрытия нашего сервера.
|
|
583
|
+
if (observedPort === port)
|
|
584
|
+
observedPort = null;
|
|
538
585
|
return new Promise((resolve) => {
|
|
539
586
|
server.close(() => resolve(true));
|
|
540
587
|
// Закрываем и keep-alive соединения, чтобы порт освобождался сразу
|
|
@@ -789,14 +836,20 @@ async function handleRequest(req, res, deps) {
|
|
|
789
836
|
}
|
|
790
837
|
if (req.method === "GET" && pathname === "/api/models-analysis") {
|
|
791
838
|
const history = await loadHistory();
|
|
792
|
-
|
|
839
|
+
// Список моделей OpenCode берём асинхронно: синхронный спавн CLI вешал
|
|
840
|
+
// event loop сервера и приводил к его перезапуску (см. opencode-models.ts).
|
|
841
|
+
const usedModels = history
|
|
842
|
+
.map((record) => (record.model ?? "").trim())
|
|
843
|
+
.filter((model) => model !== "" && model !== "по умолчанию");
|
|
844
|
+
const selection = await resolveWhatIfModels(usedModels);
|
|
845
|
+
sendJson(res, 200, aggregateModels(history, selection));
|
|
793
846
|
return;
|
|
794
847
|
}
|
|
795
848
|
// Аналитика за период (Спринт 18): итоги, дневные бакеты, топ по стоимости.
|
|
796
849
|
if (req.method === "GET" && pathname === "/api/analytics") {
|
|
797
850
|
const days = Math.min(365, Math.max(1, Math.floor(Number(url.searchParams.get("days")) || 14)));
|
|
798
851
|
const topLimit = Math.max(1, Math.floor(Number(url.searchParams.get("top")) || 10));
|
|
799
|
-
const records =
|
|
852
|
+
const records = getHistoryForAnalytics(days);
|
|
800
853
|
const tasks = await deps.getTasks();
|
|
801
854
|
const report = buildAnalytics(records, {
|
|
802
855
|
days,
|
|
@@ -804,6 +857,7 @@ async function handleRequest(req, res, deps) {
|
|
|
804
857
|
tasks: tasks.map((task) => ({
|
|
805
858
|
name: task.name,
|
|
806
859
|
matrixParentId: task.matrixParentId ?? null,
|
|
860
|
+
tokenBudget: task.tokenBudget ?? undefined,
|
|
807
861
|
})),
|
|
808
862
|
});
|
|
809
863
|
sendJson(res, 200, report);
|
|
@@ -871,6 +925,14 @@ async function handleRequest(req, res, deps) {
|
|
|
871
925
|
// Журнал аудита (Спринт 26): GET /api/audit?action=…&actor=…&limit=…
|
|
872
926
|
if (req.method === "GET" && pathname === "/api/audit") {
|
|
873
927
|
try {
|
|
928
|
+
const sinceRaw = url.searchParams.get("since") ?? undefined;
|
|
929
|
+
const untilRaw = url.searchParams.get("until") ?? undefined;
|
|
930
|
+
const dateError = auditDateFilterError(sinceRaw, "since") ??
|
|
931
|
+
auditDateFilterError(untilRaw, "until");
|
|
932
|
+
if (dateError) {
|
|
933
|
+
sendJson(res, 400, { error: dateError });
|
|
934
|
+
return;
|
|
935
|
+
}
|
|
874
936
|
const limitRaw = Number(url.searchParams.get("limit"));
|
|
875
937
|
const result = readAuditLog({
|
|
876
938
|
action: url.searchParams.get("action") ?? undefined,
|
|
@@ -1232,12 +1294,14 @@ async function collectTasksWithMetrics(deps) {
|
|
|
1232
1294
|
const key = String(r.taskName || "").toLowerCase();
|
|
1233
1295
|
if (!key)
|
|
1234
1296
|
continue;
|
|
1235
|
-
const m = byTask.get(key) ?? { total: 0, success: 0, error: 0, partial: 0 };
|
|
1297
|
+
const m = byTask.get(key) ?? { total: 0, success: 0, error: 0, partial: 0, running: 0 };
|
|
1236
1298
|
m.total += 1;
|
|
1237
1299
|
if (r.status === "success")
|
|
1238
1300
|
m.success += 1;
|
|
1239
1301
|
else if (r.status === "partial")
|
|
1240
1302
|
m.partial += 1;
|
|
1303
|
+
else if (r.status === "running")
|
|
1304
|
+
m.running += 1;
|
|
1241
1305
|
else
|
|
1242
1306
|
m.error += 1;
|
|
1243
1307
|
byTask.set(key, m);
|
|
@@ -1249,6 +1313,7 @@ async function collectTasksWithMetrics(deps) {
|
|
|
1249
1313
|
success: 0,
|
|
1250
1314
|
error: 0,
|
|
1251
1315
|
partial: 0,
|
|
1316
|
+
running: 0,
|
|
1252
1317
|
},
|
|
1253
1318
|
}));
|
|
1254
1319
|
}
|
package/dist/settings.d.ts
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { type Locale, type LocaleMode } from "./i18n.js";
|
|
2
2
|
import { type PermissionPolicy } from "./core/permissions.js";
|
|
3
|
+
import { type BudgetSettings } from "./core/budget.js";
|
|
3
4
|
/** Настройки webhook-уведомлений (Discord/Slack/generic). */
|
|
4
5
|
export interface WebhookNotificationSettings {
|
|
5
6
|
/** Включён ли канал. */
|
|
@@ -304,6 +305,24 @@ export interface PermissionSettings {
|
|
|
304
305
|
/** hybrid — без shell/question; secure — только чтение; legacy — как в 1.5.x. */
|
|
305
306
|
defaultPolicy: PermissionPolicy;
|
|
306
307
|
}
|
|
308
|
+
/**
|
|
309
|
+
* Деталь 3.8: канал «пользователь → автор».
|
|
310
|
+
*
|
|
311
|
+
* В настройках хранится только URL write-only приёмника. Никаких токенов:
|
|
312
|
+
* PAT живёт в секретах Cloudflare Worker (infra/feedback-worker).
|
|
313
|
+
*/
|
|
314
|
+
export interface FeedbackSettings {
|
|
315
|
+
/** Включена ли отправка отчётов автору. По умолчанию выключена. */
|
|
316
|
+
enabled: boolean;
|
|
317
|
+
/** URL приёмника (`POST /report`). Пустой → fail-open в локальный outbox. */
|
|
318
|
+
endpoint: string;
|
|
319
|
+
/** Прикладывать логи. По умолчанию false — приватность важнее. */
|
|
320
|
+
includeLogs: boolean;
|
|
321
|
+
/** Обратный адрес (опционально, попадает в payload). */
|
|
322
|
+
contactEmail: string;
|
|
323
|
+
/** Лимит отчётов в час (антиспам, F-1.7). */
|
|
324
|
+
maxPerHour: number;
|
|
325
|
+
}
|
|
307
326
|
/**
|
|
308
327
|
* Глобальные настройки плагина, которые меняются из GUI.
|
|
309
328
|
* Хранятся в settings.json рядом с tasks.json / history.json.
|
|
@@ -334,6 +353,10 @@ export interface SchedulerSettings {
|
|
|
334
353
|
audit: AuditSettings;
|
|
335
354
|
/** Политика прав фоновых задач (Спринт 32). */
|
|
336
355
|
permissions: PermissionSettings;
|
|
356
|
+
/** Бюджеты день/неделя (Экономика v2, E-1.1). */
|
|
357
|
+
budgets: BudgetSettings;
|
|
358
|
+
/** Обратная связь пользователей (Деталь 3.8). */
|
|
359
|
+
feedback: FeedbackSettings;
|
|
337
360
|
}
|
|
338
361
|
export declare const SETTINGS_FILE: string;
|
|
339
362
|
export declare const DEFAULT_MAX_CONCURRENT = 1;
|
|
@@ -353,6 +376,25 @@ export declare const DEFAULT_AUDIT_RETENTION_DAYS = 90;
|
|
|
353
376
|
export declare const DEFAULT_AUDIT_MAX_RECORDS = 10000;
|
|
354
377
|
/** Значения аудита по умолчанию. */
|
|
355
378
|
export declare function defaultAuditSettings(): AuditSettings;
|
|
379
|
+
/**
|
|
380
|
+
* Приводит бюджетные лимиты к безопасному виду (Экономика v2, E-1.1).
|
|
381
|
+
* Отрицательные и нечисловые значения откатываются к дефолту; 0 = без лимита.
|
|
382
|
+
*/
|
|
383
|
+
export declare function normalizeBudgetSettings(value: unknown, fallback: BudgetSettings): BudgetSettings;
|
|
384
|
+
/**
|
|
385
|
+
* Деталь 3.8 / UX-3.8.1: рабочий приёмник автора подставлен по умолчанию,
|
|
386
|
+
* чтобы пользователю достаточно было только включить отправку чекбоксом.
|
|
387
|
+
* Отправка всё равно остаётся opt-in (`enabled: false`).
|
|
388
|
+
*/
|
|
389
|
+
export declare const DEFAULT_FEEDBACK_ENDPOINT = "https://agent-steward-feedback.agent-steward.workers.dev/report";
|
|
390
|
+
/** По умолчанию канал автору выключен, логи не прикладываются. */
|
|
391
|
+
export declare const DEFAULT_FEEDBACK_SETTINGS: FeedbackSettings;
|
|
392
|
+
export declare function defaultFeedbackSettings(): FeedbackSettings;
|
|
393
|
+
/**
|
|
394
|
+
* Валидация настроек обратной связи. Неверный URL не отбрасывает всю секцию —
|
|
395
|
+
* он заменяется пустым (fail-open): отправка деградирует до outbox.
|
|
396
|
+
*/
|
|
397
|
+
export declare function normalizeFeedbackSettings(value: unknown, fallback: FeedbackSettings): FeedbackSettings;
|
|
356
398
|
/** Политика прав по умолчанию: гибрид (без shell/question). */
|
|
357
399
|
export declare function defaultPermissionsSettings(): PermissionSettings;
|
|
358
400
|
/** Значения интеграций по умолчанию: хуки выключены, подпись обязательна. */
|
package/dist/settings.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"settings.d.ts","sourceRoot":"","sources":["../src/settings.ts"],"names":[],"mappings":"AAIA,OAAO,EAA8G,KAAK,MAAM,EAAE,KAAK,UAAU,EAAE,MAAM,WAAW,CAAC;AACrK,OAAO,EAGL,KAAK,gBAAgB,EACtB,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"settings.d.ts","sourceRoot":"","sources":["../src/settings.ts"],"names":[],"mappings":"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"}
|
package/dist/settings.js
CHANGED
|
@@ -4,6 +4,7 @@ import path from "node:path";
|
|
|
4
4
|
import { PLUGIN_DIR } from "./types.js";
|
|
5
5
|
import { DEFAULT_LOCALE, DEFAULT_LOCALE_MODE, normalizeLocale, normalizeLocaleMode, SUPPORTED_LOCALES, messageIn, t } from "./i18n.js";
|
|
6
6
|
import { DEFAULT_PERMISSION_POLICY, normalizePolicy, } from "./core/permissions.js";
|
|
7
|
+
import { defaultBudgetSettings } from "./core/budget.js";
|
|
7
8
|
/** Дни shadow-периода по умолчанию. */
|
|
8
9
|
export const DEFAULT_SHADOW_DAYS = 14;
|
|
9
10
|
export const SETTINGS_FILE = path.join(PLUGIN_DIR, "settings.json");
|
|
@@ -32,6 +33,75 @@ export function defaultAuditSettings() {
|
|
|
32
33
|
maxRecords: DEFAULT_AUDIT_MAX_RECORDS,
|
|
33
34
|
};
|
|
34
35
|
}
|
|
36
|
+
/**
|
|
37
|
+
* Приводит бюджетные лимиты к безопасному виду (Экономика v2, E-1.1).
|
|
38
|
+
* Отрицательные и нечисловые значения откатываются к дефолту; 0 = без лимита.
|
|
39
|
+
*/
|
|
40
|
+
export function normalizeBudgetSettings(value, fallback) {
|
|
41
|
+
if (!value || typeof value !== "object" || Array.isArray(value)) {
|
|
42
|
+
return { ...fallback };
|
|
43
|
+
}
|
|
44
|
+
const raw = value;
|
|
45
|
+
return {
|
|
46
|
+
enabled: typeof raw.enabled === "boolean" ? raw.enabled : fallback.enabled,
|
|
47
|
+
dailyUsd: normalizeFloatInRange(raw.dailyUsd, fallback.dailyUsd, 0, 1000000),
|
|
48
|
+
weeklyUsd: normalizeFloatInRange(raw.weeklyUsd, fallback.weeklyUsd, 0, 1000000),
|
|
49
|
+
};
|
|
50
|
+
}
|
|
51
|
+
/**
|
|
52
|
+
* Деталь 3.8 / UX-3.8.1: рабочий приёмник автора подставлен по умолчанию,
|
|
53
|
+
* чтобы пользователю достаточно было только включить отправку чекбоксом.
|
|
54
|
+
* Отправка всё равно остаётся opt-in (`enabled: false`).
|
|
55
|
+
*/
|
|
56
|
+
export const DEFAULT_FEEDBACK_ENDPOINT = "https://agent-steward-feedback.agent-steward.workers.dev/report";
|
|
57
|
+
/** По умолчанию канал автору выключен, логи не прикладываются. */
|
|
58
|
+
export const DEFAULT_FEEDBACK_SETTINGS = {
|
|
59
|
+
enabled: false,
|
|
60
|
+
endpoint: DEFAULT_FEEDBACK_ENDPOINT,
|
|
61
|
+
includeLogs: false,
|
|
62
|
+
contactEmail: "",
|
|
63
|
+
maxPerHour: 6,
|
|
64
|
+
};
|
|
65
|
+
export function defaultFeedbackSettings() {
|
|
66
|
+
return { ...DEFAULT_FEEDBACK_SETTINGS };
|
|
67
|
+
}
|
|
68
|
+
/**
|
|
69
|
+
* Валидация настроек обратной связи. Неверный URL не отбрасывает всю секцию —
|
|
70
|
+
* он заменяется пустым (fail-open): отправка деградирует до outbox.
|
|
71
|
+
*/
|
|
72
|
+
export function normalizeFeedbackSettings(value, fallback) {
|
|
73
|
+
if (!value || typeof value !== "object" || Array.isArray(value)) {
|
|
74
|
+
return { ...fallback };
|
|
75
|
+
}
|
|
76
|
+
const raw = value;
|
|
77
|
+
let endpoint = typeof raw.endpoint === "string" ? raw.endpoint.trim() : fallback.endpoint;
|
|
78
|
+
// Апгрейд старых профилей: пустой endpoint из previous-версии заменяем дефолтным.
|
|
79
|
+
if (!endpoint)
|
|
80
|
+
endpoint = fallback.endpoint;
|
|
81
|
+
if (endpoint) {
|
|
82
|
+
try {
|
|
83
|
+
const url = new URL(endpoint);
|
|
84
|
+
const local = ["localhost", "127.0.0.1", "[::1]"].includes(url.hostname);
|
|
85
|
+
if ((url.protocol !== "https:" && !(url.protocol === "http:" && local)) ||
|
|
86
|
+
url.username ||
|
|
87
|
+
url.password ||
|
|
88
|
+
url.hash ||
|
|
89
|
+
endpoint.length > 2048) {
|
|
90
|
+
endpoint = "";
|
|
91
|
+
}
|
|
92
|
+
}
|
|
93
|
+
catch {
|
|
94
|
+
endpoint = "";
|
|
95
|
+
}
|
|
96
|
+
}
|
|
97
|
+
return {
|
|
98
|
+
enabled: typeof raw.enabled === "boolean" ? raw.enabled : fallback.enabled,
|
|
99
|
+
endpoint,
|
|
100
|
+
includeLogs: typeof raw.includeLogs === "boolean" ? raw.includeLogs : fallback.includeLogs,
|
|
101
|
+
contactEmail: typeof raw.contactEmail === "string" ? raw.contactEmail.trim().slice(0, 254) : fallback.contactEmail,
|
|
102
|
+
maxPerHour: normalizeIntInRange(raw.maxPerHour, fallback.maxPerHour, 1, 100),
|
|
103
|
+
};
|
|
104
|
+
}
|
|
35
105
|
/** Политика прав по умолчанию: гибрид (без shell/question). */
|
|
36
106
|
export function defaultPermissionsSettings() {
|
|
37
107
|
return { defaultPolicy: DEFAULT_PERMISSION_POLICY };
|
|
@@ -686,6 +756,8 @@ export async function loadSettings() {
|
|
|
686
756
|
const fallbackIntegrations = defaultIntegrations();
|
|
687
757
|
const fallbackAudit = defaultAuditSettings();
|
|
688
758
|
const fallbackPermissions = defaultPermissionsSettings();
|
|
759
|
+
const fallbackBudgets = defaultBudgetSettings();
|
|
760
|
+
const fallbackFeedback = defaultFeedbackSettings();
|
|
689
761
|
try {
|
|
690
762
|
const raw = await fs.readFile(SETTINGS_FILE, "utf8");
|
|
691
763
|
const parsed = JSON.parse(raw);
|
|
@@ -699,6 +771,8 @@ export async function loadSettings() {
|
|
|
699
771
|
integrations: normalizeIntegrations(parsed?.integrations, fallbackIntegrations),
|
|
700
772
|
audit: normalizeAuditSettings(parsed?.audit, fallbackAudit),
|
|
701
773
|
permissions: normalizePermissionsSettings(parsed?.permissions, fallbackPermissions),
|
|
774
|
+
budgets: normalizeBudgetSettings(parsed?.budgets, fallbackBudgets),
|
|
775
|
+
feedback: normalizeFeedbackSettings(parsed?.feedback, fallbackFeedback),
|
|
702
776
|
};
|
|
703
777
|
}
|
|
704
778
|
catch {
|
|
@@ -712,6 +786,8 @@ export async function loadSettings() {
|
|
|
712
786
|
integrations: fallbackIntegrations,
|
|
713
787
|
audit: fallbackAudit,
|
|
714
788
|
permissions: fallbackPermissions,
|
|
789
|
+
budgets: fallbackBudgets,
|
|
790
|
+
feedback: fallbackFeedback,
|
|
715
791
|
};
|
|
716
792
|
}
|
|
717
793
|
}
|
|
@@ -746,6 +822,12 @@ export async function saveSettings(patch) {
|
|
|
746
822
|
permissions: patch.permissions !== undefined
|
|
747
823
|
? normalizePermissionsSettings(patch.permissions, current.permissions)
|
|
748
824
|
: current.permissions,
|
|
825
|
+
budgets: patch.budgets !== undefined
|
|
826
|
+
? normalizeBudgetSettings(patch.budgets, current.budgets)
|
|
827
|
+
: current.budgets,
|
|
828
|
+
feedback: patch.feedback !== undefined
|
|
829
|
+
? normalizeFeedbackSettings(patch.feedback, current.feedback)
|
|
830
|
+
: current.feedback,
|
|
749
831
|
};
|
|
750
832
|
// Удобство: при включении хуков без явных учётных данных генерируем их,
|
|
751
833
|
// чтобы функция сразу работала, а секреты не приходилось придумывать вручную.
|
package/dist/task-transfer.d.ts
CHANGED
|
@@ -222,6 +222,11 @@ export interface TaskDefinition {
|
|
|
222
222
|
pipelineName?: string;
|
|
223
223
|
/** Спринт 32: стабильный id шага внутри pipeline (для diff/apply). */
|
|
224
224
|
pipelineStepId?: string;
|
|
225
|
+
/**
|
|
226
|
+
* Экономика v2 (E-2): лимит токенов на один запуск задачи.
|
|
227
|
+
* 0/undefined — лимит не задан (fail-open, как и глобальные budgets).
|
|
228
|
+
*/
|
|
229
|
+
tokenBudget?: number;
|
|
225
230
|
}
|
|
226
231
|
/** Приоритет по умолчанию — «Обычный». */
|
|
227
232
|
export declare const DEFAULT_PRIORITY = 5;
|
|
@@ -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
|
@@ -167,6 +167,10 @@ export async function buildExportJson(tasks) {
|
|
|
167
167
|
...(definition?.worktree === true ? { worktree: true } : {}),
|
|
168
168
|
// W-3: guard-условия переживают перенос между профилями.
|
|
169
169
|
...(definition?.guards ? { guards: definition.guards } : {}),
|
|
170
|
+
// QA-P0.1 (E-2.1): лимит токенов переживает экспорт/импорт.
|
|
171
|
+
...(definition?.tokenBudget !== undefined
|
|
172
|
+
? { tokenBudget: definition.tokenBudget }
|
|
173
|
+
: {}),
|
|
170
174
|
...(Array.isArray(definition?.allowedTools) && definition.allowedTools.length > 0
|
|
171
175
|
? { allowedTools: definition.allowedTools }
|
|
172
176
|
: {}),
|
|
@@ -202,6 +206,25 @@ export async function buildExportJson(tasks) {
|
|
|
202
206
|
};
|
|
203
207
|
return { data: JSON.stringify(payload, null, 2), count: exported.length };
|
|
204
208
|
}
|
|
209
|
+
/**
|
|
210
|
+
* Строковое представление unknown для текстов ошибок импорта (QA-A2.5).
|
|
211
|
+
* Примитивы превращаются в строку так же, как это делал String(); для
|
|
212
|
+
* объектов/функций сохраняется результат стандартной конверсии '[object Object]'.
|
|
213
|
+
*/
|
|
214
|
+
function describeImportValue(value) {
|
|
215
|
+
if (value === null || value === undefined)
|
|
216
|
+
return String(value);
|
|
217
|
+
switch (typeof value) {
|
|
218
|
+
case "string":
|
|
219
|
+
case "number":
|
|
220
|
+
case "boolean":
|
|
221
|
+
case "bigint":
|
|
222
|
+
case "symbol":
|
|
223
|
+
return String(value);
|
|
224
|
+
default:
|
|
225
|
+
return "[object Object]";
|
|
226
|
+
}
|
|
227
|
+
}
|
|
205
228
|
/**
|
|
206
229
|
* Разбирает файл импорта. Поддерживает как { tasks: [...] }, так и просто массив.
|
|
207
230
|
* Ошибки отдельных записей не прерывают импорт остальных.
|
|
@@ -212,7 +235,12 @@ export function parseImportJson(raw) {
|
|
|
212
235
|
parsed = JSON.parse(raw);
|
|
213
236
|
}
|
|
214
237
|
catch (err) {
|
|
215
|
-
|
|
238
|
+
const detail = err instanceof Error
|
|
239
|
+
? err.message
|
|
240
|
+
: typeof err === "object" && err !== null && "message" in err
|
|
241
|
+
? describeImportValue(err.message)
|
|
242
|
+
: describeImportValue(err);
|
|
243
|
+
throw new Error(`Файл не является корректным JSON: ${detail}`);
|
|
216
244
|
}
|
|
217
245
|
const list = Array.isArray(parsed)
|
|
218
246
|
? parsed
|
|
@@ -303,7 +331,7 @@ export function parseImportJson(raw) {
|
|
|
303
331
|
session = source.session;
|
|
304
332
|
}
|
|
305
333
|
else {
|
|
306
|
-
errors.push(`Запись ${position}${name ? ` (${name})` : ""}: неизвестный session «${
|
|
334
|
+
errors.push(`Запись ${position}${name ? ` (${name})` : ""}: неизвестный session «${describeImportValue(source.session)}» (ожидается new, reuse или last).`);
|
|
307
335
|
return;
|
|
308
336
|
}
|
|
309
337
|
}
|
|
@@ -330,6 +358,21 @@ export function parseImportJson(raw) {
|
|
|
330
358
|
source.timeoutSeconds > 0
|
|
331
359
|
? Math.floor(source.timeoutSeconds)
|
|
332
360
|
: undefined;
|
|
361
|
+
// QA-P0.1 (E-2.1): tokenBudget 0..10M, как в схемах create/update. 0 — без лимита.
|
|
362
|
+
let tokenBudget;
|
|
363
|
+
if (source.tokenBudget !== undefined) {
|
|
364
|
+
const raw = source.tokenBudget;
|
|
365
|
+
if (typeof raw === "number" &&
|
|
366
|
+
Number.isFinite(raw) &&
|
|
367
|
+
raw >= 0 &&
|
|
368
|
+
raw <= 10000000) {
|
|
369
|
+
tokenBudget = Math.floor(raw);
|
|
370
|
+
}
|
|
371
|
+
else {
|
|
372
|
+
errors.push(`Запись ${position}${name ? ` (${name})` : ""}: tokenBudget должен быть целым числом 0..10000000.`);
|
|
373
|
+
return;
|
|
374
|
+
}
|
|
375
|
+
}
|
|
333
376
|
// Новое поле workingDirectory; workdir читаем для обратной совместимости.
|
|
334
377
|
const workingDirectory = typeof source.workingDirectory === "string" && source.workingDirectory.trim()
|
|
335
378
|
? source.workingDirectory.trim()
|
|
@@ -396,7 +439,7 @@ export function parseImportJson(raw) {
|
|
|
396
439
|
windowPolicy = source.windowPolicy;
|
|
397
440
|
}
|
|
398
441
|
else {
|
|
399
|
-
errors.push(`Запись ${position}${name ? ` (${name})` : ""}: неизвестный windowPolicy «${
|
|
442
|
+
errors.push(`Запись ${position}${name ? ` (${name})` : ""}: неизвестный windowPolicy «${describeImportValue(source.windowPolicy)}» (ожидается skip, postpone или run).`);
|
|
400
443
|
return;
|
|
401
444
|
}
|
|
402
445
|
}
|
|
@@ -637,6 +680,8 @@ export function parseImportJson(raw) {
|
|
|
637
680
|
...(runWhenLoggedOffFlag ? { runWhenLoggedOff: true } : {}),
|
|
638
681
|
...(worktreeFlag ? { worktree: true } : {}),
|
|
639
682
|
...(guards ? { guards } : {}),
|
|
683
|
+
// QA-P0.1 (E-2.1): импорт сохраняет tokenBudget.
|
|
684
|
+
...(tokenBudget !== undefined ? { tokenBudget } : {}),
|
|
640
685
|
...(mcpEvent ? { mcpEvent } : {}),
|
|
641
686
|
...(allowedTools !== undefined ? { allowedTools } : {}),
|
|
642
687
|
...(deniedTools !== undefined ? { deniedTools } : {}),
|
package/dist/templates.d.ts
CHANGED
|
@@ -52,6 +52,6 @@ export declare function loadTemplates(): Promise<TaskTemplate[]>;
|
|
|
52
52
|
export declare function saveTemplate(template: Omit<TaskTemplate, "id"> & {
|
|
53
53
|
id?: string;
|
|
54
54
|
}): Promise<TaskTemplate>;
|
|
55
|
-
/** Удаляет шаблон по id. */
|
|
56
|
-
export declare function deleteTemplate(
|
|
55
|
+
/** Удаляет шаблон по id или имени (QA-P3.3). */
|
|
56
|
+
export declare function deleteTemplate(idOrName: string): Promise<void>;
|
|
57
57
|
//# sourceMappingURL=templates.d.ts.map
|
package/dist/templates.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"templates.d.ts","sourceRoot":"","sources":["../src/templates.ts"],"names":[],"mappings":"AAMA;;;;;;GAMG;AACH,MAAM,WAAW,YAAY;IAC3B,uCAAuC;IACvC,EAAE,EAAE,MAAM,CAAC;IACX,oDAAoD;IACpD,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,yEAAyE;IACzE,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,+CAA+C;IAC/C,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,2CAA2C;IAC3C,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,2CAA2C;IAC3C,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,+EAA+E;IAC/E,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;IACrB,WAAW,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,KAAK,GAAG,WAAW,CAAC;IACpD,+DAA+D;IAC/D,QAAQ,CAAC,EAAE;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IAC9D,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,kEAAkE;IAClE,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,uEAAuE;IACvE,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;IACxB,2EAA2E;IAC3E,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;CACxB;AAED,sDAAsD;AACtD,wBAAsB,aAAa,IAAI,OAAO,CAAC,YAAY,EAAE,CAAC,CAE7D;AAED;;;GAGG;AACH,wBAAsB,YAAY,CAChC,QAAQ,EAAE,IAAI,CAAC,YAAY,EAAE,IAAI,CAAC,GAAG;IAAE,EAAE,CAAC,EAAE,MAAM,CAAA;CAAE,GACnD,OAAO,CAAC,YAAY,CAAC,CAEvB;AAED,
|
|
1
|
+
{"version":3,"file":"templates.d.ts","sourceRoot":"","sources":["../src/templates.ts"],"names":[],"mappings":"AAMA;;;;;;GAMG;AACH,MAAM,WAAW,YAAY;IAC3B,uCAAuC;IACvC,EAAE,EAAE,MAAM,CAAC;IACX,oDAAoD;IACpD,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,yEAAyE;IACzE,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,+CAA+C;IAC/C,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,2CAA2C;IAC3C,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,2CAA2C;IAC3C,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,+EAA+E;IAC/E,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;IACrB,WAAW,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,KAAK,GAAG,WAAW,CAAC;IACpD,+DAA+D;IAC/D,QAAQ,CAAC,EAAE;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IAC9D,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,kEAAkE;IAClE,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,uEAAuE;IACvE,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;IACxB,2EAA2E;IAC3E,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;CACxB;AAED,sDAAsD;AACtD,wBAAsB,aAAa,IAAI,OAAO,CAAC,YAAY,EAAE,CAAC,CAE7D;AAED;;;GAGG;AACH,wBAAsB,YAAY,CAChC,QAAQ,EAAE,IAAI,CAAC,YAAY,EAAE,IAAI,CAAC,GAAG;IAAE,EAAE,CAAC,EAAE,MAAM,CAAA;CAAE,GACnD,OAAO,CAAC,YAAY,CAAC,CAEvB;AAED,gDAAgD;AAChD,wBAAsB,cAAc,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAEpE"}
|
package/dist/templates.js
CHANGED
|
@@ -10,7 +10,7 @@ export async function loadTemplates() {
|
|
|
10
10
|
export async function saveTemplate(template) {
|
|
11
11
|
return saveTemplateRow(template);
|
|
12
12
|
}
|
|
13
|
-
/** Удаляет шаблон по id. */
|
|
14
|
-
export async function deleteTemplate(
|
|
15
|
-
deleteTemplateRow(
|
|
13
|
+
/** Удаляет шаблон по id или имени (QA-P3.3). */
|
|
14
|
+
export async function deleteTemplate(idOrName) {
|
|
15
|
+
deleteTemplateRow(idOrName);
|
|
16
16
|
}
|