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/src/server.ts
CHANGED
|
@@ -12,6 +12,13 @@ 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 {
|
|
16
|
+
DEFAULT_MODEL_PRICE_PER_MILLION,
|
|
17
|
+
DEFAULT_PRICE_PER_MILLION,
|
|
18
|
+
catalogPricePerMillion,
|
|
19
|
+
normalizeModelId,
|
|
20
|
+
resolveWhatIfModels,
|
|
21
|
+
} from "./core/opencode-models.js";
|
|
15
22
|
import {
|
|
16
23
|
authenticateHookRequest,
|
|
17
24
|
extractHookSignature,
|
|
@@ -60,7 +67,7 @@ function normalizeProcessName(name: string): string {
|
|
|
60
67
|
|
|
61
68
|
/** Маркер-заголовок: по нему узнаём «свой» дашборд, уже слушающий порт. */
|
|
62
69
|
const DASHBOARD_HEADER = "x-plugin-dashboard";
|
|
63
|
-
const DASHBOARD_MARKER = "
|
|
70
|
+
const DASHBOARD_MARKER = "agent-steward";
|
|
64
71
|
|
|
65
72
|
/** Переопределение портов (используется в тестах; по умолчанию 3782/4782). */
|
|
66
73
|
export interface DashboardPorts {
|
|
@@ -72,7 +79,7 @@ export interface DashboardPorts {
|
|
|
72
79
|
export interface DashboardDeps {
|
|
73
80
|
/** Список задач плагина (тот же вид, что отдаёт get_tasks / list_tasks). */
|
|
74
81
|
getTasks: () => Promise<
|
|
75
|
-
|
|
82
|
+
{
|
|
76
83
|
name: string;
|
|
77
84
|
schedule: string;
|
|
78
85
|
status: string;
|
|
@@ -122,7 +129,7 @@ export interface DashboardDeps {
|
|
|
122
129
|
status: string;
|
|
123
130
|
message: string;
|
|
124
131
|
} | null;
|
|
125
|
-
}
|
|
132
|
+
}[]
|
|
126
133
|
>;
|
|
127
134
|
/** Немедленный запуск задачи (schtasks /run через обёртку плагина). */
|
|
128
135
|
runTask: (name: string) => Promise<{ alreadyRunning?: boolean }>;
|
|
@@ -158,25 +165,42 @@ export interface ModelAnalysis {
|
|
|
158
165
|
successRate: number;
|
|
159
166
|
}
|
|
160
167
|
|
|
168
|
+
/** Чтение JSON из переменной окружения с фолбэком на значение по умолчанию. */
|
|
169
|
+
function envJson<T>(name: string, fallback: T): T {
|
|
170
|
+
const raw = process.env[name];
|
|
171
|
+
if (!raw) return fallback;
|
|
172
|
+
try {
|
|
173
|
+
return JSON.parse(raw) as T;
|
|
174
|
+
} catch {
|
|
175
|
+
console.warn(
|
|
176
|
+
`[scheduler] Неверный JSON в переменной ${name}, используются значения по умолчанию.`,
|
|
177
|
+
);
|
|
178
|
+
return fallback;
|
|
179
|
+
}
|
|
180
|
+
}
|
|
181
|
+
|
|
182
|
+
/** Ручное переопределение цен: OPENCODE_SCHEDULER_MODEL_PRICES (JSON). */
|
|
183
|
+
const envModelPrices = envJson<Record<string, number>>(
|
|
184
|
+
"OPENCODE_SCHEDULER_MODEL_PRICES",
|
|
185
|
+
{},
|
|
186
|
+
);
|
|
187
|
+
|
|
161
188
|
/**
|
|
162
|
-
*
|
|
163
|
-
*
|
|
189
|
+
* Цена модели за 1M токенов.
|
|
190
|
+
*
|
|
191
|
+
* Порядок: ручное переопределение → каталог цен OpenCode (models.dev) →
|
|
192
|
+
* встроенная таблица → средняя оценка.
|
|
164
193
|
*/
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
"
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
/** Цена модели за 1M токенов (fallback — средняя оценка). */
|
|
177
|
-
function modelPrice(model: string | undefined): number {
|
|
178
|
-
const key = (model ?? "").trim().toLowerCase();
|
|
179
|
-
return MODEL_PRICE_PER_MILLION[key] ?? DEFAULT_PRICE_PER_MILLION;
|
|
194
|
+
export function modelPrice(model: string | undefined): number {
|
|
195
|
+
const key = normalizeModelId(model);
|
|
196
|
+
|
|
197
|
+
const override = envModelPrices[key];
|
|
198
|
+
if (typeof override === "number" && Number.isFinite(override)) return override;
|
|
199
|
+
|
|
200
|
+
const fromOpencode = catalogPricePerMillion(key);
|
|
201
|
+
if (fromOpencode !== null) return fromOpencode;
|
|
202
|
+
|
|
203
|
+
return DEFAULT_MODEL_PRICE_PER_MILLION[key] ?? DEFAULT_PRICE_PER_MILLION;
|
|
180
204
|
}
|
|
181
205
|
|
|
182
206
|
/** Оценка стоимости запуска по токенам (если точная цена неизвестна). */
|
|
@@ -188,14 +212,14 @@ function estimateCost(tokens: number, model: string | undefined): number {
|
|
|
188
212
|
* Агрегирует историю по моделям и считает сценарии What-If.
|
|
189
213
|
* Возвращает данные для GET /api/models-analysis и блока дашборда.
|
|
190
214
|
*/
|
|
191
|
-
function aggregateModels(
|
|
192
|
-
history:
|
|
215
|
+
export function aggregateModels(
|
|
216
|
+
history: {
|
|
193
217
|
status: string;
|
|
194
218
|
durationMs: number;
|
|
195
219
|
tokens?: number;
|
|
196
220
|
costUsd?: number;
|
|
197
221
|
model?: string;
|
|
198
|
-
}
|
|
222
|
+
}[],
|
|
199
223
|
) {
|
|
200
224
|
const map = new Map<
|
|
201
225
|
string,
|
|
@@ -239,14 +263,33 @@ function aggregateModels(
|
|
|
239
263
|
}))
|
|
240
264
|
.sort((a, b) => b.totalRuns - a.totalRuns);
|
|
241
265
|
|
|
242
|
-
|
|
243
|
-
|
|
266
|
+
// What-If: сначала модели, которые реально запускались, затем по одной
|
|
267
|
+
// модели на каждую цену из доступных в OpenCode. Явный список из
|
|
268
|
+
// окружения главнее.
|
|
269
|
+
const usedModels = models
|
|
270
|
+
.map((item) => item.model)
|
|
271
|
+
.filter((model) => model !== "по умолчанию");
|
|
272
|
+
const envWhatIfModels = envJson<string[] | null>(
|
|
273
|
+
"OPENCODE_SCHEDULER_WHAT_IF_MODELS",
|
|
274
|
+
null,
|
|
275
|
+
);
|
|
276
|
+
const selection =
|
|
277
|
+
Array.isArray(envWhatIfModels) && envWhatIfModels.length > 0
|
|
278
|
+
? { models: envWhatIfModels, source: "env" as const }
|
|
279
|
+
: resolveWhatIfModels(usedModels);
|
|
280
|
+
|
|
281
|
+
const whatIf = selection.models.map((model) => ({
|
|
244
282
|
model,
|
|
245
283
|
pricePerMillion: modelPrice(model),
|
|
246
284
|
cost: Number(((totalTokens * modelPrice(model)) / 1_000_000).toFixed(4)),
|
|
247
285
|
}));
|
|
248
286
|
|
|
249
|
-
return {
|
|
287
|
+
return {
|
|
288
|
+
models,
|
|
289
|
+
totals: { totalRuns, totalTokens, totalCost: Number(totalCost.toFixed(6)) },
|
|
290
|
+
whatIf,
|
|
291
|
+
whatIfSource: selection.source,
|
|
292
|
+
};
|
|
250
293
|
}
|
|
251
294
|
|
|
252
295
|
/**
|
|
@@ -352,7 +395,7 @@ export function needsDashboardSourceCheck(pathname: string): boolean {
|
|
|
352
395
|
*/
|
|
353
396
|
export async function startDashboardServer(
|
|
354
397
|
deps: DashboardDeps,
|
|
355
|
-
ports?: DashboardPorts
|
|
398
|
+
ports?: DashboardPorts,
|
|
356
399
|
): Promise<{ port: number } | null> {
|
|
357
400
|
if (running) return { port: running.port };
|
|
358
401
|
if (starting) return starting;
|
|
@@ -371,14 +414,14 @@ export async function startDashboardServer(
|
|
|
371
414
|
const server = await listenOn(port, deps);
|
|
372
415
|
const actualPort = resolveServerPort(server, port);
|
|
373
416
|
running = { server, port: actualPort };
|
|
374
|
-
console.log(`[
|
|
417
|
+
console.log(`[agent-steward] Веб-дашборд запущен: http://localhost:${actualPort}`);
|
|
375
418
|
return { port: actualPort };
|
|
376
419
|
} catch (err: any) {
|
|
377
420
|
if (err?.code !== "EADDRINUSE") {
|
|
378
421
|
console.error(
|
|
379
|
-
`[
|
|
422
|
+
`[agent-steward] Не удалось запустить дашборд на порту ${port}: ${
|
|
380
423
|
err instanceof Error ? err.message : String(err)
|
|
381
|
-
}
|
|
424
|
+
}`,
|
|
382
425
|
);
|
|
383
426
|
return null;
|
|
384
427
|
}
|
|
@@ -387,7 +430,7 @@ export async function startDashboardServer(
|
|
|
387
430
|
// в том же процессе/сессии), переиспользуем его, а не вешаем второй порт.
|
|
388
431
|
if (port !== 0 && (await isOwnDashboardOn(port))) {
|
|
389
432
|
console.log(
|
|
390
|
-
`[
|
|
433
|
+
`[agent-steward] Дашборд уже запущен на http://localhost:${port} — переиспользуем его.`,
|
|
391
434
|
);
|
|
392
435
|
return { port };
|
|
393
436
|
}
|
|
@@ -402,7 +445,7 @@ export async function startDashboardServer(
|
|
|
402
445
|
try {
|
|
403
446
|
const server = await listenOn(port, deps);
|
|
404
447
|
running = { server, port };
|
|
405
|
-
console.log(`[
|
|
448
|
+
console.log(`[agent-steward] Веб-дашборд запущен: http://localhost:${port}`);
|
|
406
449
|
return { port };
|
|
407
450
|
} catch {
|
|
408
451
|
// Не вышло — идём к следующему порту.
|
|
@@ -413,7 +456,7 @@ export async function startDashboardServer(
|
|
|
413
456
|
}
|
|
414
457
|
}
|
|
415
458
|
console.error(
|
|
416
|
-
|
|
459
|
+
"[agent-steward] Не удалось подобрать свободный порт — веб-дашборд не запущен.",
|
|
417
460
|
);
|
|
418
461
|
return null;
|
|
419
462
|
})();
|
|
@@ -447,19 +490,20 @@ async function tryFreeZombiePort(port: number): Promise<boolean> {
|
|
|
447
490
|
const normName = normalizeProcessName(info.name.toLowerCase());
|
|
448
491
|
if (!ZOMBIE_IMAGE_NAMES.has(normName)) {
|
|
449
492
|
console.warn(
|
|
450
|
-
`[
|
|
493
|
+
`[agent-steward] Порт ${port} занят процессом ${info.name} (PID ${pid}) — не трогаем, пробуем другой порт.`,
|
|
451
494
|
);
|
|
452
495
|
continue;
|
|
453
496
|
}
|
|
454
497
|
|
|
455
498
|
const cmd = (info.commandLine || "").toLowerCase();
|
|
456
499
|
const looksLikeOurs =
|
|
457
|
-
cmd.includes("
|
|
500
|
+
cmd.includes("agent-steward") ||
|
|
501
|
+
cmd.includes("opencode-windows-scheduler") || // legacy name — старые зомби-процессы
|
|
458
502
|
cmd.includes("dist/server") ||
|
|
459
503
|
cmd.includes("dist\\server");
|
|
460
504
|
if (!looksLikeOurs) {
|
|
461
505
|
console.warn(
|
|
462
|
-
`[
|
|
506
|
+
`[agent-steward] Порт ${port} занят node/bun (PID ${pid}), но это не процесс плагина — не трогаем.`,
|
|
463
507
|
);
|
|
464
508
|
continue;
|
|
465
509
|
}
|
|
@@ -471,14 +515,14 @@ async function tryFreeZombiePort(port: number): Promise<boolean> {
|
|
|
471
515
|
process.kill(pid, "SIGKILL");
|
|
472
516
|
}
|
|
473
517
|
console.log(
|
|
474
|
-
`[
|
|
518
|
+
`[agent-steward] Снят зомби-процесс ${info.name} (PID ${pid}), державший порт ${port}.`,
|
|
475
519
|
);
|
|
476
520
|
killed = true;
|
|
477
521
|
} catch (err: any) {
|
|
478
522
|
console.warn(
|
|
479
|
-
`[
|
|
523
|
+
`[agent-steward] Не удалось снять процесс PID ${pid}: ${
|
|
480
524
|
err instanceof Error ? err.message : String(err)
|
|
481
|
-
}
|
|
525
|
+
}`,
|
|
482
526
|
);
|
|
483
527
|
}
|
|
484
528
|
}
|
|
@@ -535,7 +579,7 @@ async function findListeningPidsPosix(port: number): Promise<number[]> {
|
|
|
535
579
|
const { stdout } = await execFileAsync(
|
|
536
580
|
"lsof",
|
|
537
581
|
["-nP", `-iTCP:${port}`, "-sTCP:LISTEN", "-t"],
|
|
538
|
-
{ windowsHide: true }
|
|
582
|
+
{ windowsHide: true },
|
|
539
583
|
);
|
|
540
584
|
const pids = stdout
|
|
541
585
|
.split(/\s+/)
|
|
@@ -573,7 +617,7 @@ async function getProcessInfo(pid: number): Promise<{ name: string; commandLine:
|
|
|
573
617
|
|
|
574
618
|
/** Имя процесса и командная строка через CIM (Windows PowerShell). */
|
|
575
619
|
async function getProcessInfoWindows(
|
|
576
|
-
pid: number
|
|
620
|
+
pid: number,
|
|
577
621
|
): Promise<{ name: string; commandLine: string } | null> {
|
|
578
622
|
try {
|
|
579
623
|
const script =
|
|
@@ -583,7 +627,7 @@ async function getProcessInfoWindows(
|
|
|
583
627
|
const { stdout } = await execFileAsync(
|
|
584
628
|
"powershell.exe",
|
|
585
629
|
["-NoProfile", "-NonInteractive", "-Command", script],
|
|
586
|
-
{ windowsHide: true }
|
|
630
|
+
{ windowsHide: true },
|
|
587
631
|
);
|
|
588
632
|
const line = stdout.trim();
|
|
589
633
|
if (!line) return null;
|
|
@@ -597,7 +641,7 @@ async function getProcessInfoWindows(
|
|
|
597
641
|
|
|
598
642
|
/** Имя процесса и командная строка через ps (macOS/Linux). */
|
|
599
643
|
async function getProcessInfoPosix(
|
|
600
|
-
pid: number
|
|
644
|
+
pid: number,
|
|
601
645
|
): Promise<{ name: string; commandLine: string } | null> {
|
|
602
646
|
try {
|
|
603
647
|
// NOTE: на Linux у Node главный поток помечен как "MainThread", поэтому
|
|
@@ -676,7 +720,7 @@ function listenOn(port: number, deps: DashboardDeps): Promise<http.Server> {
|
|
|
676
720
|
async function handleRequest(
|
|
677
721
|
req: http.IncomingMessage,
|
|
678
722
|
res: http.ServerResponse,
|
|
679
|
-
deps: DashboardDeps
|
|
723
|
+
deps: DashboardDeps,
|
|
680
724
|
): Promise<void> {
|
|
681
725
|
try {
|
|
682
726
|
let url: URL;
|
|
@@ -710,8 +754,8 @@ async function handleRequest(
|
|
|
710
754
|
pathname === "/api/health" ||
|
|
711
755
|
pathname === "/api/logs" ||
|
|
712
756
|
pathname === "/metrics" ||
|
|
713
|
-
|
|
714
|
-
|
|
757
|
+
pathname.startsWith("/api/dry-run/") ||
|
|
758
|
+
pathname.startsWith("/api/matrix/");
|
|
715
759
|
if (knownGet && req.method !== "GET") {
|
|
716
760
|
sendJson(res, 405, { error: t("server.methodNotAllowed") });
|
|
717
761
|
return;
|
|
@@ -797,7 +841,7 @@ async function handleRequest(
|
|
|
797
841
|
200,
|
|
798
842
|
"application/x-ndjson; charset=utf-8",
|
|
799
843
|
body ? `${body}\n` : "",
|
|
800
|
-
`logs-${stamp}.jsonl
|
|
844
|
+
`logs-${stamp}.jsonl`,
|
|
801
845
|
);
|
|
802
846
|
return;
|
|
803
847
|
}
|
|
@@ -910,7 +954,7 @@ async function handleRequest(
|
|
|
910
954
|
}
|
|
911
955
|
if (statusFilter) {
|
|
912
956
|
records = records.filter(
|
|
913
|
-
(record) => String(record.status).toLowerCase() === statusFilter
|
|
957
|
+
(record) => String(record.status).toLowerCase() === statusFilter,
|
|
914
958
|
);
|
|
915
959
|
}
|
|
916
960
|
const total = records.length;
|
|
@@ -928,11 +972,11 @@ async function handleRequest(
|
|
|
928
972
|
if (req.method === "GET" && pathname === "/api/analytics") {
|
|
929
973
|
const days = Math.min(
|
|
930
974
|
365,
|
|
931
|
-
Math.max(1, Math.floor(Number(url.searchParams.get("days")) || 14))
|
|
975
|
+
Math.max(1, Math.floor(Number(url.searchParams.get("days")) || 14)),
|
|
932
976
|
);
|
|
933
977
|
const topLimit = Math.max(
|
|
934
978
|
1,
|
|
935
|
-
Math.floor(Number(url.searchParams.get("top")) || 10)
|
|
979
|
+
Math.floor(Number(url.searchParams.get("top")) || 10),
|
|
936
980
|
);
|
|
937
981
|
const records = getHistory(null, 20000);
|
|
938
982
|
const tasks = await deps.getTasks();
|
|
@@ -965,7 +1009,7 @@ async function handleRequest(
|
|
|
965
1009
|
200,
|
|
966
1010
|
"application/json; charset=utf-8",
|
|
967
1011
|
JSON.stringify(buildOtlpExport(records), null, 2),
|
|
968
|
-
`history-${stamp}.otlp.json
|
|
1012
|
+
`history-${stamp}.otlp.json`,
|
|
969
1013
|
);
|
|
970
1014
|
} else if (format === "json") {
|
|
971
1015
|
sendAttachment(
|
|
@@ -973,7 +1017,7 @@ async function handleRequest(
|
|
|
973
1017
|
200,
|
|
974
1018
|
"application/json; charset=utf-8",
|
|
975
1019
|
JSON.stringify({ exportedAt: new Date().toISOString(), records }, null, 2),
|
|
976
|
-
`history-${stamp}.json
|
|
1020
|
+
`history-${stamp}.json`,
|
|
977
1021
|
);
|
|
978
1022
|
} else {
|
|
979
1023
|
sendAttachment(
|
|
@@ -981,7 +1025,7 @@ async function handleRequest(
|
|
|
981
1025
|
200,
|
|
982
1026
|
"text/csv; charset=utf-8",
|
|
983
1027
|
historyToCsv(records),
|
|
984
|
-
`history-${stamp}.csv
|
|
1028
|
+
`history-${stamp}.csv`,
|
|
985
1029
|
);
|
|
986
1030
|
}
|
|
987
1031
|
return;
|
|
@@ -1021,7 +1065,7 @@ async function handleRequest(
|
|
|
1021
1065
|
200,
|
|
1022
1066
|
"application/octet-stream",
|
|
1023
1067
|
data,
|
|
1024
|
-
`scheduler-${stamp}.db
|
|
1068
|
+
`scheduler-${stamp}.db`,
|
|
1025
1069
|
);
|
|
1026
1070
|
} catch (err: any) {
|
|
1027
1071
|
sendJson(res, 500, {
|
|
@@ -1053,7 +1097,7 @@ async function handleRequest(
|
|
|
1053
1097
|
}
|
|
1054
1098
|
|
|
1055
1099
|
// Входящий webhook-триггер (Спринт 22): POST /api/hooks/:task?token=…
|
|
1056
|
-
const hookMatch = req.method === "POST" &&
|
|
1100
|
+
const hookMatch = req.method === "POST" && (/^\/api\/hooks\/(.+)$/.exec(pathname));
|
|
1057
1101
|
if (hookMatch) {
|
|
1058
1102
|
const taskName = hookMatch[1].replace(/\/+$/, "").trim();
|
|
1059
1103
|
const remote = req.socket.remoteAddress ?? null;
|
|
@@ -1066,7 +1110,7 @@ async function handleRequest(
|
|
|
1066
1110
|
httpStatus: number,
|
|
1067
1111
|
status: "accepted" | "rejected",
|
|
1068
1112
|
reason?: string,
|
|
1069
|
-
payloadBytes = declaredBytes
|
|
1113
|
+
payloadBytes = declaredBytes,
|
|
1070
1114
|
) => {
|
|
1071
1115
|
appendStructuredLog({
|
|
1072
1116
|
event: "hook.received",
|
|
@@ -1166,7 +1210,7 @@ async function handleRequest(
|
|
|
1166
1210
|
}
|
|
1167
1211
|
|
|
1168
1212
|
// Запуск задачи: POST /api/run/:name (имя URL-кодируется на клиенте).
|
|
1169
|
-
const runMatch = req.method === "POST" &&
|
|
1213
|
+
const runMatch = req.method === "POST" && (/^\/api\/run\/(.+)$/.exec(pathname));
|
|
1170
1214
|
if (runMatch) {
|
|
1171
1215
|
const name = runMatch[1].replace(/\/+$/, "");
|
|
1172
1216
|
if (!name) {
|
|
@@ -1201,7 +1245,7 @@ async function handleRequest(
|
|
|
1201
1245
|
|
|
1202
1246
|
// Lifecycle матриц (Спринт 16): отмена выполняющейся матрицы.
|
|
1203
1247
|
const cancelMatrixMatch =
|
|
1204
|
-
req.method === "POST" &&
|
|
1248
|
+
req.method === "POST" && (/^\/api\/cancel-matrix\/(.+)$/.exec(pathname));
|
|
1205
1249
|
if (cancelMatrixMatch) {
|
|
1206
1250
|
const name = decodeURIComponent(cancelMatrixMatch[1]).replace(/\/+$/, "");
|
|
1207
1251
|
if (!name) {
|
|
@@ -1272,7 +1316,7 @@ async function handleRequest(
|
|
|
1272
1316
|
}
|
|
1273
1317
|
|
|
1274
1318
|
// Удаление задачи: POST /api/delete/:name (кнопка «Удалить» в таблице).
|
|
1275
|
-
const deleteMatch = req.method === "POST" &&
|
|
1319
|
+
const deleteMatch = req.method === "POST" && (/^\/api\/delete\/(.+)$/.exec(pathname));
|
|
1276
1320
|
if (deleteMatch) {
|
|
1277
1321
|
const name = deleteMatch[1].replace(/\/+$/, "");
|
|
1278
1322
|
if (!name) {
|
|
@@ -1304,7 +1348,7 @@ async function handleRequest(
|
|
|
1304
1348
|
sendJson(res, 404, { error: t("server.notFound") });
|
|
1305
1349
|
} catch (err: any) {
|
|
1306
1350
|
const message = err instanceof Error ? err.message : String(err);
|
|
1307
|
-
console.error(`[
|
|
1351
|
+
console.error(`[agent-steward] Ошибка обработки запроса ${req.url}: ${message}`);
|
|
1308
1352
|
if (res.headersSent) {
|
|
1309
1353
|
res.destroy();
|
|
1310
1354
|
return;
|
|
@@ -1352,7 +1396,7 @@ function sendBuffer(
|
|
|
1352
1396
|
status: number,
|
|
1353
1397
|
contentType: string,
|
|
1354
1398
|
body: Buffer,
|
|
1355
|
-
filename: string
|
|
1399
|
+
filename: string,
|
|
1356
1400
|
): void {
|
|
1357
1401
|
if (res.headersSent) {
|
|
1358
1402
|
res.end();
|
|
@@ -1375,7 +1419,7 @@ function sendAttachment(
|
|
|
1375
1419
|
status: number,
|
|
1376
1420
|
contentType: string,
|
|
1377
1421
|
body: string,
|
|
1378
|
-
filename: string
|
|
1422
|
+
filename: string,
|
|
1379
1423
|
): void {
|
|
1380
1424
|
if (res.headersSent) {
|
|
1381
1425
|
res.end();
|
|
@@ -1720,6 +1764,7 @@ function renderPage(): string {
|
|
|
1720
1764
|
var updated = document.getElementById('updated');
|
|
1721
1765
|
var allTasks = [];
|
|
1722
1766
|
var allWorkspaces = [];
|
|
1767
|
+
var allAnalytics = null;
|
|
1723
1768
|
var activeWorkspace = 'all';
|
|
1724
1769
|
/** Раскрытые родители матриц (имя → true). */
|
|
1725
1770
|
var expandedMatrixParents = {};
|
|
@@ -1731,6 +1776,8 @@ function renderPage(): string {
|
|
|
1731
1776
|
// (HTTP 499), и тогда в консоли появляется ошибка при каждой загрузке.
|
|
1732
1777
|
var preferSummaryMetrics = true;
|
|
1733
1778
|
var metricsFallbackLogged = false;
|
|
1779
|
+
// P3-29: тяжёлая аналитика обновляется реже остальных блоков.
|
|
1780
|
+
var ANALYTICS_INTERVAL_MS = 60000;
|
|
1734
1781
|
|
|
1735
1782
|
function esc(s) {
|
|
1736
1783
|
var d = document.createElement('div');
|
|
@@ -1786,7 +1833,7 @@ function renderPage(): string {
|
|
|
1786
1833
|
' | Content-Type: ' + (ct || '(пусто)') +
|
|
1787
1834
|
'\\nПервые 2000 символов ответа:\\n' + text.slice(0, 2000)
|
|
1788
1835
|
);
|
|
1789
|
-
if (marker !== 'opencode-windows-scheduler') {
|
|
1836
|
+
if (marker !== 'agent-steward' && marker !== 'opencode-windows-scheduler') {
|
|
1790
1837
|
console.error(
|
|
1791
1838
|
'Ответ пришёл не от дашборда плагина: нет заголовка x-plugin-dashboard. ' +
|
|
1792
1839
|
'Похоже, на этом порту работает другой сервис.'
|
|
@@ -2075,18 +2122,18 @@ function renderPage(): string {
|
|
|
2075
2122
|
html += '</tbody></table>';
|
|
2076
2123
|
box.innerHTML = html;
|
|
2077
2124
|
|
|
2078
|
-
var gpt = null;
|
|
2079
|
-
var deepseek = null;
|
|
2080
|
-
for (var j = 0; j < whatIf.length; j++) {
|
|
2081
|
-
if (whatIf[j].model === 'openai/gpt-4o') gpt = whatIf[j];
|
|
2082
|
-
if (whatIf[j].model === 'deepseek/deepseek-coder') deepseek = whatIf[j];
|
|
2083
|
-
}
|
|
2084
2125
|
var parts = [];
|
|
2085
|
-
|
|
2086
|
-
|
|
2126
|
+
var source = data && data.whatIfSource;
|
|
2127
|
+
if (source === 'opencode') {
|
|
2128
|
+
parts.push('Модели и цены — из OpenCode (ваши доступные модели):');
|
|
2129
|
+
} else if (source === 'history') {
|
|
2130
|
+
parts.push('Модели для сравнения — те, что уже запускались:');
|
|
2131
|
+
} else if (source === 'default') {
|
|
2132
|
+
parts.push('OpenCode недоступен, показаны модели по умолчанию:');
|
|
2087
2133
|
}
|
|
2088
|
-
|
|
2089
|
-
|
|
2134
|
+
for (var j = 0; j < whatIf.length; j++) {
|
|
2135
|
+
var w = whatIf[j];
|
|
2136
|
+
parts.push('Если бы все запуски выполнялись через <b>' + esc(w.model) + '</b>, это стоило бы ~<b>' + money(w.cost) + '</b> (' + w.pricePerMillion + ' $/1M токенов).');
|
|
2090
2137
|
}
|
|
2091
2138
|
parts.push('Всего запусков: <b>' + totals.totalRuns + '</b>, токенов: <b>' + Number(totals.totalTokens || 0).toLocaleString('ru-RU') + '</b>, фактическая стоимость: <b>' + money(totals.totalCost) + '</b>.');
|
|
2092
2139
|
text.innerHTML = parts.join(' ');
|
|
@@ -2313,7 +2360,7 @@ function renderPage(): string {
|
|
|
2313
2360
|
}
|
|
2314
2361
|
|
|
2315
2362
|
if (visible.length === 0) {
|
|
2316
|
-
rows.innerHTML = '<tr><td colspan="9" class="empty"
|
|
2363
|
+
rows.innerHTML = '<tr><td colspan="9" class="empty">' + EMPTY_TASKS_HTML + '</td></tr>';
|
|
2317
2364
|
return;
|
|
2318
2365
|
}
|
|
2319
2366
|
var html = '';
|
|
@@ -2334,7 +2381,7 @@ function renderPage(): string {
|
|
|
2334
2381
|
}
|
|
2335
2382
|
}
|
|
2336
2383
|
if (shown === 0) {
|
|
2337
|
-
rows.innerHTML = '<tr><td colspan="9" class="empty"
|
|
2384
|
+
rows.innerHTML = '<tr><td colspan="9" class="empty">' + EMPTY_TASKS_HTML + '</td></tr>';
|
|
2338
2385
|
return;
|
|
2339
2386
|
}
|
|
2340
2387
|
rows.innerHTML = html;
|
|
@@ -2397,6 +2444,16 @@ function renderPage(): string {
|
|
|
2397
2444
|
// Без него кросс-сайтовый fetch не пройдёт (нужен CORS-preflight, которого нет).
|
|
2398
2445
|
var CLIENT_HEADERS = { 'X-Scheduler-Client': 'dashboard' };
|
|
2399
2446
|
|
|
2447
|
+
// P3-29: новогоднее оформление (снежинки и «украсить ёлку») — только по
|
|
2448
|
+
// явному флагу ?snow=1, чтобы не крутить 18 анимаций круглый год.
|
|
2449
|
+
var FESTIVE = false;
|
|
2450
|
+
try {
|
|
2451
|
+
FESTIVE = new URLSearchParams(location.search).get('snow') === '1';
|
|
2452
|
+
} catch (_) {}
|
|
2453
|
+
var EMPTY_TASKS_HTML = FESTIVE
|
|
2454
|
+
? '🎄 Задач пока нет. Самое время украсить ёлку!'
|
|
2455
|
+
: 'Задач пока нет. Самое время создать!';
|
|
2456
|
+
|
|
2400
2457
|
// Устойчивая загрузка: антивирусы иногда блокируют отдельные URL
|
|
2401
2458
|
// (например, /api/metrics) статусом 499 и картинкой вместо JSON.
|
|
2402
2459
|
// Один сбой не должен ломать весь дашборд.
|
|
@@ -2444,8 +2501,7 @@ function renderPage(): string {
|
|
|
2444
2501
|
loadMetricsJson(),
|
|
2445
2502
|
safeJson('/api/history', { records: [] }),
|
|
2446
2503
|
safeJson('/api/models-analysis', { models: [], totals: {}, whatIf: [] }),
|
|
2447
|
-
safeJson('/api/workspaces', { workspaces: [] })
|
|
2448
|
-
safeJson('/api/analytics?days=14', null)
|
|
2504
|
+
safeJson('/api/workspaces', { workspaces: [] })
|
|
2449
2505
|
]);
|
|
2450
2506
|
var tasks = (results[0] && results[0].tasks) || [];
|
|
2451
2507
|
var m = results[1] || {};
|
|
@@ -2465,7 +2521,7 @@ function renderPage(): string {
|
|
|
2465
2521
|
renderGraph(tasks);
|
|
2466
2522
|
renderHistory(history);
|
|
2467
2523
|
renderModelsAnalysis(modelsAnalysis);
|
|
2468
|
-
renderAnalytics(
|
|
2524
|
+
renderAnalytics(allAnalytics);
|
|
2469
2525
|
showServerWarn(results[0] ? null : 'Не удалось загрузить список задач — остальные блоки обновлены. Подробности в консоли (F12).');
|
|
2470
2526
|
updated.textContent = 'Обновлено: ' + new Date().toLocaleTimeString();
|
|
2471
2527
|
} catch (err) {
|
|
@@ -2475,6 +2531,25 @@ function renderPage(): string {
|
|
|
2475
2531
|
}
|
|
2476
2532
|
}
|
|
2477
2533
|
|
|
2534
|
+
// P3-29: аналитика — тяжёлая агрегация SQLite, грузим реже основных блоков
|
|
2535
|
+
// и используем ETag/If-None-Match, чтобы не перезапрашивать неизменённые данные.
|
|
2536
|
+
var analyticsEtag = null;
|
|
2537
|
+
async function loadAnalytics() {
|
|
2538
|
+
try {
|
|
2539
|
+
var headers = { 'X-Scheduler-Client': 'dashboard' };
|
|
2540
|
+
if (analyticsEtag) headers['If-None-Match'] = analyticsEtag;
|
|
2541
|
+
var res = await fetch('/api/analytics?days=14', { cache: 'no-store', headers: headers });
|
|
2542
|
+
if (res.status === 304) return; // не изменилось с прошлого раза
|
|
2543
|
+
analyticsEtag = res.headers.get('ETag');
|
|
2544
|
+
allAnalytics = await readJson(res);
|
|
2545
|
+
if (allAnalytics && allAnalytics.totals) {
|
|
2546
|
+
renderAnalytics(allAnalytics);
|
|
2547
|
+
}
|
|
2548
|
+
} catch (err) {
|
|
2549
|
+
console.error('Аналитика недоступна:', err);
|
|
2550
|
+
}
|
|
2551
|
+
}
|
|
2552
|
+
|
|
2478
2553
|
document.addEventListener('click', function (e) {
|
|
2479
2554
|
var matrixBtn = e.target && e.target.closest ? e.target.closest('button[data-matrix]') : null;
|
|
2480
2555
|
if (!matrixBtn) return;
|
|
@@ -2639,6 +2714,8 @@ function renderPage(): string {
|
|
|
2639
2714
|
|
|
2640
2715
|
loadAll();
|
|
2641
2716
|
setInterval(loadAll, 5000);
|
|
2717
|
+
loadAnalytics();
|
|
2718
|
+
setInterval(loadAnalytics, ANALYTICS_INTERVAL_MS);
|
|
2642
2719
|
})();
|
|
2643
2720
|
</script>
|
|
2644
2721
|
|