agent-steward 0.0.4 → 0.0.5
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 +134 -2
- package/CROSS_PLATFORM.md +19 -0
- package/README.md +52 -7
- package/ROADMAP-STRATEGY.md +21 -18
- package/ROADMAP.md +140 -159
- package/dist/cli.d.ts +3 -0
- package/dist/cli.d.ts.map +1 -0
- package/dist/cli.js +351 -0
- package/dist/core/execution.d.ts +203 -0
- package/dist/core/execution.d.ts.map +1 -0
- package/dist/core/execution.js +309 -0
- package/dist/core/gate-integrity.d.ts +35 -0
- package/dist/core/gate-integrity.d.ts.map +1 -0
- package/dist/core/gate-integrity.js +132 -0
- package/dist/core/git-trigger.d.ts.map +1 -1
- package/dist/core/git-trigger.js +14 -2
- package/dist/core/guard-run.d.ts +4 -0
- package/dist/core/guard-run.d.ts.map +1 -0
- package/dist/core/guard-run.js +101 -0
- package/dist/core/guard.d.ts +52 -0
- package/dist/core/guard.d.ts.map +1 -0
- package/dist/core/guard.js +362 -0
- package/dist/core/lock.d.ts +41 -0
- package/dist/core/lock.d.ts.map +1 -1
- package/dist/core/lock.js +141 -29
- package/dist/core/matrix.d.ts.map +1 -1
- package/dist/core/matrix.js +75 -15
- package/dist/core/mission.d.ts +83 -0
- package/dist/core/mission.d.ts.map +1 -0
- package/dist/core/mission.js +334 -0
- package/dist/core/pipeline-apply.d.ts +38 -0
- package/dist/core/pipeline-apply.d.ts.map +1 -0
- package/dist/core/pipeline-apply.js +117 -0
- package/dist/core/pipeline-io.d.ts +13 -0
- package/dist/core/pipeline-io.d.ts.map +1 -0
- package/dist/core/pipeline-io.js +64 -0
- package/dist/core/pipeline-map.d.ts +46 -0
- package/dist/core/pipeline-map.d.ts.map +1 -0
- package/dist/core/pipeline-map.js +196 -0
- package/dist/core/pipeline-spec.d.ts +109 -0
- package/dist/core/pipeline-spec.d.ts.map +1 -0
- package/dist/core/pipeline-spec.js +554 -0
- package/dist/core/ps-wrapper.d.ts +19 -2
- package/dist/core/ps-wrapper.d.ts.map +1 -1
- package/dist/core/ps-wrapper.js +250 -62
- package/dist/core/record-history.d.ts.map +1 -1
- package/dist/core/record-history.js +130 -29
- package/dist/core/router/rules.d.ts.map +1 -1
- package/dist/core/router/rules.js +6 -0
- package/dist/core/scheduler/linux.d.ts +8 -1
- package/dist/core/scheduler/linux.d.ts.map +1 -1
- package/dist/core/scheduler/linux.js +34 -9
- package/dist/core/scheduler/mac.d.ts +44 -2
- package/dist/core/scheduler/mac.d.ts.map +1 -1
- package/dist/core/scheduler/mac.js +126 -15
- package/dist/core/scheduler/windows.d.ts.map +1 -1
- package/dist/core/scheduler/windows.js +15 -12
- package/dist/core/structured-log.d.ts +7 -1
- package/dist/core/structured-log.d.ts.map +1 -1
- package/dist/core/worktree-run.d.ts +4 -0
- package/dist/core/worktree-run.d.ts.map +1 -0
- package/dist/core/worktree-run.js +164 -0
- package/dist/core/worktree.d.ts +115 -0
- package/dist/core/worktree.d.ts.map +1 -0
- package/dist/core/worktree.js +462 -0
- package/dist/core/wrappers/bash.d.ts +17 -0
- package/dist/core/wrappers/bash.d.ts.map +1 -1
- package/dist/core/wrappers/bash.js +175 -24
- package/dist/db/capability-repo.d.ts +43 -2
- package/dist/db/capability-repo.d.ts.map +1 -1
- package/dist/db/capability-repo.js +96 -11
- package/dist/db/history-repo.d.ts +38 -5
- package/dist/db/history-repo.d.ts.map +1 -1
- package/dist/db/history-repo.js +88 -25
- package/dist/db/metrics-repo.js +2 -2
- package/dist/db/recovery.d.ts.map +1 -1
- package/dist/db/recovery.js +5 -4
- package/dist/db/run-journal.d.ts +33 -5
- package/dist/db/run-journal.d.ts.map +1 -1
- package/dist/db/run-journal.js +78 -14
- package/dist/db/run-resume.d.ts +5 -0
- package/dist/db/run-resume.d.ts.map +1 -1
- package/dist/db/run-resume.js +9 -2
- package/dist/db/runs-repo.d.ts +19 -2
- package/dist/db/runs-repo.d.ts.map +1 -1
- package/dist/db/runs-repo.js +22 -6
- package/dist/db/schema.d.ts +2 -2
- package/dist/db/schema.d.ts.map +1 -1
- package/dist/db/schema.js +63 -2
- package/dist/history.d.ts +1 -1
- package/dist/history.d.ts.map +1 -1
- package/dist/i18n.d.ts +5 -0
- package/dist/i18n.d.ts.map +1 -1
- package/dist/i18n.js +11 -4
- package/dist/index.d.ts +136 -2
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +378 -14
- package/dist/notifications.d.ts +22 -0
- package/dist/notifications.d.ts.map +1 -1
- package/dist/notifications.js +36 -8
- package/dist/profiles.d.ts.map +1 -1
- package/dist/profiles.js +25 -4
- package/dist/rpc.d.ts +246 -0
- package/dist/rpc.d.ts.map +1 -1
- package/dist/rpc.js +117 -0
- package/dist/server.d.ts +15 -0
- package/dist/server.d.ts.map +1 -1
- package/dist/server.js +77 -18
- package/dist/settings.d.ts +2 -2
- package/dist/settings.d.ts.map +1 -1
- package/dist/settings.js +3 -3
- package/dist/shared/jobs-view.d.ts +1 -1
- package/dist/shared/jobs-view.d.ts.map +1 -1
- package/dist/shared/jobs-view.js +2 -0
- package/dist/task-transfer.d.ts +16 -0
- package/dist/task-transfer.d.ts.map +1 -1
- package/dist/task-transfer.js +16 -0
- package/docs/ARCHITECTURE.md +281 -65
- package/docs/COMPATIBILITY.md +2 -2
- package/docs/CONCEPT.md +18 -4
- package/docs/CROSS_PLATFORM.ru.md +20 -0
- package/docs/CROSS_PLATFORM.zh.md +18 -0
- package/docs/EXECUTION-LOOP.md +22 -7
- package/docs/FEATURES.md +65 -4
- package/docs/FEATURES.zh.md +52 -4
- package/docs/MIGRATION.md +2 -2
- package/docs/PIPELINE.md +293 -0
- package/docs/README.ru.md +42 -3
- package/docs/README.zh.md +43 -3
- package/docs/SAFETY.md +23 -3
- package/gui-experimental.cjs +9 -8
- package/locales/en.json +17 -1
- package/locales/ru.json +17 -1
- package/locales/zh.json +17 -1
- package/opencode.pipeline.yaml +35 -0
- package/package.json +23 -4
- package/scripts/test-home.mjs +83 -0
- package/src/cli.ts +412 -0
- package/src/core/dry-run.ts +2 -2
- package/src/core/execution.ts +538 -0
- package/src/core/file-watcher.ts +2 -2
- package/src/core/gate-integrity.ts +160 -0
- package/src/core/git-trigger.ts +18 -5
- package/src/core/guard-run.ts +119 -0
- package/src/core/guard.ts +431 -0
- package/src/core/lock.ts +178 -37
- package/src/core/matrix.ts +95 -50
- package/src/core/mission.ts +485 -0
- package/src/core/native-notify.ts +1 -1
- package/src/core/pipeline-apply.ts +158 -0
- package/src/core/pipeline-io.ts +79 -0
- package/src/core/pipeline-map.ts +264 -0
- package/src/core/pipeline-spec.ts +775 -0
- package/src/core/ps-wrapper.ts +263 -63
- package/src/core/record-history.ts +164 -77
- package/src/core/router/rules.ts +6 -0
- package/src/core/schedule-gate.ts +1 -1
- package/src/core/scheduler/at-fallback.ts +1 -1
- package/src/core/scheduler/linux.ts +40 -11
- package/src/core/scheduler/logs.ts +2 -2
- package/src/core/scheduler/mac.ts +174 -14
- package/src/core/scheduler/registry.ts +2 -2
- package/src/core/scheduler/windows.ts +19 -15
- package/src/core/secrets.ts +8 -8
- package/src/core/structured-log.ts +22 -5
- package/src/core/telegram.ts +2 -2
- package/src/core/triage-worker.ts +7 -7
- package/src/core/triage.ts +2 -2
- package/src/core/worktree-run.ts +199 -0
- package/src/core/worktree.ts +600 -0
- package/src/core/wrappers/bash.ts +190 -23
- package/src/db/capability-repo.ts +127 -10
- package/src/db/history-repo.ts +129 -22
- package/src/db/metrics-repo.ts +2 -2
- package/src/db/recovery.ts +5 -4
- package/src/db/run-journal.ts +100 -13
- package/src/db/run-resume.ts +17 -1
- package/src/db/runs-repo.ts +36 -6
- package/src/db/schema.ts +65 -2
- package/src/gui.tsx +177 -13
- package/src/history.ts +1 -1
- package/src/i18n.ts +12 -4
- package/src/index.ts +524 -4
- package/src/notifications.ts +38 -8
- package/src/profiles.ts +26 -4
- package/src/rpc.ts +128 -0
- package/src/server.ts +94 -18
- package/src/settings.ts +5 -5
- package/src/shared/jobs-view.ts +3 -1
- package/src/task-transfer.ts +31 -0
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { spawn } from "node:child_process";
|
|
2
2
|
import fs from "node:fs";
|
|
3
|
+
import os from "node:os";
|
|
3
4
|
import { pathToFileURL } from "node:url";
|
|
4
5
|
import { runTaskNow } from "./scheduler/run-now.js";
|
|
5
6
|
import { createSchedulerBackend } from "./scheduler/index.js";
|
|
@@ -9,6 +10,24 @@ import { deleteSetting, decrementCounterSetting } from "../db/settings-repo.js";
|
|
|
9
10
|
import { getTask, listTasks } from "../db/tasks-repo.js";
|
|
10
11
|
import { rotateSessionIfNeeded } from "./session.js";
|
|
11
12
|
import { advanceMatrixAfterClone, finalizeMatrixIfComplete, } from "./matrix.js";
|
|
13
|
+
import { appendStructuredLog } from "./structured-log.js";
|
|
14
|
+
/**
|
|
15
|
+
* Диагностика рекордера пишется в runs.jsonl: цепочки, DAG, повторы и
|
|
16
|
+
* one-shot-очистка иначе не видны в машиночитаемом логе. Human-readable
|
|
17
|
+
* вывод остаётся только в логе задачи; stdout `--start` не трогаем — обёртка
|
|
18
|
+
* читает оттуда runId.
|
|
19
|
+
*/
|
|
20
|
+
function logRecorderEvent(event, task, details = {}) {
|
|
21
|
+
appendStructuredLog({
|
|
22
|
+
event,
|
|
23
|
+
task,
|
|
24
|
+
runId: details.runId,
|
|
25
|
+
status: details.status,
|
|
26
|
+
error: details.error,
|
|
27
|
+
reason: details.reason,
|
|
28
|
+
nextTask: details.nextTask,
|
|
29
|
+
});
|
|
30
|
+
}
|
|
12
31
|
/** Префикс ключа настроек со счётчиком повторов конкретной задачи. */
|
|
13
32
|
const RETRY_STATE_PREFIX = "retry_state:";
|
|
14
33
|
function retryStateKey(taskName) {
|
|
@@ -119,7 +138,10 @@ async function triggerTask(taskName) {
|
|
|
119
138
|
return true;
|
|
120
139
|
}
|
|
121
140
|
catch (err) {
|
|
122
|
-
|
|
141
|
+
logRecorderEvent("chain.trigger_failed", taskName, {
|
|
142
|
+
nextTask: taskName,
|
|
143
|
+
error: err instanceof Error ? err.message : String(err),
|
|
144
|
+
});
|
|
123
145
|
return false;
|
|
124
146
|
}
|
|
125
147
|
}
|
|
@@ -146,7 +168,7 @@ async function scheduleRetry(taskName) {
|
|
|
146
168
|
const remaining = decrementCounterSetting(key, count);
|
|
147
169
|
if (remaining === null) {
|
|
148
170
|
deleteSetting(key);
|
|
149
|
-
|
|
171
|
+
logRecorderEvent("retry.exhausted", taskName, { reason: "retries exhausted" });
|
|
150
172
|
return false;
|
|
151
173
|
}
|
|
152
174
|
const script = process.argv[1];
|
|
@@ -160,12 +182,15 @@ async function scheduleRetry(taskName) {
|
|
|
160
182
|
windowsHide: true,
|
|
161
183
|
});
|
|
162
184
|
child.unref();
|
|
163
|
-
|
|
164
|
-
`
|
|
185
|
+
logRecorderEvent("retry.scheduled", taskName, {
|
|
186
|
+
reason: `delay=${delay}s, remaining=${remaining}`,
|
|
187
|
+
});
|
|
165
188
|
return true;
|
|
166
189
|
}
|
|
167
190
|
catch (err) {
|
|
168
|
-
|
|
191
|
+
logRecorderEvent("retry.schedule_failed", taskName, {
|
|
192
|
+
error: err instanceof Error ? err.message : String(err),
|
|
193
|
+
});
|
|
169
194
|
return false;
|
|
170
195
|
}
|
|
171
196
|
}
|
|
@@ -180,10 +205,12 @@ async function runRetry(taskName, delaySec) {
|
|
|
180
205
|
await new Promise((resolve) => setTimeout(resolve, delay * 1000));
|
|
181
206
|
try {
|
|
182
207
|
await runTaskNow(taskName);
|
|
183
|
-
|
|
208
|
+
logRecorderEvent("retry.started", taskName);
|
|
184
209
|
}
|
|
185
210
|
catch (err) {
|
|
186
|
-
|
|
211
|
+
logRecorderEvent("retry.failed", taskName, {
|
|
212
|
+
error: err instanceof Error ? err.message : String(err),
|
|
213
|
+
});
|
|
187
214
|
}
|
|
188
215
|
}
|
|
189
216
|
/**
|
|
@@ -271,6 +298,36 @@ async function main() {
|
|
|
271
298
|
await runRetry(second, Number(third));
|
|
272
299
|
return;
|
|
273
300
|
}
|
|
301
|
+
/**
|
|
302
|
+
* W-4: режим пропуска — node record-history.js --skip "<task>" "<reasonB64>" "<logFile>" [durationMs]
|
|
303
|
+
* Вызывается обёртками при срабатывании guard (код 4). Причина передаётся
|
|
304
|
+
* base64, чтобы не подставлять произвольный текст в командную строку. Пропуск
|
|
305
|
+
* попадает в историю и total-метрику, но не считается ошибкой, не шлёт
|
|
306
|
+
* уведомление, не запускает цепочки/повторы и не запускает DAG.
|
|
307
|
+
*/
|
|
308
|
+
if (first === "--skip") {
|
|
309
|
+
const taskName = second;
|
|
310
|
+
if (!taskName)
|
|
311
|
+
process.exit(1);
|
|
312
|
+
let reason = "guard conditions not met";
|
|
313
|
+
if (third) {
|
|
314
|
+
try {
|
|
315
|
+
const decoded = Buffer.from(third, "base64").toString("utf8").trim();
|
|
316
|
+
if (decoded)
|
|
317
|
+
reason = decoded;
|
|
318
|
+
}
|
|
319
|
+
catch {
|
|
320
|
+
// Битая base64 — оставляем причину по умолчанию.
|
|
321
|
+
}
|
|
322
|
+
}
|
|
323
|
+
const durationMs = Math.max(0, Number(fifth) || 0);
|
|
324
|
+
const finishedAt = new Date().toISOString();
|
|
325
|
+
const startedAt = new Date(Date.now() - durationMs).toISOString();
|
|
326
|
+
const definition = getTask(taskName);
|
|
327
|
+
recordRun(taskName, "skipped", startedAt, durationMs, reason, null, undefined, undefined, undefined, undefined, undefined, finishedAt, definition?.workspaceId ?? null, definition?.allowedTools ?? null, definition?.deniedTools ?? null);
|
|
328
|
+
await handleCompletion(taskName, "skipped", null, reason, durationMs);
|
|
329
|
+
return;
|
|
330
|
+
}
|
|
274
331
|
const parseOptionalNumber = (value) => {
|
|
275
332
|
if (!value || value === "-")
|
|
276
333
|
return undefined;
|
|
@@ -296,7 +353,14 @@ async function main() {
|
|
|
296
353
|
process.exit(1);
|
|
297
354
|
const startedAt = third ?? new Date().toISOString();
|
|
298
355
|
const definition = getTask(taskName);
|
|
299
|
-
|
|
356
|
+
// Владелец — процесс-обёртка, запустивший recorder. Он живёт дольше
|
|
357
|
+
// короткоживущего recorder'а, поэтому именно его PID проверяет recovery.
|
|
358
|
+
const owner = {
|
|
359
|
+
pid: process.ppid && process.ppid > 0 ? process.ppid : null,
|
|
360
|
+
host: os.hostname(),
|
|
361
|
+
startedAt: new Date().toISOString(),
|
|
362
|
+
};
|
|
363
|
+
const runId = startRun(taskName, startedAt, definition?.workspaceId ?? null, definition?.allowedTools ?? null, definition?.deniedTools ?? null, owner);
|
|
300
364
|
console.log(String(runId));
|
|
301
365
|
return;
|
|
302
366
|
}
|
|
@@ -333,14 +397,19 @@ async function main() {
|
|
|
333
397
|
const model = ninth && ninth !== "-" ? ninth.trim() || undefined : undefined;
|
|
334
398
|
const preFlightStatus = parseHookStatus(tenth);
|
|
335
399
|
const postFlightStatus = parseHookStatus(eleventh);
|
|
336
|
-
const st = status === "success" ? "success" : status === "timeout" ? "timeout" : "error";
|
|
400
|
+
const st = status === "success" ? "success" : status === "timeout" ? "timeout" : status === "skipped" ? "skipped" : "error";
|
|
337
401
|
const definition = getTask(taskName);
|
|
338
402
|
const chainTarget = st === "success"
|
|
339
403
|
? definition?.nextTaskOnSuccess || null
|
|
340
|
-
:
|
|
404
|
+
: st === "skipped"
|
|
405
|
+
? null
|
|
406
|
+
: definition?.nextTaskOnError || null;
|
|
341
407
|
const completed = finishRun(runId, st, durationMs, error, chainTarget, tokensResolved, costResolved, model, preFlightStatus, postFlightStatus);
|
|
342
408
|
if (!completed) {
|
|
343
|
-
|
|
409
|
+
logRecorderEvent("run.finish_skipped", taskName, {
|
|
410
|
+
runId,
|
|
411
|
+
reason: "already finished or not found",
|
|
412
|
+
});
|
|
344
413
|
return;
|
|
345
414
|
}
|
|
346
415
|
await handleCompletion(taskName, st, chainTarget, error, durationMs, tokensResolved, costResolved);
|
|
@@ -359,18 +428,36 @@ async function main() {
|
|
|
359
428
|
// "-" означает «данных нет» (openCode не печатал usage в лог).
|
|
360
429
|
const tokens = parseOptionalNumber(sixth);
|
|
361
430
|
const costUsd = parseOptionalNumber(seventh);
|
|
431
|
+
// B10: 11-й аргумент — лог-файл задачи. Раньше legacy-режим его не читал,
|
|
432
|
+
// поэтому при "-" в токенах/стоимости usage терялся. Парсим лог так же,
|
|
433
|
+
// как режим --finish; отсутствие файла — graceful fallback (parseUsageFromLog
|
|
434
|
+
// возвращает пустой объект и не бросает).
|
|
435
|
+
const logFile = eleventh && eleventh !== "-" ? eleventh : undefined;
|
|
436
|
+
let tokensResolved = tokens;
|
|
437
|
+
let costResolved = costUsd;
|
|
438
|
+
if ((tokensResolved === undefined || costResolved === undefined) && logFile) {
|
|
439
|
+
const usage = parseUsageFromLog(logFile);
|
|
440
|
+
if (tokensResolved === undefined && usage.tokens !== undefined) {
|
|
441
|
+
tokensResolved = usage.tokens;
|
|
442
|
+
}
|
|
443
|
+
if (costResolved === undefined && usage.costUsd !== undefined) {
|
|
444
|
+
costResolved = usage.costUsd;
|
|
445
|
+
}
|
|
446
|
+
}
|
|
362
447
|
// Восьмой аргумент — модель; "-" означает, что модель не задана.
|
|
363
448
|
const model = eighth && eighth !== "-" ? eighth.trim() || undefined : undefined;
|
|
364
449
|
// Девятый и десятый — итоги pre/post-flight хуков.
|
|
365
450
|
const preFlightStatus = parseHookStatus(ninth);
|
|
366
451
|
const postFlightStatus = parseHookStatus(tenth);
|
|
367
|
-
const st = status === "success" ? "success" : status === "timeout" ? "timeout" : "error";
|
|
452
|
+
const st = status === "success" ? "success" : status === "timeout" ? "timeout" : status === "skipped" ? "skipped" : "error";
|
|
368
453
|
const definition = getTask(taskName);
|
|
369
454
|
const chainTarget = st === "success"
|
|
370
455
|
? definition?.nextTaskOnSuccess || null
|
|
371
|
-
:
|
|
372
|
-
|
|
373
|
-
|
|
456
|
+
: st === "skipped"
|
|
457
|
+
? null
|
|
458
|
+
: definition?.nextTaskOnError || null;
|
|
459
|
+
recordRun(taskName, st, startedAt, durationMs, error, chainTarget, tokensResolved, costResolved, model, preFlightStatus, postFlightStatus, new Date().toISOString(), definition?.workspaceId ?? null, definition?.allowedTools ?? null, definition?.deniedTools ?? null);
|
|
460
|
+
await handleCompletion(taskName, st, chainTarget, error, durationMs, tokensResolved, costResolved);
|
|
374
461
|
}
|
|
375
462
|
/**
|
|
376
463
|
* Удаляет отработавшую ONCE-задачу из Планировщика Windows.
|
|
@@ -392,11 +479,13 @@ export async function cleanupWindowsOneShotTask(taskName, deps = {}) {
|
|
|
392
479
|
((name) => createSchedulerBackend().deleteTask(name));
|
|
393
480
|
try {
|
|
394
481
|
await deleteTask(taskName);
|
|
395
|
-
|
|
482
|
+
logRecorderEvent("oneshot.cleaned", taskName);
|
|
396
483
|
return true;
|
|
397
484
|
}
|
|
398
485
|
catch (err) {
|
|
399
|
-
|
|
486
|
+
logRecorderEvent("oneshot.cleanup_failed", taskName, {
|
|
487
|
+
error: err instanceof Error ? err.message : String(err),
|
|
488
|
+
});
|
|
400
489
|
return false;
|
|
401
490
|
}
|
|
402
491
|
}
|
|
@@ -406,10 +495,13 @@ export async function cleanupWindowsOneShotTask(taskName, deps = {}) {
|
|
|
406
495
|
*/
|
|
407
496
|
async function handleCompletion(taskName, st, chainTarget, error, durationMs, tokens, costUsd) {
|
|
408
497
|
// Уведомление о завершении (webhook). Ошибки отправки логируются внутри
|
|
409
|
-
// и не влияют на историю, цепочки и повторы.
|
|
410
|
-
|
|
411
|
-
|
|
412
|
-
|
|
498
|
+
// и не влияют на историю, цепочки и повторы. Пропуск guard не уведомляем:
|
|
499
|
+
// для него нет отдельного шаблона, а шум в уведомлениях не нужен.
|
|
500
|
+
if (st !== "skipped") {
|
|
501
|
+
await notifyTaskCompletion(taskName, st, durationMs, error, tokens, costUsd, {
|
|
502
|
+
asyncTriage: true,
|
|
503
|
+
});
|
|
504
|
+
}
|
|
413
505
|
// P2-27: Windows не удаляет ONCE-задачи сам, а флаг schtasks `/z` на
|
|
414
506
|
// практике ломает создание задачи («task XML ... EndBoundary»).
|
|
415
507
|
// Поэтому снимаем отработавшую one-shot задачу из Планировщика здесь.
|
|
@@ -422,7 +514,9 @@ async function handleCompletion(taskName, st, chainTarget, error, durationMs, to
|
|
|
422
514
|
await finalizeMatrixIfComplete(taskName);
|
|
423
515
|
}
|
|
424
516
|
catch (err) {
|
|
425
|
-
|
|
517
|
+
logRecorderEvent("matrix.error", taskName, {
|
|
518
|
+
error: err instanceof Error ? err.message : String(err),
|
|
519
|
+
});
|
|
426
520
|
}
|
|
427
521
|
if (st === "success") {
|
|
428
522
|
// Успешный запуск сбрасывает счётчик повторов.
|
|
@@ -430,7 +524,7 @@ async function handleCompletion(taskName, st, chainTarget, error, durationMs, to
|
|
|
430
524
|
if (chainTarget) {
|
|
431
525
|
const started = await triggerTask(chainTarget);
|
|
432
526
|
if (started) {
|
|
433
|
-
|
|
527
|
+
logRecorderEvent("chain.triggered", taskName, { nextTask: chainTarget });
|
|
434
528
|
}
|
|
435
529
|
}
|
|
436
530
|
// DAG: после успеха проверяем задачи, у которых эта задача — одна из
|
|
@@ -444,22 +538,25 @@ async function handleCompletion(taskName, st, chainTarget, error, durationMs, to
|
|
|
444
538
|
for (const dependent of dependents) {
|
|
445
539
|
const started = await triggerTask(dependent);
|
|
446
540
|
if (started) {
|
|
447
|
-
|
|
541
|
+
logRecorderEvent("dag.triggered", taskName, { nextTask: dependent });
|
|
448
542
|
}
|
|
449
543
|
}
|
|
450
544
|
}
|
|
451
545
|
catch (err) {
|
|
452
|
-
|
|
546
|
+
logRecorderEvent("dag.trigger_failed", taskName, {
|
|
547
|
+
error: err instanceof Error ? err.message : String(err),
|
|
548
|
+
});
|
|
453
549
|
}
|
|
454
550
|
}
|
|
455
|
-
else {
|
|
551
|
+
else if (st !== "skipped") {
|
|
456
552
|
// Сначала пытаемся повторить саму задачу; компенсирующая задача запускается
|
|
457
553
|
// только когда повторы исчерпаны (или не настроены).
|
|
554
|
+
// Пропуск guard — не ошибка: повторы и компенсации не запускаются.
|
|
458
555
|
const retryScheduled = await scheduleRetry(taskName);
|
|
459
556
|
if (!retryScheduled && chainTarget) {
|
|
460
557
|
const started = await triggerTask(chainTarget);
|
|
461
558
|
if (started) {
|
|
462
|
-
|
|
559
|
+
logRecorderEvent("compensation.triggered", taskName, { nextTask: chainTarget });
|
|
463
560
|
}
|
|
464
561
|
}
|
|
465
562
|
}
|
|
@@ -469,7 +566,9 @@ async function handleCompletion(taskName, st, chainTarget, error, durationMs, to
|
|
|
469
566
|
await rotateSessionIfNeeded(taskName);
|
|
470
567
|
}
|
|
471
568
|
catch (err) {
|
|
472
|
-
|
|
569
|
+
logRecorderEvent("session.rotate_failed", taskName, {
|
|
570
|
+
error: err instanceof Error ? err.message : String(err),
|
|
571
|
+
});
|
|
473
572
|
}
|
|
474
573
|
}
|
|
475
574
|
/**
|
|
@@ -489,7 +588,9 @@ function isDirectInvocation() {
|
|
|
489
588
|
}
|
|
490
589
|
if (isDirectInvocation()) {
|
|
491
590
|
main().catch((err) => {
|
|
492
|
-
|
|
591
|
+
logRecorderEvent("record_history.fatal", "record-history", {
|
|
592
|
+
error: err instanceof Error ? err.message : String(err),
|
|
593
|
+
});
|
|
493
594
|
process.exit(1);
|
|
494
595
|
});
|
|
495
596
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rules.d.ts","sourceRoot":"","sources":["../../../src/core/router/rules.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAEH,+BAA+B;AAC/B,MAAM,MAAM,eAAe,GAAG,QAAQ,GAAG,KAAK,GAAG,OAAO,CAAC;AAEzD,+DAA+D;AAC/D,MAAM,MAAM,cAAc,GAAG,OAAO,GAAG,OAAO,CAAC;AAE/C,gEAAgE;AAChE,MAAM,WAAW,eAAe;IAC9B,uEAAuE;IACvE,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,eAAe,CAAC;IAC3B,QAAQ,EAAE,cAAc,CAAC;IACzB,gEAAgE;IAChE,WAAW,EAAE,MAAM,CAAC;CACrB;AAED;;;;;;GAMG;AACH,eAAO,MAAM,kBAAkB,EAAE,SAAS,eAAe,
|
|
1
|
+
{"version":3,"file":"rules.d.ts","sourceRoot":"","sources":["../../../src/core/router/rules.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAEH,+BAA+B;AAC/B,MAAM,MAAM,eAAe,GAAG,QAAQ,GAAG,KAAK,GAAG,OAAO,CAAC;AAEzD,+DAA+D;AAC/D,MAAM,MAAM,cAAc,GAAG,OAAO,GAAG,OAAO,CAAC;AAE/C,gEAAgE;AAChE,MAAM,WAAW,eAAe;IAC9B,uEAAuE;IACvE,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,eAAe,CAAC;IAC3B,QAAQ,EAAE,cAAc,CAAC;IACzB,gEAAgE;IAChE,WAAW,EAAE,MAAM,CAAC;CACrB;AAED;;;;;;GAMG;AACH,eAAO,MAAM,kBAAkB,EAAE,SAAS,eAAe,EA2CvD,CAAC;AAMH;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAMvD;AAED,sFAAsF;AACtF,wBAAgB,eAAe,CAAC,QAAQ,EAAE,MAAM,GAAG,eAAe,GAAG,SAAS,CAK7E;AAED,uEAAuE;AACvE,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAE1D;AAED,yDAAyD;AACzD,wBAAgB,oBAAoB,IAAI,SAAS,eAAe,EAAE,CAEjE"}
|
|
@@ -37,6 +37,12 @@ export const STATIC_ROUTE_RULES = Object.freeze([
|
|
|
37
37
|
executor: "local",
|
|
38
38
|
description: "Тесты запускаются локальным процессом.",
|
|
39
39
|
},
|
|
40
|
+
{
|
|
41
|
+
taskType: "mission",
|
|
42
|
+
transport: "direct",
|
|
43
|
+
executor: "local",
|
|
44
|
+
description: "Ad-hoc миссия исполняется локально через обёртку без регистрации в ОС.",
|
|
45
|
+
},
|
|
40
46
|
{
|
|
41
47
|
taskType: "apply_diff",
|
|
42
48
|
transport: "direct",
|
|
@@ -25,7 +25,14 @@ export declare class LinuxScheduler extends PosixSchedulerBase {
|
|
|
25
25
|
private renderBlock;
|
|
26
26
|
/** Читает текущий crontab (пустая строка, если crontab ещё не создан). */
|
|
27
27
|
private readCrontab;
|
|
28
|
-
/**
|
|
28
|
+
/**
|
|
29
|
+
* Убирает управляемый блок плагина из текста crontab.
|
|
30
|
+
*
|
|
31
|
+
* B9: удаляются только строки между парными маркерами. Незакрытый блок
|
|
32
|
+
* (маркер начала без конца) — fail-closed: бросаем ошибку, чтобы вызывающий
|
|
33
|
+
* не записал crontab и пользовательские задания после маркера не пропали.
|
|
34
|
+
* Строки вне маркеров сохраняются байт-в-байт, включая пустые.
|
|
35
|
+
*/
|
|
29
36
|
private stripBlock;
|
|
30
37
|
/** Записывает crontab через stdin: `crontab -`. */
|
|
31
38
|
private writeCrontab;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"linux.d.ts","sourceRoot":"","sources":["../../../src/core/scheduler/linux.ts"],"names":[],"mappings":"AAIA,OAAO,EAML,KAAK,qBAAqB,EAC3B,MAAM,kBAAkB,CAAC;AAK1B,OAAO,EAAE,kBAAkB,EAAc,MAAM,YAAY,CAAC;AAC5D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAInD;;;;;;;;;;GAUG;AACH,qBAAa,cAAe,SAAQ,kBAAkB;IACpD,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC,QAAQ,CAAW;IAC7C,QAAQ,CAAC,KAAK,8BAA8B;IAE5C,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAS;IACpC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAS;IAClC,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAS;IAC1C,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAS;IACxC,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAU;gBAE9B,OAAO,GAAE,MAAyB;IAY9C,OAAO,CAAC,QAAQ;IAkBhB,OAAO,CAAC,WAAW;IAYnB,0EAA0E;YAC5D,WAAW;
|
|
1
|
+
{"version":3,"file":"linux.d.ts","sourceRoot":"","sources":["../../../src/core/scheduler/linux.ts"],"names":[],"mappings":"AAIA,OAAO,EAML,KAAK,qBAAqB,EAC3B,MAAM,kBAAkB,CAAC;AAK1B,OAAO,EAAE,kBAAkB,EAAc,MAAM,YAAY,CAAC;AAC5D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAInD;;;;;;;;;;GAUG;AACH,qBAAa,cAAe,SAAQ,kBAAkB;IACpD,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC,QAAQ,CAAW;IAC7C,QAAQ,CAAC,KAAK,8BAA8B;IAE5C,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAS;IACpC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAS;IAClC,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAS;IAC1C,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAS;IACxC,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAU;gBAE9B,OAAO,GAAE,MAAyB;IAY9C,OAAO,CAAC,QAAQ;IAkBhB,OAAO,CAAC,WAAW;IAYnB,0EAA0E;YAC5D,WAAW;IAmBzB;;;;;;;OAOG;IACH,OAAO,CAAC,UAAU;IAiDlB,mDAAmD;YACrC,YAAY;IAgB1B,8CAA8C;YAChC,cAAc;IA+B5B;;;mDAG+C;IAC/C,OAAO,CAAC,SAAS;IAKjB;;;OAGG;YACW,UAAU;IAuExB,oDAAoD;YACtC,QAAQ;IAiBtB;;;OAGG;IACG,mBAAmB,IAAI,OAAO,CAAC,qBAAqB,CAAC;cAI3C,YAAY,CAAC,KAAK,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;cAUjD,cAAc,CAAC,KAAK,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;cAQnD,UAAU,CAAC,KAAK,EAAE,aAAa,EAAE,MAAM,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;CAoBjF"}
|
|
@@ -72,17 +72,25 @@ export class LinuxScheduler extends PosixSchedulerBase {
|
|
|
72
72
|
return stdout;
|
|
73
73
|
}
|
|
74
74
|
catch (err) {
|
|
75
|
-
const
|
|
75
|
+
const stderrRaw = err?.stderr;
|
|
76
|
+
const stderr = typeof stderrRaw === "string" ? stderrRaw : String(stderrRaw ?? "");
|
|
76
77
|
// "no crontab for user" — это нормальное состояние. Любую другую ошибку
|
|
77
78
|
// (нет доступа, сбой crontab) нельзя превращать в пустой crontab: иначе
|
|
78
79
|
// последующая запись затрёт пользовательские задания.
|
|
79
80
|
if (/no crontab/i.test(stderr) || /no crontab/i.test(String(err?.message ?? ""))) {
|
|
80
81
|
return "";
|
|
81
82
|
}
|
|
82
|
-
throw new Error(`Не удалось прочитать crontab: ${stderr.trim() || err?.message || err}`);
|
|
83
|
+
throw new Error(`Не удалось прочитать crontab: ${stderr.trim() || err?.message || String(err)}`);
|
|
83
84
|
}
|
|
84
85
|
}
|
|
85
|
-
/**
|
|
86
|
+
/**
|
|
87
|
+
* Убирает управляемый блок плагина из текста crontab.
|
|
88
|
+
*
|
|
89
|
+
* B9: удаляются только строки между парными маркерами. Незакрытый блок
|
|
90
|
+
* (маркер начала без конца) — fail-closed: бросаем ошибку, чтобы вызывающий
|
|
91
|
+
* не записал crontab и пользовательские задания после маркера не пропали.
|
|
92
|
+
* Строки вне маркеров сохраняются байт-в-байт, включая пустые.
|
|
93
|
+
*/
|
|
86
94
|
stripBlock(content) {
|
|
87
95
|
// Совместимость: до появления профилей блок назывался без суффикса.
|
|
88
96
|
// Он принадлежит профилю default; другие профили его не трогают.
|
|
@@ -98,19 +106,33 @@ export class LinuxScheduler extends PosixSchedulerBase {
|
|
|
98
106
|
const lines = content.split(/\r?\n/);
|
|
99
107
|
const result = [];
|
|
100
108
|
let inside = false;
|
|
101
|
-
|
|
102
|
-
|
|
109
|
+
let openAt = 0;
|
|
110
|
+
for (let index = 0; index < lines.length; index += 1) {
|
|
111
|
+
const line = lines[index];
|
|
112
|
+
const trimmed = line.trim();
|
|
113
|
+
if (isBegin(trimmed)) {
|
|
114
|
+
if (inside) {
|
|
115
|
+
throw new Error(`crontab: вложенный маркер начала блока на строке ${index + 1} ` +
|
|
116
|
+
`(предыдущий блок открыт на строке ${openAt}). Файл не изменён.`);
|
|
117
|
+
}
|
|
103
118
|
inside = true;
|
|
119
|
+
openAt = index + 1;
|
|
104
120
|
continue;
|
|
105
121
|
}
|
|
106
|
-
if (isEnd(
|
|
122
|
+
if (inside && isEnd(trimmed)) {
|
|
107
123
|
inside = false;
|
|
108
124
|
continue;
|
|
109
125
|
}
|
|
126
|
+
// Строки внутри блока удаляются; всё остальное (включая «сиротский»
|
|
127
|
+
// маркер конца) остаётся без изменений.
|
|
110
128
|
if (!inside)
|
|
111
129
|
result.push(line);
|
|
112
130
|
}
|
|
113
|
-
|
|
131
|
+
if (inside) {
|
|
132
|
+
throw new Error(`crontab: незакрытый блок плагина с строки ${openAt} — ` +
|
|
133
|
+
"маркер конца не найден. Файл не изменён.");
|
|
134
|
+
}
|
|
135
|
+
return result.join("\n");
|
|
114
136
|
}
|
|
115
137
|
/** Записывает crontab через stdin: `crontab -`. */
|
|
116
138
|
async writeCrontab(content) {
|
|
@@ -140,14 +162,17 @@ export class LinuxScheduler extends PosixSchedulerBase {
|
|
|
140
162
|
await withLockWait(crontabLock, "crontab", async () => {
|
|
141
163
|
const entries = await this.registry.load();
|
|
142
164
|
const current = await this.readCrontab();
|
|
143
|
-
|
|
165
|
+
// B9: stripBlock сохраняет содержимое вне маркеров. Отрезаем только
|
|
166
|
+
// хвостовые переводы строк, чтобы повторные rebuild не копили пустые
|
|
167
|
+
// строки; одна финальная добавляется ниже.
|
|
168
|
+
const base = this.stripBlock(current).replace(/\n+$/, "");
|
|
144
169
|
const block = this.renderBlock(entries);
|
|
145
170
|
// Пустой блок (нет задач) не пишем, чтобы не оставлять мусор в crontab.
|
|
146
171
|
const hasTasks = block
|
|
147
172
|
.split("\n")
|
|
148
173
|
.some((line) => line.trim().startsWith("# task:"));
|
|
149
174
|
const next = [base, hasTasks ? block : ""].filter(Boolean).join("\n");
|
|
150
|
-
await this.writeCrontab(next);
|
|
175
|
+
await this.writeCrontab(next ? `${next}\n` : "");
|
|
151
176
|
}, { timeoutMs: 15000, staleMs: 60000 });
|
|
152
177
|
}
|
|
153
178
|
/** Строка команды one-shot для stdin `at`.
|
|
@@ -22,12 +22,54 @@ interface LaunchdSchedule {
|
|
|
22
22
|
* Поддерживается то же подмножество, что и у Windows-бэкенда.
|
|
23
23
|
*/
|
|
24
24
|
export declare function cronToLaunchdSchedule(cron: string): LaunchdSchedule;
|
|
25
|
+
/** Ошибка запуска launchctl с командой, кодом выхода и stderr. */
|
|
26
|
+
export declare function describeLaunchctlError(args: string[], err: unknown): string;
|
|
27
|
+
/**
|
|
28
|
+
* Запускает launchctl и либо пробрасывает ошибку с stderr/exit code,
|
|
29
|
+
* либо глотает её (unload незагруженного агента — штатная ситуация).
|
|
30
|
+
*/
|
|
31
|
+
export declare function runLaunchctl(runner: (args: string[]) => Promise<unknown>, args: string[], options?: {
|
|
32
|
+
tolerateFailure?: boolean;
|
|
33
|
+
}): Promise<void>;
|
|
34
|
+
/** Команды launchctl при установке записи. */
|
|
35
|
+
export interface LaunchctlInstallPlan {
|
|
36
|
+
/** unload перед перезаписью plist (best effort: агент мог быть не загружен). */
|
|
37
|
+
beforeWrite: string[];
|
|
38
|
+
/** load после записи; null — задача на паузе, загружать её нельзя. */
|
|
39
|
+
afterWrite: string[] | null;
|
|
40
|
+
}
|
|
41
|
+
/**
|
|
42
|
+
* B5: `load -w` не только загружает агент, но и снимает Disabled,
|
|
43
|
+
* поэтому для приостановленной задачи его вызывать нельзя — иначе
|
|
44
|
+
* установка молча возобновляет задачу. Вместо этого `unload -w`
|
|
45
|
+
* фиксирует Disabled, чтобы launchd не загрузил агент при следующем входе.
|
|
46
|
+
*/
|
|
47
|
+
export declare function planLaunchctlInstall(paused: boolean, plistPath: string): LaunchctlInstallPlan;
|
|
48
|
+
/**
|
|
49
|
+
* ML-1: macOS 13 (Darwin 22) заменяет `load`/`unload` на `bootstrap`/`bootout`
|
|
50
|
+
* с явным доменом `gui/<uid>`. `-w` у legacy-команды здесь не нужен: bootstrap
|
|
51
|
+
* сам регистрирует агент, а bootout — снимает регистрацию.
|
|
52
|
+
*/
|
|
53
|
+
export declare function modernLaunchctlArgs(args: string[], uid?: number): string[];
|
|
54
|
+
/** Современные команды доступны на macOS 13+ (Darwin 22+). */
|
|
55
|
+
export declare function supportsModernLaunchctl(platform?: NodeJS.Platform, release?: string): boolean;
|
|
56
|
+
/**
|
|
57
|
+
* Выполняет launchctl через современные команды; при отсутствии поддержки
|
|
58
|
+
* (macOS < 13 или «unrecognized subcommand») повторяет legacy-аргументы.
|
|
59
|
+
*/
|
|
60
|
+
export declare function runLaunchctlModern(runner: (args: string[]) => Promise<unknown>, args: string[], options?: {
|
|
61
|
+
tolerateFailure?: boolean;
|
|
62
|
+
}): Promise<void>;
|
|
25
63
|
/**
|
|
26
64
|
* Бэкенд планировщика macOS на основе launchd.
|
|
27
65
|
*
|
|
28
66
|
* Каждая задача — отдельный LaunchAgent:
|
|
29
67
|
* ~/Library/LaunchAgents/com.opencode.scheduler.<name>.plist
|
|
30
|
-
* Управление — через launchctl
|
|
68
|
+
* Управление — через `launchctl bootstrap/bootout` (macOS ≥13), с фолбэком
|
|
69
|
+
* на legacy `load/unload -w` для более старых систем. `planLaunchctlInstall`
|
|
70
|
+
* намеренно остаётся на legacy-командах: обратная совместимость контракта.
|
|
71
|
+
* Ошибки загрузки не глотаются: битый plist должен вернуть ошибку установки,
|
|
72
|
+
* а не оставить задачу молча незапланированной.
|
|
31
73
|
*/
|
|
32
74
|
export declare class MacScheduler extends PosixSchedulerBase {
|
|
33
75
|
readonly platform: NodeJS.Platform;
|
|
@@ -36,7 +78,7 @@ export declare class MacScheduler extends PosixSchedulerBase {
|
|
|
36
78
|
private readonly profile;
|
|
37
79
|
private label;
|
|
38
80
|
private plistPath;
|
|
39
|
-
/** Выполняет launchctl
|
|
81
|
+
/** Выполняет launchctl; tolerateFailure оставлен только для bootout/unload. */
|
|
40
82
|
private launchctl;
|
|
41
83
|
protected installEntry(entry: RegistryEntry): Promise<void>;
|
|
42
84
|
protected uninstallEntry(entry: RegistryEntry): Promise<void>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mac.d.ts","sourceRoot":"","sources":["../../../src/core/scheduler/mac.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAChD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"mac.d.ts","sourceRoot":"","sources":["../../../src/core/scheduler/mac.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAChD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAsBnD,0CAA0C;AAC1C,UAAU,eAAe;IACvB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,GAAG,CAAC,EAAE,MAAM,CAAC;CACd;AAED,wDAAwD;AACxD,UAAU,eAAe;IACvB,kEAAkE;IAClE,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,6DAA6D;IAC7D,QAAQ,CAAC,EAAE,eAAe,CAAC;IAC3B,kEAAkE;IAClE,SAAS,CAAC,EAAE,eAAe,EAAE,CAAC;CAC/B;AAED;;;GAGG;AACH,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,MAAM,GAAG,eAAe,CA6DnE;AAuID,kEAAkE;AAClE,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,GAAG,EAAE,OAAO,GAAG,MAAM,CAkB3E;AAED;;;GAGG;AACH,wBAAsB,YAAY,CAChC,MAAM,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,OAAO,CAAC,OAAO,CAAC,EAC5C,IAAI,EAAE,MAAM,EAAE,EACd,OAAO,GAAE;IAAE,eAAe,CAAC,EAAE,OAAO,CAAA;CAAO,GAC1C,OAAO,CAAC,IAAI,CAAC,CAYf;AAED,8CAA8C;AAC9C,MAAM,WAAW,oBAAoB;IACnC,gFAAgF;IAChF,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,sEAAsE;IACtE,UAAU,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;CAC7B;AAED;;;;;GAKG;AACH,wBAAgB,oBAAoB,CAClC,MAAM,EAAE,OAAO,EACf,SAAS,EAAE,MAAM,GAChB,oBAAoB,CAWtB;AAED;;;;GAIG;AACH,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,GAAG,GAAE,MAAkC,GAAG,MAAM,EAAE,CAKrG;AAED,8DAA8D;AAC9D,wBAAgB,uBAAuB,CACrC,QAAQ,GAAE,MAAM,CAAC,QAA2B,EAC5C,OAAO,GAAE,MAAqB,GAC7B,OAAO,CAIT;AAWD;;;GAGG;AACH,wBAAsB,kBAAkB,CACtC,MAAM,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,OAAO,CAAC,OAAO,CAAC,EAC5C,IAAI,EAAE,MAAM,EAAE,EACd,OAAO,GAAE;IAAE,eAAe,CAAC,EAAE,OAAO,CAAA;CAAO,GAC1C,OAAO,CAAC,IAAI,CAAC,CAiBf;AAED;;;;;;;;;;GAUG;AACH,qBAAa,YAAa,SAAQ,kBAAkB;IAClD,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC,QAAQ,CAAY;IAC9C,QAAQ,CAAC,KAAK,8BAA8B;gBAEhC,OAAO,GAAE,MAAyB;IAK9C,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAS;IAEjC,OAAO,CAAC,KAAK;IAmBb,OAAO,CAAC,SAAS;IAIjB,+EAA+E;YACjE,SAAS;cAWP,YAAY,CAAC,KAAK,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;cAuBjD,cAAc,CAAC,KAAK,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;cAMnD,UAAU,CAAC,KAAK,EAAE,aAAa,EAAE,MAAM,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;CASjF"}
|