agent-steward 0.0.2 → 0.0.4
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 +45 -2
- package/CROSS_PLATFORM.md +11 -9
- package/README.md +11 -10
- package/ROADMAP-STRATEGY.md +93 -44
- package/ROADMAP.md +148 -1017
- package/dist/core/cron-to-schtasks.d.ts +0 -8
- package/dist/core/cron-to-schtasks.d.ts.map +1 -1
- package/dist/core/cron-to-schtasks.js +11 -86
- package/dist/core/dlq-api.d.ts +44 -0
- package/dist/core/dlq-api.d.ts.map +1 -0
- package/dist/core/dlq-api.js +68 -0
- package/dist/core/dry-run.d.ts.map +1 -1
- package/dist/core/dry-run.js +19 -2
- package/dist/core/file-watcher.js +9 -9
- package/dist/core/git-trigger.js +4 -4
- package/dist/core/lock.d.ts +20 -4
- package/dist/core/lock.d.ts.map +1 -1
- package/dist/core/lock.js +99 -26
- package/dist/core/one-shot.d.ts +31 -5
- package/dist/core/one-shot.d.ts.map +1 -1
- package/dist/core/one-shot.js +78 -10
- package/dist/core/opencode-cli.d.ts +28 -0
- package/dist/core/opencode-cli.d.ts.map +1 -0
- package/dist/core/opencode-cli.js +74 -0
- package/dist/core/opencode-models.d.ts +62 -0
- package/dist/core/opencode-models.d.ts.map +1 -0
- package/dist/core/opencode-models.js +277 -0
- package/dist/core/otel.js +2 -2
- 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 +66 -36
- package/dist/core/record-history.d.ts +15 -0
- package/dist/core/record-history.d.ts.map +1 -1
- package/dist/core/record-history.js +78 -54
- package/dist/core/router/dispatch.d.ts +36 -0
- package/dist/core/router/dispatch.d.ts.map +1 -0
- package/dist/core/router/dispatch.js +59 -0
- package/dist/core/router/escalation.d.ts +47 -0
- package/dist/core/router/escalation.d.ts.map +1 -0
- package/dist/core/router/escalation.js +87 -0
- package/dist/core/router/planner.d.ts +53 -0
- package/dist/core/router/planner.d.ts.map +1 -0
- package/dist/core/router/planner.js +113 -0
- package/dist/core/router/rules.d.ts +46 -0
- package/dist/core/router/rules.d.ts.map +1 -0
- package/dist/core/router/rules.js +85 -0
- package/dist/core/run-panel-api.d.ts +94 -0
- package/dist/core/run-panel-api.d.ts.map +1 -0
- package/dist/core/run-panel-api.js +169 -0
- package/dist/core/schedule-gate.js +5 -1
- package/dist/core/schedule-v2.d.ts +36 -2
- package/dist/core/schedule-v2.d.ts.map +1 -1
- package/dist/core/schedule-v2.js +98 -12
- package/dist/core/scheduler/at-fallback.d.ts +95 -0
- package/dist/core/scheduler/at-fallback.d.ts.map +1 -0
- package/dist/core/scheduler/at-fallback.js +200 -0
- package/dist/core/scheduler/linux.d.ts +13 -2
- package/dist/core/scheduler/linux.d.ts.map +1 -1
- package/dist/core/scheduler/linux.js +67 -13
- package/dist/core/scheduler/mac.d.ts +14 -8
- package/dist/core/scheduler/mac.d.ts.map +1 -1
- package/dist/core/scheduler/mac.js +71 -22
- package/dist/core/scheduler/posix.d.ts.map +1 -1
- package/dist/core/scheduler/posix.js +37 -2
- package/dist/core/scheduler/registry.d.ts +13 -0
- package/dist/core/scheduler/registry.d.ts.map +1 -1
- package/dist/core/scheduler/registry.js +83 -21
- package/dist/core/scheduler/run-now.d.ts +16 -0
- package/dist/core/scheduler/run-now.d.ts.map +1 -0
- package/dist/core/scheduler/run-now.js +28 -0
- package/dist/core/scheduler/windows.d.ts +16 -3
- package/dist/core/scheduler/windows.d.ts.map +1 -1
- package/dist/core/scheduler/windows.js +249 -96
- package/dist/core/secrets.d.ts.map +1 -1
- package/dist/core/secrets.js +127 -30
- package/dist/core/self-analysis.js +55 -55
- package/dist/core/session.d.ts.map +1 -1
- package/dist/core/session.js +18 -11
- package/dist/core/summary.js +1 -1
- package/dist/core/task-name.d.ts +24 -0
- package/dist/core/task-name.d.ts.map +1 -0
- package/dist/core/task-name.js +40 -0
- package/dist/core/triage-chain.js +1 -1
- package/dist/core/triage-worker.js +2 -2
- package/dist/core/triage.js +1 -1
- package/dist/core/wrappers/bash.d.ts.map +1 -1
- package/dist/core/wrappers/bash.js +82 -37
- package/dist/db/capability-repo.d.ts +83 -0
- package/dist/db/capability-repo.d.ts.map +1 -0
- package/dist/db/capability-repo.js +182 -0
- package/dist/db/history-repo.d.ts +8 -0
- package/dist/db/history-repo.d.ts.map +1 -1
- package/dist/db/history-repo.js +19 -0
- package/dist/db/index.d.ts +6 -0
- package/dist/db/index.d.ts.map +1 -1
- package/dist/db/index.js +48 -2
- package/dist/db/migrate.d.ts.map +1 -1
- package/dist/db/migrate.js +3 -1
- package/dist/db/run-context.d.ts +103 -0
- package/dist/db/run-context.d.ts.map +1 -0
- package/dist/db/run-context.js +224 -0
- package/dist/db/run-dlq.d.ts +100 -0
- package/dist/db/run-dlq.d.ts.map +1 -0
- package/dist/db/run-dlq.js +191 -0
- package/dist/db/run-journal.d.ts +60 -0
- package/dist/db/run-journal.d.ts.map +1 -0
- package/dist/db/run-journal.js +143 -0
- package/dist/db/run-resume.d.ts +51 -0
- package/dist/db/run-resume.d.ts.map +1 -0
- package/dist/db/run-resume.js +156 -0
- package/dist/db/runs-repo.d.ts +128 -0
- package/dist/db/runs-repo.d.ts.map +1 -0
- package/dist/db/runs-repo.js +342 -0
- package/dist/db/schema.d.ts +16 -2
- package/dist/db/schema.d.ts.map +1 -1
- package/dist/db/schema.js +342 -35
- package/dist/db/settings-repo.d.ts +11 -0
- package/dist/db/settings-repo.d.ts.map +1 -1
- package/dist/db/settings-repo.js +25 -0
- package/dist/db/step-idempotency.d.ts +51 -0
- package/dist/db/step-idempotency.d.ts.map +1 -0
- package/dist/db/step-idempotency.js +136 -0
- package/dist/index.d.ts +5 -5
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +168 -40
- package/dist/notifications.js +18 -18
- package/dist/profiles.d.ts +7 -3
- package/dist/profiles.d.ts.map +1 -1
- package/dist/profiles.js +85 -7
- package/dist/rpc.d.ts +787 -0
- package/dist/rpc.d.ts.map +1 -1
- package/dist/rpc.js +324 -0
- package/dist/server.d.ts +33 -2
- package/dist/server.d.ts.map +1 -1
- package/dist/server.js +115 -54
- package/dist/shared/jobs-view.d.ts.map +1 -1
- package/dist/skill.js +1 -1
- package/dist/task-transfer.d.ts +1 -1
- package/dist/task-transfer.d.ts.map +1 -1
- package/dist/task-transfer.js +14 -10
- package/dist/types.d.ts +20 -4
- package/dist/types.d.ts.map +1 -1
- package/dist/types.js +44 -9
- package/dist/workspaces.d.ts +25 -3
- package/dist/workspaces.d.ts.map +1 -1
- package/dist/workspaces.js +44 -9
- package/docs/ARCHITECTURE.md +335 -9
- package/docs/COMPATIBILITY.md +10 -6
- package/docs/CONCEPT.md +183 -91
- package/docs/CROSS_PLATFORM.ru.md +11 -9
- package/docs/CROSS_PLATFORM.zh.md +11 -9
- package/docs/EXECUTION-LOOP.md +196 -0
- package/docs/FAQ.md +2 -2
- package/docs/FAQ.ru.md +2 -2
- package/docs/FAQ.zh.md +2 -2
- package/docs/FEATURES.md +5 -4
- package/docs/FEATURES.zh.md +5 -4
- package/docs/MIGRATION.md +34 -26
- package/docs/README.ru.md +27 -8
- package/docs/README.zh.md +11 -10
- package/docs/SAFETY.md +122 -0
- package/docs/SAVINGS.md +29 -0
- package/docs/SAVINGS.ru.md +29 -0
- package/docs/SAVINGS.zh.md +18 -0
- package/docs/V1-V2-COMPATIBILITY-PLAN.md +6 -6
- package/gui-experimental.cjs +8 -8
- package/index.js +1 -0
- package/locales/en.json +68 -0
- package/locales/ru.json +68 -0
- package/locales/zh.json +68 -0
- package/package.json +57 -11
- package/scripts/audit-bundle.mjs +215 -0
- package/src/core/analytics.ts +2 -2
- package/src/core/audit.ts +17 -17
- package/src/core/cron-to-schtasks.ts +14 -93
- package/src/core/dlq-api.ts +98 -0
- package/src/core/dry-run.ts +51 -27
- package/src/core/file-watcher.ts +17 -17
- package/src/core/git-trigger.ts +9 -9
- package/src/core/glob.ts +1 -1
- package/src/core/local-ai.ts +2 -2
- package/src/core/lock.ts +104 -31
- package/src/core/matrix.ts +31 -31
- package/src/core/native-notify.ts +2 -2
- package/src/core/one-shot.ts +91 -13
- package/src/core/opencode-cli.ts +103 -0
- package/src/core/opencode-models.ts +315 -0
- package/src/core/otel.ts +4 -4
- package/src/core/permissions.ts +5 -5
- package/src/core/prometheus.ts +17 -17
- package/src/core/ps-wrapper.ts +68 -38
- package/src/core/record-history.ts +114 -76
- package/src/core/retention.ts +3 -3
- package/src/core/router/dispatch.ts +94 -0
- package/src/core/router/escalation.ts +129 -0
- package/src/core/router/planner.ts +166 -0
- package/src/core/router/rules.ts +109 -0
- package/src/core/run-panel-api.ts +262 -0
- package/src/core/savings.ts +1 -1
- package/src/core/schedule-gate.ts +17 -13
- package/src/core/schedule-v2.ts +138 -29
- package/src/core/scheduler/at-fallback.ts +298 -0
- package/src/core/scheduler/index.ts +3 -3
- package/src/core/scheduler/linux.ts +92 -19
- package/src/core/scheduler/logs.ts +1 -1
- package/src/core/scheduler/mac.ts +112 -60
- package/src/core/scheduler/posix.ts +35 -2
- package/src/core/scheduler/registry.ts +109 -26
- package/src/core/scheduler/run-now.ts +32 -0
- package/src/core/scheduler/windows.ts +295 -125
- package/src/core/secrets.ts +139 -39
- package/src/core/self-analysis.ts +61 -61
- package/src/core/session.ts +26 -13
- package/src/core/structured-log.ts +3 -3
- package/src/core/summary.ts +25 -25
- package/src/core/task-name.ts +67 -0
- package/src/core/telegram.ts +16 -16
- package/src/core/triage-chain.ts +4 -4
- package/src/core/triage-compare.ts +8 -8
- package/src/core/triage-rules.ts +4 -4
- package/src/core/triage-shadow.ts +7 -7
- package/src/core/triage-worker.ts +6 -6
- package/src/core/triage.ts +23 -23
- package/src/core/watch-paths.ts +1 -1
- package/src/core/wrappers/bash.ts +90 -45
- package/src/db/capability-repo.ts +285 -0
- package/src/db/git-state-repo.ts +1 -1
- package/src/db/history-repo.ts +44 -22
- package/src/db/index.ts +53 -7
- package/src/db/metrics-repo.ts +10 -10
- package/src/db/migrate.ts +13 -11
- package/src/db/recovery.ts +3 -3
- package/src/db/run-context.ts +370 -0
- package/src/db/run-dlq.ts +310 -0
- package/src/db/run-journal.ts +212 -0
- package/src/db/run-resume.ts +256 -0
- package/src/db/runs-repo.ts +504 -0
- package/src/db/schema.ts +357 -44
- package/src/db/settings-repo.ts +33 -2
- package/src/db/step-idempotency.ts +185 -0
- package/src/db/tasks-repo.ts +10 -10
- package/src/db/templates-repo.ts +7 -7
- package/src/gui.tsx +516 -1
- package/src/history.ts +4 -4
- package/src/i18n.ts +7 -7
- package/src/index.ts +465 -308
- package/src/integrations.ts +6 -6
- package/src/notifications.ts +76 -76
- package/src/profiles.ts +98 -7
- package/src/rpc.ts +347 -1
- package/src/schtasks.ts +2 -2
- package/src/server.ts +155 -78
- package/src/settings.ts +44 -44
- package/src/shared/jobs-view.ts +60 -60
- package/src/skill.ts +1 -1
- package/src/task-transfer.ts +58 -56
- package/src/templates.ts +1 -1
- package/src/types.ts +54 -10
- package/src/workspaces.ts +73 -24
- package/dist/core/self-analysis.test.d.ts +0 -2
- package/dist/core/self-analysis.test.d.ts.map +0 -1
- package/dist/core/self-analysis.test.js +0 -219
- package/dist/gui-experimental.cjs +0 -1
package/dist/server.js
CHANGED
|
@@ -12,6 +12,7 @@ import { listWorkspaces } from "./workspaces.js";
|
|
|
12
12
|
import { getProfileName, getProfilePort } from "./profiles.js";
|
|
13
13
|
import { simulatePipeline } from "./core/dry-run.js";
|
|
14
14
|
import { loadSettings } from "./settings.js";
|
|
15
|
+
import { DEFAULT_MODEL_PRICE_PER_MILLION, DEFAULT_PRICE_PER_MILLION, catalogPricePerMillion, normalizeModelId, resolveWhatIfModels, } from "./core/opencode-models.js";
|
|
15
16
|
import { authenticateHookRequest, extractHookSignature, extractHookToken, readRequestBody, } from "./integrations.js";
|
|
16
17
|
import { appendStructuredLog, readStructuredLogs } from "./core/structured-log.js";
|
|
17
18
|
import { PROMETHEUS_CONTENT_TYPE, renderPrometheusMetrics } from "./core/prometheus.js";
|
|
@@ -49,25 +50,37 @@ function normalizeProcessName(name) {
|
|
|
49
50
|
}
|
|
50
51
|
/** Маркер-заголовок: по нему узнаём «свой» дашборд, уже слушающий порт. */
|
|
51
52
|
const DASHBOARD_HEADER = "x-plugin-dashboard";
|
|
52
|
-
const DASHBOARD_MARKER = "
|
|
53
|
+
const DASHBOARD_MARKER = "agent-steward";
|
|
54
|
+
/** Чтение JSON из переменной окружения с фолбэком на значение по умолчанию. */
|
|
55
|
+
function envJson(name, fallback) {
|
|
56
|
+
const raw = process.env[name];
|
|
57
|
+
if (!raw)
|
|
58
|
+
return fallback;
|
|
59
|
+
try {
|
|
60
|
+
return JSON.parse(raw);
|
|
61
|
+
}
|
|
62
|
+
catch {
|
|
63
|
+
console.warn(`[scheduler] Неверный JSON в переменной ${name}, используются значения по умолчанию.`);
|
|
64
|
+
return fallback;
|
|
65
|
+
}
|
|
66
|
+
}
|
|
67
|
+
/** Ручное переопределение цен: OPENCODE_SCHEDULER_MODEL_PRICES (JSON). */
|
|
68
|
+
const envModelPrices = envJson("OPENCODE_SCHEDULER_MODEL_PRICES", {});
|
|
53
69
|
/**
|
|
54
|
-
*
|
|
55
|
-
*
|
|
70
|
+
* Цена модели за 1M токенов.
|
|
71
|
+
*
|
|
72
|
+
* Порядок: ручное переопределение → каталог цен OpenCode (models.dev) →
|
|
73
|
+
* встроенная таблица → средняя оценка.
|
|
56
74
|
*/
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
"
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
const DEFAULT_PRICE_PER_MILLION = 3;
|
|
67
|
-
/** Цена модели за 1M токенов (fallback — средняя оценка). */
|
|
68
|
-
function modelPrice(model) {
|
|
69
|
-
const key = (model ?? "").trim().toLowerCase();
|
|
70
|
-
return MODEL_PRICE_PER_MILLION[key] ?? DEFAULT_PRICE_PER_MILLION;
|
|
75
|
+
export function modelPrice(model) {
|
|
76
|
+
const key = normalizeModelId(model);
|
|
77
|
+
const override = envModelPrices[key];
|
|
78
|
+
if (typeof override === "number" && Number.isFinite(override))
|
|
79
|
+
return override;
|
|
80
|
+
const fromOpencode = catalogPricePerMillion(key);
|
|
81
|
+
if (fromOpencode !== null)
|
|
82
|
+
return fromOpencode;
|
|
83
|
+
return DEFAULT_MODEL_PRICE_PER_MILLION[key] ?? DEFAULT_PRICE_PER_MILLION;
|
|
71
84
|
}
|
|
72
85
|
/** Оценка стоимости запуска по токенам (если точная цена неизвестна). */
|
|
73
86
|
function estimateCost(tokens, model) {
|
|
@@ -77,7 +90,7 @@ function estimateCost(tokens, model) {
|
|
|
77
90
|
* Агрегирует историю по моделям и считает сценарии What-If.
|
|
78
91
|
* Возвращает данные для GET /api/models-analysis и блока дашборда.
|
|
79
92
|
*/
|
|
80
|
-
function aggregateModels(history) {
|
|
93
|
+
export function aggregateModels(history) {
|
|
81
94
|
const map = new Map();
|
|
82
95
|
let totalTokens = 0;
|
|
83
96
|
let totalCost = 0;
|
|
@@ -111,13 +124,27 @@ function aggregateModels(history) {
|
|
|
111
124
|
successRate: item.runs > 0 ? Math.round((item.success / item.runs) * 100) : 0,
|
|
112
125
|
}))
|
|
113
126
|
.sort((a, b) => b.totalRuns - a.totalRuns);
|
|
114
|
-
|
|
115
|
-
|
|
127
|
+
// What-If: сначала модели, которые реально запускались, затем по одной
|
|
128
|
+
// модели на каждую цену из доступных в OpenCode. Явный список из
|
|
129
|
+
// окружения главнее.
|
|
130
|
+
const usedModels = models
|
|
131
|
+
.map((item) => item.model)
|
|
132
|
+
.filter((model) => model !== "по умолчанию");
|
|
133
|
+
const envWhatIfModels = envJson("OPENCODE_SCHEDULER_WHAT_IF_MODELS", null);
|
|
134
|
+
const selection = Array.isArray(envWhatIfModels) && envWhatIfModels.length > 0
|
|
135
|
+
? { models: envWhatIfModels, source: "env" }
|
|
136
|
+
: resolveWhatIfModels(usedModels);
|
|
137
|
+
const whatIf = selection.models.map((model) => ({
|
|
116
138
|
model,
|
|
117
139
|
pricePerMillion: modelPrice(model),
|
|
118
140
|
cost: Number(((totalTokens * modelPrice(model)) / 1000000).toFixed(4)),
|
|
119
141
|
}));
|
|
120
|
-
return {
|
|
142
|
+
return {
|
|
143
|
+
models,
|
|
144
|
+
totals: { totalRuns, totalTokens, totalCost: Number(totalCost.toFixed(6)) },
|
|
145
|
+
whatIf,
|
|
146
|
+
whatIfSource: selection.source,
|
|
147
|
+
};
|
|
121
148
|
}
|
|
122
149
|
/**
|
|
123
150
|
* Оценка стоимости токенов, если OpenCode не напечатал цену в логе:
|
|
@@ -235,18 +262,18 @@ export async function startDashboardServer(deps, ports) {
|
|
|
235
262
|
const server = await listenOn(port, deps);
|
|
236
263
|
const actualPort = resolveServerPort(server, port);
|
|
237
264
|
running = { server, port: actualPort };
|
|
238
|
-
console.log(`[
|
|
265
|
+
console.log(`[agent-steward] Веб-дашборд запущен: http://localhost:${actualPort}`);
|
|
239
266
|
return { port: actualPort };
|
|
240
267
|
}
|
|
241
268
|
catch (err) {
|
|
242
269
|
if (err?.code !== "EADDRINUSE") {
|
|
243
|
-
console.error(`[
|
|
270
|
+
console.error(`[agent-steward] Не удалось запустить дашборд на порту ${port}: ${err instanceof Error ? err.message : String(err)}`);
|
|
244
271
|
return null;
|
|
245
272
|
}
|
|
246
273
|
// Порт занят: если это уже наш дашборд (другой экземпляр плагина
|
|
247
274
|
// в том же процессе/сессии), переиспользуем его, а не вешаем второй порт.
|
|
248
275
|
if (port !== 0 && (await isOwnDashboardOn(port))) {
|
|
249
|
-
console.log(`[
|
|
276
|
+
console.log(`[agent-steward] Дашборд уже запущен на http://localhost:${port} — переиспользуем его.`);
|
|
250
277
|
return { port };
|
|
251
278
|
}
|
|
252
279
|
// Порт занят чужим или старым процессом: пробуем снять зомби
|
|
@@ -259,7 +286,7 @@ export async function startDashboardServer(deps, ports) {
|
|
|
259
286
|
try {
|
|
260
287
|
const server = await listenOn(port, deps);
|
|
261
288
|
running = { server, port };
|
|
262
|
-
console.log(`[
|
|
289
|
+
console.log(`[agent-steward] Веб-дашборд запущен: http://localhost:${port}`);
|
|
263
290
|
return { port };
|
|
264
291
|
}
|
|
265
292
|
catch {
|
|
@@ -270,7 +297,7 @@ export async function startDashboardServer(deps, ports) {
|
|
|
270
297
|
// Чужой сервис — пробуем запасной порт.
|
|
271
298
|
}
|
|
272
299
|
}
|
|
273
|
-
console.error(
|
|
300
|
+
console.error("[agent-steward] Не удалось подобрать свободный порт — веб-дашборд не запущен.");
|
|
274
301
|
return null;
|
|
275
302
|
})();
|
|
276
303
|
const result = await starting;
|
|
@@ -299,15 +326,16 @@ async function tryFreeZombiePort(port) {
|
|
|
299
326
|
continue;
|
|
300
327
|
const normName = normalizeProcessName(info.name.toLowerCase());
|
|
301
328
|
if (!ZOMBIE_IMAGE_NAMES.has(normName)) {
|
|
302
|
-
console.warn(`[
|
|
329
|
+
console.warn(`[agent-steward] Порт ${port} занят процессом ${info.name} (PID ${pid}) — не трогаем, пробуем другой порт.`);
|
|
303
330
|
continue;
|
|
304
331
|
}
|
|
305
332
|
const cmd = (info.commandLine || "").toLowerCase();
|
|
306
|
-
const looksLikeOurs = cmd.includes("
|
|
333
|
+
const looksLikeOurs = cmd.includes("agent-steward") ||
|
|
334
|
+
cmd.includes("opencode-windows-scheduler") || // legacy name — старые зомби-процессы
|
|
307
335
|
cmd.includes("dist/server") ||
|
|
308
336
|
cmd.includes("dist\\server");
|
|
309
337
|
if (!looksLikeOurs) {
|
|
310
|
-
console.warn(`[
|
|
338
|
+
console.warn(`[agent-steward] Порт ${port} занят node/bun (PID ${pid}), но это не процесс плагина — не трогаем.`);
|
|
311
339
|
continue;
|
|
312
340
|
}
|
|
313
341
|
try {
|
|
@@ -317,11 +345,11 @@ async function tryFreeZombiePort(port) {
|
|
|
317
345
|
else {
|
|
318
346
|
process.kill(pid, "SIGKILL");
|
|
319
347
|
}
|
|
320
|
-
console.log(`[
|
|
348
|
+
console.log(`[agent-steward] Снят зомби-процесс ${info.name} (PID ${pid}), державший порт ${port}.`);
|
|
321
349
|
killed = true;
|
|
322
350
|
}
|
|
323
351
|
catch (err) {
|
|
324
|
-
console.warn(`[
|
|
352
|
+
console.warn(`[agent-steward] Не удалось снять процесс PID ${pid}: ${err instanceof Error ? err.message : String(err)}`);
|
|
325
353
|
}
|
|
326
354
|
}
|
|
327
355
|
return killed;
|
|
@@ -538,8 +566,8 @@ async function handleRequest(req, res, deps) {
|
|
|
538
566
|
pathname === "/api/health" ||
|
|
539
567
|
pathname === "/api/logs" ||
|
|
540
568
|
pathname === "/metrics" ||
|
|
541
|
-
|
|
542
|
-
|
|
569
|
+
pathname.startsWith("/api/dry-run/") ||
|
|
570
|
+
pathname.startsWith("/api/matrix/");
|
|
543
571
|
if (knownGet && req.method !== "GET") {
|
|
544
572
|
sendJson(res, 405, { error: t("server.methodNotAllowed") });
|
|
545
573
|
return;
|
|
@@ -833,7 +861,7 @@ async function handleRequest(req, res, deps) {
|
|
|
833
861
|
return;
|
|
834
862
|
}
|
|
835
863
|
// Входящий webhook-триггер (Спринт 22): POST /api/hooks/:task?token=…
|
|
836
|
-
const hookMatch = req.method === "POST" &&
|
|
864
|
+
const hookMatch = req.method === "POST" && (/^\/api\/hooks\/(.+)$/.exec(pathname));
|
|
837
865
|
if (hookMatch) {
|
|
838
866
|
const taskName = hookMatch[1].replace(/\/+$/, "").trim();
|
|
839
867
|
const remote = req.socket.remoteAddress ?? null;
|
|
@@ -936,7 +964,7 @@ async function handleRequest(req, res, deps) {
|
|
|
936
964
|
return;
|
|
937
965
|
}
|
|
938
966
|
// Запуск задачи: POST /api/run/:name (имя URL-кодируется на клиенте).
|
|
939
|
-
const runMatch = req.method === "POST" &&
|
|
967
|
+
const runMatch = req.method === "POST" && (/^\/api\/run\/(.+)$/.exec(pathname));
|
|
940
968
|
if (runMatch) {
|
|
941
969
|
const name = runMatch[1].replace(/\/+$/, "");
|
|
942
970
|
if (!name) {
|
|
@@ -970,7 +998,7 @@ async function handleRequest(req, res, deps) {
|
|
|
970
998
|
return;
|
|
971
999
|
}
|
|
972
1000
|
// Lifecycle матриц (Спринт 16): отмена выполняющейся матрицы.
|
|
973
|
-
const cancelMatrixMatch = req.method === "POST" &&
|
|
1001
|
+
const cancelMatrixMatch = req.method === "POST" && (/^\/api\/cancel-matrix\/(.+)$/.exec(pathname));
|
|
974
1002
|
if (cancelMatrixMatch) {
|
|
975
1003
|
const name = decodeURIComponent(cancelMatrixMatch[1]).replace(/\/+$/, "");
|
|
976
1004
|
if (!name) {
|
|
@@ -1040,7 +1068,7 @@ async function handleRequest(req, res, deps) {
|
|
|
1040
1068
|
return;
|
|
1041
1069
|
}
|
|
1042
1070
|
// Удаление задачи: POST /api/delete/:name (кнопка «Удалить» в таблице).
|
|
1043
|
-
const deleteMatch = req.method === "POST" &&
|
|
1071
|
+
const deleteMatch = req.method === "POST" && (/^\/api\/delete\/(.+)$/.exec(pathname));
|
|
1044
1072
|
if (deleteMatch) {
|
|
1045
1073
|
const name = deleteMatch[1].replace(/\/+$/, "");
|
|
1046
1074
|
if (!name) {
|
|
@@ -1073,7 +1101,7 @@ async function handleRequest(req, res, deps) {
|
|
|
1073
1101
|
}
|
|
1074
1102
|
catch (err) {
|
|
1075
1103
|
const message = err instanceof Error ? err.message : String(err);
|
|
1076
|
-
console.error(`[
|
|
1104
|
+
console.error(`[agent-steward] Ошибка обработки запроса ${req.url}: ${message}`);
|
|
1077
1105
|
if (res.headersSent) {
|
|
1078
1106
|
res.destroy();
|
|
1079
1107
|
return;
|
|
@@ -1471,6 +1499,7 @@ function renderPage() {
|
|
|
1471
1499
|
var updated = document.getElementById('updated');
|
|
1472
1500
|
var allTasks = [];
|
|
1473
1501
|
var allWorkspaces = [];
|
|
1502
|
+
var allAnalytics = null;
|
|
1474
1503
|
var activeWorkspace = 'all';
|
|
1475
1504
|
/** Раскрытые родители матриц (имя → true). */
|
|
1476
1505
|
var expandedMatrixParents = {};
|
|
@@ -1482,6 +1511,8 @@ function renderPage() {
|
|
|
1482
1511
|
// (HTTP 499), и тогда в консоли появляется ошибка при каждой загрузке.
|
|
1483
1512
|
var preferSummaryMetrics = true;
|
|
1484
1513
|
var metricsFallbackLogged = false;
|
|
1514
|
+
// P3-29: тяжёлая аналитика обновляется реже остальных блоков.
|
|
1515
|
+
var ANALYTICS_INTERVAL_MS = 60000;
|
|
1485
1516
|
|
|
1486
1517
|
function esc(s) {
|
|
1487
1518
|
var d = document.createElement('div');
|
|
@@ -1537,7 +1568,7 @@ function renderPage() {
|
|
|
1537
1568
|
' | Content-Type: ' + (ct || '(пусто)') +
|
|
1538
1569
|
'\\nПервые 2000 символов ответа:\\n' + text.slice(0, 2000)
|
|
1539
1570
|
);
|
|
1540
|
-
if (marker !== 'opencode-windows-scheduler') {
|
|
1571
|
+
if (marker !== 'agent-steward' && marker !== 'opencode-windows-scheduler') {
|
|
1541
1572
|
console.error(
|
|
1542
1573
|
'Ответ пришёл не от дашборда плагина: нет заголовка x-plugin-dashboard. ' +
|
|
1543
1574
|
'Похоже, на этом порту работает другой сервис.'
|
|
@@ -1826,18 +1857,18 @@ function renderPage() {
|
|
|
1826
1857
|
html += '</tbody></table>';
|
|
1827
1858
|
box.innerHTML = html;
|
|
1828
1859
|
|
|
1829
|
-
var gpt = null;
|
|
1830
|
-
var deepseek = null;
|
|
1831
|
-
for (var j = 0; j < whatIf.length; j++) {
|
|
1832
|
-
if (whatIf[j].model === 'openai/gpt-4o') gpt = whatIf[j];
|
|
1833
|
-
if (whatIf[j].model === 'deepseek/deepseek-coder') deepseek = whatIf[j];
|
|
1834
|
-
}
|
|
1835
1860
|
var parts = [];
|
|
1836
|
-
|
|
1837
|
-
|
|
1861
|
+
var source = data && data.whatIfSource;
|
|
1862
|
+
if (source === 'opencode') {
|
|
1863
|
+
parts.push('Модели и цены — из OpenCode (ваши доступные модели):');
|
|
1864
|
+
} else if (source === 'history') {
|
|
1865
|
+
parts.push('Модели для сравнения — те, что уже запускались:');
|
|
1866
|
+
} else if (source === 'default') {
|
|
1867
|
+
parts.push('OpenCode недоступен, показаны модели по умолчанию:');
|
|
1838
1868
|
}
|
|
1839
|
-
|
|
1840
|
-
|
|
1869
|
+
for (var j = 0; j < whatIf.length; j++) {
|
|
1870
|
+
var w = whatIf[j];
|
|
1871
|
+
parts.push('Если бы все запуски выполнялись через <b>' + esc(w.model) + '</b>, это стоило бы ~<b>' + money(w.cost) + '</b> (' + w.pricePerMillion + ' $/1M токенов).');
|
|
1841
1872
|
}
|
|
1842
1873
|
parts.push('Всего запусков: <b>' + totals.totalRuns + '</b>, токенов: <b>' + Number(totals.totalTokens || 0).toLocaleString('ru-RU') + '</b>, фактическая стоимость: <b>' + money(totals.totalCost) + '</b>.');
|
|
1843
1874
|
text.innerHTML = parts.join(' ');
|
|
@@ -2064,7 +2095,7 @@ function renderPage() {
|
|
|
2064
2095
|
}
|
|
2065
2096
|
|
|
2066
2097
|
if (visible.length === 0) {
|
|
2067
|
-
rows.innerHTML = '<tr><td colspan="9" class="empty"
|
|
2098
|
+
rows.innerHTML = '<tr><td colspan="9" class="empty">' + EMPTY_TASKS_HTML + '</td></tr>';
|
|
2068
2099
|
return;
|
|
2069
2100
|
}
|
|
2070
2101
|
var html = '';
|
|
@@ -2085,7 +2116,7 @@ function renderPage() {
|
|
|
2085
2116
|
}
|
|
2086
2117
|
}
|
|
2087
2118
|
if (shown === 0) {
|
|
2088
|
-
rows.innerHTML = '<tr><td colspan="9" class="empty"
|
|
2119
|
+
rows.innerHTML = '<tr><td colspan="9" class="empty">' + EMPTY_TASKS_HTML + '</td></tr>';
|
|
2089
2120
|
return;
|
|
2090
2121
|
}
|
|
2091
2122
|
rows.innerHTML = html;
|
|
@@ -2148,6 +2179,16 @@ function renderPage() {
|
|
|
2148
2179
|
// Без него кросс-сайтовый fetch не пройдёт (нужен CORS-preflight, которого нет).
|
|
2149
2180
|
var CLIENT_HEADERS = { 'X-Scheduler-Client': 'dashboard' };
|
|
2150
2181
|
|
|
2182
|
+
// P3-29: новогоднее оформление (снежинки и «украсить ёлку») — только по
|
|
2183
|
+
// явному флагу ?snow=1, чтобы не крутить 18 анимаций круглый год.
|
|
2184
|
+
var FESTIVE = false;
|
|
2185
|
+
try {
|
|
2186
|
+
FESTIVE = new URLSearchParams(location.search).get('snow') === '1';
|
|
2187
|
+
} catch (_) {}
|
|
2188
|
+
var EMPTY_TASKS_HTML = FESTIVE
|
|
2189
|
+
? '🎄 Задач пока нет. Самое время украсить ёлку!'
|
|
2190
|
+
: 'Задач пока нет. Самое время создать!';
|
|
2191
|
+
|
|
2151
2192
|
// Устойчивая загрузка: антивирусы иногда блокируют отдельные URL
|
|
2152
2193
|
// (например, /api/metrics) статусом 499 и картинкой вместо JSON.
|
|
2153
2194
|
// Один сбой не должен ломать весь дашборд.
|
|
@@ -2195,8 +2236,7 @@ function renderPage() {
|
|
|
2195
2236
|
loadMetricsJson(),
|
|
2196
2237
|
safeJson('/api/history', { records: [] }),
|
|
2197
2238
|
safeJson('/api/models-analysis', { models: [], totals: {}, whatIf: [] }),
|
|
2198
|
-
safeJson('/api/workspaces', { workspaces: [] })
|
|
2199
|
-
safeJson('/api/analytics?days=14', null)
|
|
2239
|
+
safeJson('/api/workspaces', { workspaces: [] })
|
|
2200
2240
|
]);
|
|
2201
2241
|
var tasks = (results[0] && results[0].tasks) || [];
|
|
2202
2242
|
var m = results[1] || {};
|
|
@@ -2216,7 +2256,7 @@ function renderPage() {
|
|
|
2216
2256
|
renderGraph(tasks);
|
|
2217
2257
|
renderHistory(history);
|
|
2218
2258
|
renderModelsAnalysis(modelsAnalysis);
|
|
2219
|
-
renderAnalytics(
|
|
2259
|
+
renderAnalytics(allAnalytics);
|
|
2220
2260
|
showServerWarn(results[0] ? null : 'Не удалось загрузить список задач — остальные блоки обновлены. Подробности в консоли (F12).');
|
|
2221
2261
|
updated.textContent = 'Обновлено: ' + new Date().toLocaleTimeString();
|
|
2222
2262
|
} catch (err) {
|
|
@@ -2226,6 +2266,25 @@ function renderPage() {
|
|
|
2226
2266
|
}
|
|
2227
2267
|
}
|
|
2228
2268
|
|
|
2269
|
+
// P3-29: аналитика — тяжёлая агрегация SQLite, грузим реже основных блоков
|
|
2270
|
+
// и используем ETag/If-None-Match, чтобы не перезапрашивать неизменённые данные.
|
|
2271
|
+
var analyticsEtag = null;
|
|
2272
|
+
async function loadAnalytics() {
|
|
2273
|
+
try {
|
|
2274
|
+
var headers = { 'X-Scheduler-Client': 'dashboard' };
|
|
2275
|
+
if (analyticsEtag) headers['If-None-Match'] = analyticsEtag;
|
|
2276
|
+
var res = await fetch('/api/analytics?days=14', { cache: 'no-store', headers: headers });
|
|
2277
|
+
if (res.status === 304) return; // не изменилось с прошлого раза
|
|
2278
|
+
analyticsEtag = res.headers.get('ETag');
|
|
2279
|
+
allAnalytics = await readJson(res);
|
|
2280
|
+
if (allAnalytics && allAnalytics.totals) {
|
|
2281
|
+
renderAnalytics(allAnalytics);
|
|
2282
|
+
}
|
|
2283
|
+
} catch (err) {
|
|
2284
|
+
console.error('Аналитика недоступна:', err);
|
|
2285
|
+
}
|
|
2286
|
+
}
|
|
2287
|
+
|
|
2229
2288
|
document.addEventListener('click', function (e) {
|
|
2230
2289
|
var matrixBtn = e.target && e.target.closest ? e.target.closest('button[data-matrix]') : null;
|
|
2231
2290
|
if (!matrixBtn) return;
|
|
@@ -2390,6 +2449,8 @@ function renderPage() {
|
|
|
2390
2449
|
|
|
2391
2450
|
loadAll();
|
|
2392
2451
|
setInterval(loadAll, 5000);
|
|
2452
|
+
loadAnalytics();
|
|
2453
|
+
setInterval(loadAnalytics, ANALYTICS_INTERVAL_MS);
|
|
2393
2454
|
})();
|
|
2394
2455
|
</script>
|
|
2395
2456
|
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"jobs-view.d.ts","sourceRoot":"","sources":["../../src/shared/jobs-view.ts"],"names":[],"mappings":"AACA,OAAO,EAAoC,KAAK,aAAa,EAAE,MAAM,eAAe,
|
|
1
|
+
{"version":3,"file":"jobs-view.d.ts","sourceRoot":"","sources":["../../src/shared/jobs-view.ts"],"names":[],"mappings":"AACA,OAAO,EAAoC,KAAK,aAAa,EAAE,MAAM,eAAe,CAAC;AACrF,OAAO,EAEL,KAAK,cAAc,EACpB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAErD,MAAM,MAAM,SAAS,GAAG,SAAS,GAAG,SAAS,GAAG,OAAO,GAAG,SAAS,GAAG,MAAM,GAAG,SAAS,CAAA;AAExF,MAAM,WAAW,OAAO;IACtB,IAAI,EAAE,MAAM,CAAA;IACZ,MAAM,EAAE,SAAS,CAAA;IACjB,oDAAoD;IACpD,MAAM,CAAC,EAAE,OAAO,CAAA;IAChB,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,mDAAmD;IACnD,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,mEAAmE;IACnE,cAAc,CAAC,EAAE,OAAO,CAAA;CACzB;AAED,0DAA0D;AAC1D,MAAM,WAAW,aAAa;IAC5B,GAAG,EAAE,OAAO,CAAA;IACZ,6CAA6C;IAC7C,KAAK,EAAE,MAAM,CAAA;CACd;AAED;;;;GAIG;AACH,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,SAAS,OAAO,EAAE,GAAG,aAAa,EAAE,CAkC7E;AAED;;;GAGG;AACH,wBAAgB,gBAAgB,CAC9B,IAAI,EAAE,SAAS,aAAa,EAAE,EAC9B,WAAW,EAAE,MAAM,GAAG,SAAS,EAC/B,KAAK,EAAE,MAAM,GACZ,MAAM,GAAG,SAAS,CAQpB;AAED;;;GAGG;AACH,wBAAgB,YAAY,CAC1B,IAAI,EAAE,MAAM,GAAG,SAAS,EACxB,KAAK,EAAE,MAAM,GAAG,SAAS,EACzB,QAAQ,SAAK,GACZ,MAAM,CAMR;AAED;;;GAGG;AACH,wBAAgB,UAAU,CAAC,MAAM,EAAE,SAAS,GAAG,MAAM,CAgBpD;AASD;;;;GAIG;AACH,wBAAgB,aAAa,CAC3B,KAAK,EAAE,SAAS,iBAAiB,EAAE,EACnC,OAAO,EAAE,SAAS,aAAa,EAAE,EACjC,WAAW,EAAE,SAAS,cAAc,EAAE,GACrC,OAAO,EAAE,CAsBX;AAED;;;;;;;GAOG;AACH,wBAAsB,WAAW,CAAC,QAAQ,EAAE,OAAO,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC,CAYvE"}
|
package/dist/skill.js
CHANGED
|
@@ -68,7 +68,7 @@ export function loadSchedulerSkill() {
|
|
|
68
68
|
}
|
|
69
69
|
catch {
|
|
70
70
|
if (process.env.OPENCODE_SCHEDULER_DEBUG_SKILL) {
|
|
71
|
-
console.error(`[
|
|
71
|
+
console.error(`[agent-steward] Скилл не найден: ${skillPath}`);
|
|
72
72
|
}
|
|
73
73
|
return undefined;
|
|
74
74
|
}
|
package/dist/task-transfer.d.ts
CHANGED
|
@@ -227,7 +227,7 @@ export declare function loadTaskDefinitions(): Promise<TaskDefinition[]>;
|
|
|
227
227
|
export declare function saveTaskDefinition(definition: TaskDefinition): Promise<void>;
|
|
228
228
|
/** Удаляет определение задачи из хранилища. */
|
|
229
229
|
export declare function removeTaskDefinition(name: string): Promise<void>;
|
|
230
|
-
/** Убирает префикс папки плагина из полного имени
|
|
230
|
+
/** Убирает префикс папки плагина из полного имени задачи (новый или старый). */
|
|
231
231
|
export declare function stripTaskPrefix(fullName: string): string;
|
|
232
232
|
/**
|
|
233
233
|
* Собирает JSON для экспорта.
|
|
@@ -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
|
@@ -1,11 +1,12 @@
|
|
|
1
1
|
import fs from "node:fs/promises";
|
|
2
2
|
import path from "node:path";
|
|
3
|
-
import { PLUGIN_DIR, sanitizeName } from "./types.js";
|
|
3
|
+
import { PLUGIN_DIR, sanitizeName, TASK_FOLDER_NAME, LEGACY_TASK_FOLDER_NAME } from "./types.js";
|
|
4
4
|
import { listTasks, saveTask, deleteTask, } from "./db/tasks-repo.js";
|
|
5
5
|
import { normalizeOneShotRunAt } from "./core/one-shot.js";
|
|
6
6
|
import { isValidIanaTimeZone, normalizeActiveDays, validateLaunchWindow, } from "./core/schedule-v2.js";
|
|
7
7
|
import { isValidSessionId } from "./core/session.js";
|
|
8
|
-
const PREFIX =
|
|
8
|
+
const PREFIX = `\\OpenCode\\${TASK_FOLDER_NAME}\\`;
|
|
9
|
+
const LEGACY_PREFIX = `\\OpenCode\\${LEGACY_TASK_FOLDER_NAME}\\`;
|
|
9
10
|
/** Приоритет по умолчанию — «Обычный». */
|
|
10
11
|
export const DEFAULT_PRIORITY = 5;
|
|
11
12
|
/** Максимальный приоритет (10 — «Критический»). */
|
|
@@ -45,9 +46,13 @@ export async function saveTaskDefinition(definition) {
|
|
|
45
46
|
export async function removeTaskDefinition(name) {
|
|
46
47
|
deleteTask(name);
|
|
47
48
|
}
|
|
48
|
-
/** Убирает префикс папки плагина из полного имени
|
|
49
|
+
/** Убирает префикс папки плагина из полного имени задачи (новый или старый). */
|
|
49
50
|
export function stripTaskPrefix(fullName) {
|
|
50
|
-
|
|
51
|
+
if (fullName.startsWith(PREFIX))
|
|
52
|
+
return fullName.slice(PREFIX.length);
|
|
53
|
+
if (fullName.startsWith(LEGACY_PREFIX))
|
|
54
|
+
return fullName.slice(LEGACY_PREFIX.length);
|
|
55
|
+
return fullName;
|
|
51
56
|
}
|
|
52
57
|
/**
|
|
53
58
|
* Собирает JSON для экспорта.
|
|
@@ -171,8 +176,7 @@ export async function buildExportJson(tasks) {
|
|
|
171
176
|
...(definition?.matrixParentId
|
|
172
177
|
? { matrixParentId: definition.matrixParentId }
|
|
173
178
|
: {}),
|
|
174
|
-
...(definition?.mcpEvent &&
|
|
175
|
-
definition.mcpEvent.event &&
|
|
179
|
+
...(definition?.mcpEvent?.event &&
|
|
176
180
|
definition.mcpEvent.server
|
|
177
181
|
? {
|
|
178
182
|
mcpEvent: {
|
|
@@ -302,7 +306,7 @@ export function parseImportJson(raw) {
|
|
|
302
306
|
? source.sessionId.trim()
|
|
303
307
|
: undefined;
|
|
304
308
|
if (sessionId && !isValidSessionId(sessionId)) {
|
|
305
|
-
errors.push(`Запись ${position}${name ? ` (${name})` : ""}: некорректный sessionId «${sessionId}».`);
|
|
309
|
+
errors.push(`Запись ${position}${name ? ` (${name})` : ""}: некорректный sessionId «${String(sessionId)}».`);
|
|
306
310
|
return;
|
|
307
311
|
}
|
|
308
312
|
let sessionMaxRuns;
|
|
@@ -406,7 +410,7 @@ export function parseImportJson(raw) {
|
|
|
406
410
|
const pausedUntil = readOptionalString(source.pausedUntil);
|
|
407
411
|
if (pausedUntil && Number.isNaN(Date.parse(pausedUntil))) {
|
|
408
412
|
errors.push(`Запись ${position}${name ? ` (${name})` : ""}: pausedUntil должен быть ` +
|
|
409
|
-
|
|
413
|
+
"датой в формате ISO (например 2026-12-01T09:00:00Z).");
|
|
410
414
|
}
|
|
411
415
|
// Спринт 27.5.8: бессрочная пауза импортируется вместе с задачей.
|
|
412
416
|
const pausedFlag = source.paused === true;
|
|
@@ -444,7 +448,7 @@ export function parseImportJson(raw) {
|
|
|
444
448
|
if (allowedRaw !== undefined) {
|
|
445
449
|
if (allowedRaw === "empty") {
|
|
446
450
|
errors.push(`Запись ${position}${name ? ` (${name})` : ""}: пустой allowedTools запрещён — ` +
|
|
447
|
-
|
|
451
|
+
"задайте список инструментов или уберите поле.");
|
|
448
452
|
}
|
|
449
453
|
else {
|
|
450
454
|
allowedTools = allowedRaw;
|
|
@@ -516,7 +520,7 @@ export function parseImportJson(raw) {
|
|
|
516
520
|
const workspaceKey = key.trim();
|
|
517
521
|
if (!workspaceKey || !allowed.has(workspaceKey)) {
|
|
518
522
|
errors.push(`${label}: matrix.overrides содержит workspace "${workspaceKey}", ` +
|
|
519
|
-
|
|
523
|
+
"которого нет в workspaceIds.");
|
|
520
524
|
continue;
|
|
521
525
|
}
|
|
522
526
|
if (typeof value !== "object" || value === null || Array.isArray(value)) {
|
package/dist/types.d.ts
CHANGED
|
@@ -1,16 +1,21 @@
|
|
|
1
1
|
import { z } from "zod";
|
|
2
|
-
/** Префикс всех задач плагина (историческое имя, сохраняется для совместимости). */
|
|
3
|
-
export declare const TASK_PREFIX = "OpenCode\\windows-scheduler";
|
|
4
2
|
/** Папка задач плагина в планировщике ОС (Windows). */
|
|
5
3
|
export declare const TASK_FOLDER = "OpenCode";
|
|
6
4
|
/**
|
|
7
5
|
* Имя папки/блока задач. У нестандартного профиля своё пространство имён,
|
|
8
6
|
* иначе профили делят одну папку Планировщика Windows и один блок crontab.
|
|
9
|
-
*
|
|
10
|
-
*
|
|
7
|
+
* Новое имя — agent-steward; историческое windows-scheduler поддерживается
|
|
8
|
+
* как legacy (см. legacyTaskFolderNameForProfile).
|
|
11
9
|
*/
|
|
12
10
|
export declare function taskFolderNameForProfile(profile?: string): string;
|
|
11
|
+
/** Историческое имя папки/блока задач — для чтения и удаления старых задач. */
|
|
12
|
+
export declare function legacyTaskFolderNameForProfile(profile?: string): string;
|
|
13
13
|
export declare const TASK_FOLDER_NAME: string;
|
|
14
|
+
export declare const LEGACY_TASK_FOLDER_NAME: string;
|
|
15
|
+
/** Префикс всех задач плагина. */
|
|
16
|
+
export declare const TASK_PREFIX: string;
|
|
17
|
+
/** Исторический префикс задач (до переименования). */
|
|
18
|
+
export declare const LEGACY_TASK_PREFIX: string;
|
|
14
19
|
export declare const PLUGIN_DIR: string;
|
|
15
20
|
export declare const LOCK_DIR: string;
|
|
16
21
|
export declare const LOG_DIR: string;
|
|
@@ -25,6 +30,17 @@ export declare const STALE_LOCK_MAX_AGE_MS: number;
|
|
|
25
30
|
* Используется единообразно при создании задачи (index.ts) и при чтении логов (schtasks.ts).
|
|
26
31
|
*/
|
|
27
32
|
export declare function sanitizeName(name: string): string;
|
|
33
|
+
/**
|
|
34
|
+
* Проверяет идентификатор LLM-модели перед подстановкой в командную строку.
|
|
35
|
+
*
|
|
36
|
+
* Формат: `provider/model` (вариант — `provider/model#variant`).
|
|
37
|
+
* Разрешены только латиница, цифры и символы `. _ : / -` (плюс `#` для
|
|
38
|
+
* варианта). Это исключает PowerShell-subexpression (`$(...)`, backtick)
|
|
39
|
+
* и прочие спецсимволы. Пустая строка — «модель не задана», это допустимо.
|
|
40
|
+
*
|
|
41
|
+
* @returns текст ошибки или null, если значение допустимо.
|
|
42
|
+
*/
|
|
43
|
+
export declare function validateModelId(raw: string): string | null;
|
|
28
44
|
/**
|
|
29
45
|
* Проверяет имя задачи до создания файлов и записи в БД.
|
|
30
46
|
*
|
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,
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAGxB,uDAAuD;AACvD,eAAO,MAAM,WAAW,aAAa,CAAC;AACtC;;;;;GAKG;AACH,wBAAgB,wBAAwB,CAAC,OAAO,GAAE,MAAyB,GAAG,MAAM,CAEnF;AAED,+EAA+E;AAC/E,wBAAgB,8BAA8B,CAC5C,OAAO,GAAE,MAAyB,GACjC,MAAM,CAER;AAED,eAAO,MAAM,gBAAgB,QAA6B,CAAC;AAC3D,eAAO,MAAM,uBAAuB,QAAmC,CAAC;AAExE,kCAAkC;AAClC,eAAO,MAAM,WAAW,QAAkC,CAAC;AAC3D,sDAAsD;AACtD,eAAO,MAAM,kBAAkB,QAAyC,CAAC;AAczE,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,eAAe,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAW1D;AAED;;;;;;;;;GASG;AACH,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAsC3D;AAED;;;GAGG;AACH,eAAO,MAAM,eAAe;;;;;;iBA6B1B,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"}
|