agent-steward 0.0.2 → 0.0.3
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 +25 -2
- package/CROSS_PLATFORM.md +11 -9
- package/README.md +9 -8
- package/ROADMAP-STRATEGY.md +93 -44
- package/ROADMAP.md +114 -999
- 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/dry-run.js +1 -1
- package/dist/core/file-watcher.js +9 -9
- package/dist/core/git-trigger.js +4 -4
- package/dist/core/lock.js +2 -4
- package/dist/core/one-shot.d.ts +27 -5
- package/dist/core/one-shot.d.ts.map +1 -1
- package/dist/core/one-shot.js +53 -10
- 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 +55 -35
- package/dist/core/record-history.js +22 -22
- package/dist/core/schedule-v2.d.ts +2 -2
- package/dist/core/schedule-v2.d.ts.map +1 -1
- package/dist/core/schedule-v2.js +7 -7
- package/dist/core/scheduler/at-fallback.d.ts +42 -0
- package/dist/core/scheduler/at-fallback.d.ts.map +1 -0
- package/dist/core/scheduler/at-fallback.js +70 -0
- package/dist/core/scheduler/linux.d.ts +3 -1
- package/dist/core/scheduler/linux.d.ts.map +1 -1
- package/dist/core/scheduler/linux.js +43 -7
- 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 +12 -1
- package/dist/core/scheduler/registry.d.ts +2 -0
- package/dist/core/scheduler/registry.d.ts.map +1 -1
- 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.js +2 -2
- package/dist/core/self-analysis.js +55 -55
- package/dist/core/summary.js +1 -1
- 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.js +33 -33
- package/dist/db/index.d.ts +2 -0
- package/dist/db/index.d.ts.map +1 -1
- package/dist/db/index.js +9 -1
- 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 +48 -0
- package/dist/db/run-resume.d.ts.map +1 -0
- package/dist/db/run-resume.js +137 -0
- package/dist/db/runs-repo.d.ts +120 -0
- package/dist/db/runs-repo.d.ts.map +1 -0
- package/dist/db/runs-repo.js +319 -0
- package/dist/db/schema.d.ts +16 -2
- package/dist/db/schema.d.ts.map +1 -1
- package/dist/db/schema.js +190 -35
- package/dist/index.d.ts +1 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +66 -36
- 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 +109 -0
- package/dist/rpc.d.ts.map +1 -1
- package/dist/rpc.js +89 -0
- package/dist/server.d.ts +2 -2
- package/dist/server.d.ts.map +1 -1
- package/dist/server.js +20 -19
- 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 +37 -9
- package/dist/workspaces.js +1 -1
- package/docs/ARCHITECTURE.md +110 -8
- package/docs/COMPATIBILITY.md +10 -6
- package/docs/CONCEPT.md +15 -3
- package/docs/CROSS_PLATFORM.ru.md +11 -9
- package/docs/CROSS_PLATFORM.zh.md +11 -9
- 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 +26 -7
- package/docs/README.zh.md +9 -8
- package/docs/V1-V2-COMPATIBILITY-PLAN.md +6 -6
- package/gui-experimental.cjs +8 -8
- package/index.js +1 -0
- package/locales/en.json +1 -0
- package/locales/ru.json +1 -0
- package/locales/zh.json +1 -0
- package/package.json +31 -10
- 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/dry-run.ts +26 -26
- 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 +9 -9
- package/src/core/matrix.ts +31 -31
- package/src/core/native-notify.ts +2 -2
- package/src/core/one-shot.ts +63 -13
- 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 +57 -37
- package/src/core/record-history.ts +40 -40
- package/src/core/retention.ts +3 -3
- package/src/core/savings.ts +1 -1
- package/src/core/schedule-gate.ts +12 -12
- package/src/core/schedule-v2.ts +24 -24
- package/src/core/scheduler/at-fallback.ts +113 -0
- package/src/core/scheduler/index.ts +3 -3
- package/src/core/scheduler/linux.ts +64 -13
- package/src/core/scheduler/logs.ts +1 -1
- package/src/core/scheduler/mac.ts +112 -60
- package/src/core/scheduler/posix.ts +15 -1
- package/src/core/scheduler/registry.ts +6 -4
- package/src/core/scheduler/windows.ts +295 -125
- package/src/core/secrets.ts +13 -13
- package/src/core/self-analysis.ts +61 -61
- package/src/core/session.ts +3 -3
- package/src/core/structured-log.ts +3 -3
- package/src/core/summary.ts +25 -25
- 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 +41 -41
- package/src/db/git-state-repo.ts +1 -1
- package/src/db/history-repo.ts +22 -22
- package/src/db/index.ts +16 -6
- package/src/db/metrics-repo.ts +10 -10
- package/src/db/migrate.ts +10 -10
- package/src/db/recovery.ts +3 -3
- package/src/db/run-journal.ts +212 -0
- package/src/db/run-resume.ts +220 -0
- package/src/db/runs-repo.ts +481 -0
- package/src/db/schema.ts +205 -44
- package/src/db/settings-repo.ts +2 -2
- package/src/db/tasks-repo.ts +10 -10
- package/src/db/templates-repo.ts +7 -7
- package/src/gui.tsx +1 -1
- package/src/history.ts +4 -4
- package/src/i18n.ts +7 -7
- package/src/index.ts +341 -304
- package/src/integrations.ts +6 -6
- package/src/notifications.ts +76 -76
- package/src/profiles.ts +98 -7
- package/src/rpc.ts +96 -1
- package/src/schtasks.ts +2 -2
- package/src/server.ts +43 -42
- 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 +45 -10
- package/src/workspaces.ts +16 -16
- 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
|
@@ -27,25 +27,25 @@ function readLogTail(filePath, maxLines) {
|
|
|
27
27
|
return [];
|
|
28
28
|
}
|
|
29
29
|
}
|
|
30
|
-
const USAGE_PREFIX =
|
|
30
|
+
const USAGE_PREFIX = "^\\s*(?:\\[.*?\\]\\s*)?";
|
|
31
31
|
const TOKEN_PATTERNS = [
|
|
32
|
-
new RegExp(USAGE_PREFIX +
|
|
33
|
-
new RegExp(USAGE_PREFIX +
|
|
32
|
+
new RegExp(USAGE_PREFIX + "(?:tokens?|token\\s+usage|usage)\\s*[:=]\\s*([0-9][0-9.,]*)\\s*([kKmM])?\\b", "i"),
|
|
33
|
+
new RegExp(USAGE_PREFIX + "(?:input|output|total)\\s+tokens?\\s*[:=]?\\s*([0-9][0-9.,]*)\\s*([kKmM])?\\b", "i"),
|
|
34
34
|
];
|
|
35
35
|
const COST_PATTERNS = [
|
|
36
|
-
new RegExp(USAGE_PREFIX +
|
|
37
|
-
new RegExp(USAGE_PREFIX +
|
|
36
|
+
new RegExp(USAGE_PREFIX + "(?:cost|total\\s+cost)\\s*[:=]?\\s*\\$\\s*([0-9]+(?:[.,][0-9]+)?)", "i"),
|
|
37
|
+
new RegExp(USAGE_PREFIX + "(?:cost|total\\s+cost)\\s*[:=]\\s*([0-9]+(?:[.,][0-9]+)?)\\s*(?:usd|\\$)", "i"),
|
|
38
38
|
];
|
|
39
39
|
function parseUsageValue(raw, suffix) {
|
|
40
|
-
const value = parseFloat(raw.replace(
|
|
40
|
+
const value = parseFloat(raw.replace(",", "."));
|
|
41
41
|
if (!Number.isFinite(value))
|
|
42
42
|
return undefined;
|
|
43
43
|
let mult = 1;
|
|
44
44
|
if (suffix) {
|
|
45
45
|
const s = suffix.toLowerCase();
|
|
46
|
-
if (s ===
|
|
46
|
+
if (s === "k")
|
|
47
47
|
mult = 1000;
|
|
48
|
-
else if (s ===
|
|
48
|
+
else if (s === "m")
|
|
49
49
|
mult = 1000000;
|
|
50
50
|
}
|
|
51
51
|
return Math.round(value * mult);
|
|
@@ -83,7 +83,7 @@ export function parseUsageFromLog(logFile) {
|
|
|
83
83
|
for (const pattern of COST_PATTERNS) {
|
|
84
84
|
const m = text.match(pattern);
|
|
85
85
|
if (m) {
|
|
86
|
-
result.costUsd = parseFloat(m[1].replace(
|
|
86
|
+
result.costUsd = parseFloat(m[1].replace(",", "."));
|
|
87
87
|
break;
|
|
88
88
|
}
|
|
89
89
|
}
|
|
@@ -114,7 +114,7 @@ async function triggerTask(taskName) {
|
|
|
114
114
|
return true;
|
|
115
115
|
}
|
|
116
116
|
catch (err) {
|
|
117
|
-
console.error(`[
|
|
117
|
+
console.error(`[agent-steward] Не удалось запустить задачу цепочки "${taskName}": ${err instanceof Error ? err.message : String(err)}`);
|
|
118
118
|
return false;
|
|
119
119
|
}
|
|
120
120
|
}
|
|
@@ -153,7 +153,7 @@ async function scheduleRetry(taskName) {
|
|
|
153
153
|
: count;
|
|
154
154
|
if (remaining <= 0) {
|
|
155
155
|
await clearRetryState(taskName);
|
|
156
|
-
console.log(`[
|
|
156
|
+
console.log(`[agent-steward] Повторы для "${taskName}" исчерпаны.`);
|
|
157
157
|
return false;
|
|
158
158
|
}
|
|
159
159
|
state[key] = remaining - 1;
|
|
@@ -169,12 +169,12 @@ async function scheduleRetry(taskName) {
|
|
|
169
169
|
windowsHide: true,
|
|
170
170
|
});
|
|
171
171
|
child.unref();
|
|
172
|
-
console.log(`[
|
|
172
|
+
console.log(`[agent-steward] Задача "${taskName}" будет повторена через ${delay} с ` +
|
|
173
173
|
`(осталось повторов: ${remaining - 1}).`);
|
|
174
174
|
return true;
|
|
175
175
|
}
|
|
176
176
|
catch (err) {
|
|
177
|
-
console.error(`[
|
|
177
|
+
console.error(`[agent-steward] Не удалось запланировать повтор "${taskName}": ${err instanceof Error ? err.message : String(err)}`);
|
|
178
178
|
return false;
|
|
179
179
|
}
|
|
180
180
|
}
|
|
@@ -189,10 +189,10 @@ async function runRetry(taskName, delaySec) {
|
|
|
189
189
|
await new Promise((resolve) => setTimeout(resolve, delay * 1000));
|
|
190
190
|
try {
|
|
191
191
|
await createSchedulerBackend().runTask(taskName);
|
|
192
|
-
console.log(`[
|
|
192
|
+
console.log(`[agent-steward] Повторный запуск задачи "${taskName}".`);
|
|
193
193
|
}
|
|
194
194
|
catch (err) {
|
|
195
|
-
console.error(`[
|
|
195
|
+
console.error(`[agent-steward] Повторный запуск "${taskName}" не удался: ${err instanceof Error ? err.message : String(err)}`);
|
|
196
196
|
}
|
|
197
197
|
}
|
|
198
198
|
/**
|
|
@@ -349,7 +349,7 @@ async function main() {
|
|
|
349
349
|
: definition?.nextTaskOnError || null;
|
|
350
350
|
const completed = finishRun(runId, st, durationMs, error, chainTarget, tokensResolved, costResolved, model, preFlightStatus, postFlightStatus);
|
|
351
351
|
if (!completed) {
|
|
352
|
-
console.error(`[
|
|
352
|
+
console.error(`[agent-steward] record-history: запись #${runId} уже завершена или не найдена.`);
|
|
353
353
|
return;
|
|
354
354
|
}
|
|
355
355
|
await handleCompletion(taskName, st, chainTarget, error, durationMs, tokensResolved, costResolved);
|
|
@@ -407,7 +407,7 @@ async function handleCompletion(taskName, st, chainTarget, error, durationMs, to
|
|
|
407
407
|
if (chainTarget) {
|
|
408
408
|
const started = await triggerTask(chainTarget);
|
|
409
409
|
if (started) {
|
|
410
|
-
console.log(`[
|
|
410
|
+
console.log(`[agent-steward] Запущена следующая задача в цепочке: ${chainTarget}`);
|
|
411
411
|
}
|
|
412
412
|
}
|
|
413
413
|
// DAG: после успеха проверяем задачи, у которых эта задача — одна из
|
|
@@ -420,12 +420,12 @@ async function handleCompletion(taskName, st, chainTarget, error, durationMs, to
|
|
|
420
420
|
for (const dependent of dependents) {
|
|
421
421
|
const started = await triggerTask(dependent);
|
|
422
422
|
if (started) {
|
|
423
|
-
console.log(`[
|
|
423
|
+
console.log(`[agent-steward] DAG: все зависимости выполнены, запущена задача "${dependent}".`);
|
|
424
424
|
}
|
|
425
425
|
}
|
|
426
426
|
}
|
|
427
427
|
catch (err) {
|
|
428
|
-
console.error(`[
|
|
428
|
+
console.error(`[agent-steward] DAG: не удалось запустить зависимые задачи: ${err instanceof Error ? err.message : String(err)}`);
|
|
429
429
|
}
|
|
430
430
|
}
|
|
431
431
|
else {
|
|
@@ -435,7 +435,7 @@ async function handleCompletion(taskName, st, chainTarget, error, durationMs, to
|
|
|
435
435
|
if (!retryScheduled && chainTarget) {
|
|
436
436
|
const started = await triggerTask(chainTarget);
|
|
437
437
|
if (started) {
|
|
438
|
-
console.log(`[
|
|
438
|
+
console.log(`[agent-steward] Запущена компенсирующая задача: ${chainTarget}`);
|
|
439
439
|
}
|
|
440
440
|
}
|
|
441
441
|
}
|
|
@@ -445,7 +445,7 @@ async function handleCompletion(taskName, st, chainTarget, error, durationMs, to
|
|
|
445
445
|
await rotateSessionIfNeeded(taskName);
|
|
446
446
|
}
|
|
447
447
|
catch (err) {
|
|
448
|
-
console.warn(`[
|
|
448
|
+
console.warn(`[agent-steward] Не удалось обновить состояние сессии "${taskName}": ${err instanceof Error ? err.message : String(err)}`);
|
|
449
449
|
}
|
|
450
450
|
}
|
|
451
451
|
/**
|
|
@@ -465,7 +465,7 @@ function isDirectInvocation() {
|
|
|
465
465
|
}
|
|
466
466
|
if (isDirectInvocation()) {
|
|
467
467
|
main().catch((err) => {
|
|
468
|
-
console.error(`[
|
|
468
|
+
console.error(`[agent-steward] record-history: не удалось записать результат запуска: ${err instanceof Error ? err.message : String(err)}`);
|
|
469
469
|
process.exit(1);
|
|
470
470
|
});
|
|
471
471
|
}
|
|
@@ -29,10 +29,10 @@ export interface ParsedCron {
|
|
|
29
29
|
/** День недели 0(Вс)..6(Сб) или null, если поле = «*» и не содержит «#». */
|
|
30
30
|
dayOfWeek: Set<number> | null;
|
|
31
31
|
/** Пары {weekday, n} для «#». */
|
|
32
|
-
nthWeekday:
|
|
32
|
+
nthWeekday: {
|
|
33
33
|
weekday: number;
|
|
34
34
|
n: number;
|
|
35
|
-
}
|
|
35
|
+
}[];
|
|
36
36
|
}
|
|
37
37
|
/** Разворачивает «@every 15m|2h|1d» в обычный cron. */
|
|
38
38
|
export declare function normalizeCron(expr: string): string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"schedule-v2.d.ts","sourceRoot":"","sources":["../../src/core/schedule-v2.ts"],"names":[],"mappings":"AAeA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAalD,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,MAAM,CAAC;IACzC,IAAI,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,EAAE,EAAE,MAAM,CAAC;IACzD,OAAO,EAAE,MAAM,CAAC;CACjB;AAmBD,wBAAgB,mBAAmB,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CASvD;AAED,0EAA0E;AAC1E,wBAAgB,cAAc,IAAI,MAAM,CAMvC;AAED,kFAAkF;AAClF,wBAAgB,UAAU,CAAC,IAAI,EAAE,IAAI,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,UAAU,CAsBpE;AAED,gGAAgG;AAChG,wBAAgB,SAAS,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,IAAI,CA2BhH;AAwED,MAAM,WAAW,UAAU;IACzB,oDAAoD;IACpD,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IACpB,IAAI,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IAClB,4DAA4D;IAC5D,UAAU,EAAE,GAAG,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC;IAC/B,wDAAwD;IACxD,OAAO,EAAE,OAAO,CAAC;IACjB,KAAK,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IACnB,4EAA4E;IAC5E,SAAS,EAAE,GAAG,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC;IAC9B,iCAAiC;IACjC,UAAU,EAAE
|
|
1
|
+
{"version":3,"file":"schedule-v2.d.ts","sourceRoot":"","sources":["../../src/core/schedule-v2.ts"],"names":[],"mappings":"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"}
|
package/dist/core/schedule-v2.js
CHANGED
|
@@ -129,10 +129,10 @@ function expandField(token, min, max, names) {
|
|
|
129
129
|
let item = raw.trim().toUpperCase();
|
|
130
130
|
if (!item)
|
|
131
131
|
throw new Error(t("schedule.error.cronEmptyItem", { token }));
|
|
132
|
-
if (names
|
|
132
|
+
if (names?.[item] !== undefined)
|
|
133
133
|
item = String(names[item]);
|
|
134
134
|
// шаг: a-b/n или */n
|
|
135
|
-
const stepMatch =
|
|
135
|
+
const stepMatch = /^(.*)\/([0-9]+)$/.exec(item);
|
|
136
136
|
let step = 1;
|
|
137
137
|
if (stepMatch) {
|
|
138
138
|
item = (stepMatch[1] ?? "").trim();
|
|
@@ -151,13 +151,13 @@ function expandField(token, min, max, names) {
|
|
|
151
151
|
result.add(v);
|
|
152
152
|
continue;
|
|
153
153
|
}
|
|
154
|
-
const rangeMatch =
|
|
154
|
+
const rangeMatch = /^([0-9A-Z]+)-([0-9A-Z]+)$/.exec(item);
|
|
155
155
|
if (rangeMatch) {
|
|
156
156
|
let aToken = rangeMatch[1];
|
|
157
157
|
let bToken = rangeMatch[2];
|
|
158
|
-
if (names
|
|
158
|
+
if (names?.[aToken] !== undefined)
|
|
159
159
|
aToken = String(names[aToken]);
|
|
160
|
-
if (names
|
|
160
|
+
if (names?.[bToken] !== undefined)
|
|
161
161
|
bToken = String(names[bToken]);
|
|
162
162
|
const a = Number(aToken);
|
|
163
163
|
const b = Number(bToken);
|
|
@@ -182,7 +182,7 @@ function expandField(token, min, max, names) {
|
|
|
182
182
|
/** Разворачивает «@every 15m|2h|1d» в обычный cron. */
|
|
183
183
|
export function normalizeCron(expr) {
|
|
184
184
|
const trimmed = expr.trim();
|
|
185
|
-
const match =
|
|
185
|
+
const match = /^@every\s+(\d+)([mhd])$/i.exec(trimmed);
|
|
186
186
|
if (!match)
|
|
187
187
|
return trimmed;
|
|
188
188
|
const n = Number(match[1]);
|
|
@@ -230,7 +230,7 @@ export function parseCron(expr) {
|
|
|
230
230
|
const tokens = dowF.trim().toUpperCase().split(",").map((s) => s.trim());
|
|
231
231
|
const kept = [];
|
|
232
232
|
for (const token of tokens) {
|
|
233
|
-
const hash =
|
|
233
|
+
const hash = /^([0-9A-Z]+)#([1-5])$/.exec(token);
|
|
234
234
|
if (hash) {
|
|
235
235
|
let dToken = hash[1];
|
|
236
236
|
if (DOW_NAMES[dToken] !== undefined)
|
|
@@ -0,0 +1,42 @@
|
|
|
1
|
+
import type { RegistryEntry } from "./registry.js";
|
|
2
|
+
/**
|
|
3
|
+
* Fallback для one-shot задач, когда утилита `at` не установлена.
|
|
4
|
+
*
|
|
5
|
+
* Запускает отвязанный (detached) `/bin/bash`, который спит до `runAt` и
|
|
6
|
+
* затем выполняет команду задачи. Это не полноценная замена `atd`:
|
|
7
|
+
* - процесс не переживает перезагрузку машины;
|
|
8
|
+
* - не переживает ручной kill;
|
|
9
|
+
* - не виден в `atq`.
|
|
10
|
+
* Поэтому fallback используется только как последнее средство и пишет
|
|
11
|
+
* предупреждение в лог. Если `at` доступен — вызывается он.
|
|
12
|
+
*/
|
|
13
|
+
export interface DetachedOneShotSpawn {
|
|
14
|
+
once(event: "error", listener: (err: Error) => void): unknown;
|
|
15
|
+
once(event: "spawn", listener: () => void): unknown;
|
|
16
|
+
unref(): unknown;
|
|
17
|
+
pid?: number;
|
|
18
|
+
}
|
|
19
|
+
export type DetachedOneShotSpawnFn = (file: string, args: string[], options: {
|
|
20
|
+
detached: boolean;
|
|
21
|
+
stdio: "ignore";
|
|
22
|
+
}) => DetachedOneShotSpawn;
|
|
23
|
+
export interface ScheduleAtFallbackDeps {
|
|
24
|
+
spawnFn?: DetachedOneShotSpawnFn;
|
|
25
|
+
now?: () => number;
|
|
26
|
+
}
|
|
27
|
+
/** Ошибка `spawn("at")`, означающая, что бинарник не найден. */
|
|
28
|
+
export declare function isAtMissingError(err: unknown): boolean;
|
|
29
|
+
/** Сколько секунд осталось до `runAt` (0, если момент уже прошёл). */
|
|
30
|
+
export declare function computeDelaySeconds(runAt: string, nowMs: number): number;
|
|
31
|
+
/** Скрипт для `/bin/bash -c`: подождать и выполнить команду задачи. */
|
|
32
|
+
export declare function buildDetachedOneShotScript(entry: RegistryEntry, command: string, nowMs: number): string;
|
|
33
|
+
/** Является ли сохранённый id задания pid-ом fallback-процесса. */
|
|
34
|
+
export declare function isPidJobId(jobId: string | undefined): boolean;
|
|
35
|
+
/**
|
|
36
|
+
* Запускает отвязанный one-shot и возвращает `pid:<pid>` для `cancelAt`.
|
|
37
|
+
* Промис резолвится сразу после успешного `spawn`, не дожидаясь выполнения.
|
|
38
|
+
*/
|
|
39
|
+
export declare function scheduleAtFallback(entry: RegistryEntry, command: string, deps?: ScheduleAtFallbackDeps): Promise<string>;
|
|
40
|
+
/** Снимает fallback-процесс. Ошибки (процесс уже завершился) игнорируются. */
|
|
41
|
+
export declare function cancelAtFallback(jobId: string): boolean;
|
|
42
|
+
//# sourceMappingURL=at-fallback.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"at-fallback.d.ts","sourceRoot":"","sources":["../../../src/core/scheduler/at-fallback.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAEnD;;;;;;;;;;GAUG;AAEH,MAAM,WAAW,oBAAoB;IACnC,IAAI,CAAC,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,CAAC,GAAG,EAAE,KAAK,KAAK,IAAI,GAAG,OAAO,CAAC;IAC9D,IAAI,CAAC,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,IAAI,GAAG,OAAO,CAAC;IACpD,KAAK,IAAI,OAAO,CAAC;IACjB,GAAG,CAAC,EAAE,MAAM,CAAC;CACd;AAED,MAAM,MAAM,sBAAsB,GAAG,CACnC,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EAAE,EACd,OAAO,EAAE;IAAE,QAAQ,EAAE,OAAO,CAAC;IAAC,KAAK,EAAE,QAAQ,CAAA;CAAE,KAC5C,oBAAoB,CAAC;AAE1B,MAAM,WAAW,sBAAsB;IACrC,OAAO,CAAC,EAAE,sBAAsB,CAAC;IACjC,GAAG,CAAC,EAAE,MAAM,MAAM,CAAC;CACpB;AAID,gEAAgE;AAChE,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,OAAO,GAAG,OAAO,CAMtD;AAED,sEAAsE;AACtE,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,CAMxE;AAED,uEAAuE;AACvE,wBAAgB,0BAA0B,CACxC,KAAK,EAAE,aAAa,EACpB,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,MAAM,GACZ,MAAM,CAMR;AAED,mEAAmE;AACnE,wBAAgB,UAAU,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,CAE7D;AAMD;;;GAGG;AACH,wBAAsB,kBAAkB,CACtC,KAAK,EAAE,aAAa,EACpB,OAAO,EAAE,MAAM,EACf,IAAI,GAAE,sBAA2B,GAChC,OAAO,CAAC,MAAM,CAAC,CAgBjB;AAED,8EAA8E;AAC9E,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAUvD"}
|
|
@@ -0,0 +1,70 @@
|
|
|
1
|
+
import { spawn } from "node:child_process";
|
|
2
|
+
const PID_JOB_PREFIX = "pid:";
|
|
3
|
+
/** Ошибка `spawn("at")`, означающая, что бинарник не найден. */
|
|
4
|
+
export function isAtMissingError(err) {
|
|
5
|
+
if (!err || typeof err !== "object")
|
|
6
|
+
return false;
|
|
7
|
+
const code = err.code;
|
|
8
|
+
if (code === "ENOENT")
|
|
9
|
+
return true;
|
|
10
|
+
const message = err.message;
|
|
11
|
+
return typeof message === "string" && /ENOENT|not found|no such file/i.test(message);
|
|
12
|
+
}
|
|
13
|
+
/** Сколько секунд осталось до `runAt` (0, если момент уже прошёл). */
|
|
14
|
+
export function computeDelaySeconds(runAt, nowMs) {
|
|
15
|
+
const target = Date.parse(runAt);
|
|
16
|
+
if (!Number.isFinite(target)) {
|
|
17
|
+
throw new Error(`Некорректное время one-shot: «${runAt}».`);
|
|
18
|
+
}
|
|
19
|
+
return Math.max(0, Math.ceil((target - nowMs) / 1000));
|
|
20
|
+
}
|
|
21
|
+
/** Скрипт для `/bin/bash -c`: подождать и выполнить команду задачи. */
|
|
22
|
+
export function buildDetachedOneShotScript(entry, command, nowMs) {
|
|
23
|
+
if (!entry.runAt) {
|
|
24
|
+
throw new Error(`Задача "${entry.name}": не задано runAt для one-shot.`);
|
|
25
|
+
}
|
|
26
|
+
const delay = computeDelaySeconds(entry.runAt, nowMs);
|
|
27
|
+
return `sleep ${delay}; ${command}`;
|
|
28
|
+
}
|
|
29
|
+
/** Является ли сохранённый id задания pid-ом fallback-процесса. */
|
|
30
|
+
export function isPidJobId(jobId) {
|
|
31
|
+
return typeof jobId === "string" && jobId.startsWith(PID_JOB_PREFIX);
|
|
32
|
+
}
|
|
33
|
+
function pidFromJobId(jobId) {
|
|
34
|
+
return Number.parseInt(jobId.slice(PID_JOB_PREFIX.length), 10);
|
|
35
|
+
}
|
|
36
|
+
/**
|
|
37
|
+
* Запускает отвязанный one-shot и возвращает `pid:<pid>` для `cancelAt`.
|
|
38
|
+
* Промис резолвится сразу после успешного `spawn`, не дожидаясь выполнения.
|
|
39
|
+
*/
|
|
40
|
+
export async function scheduleAtFallback(entry, command, deps = {}) {
|
|
41
|
+
const spawnFn = deps.spawnFn ?? spawn;
|
|
42
|
+
const now = deps.now ? deps.now() : Date.now();
|
|
43
|
+
const script = buildDetachedOneShotScript(entry, command, now);
|
|
44
|
+
return new Promise((resolve, reject) => {
|
|
45
|
+
const child = spawnFn("/bin/bash", ["-c", script], {
|
|
46
|
+
detached: true,
|
|
47
|
+
stdio: "ignore",
|
|
48
|
+
});
|
|
49
|
+
child.once("error", reject);
|
|
50
|
+
child.once("spawn", () => {
|
|
51
|
+
child.unref();
|
|
52
|
+
resolve(`${PID_JOB_PREFIX}${child.pid ?? 0}`);
|
|
53
|
+
});
|
|
54
|
+
});
|
|
55
|
+
}
|
|
56
|
+
/** Снимает fallback-процесс. Ошибки (процесс уже завершился) игнорируются. */
|
|
57
|
+
export function cancelAtFallback(jobId) {
|
|
58
|
+
if (!isPidJobId(jobId))
|
|
59
|
+
return false;
|
|
60
|
+
const pid = pidFromJobId(jobId);
|
|
61
|
+
if (!Number.isFinite(pid) || pid <= 0)
|
|
62
|
+
return false;
|
|
63
|
+
try {
|
|
64
|
+
process.kill(pid, "SIGTERM");
|
|
65
|
+
return true;
|
|
66
|
+
}
|
|
67
|
+
catch {
|
|
68
|
+
return false;
|
|
69
|
+
}
|
|
70
|
+
}
|
|
@@ -13,9 +13,11 @@ import type { RegistryEntry } from "./registry.js";
|
|
|
13
13
|
*/
|
|
14
14
|
export declare class LinuxScheduler extends PosixSchedulerBase {
|
|
15
15
|
readonly platform: NodeJS.Platform;
|
|
16
|
-
readonly title = "
|
|
16
|
+
readonly title = "agent-steward by DeadSno";
|
|
17
17
|
private readonly blockBegin;
|
|
18
18
|
private readonly blockEnd;
|
|
19
|
+
private readonly legacyBlockBegin;
|
|
20
|
+
private readonly legacyBlockEnd;
|
|
19
21
|
private readonly ownsLegacyBlock;
|
|
20
22
|
constructor(profile?: string);
|
|
21
23
|
private cronLine;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"linux.d.ts","sourceRoot":"","sources":["../../../src/core/scheduler/linux.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"linux.d.ts","sourceRoot":"","sources":["../../../src/core/scheduler/linux.ts"],"names":[],"mappings":"AAcA,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;IAkBzB,0DAA0D;IAC1D,OAAO,CAAC,UAAU;IA+BlB,mDAAmD;YACrC,YAAY;IAgB1B,8CAA8C;YAChC,cAAc;IA4B5B,8CAA8C;IAC9C,OAAO,CAAC,SAAS;IAKjB;;;OAGG;YACW,UAAU;IAuExB,oDAAoD;YACtC,QAAQ;cAgBN,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;CAYjF"}
|
|
@@ -2,10 +2,11 @@ import { execFile, spawn } from "node:child_process";
|
|
|
2
2
|
import path from "node:path";
|
|
3
3
|
import { promisify } from "node:util";
|
|
4
4
|
import { buildAtTimestamp } from "../one-shot.js";
|
|
5
|
+
import { cancelAtFallback, isAtMissingError, isPidJobId, scheduleAtFallback, } from "./at-fallback.js";
|
|
5
6
|
import { needsPollMode } from "../schedule-v2.js";
|
|
6
7
|
import { LockManager, withLockWait } from "../lock.js";
|
|
7
8
|
import { getBasePluginDir, getProfileName } from "../../profiles.js";
|
|
8
|
-
import { taskFolderNameForProfile } from "../../types.js";
|
|
9
|
+
import { taskFolderNameForProfile, legacyTaskFolderNameForProfile } from "../../types.js";
|
|
9
10
|
import { PosixSchedulerBase, shellQuote } from "./posix.js";
|
|
10
11
|
const execFileAsync = promisify(execFile);
|
|
11
12
|
/**
|
|
@@ -23,11 +24,15 @@ export class LinuxScheduler extends PosixSchedulerBase {
|
|
|
23
24
|
constructor(profile = getProfileName()) {
|
|
24
25
|
super("linux", profile);
|
|
25
26
|
this.platform = "linux";
|
|
26
|
-
this.title = "
|
|
27
|
+
this.title = "agent-steward by DeadSno";
|
|
27
28
|
const folderName = taskFolderNameForProfile(profile);
|
|
29
|
+
const legacyFolderName = legacyTaskFolderNameForProfile(profile);
|
|
28
30
|
this.blockBegin = `# >>> opencode-scheduler:${folderName} >>>`;
|
|
29
31
|
this.blockEnd = `# <<< opencode-scheduler:${folderName} <<<`;
|
|
30
|
-
this.
|
|
32
|
+
this.legacyBlockBegin = `# >>> opencode-scheduler:${legacyFolderName} >>>`;
|
|
33
|
+
this.legacyBlockEnd = `# <<< opencode-scheduler:${legacyFolderName} <<<`;
|
|
34
|
+
// Древний бессуффиксный блок принадлежит только профилю default.
|
|
35
|
+
this.ownsLegacyBlock = profile === "default";
|
|
31
36
|
}
|
|
32
37
|
cronLine(entry) {
|
|
33
38
|
if (entry.triggerType !== "cron") {
|
|
@@ -39,7 +44,11 @@ export class LinuxScheduler extends PosixSchedulerBase {
|
|
|
39
44
|
// crontab понимает только 5-полевой cron. Расширенные выражения (L, #,
|
|
40
45
|
// списки, @daily и т.п.) нельзя писать в crontab как есть — опрашиваем
|
|
41
46
|
// каждую минуту, а решение о запуске принимает gate во враппере.
|
|
42
|
-
|
|
47
|
+
// Задачи с чужой IANA-таймзоной (не системной) тоже уходят в poll-режим,
|
|
48
|
+
// иначе crontab сработает по системному времени, а не по таймзоне задачи.
|
|
49
|
+
const schedule = needsPollMode(entry.schedule, entry.timezone)
|
|
50
|
+
? "* * * * *"
|
|
51
|
+
: entry.schedule;
|
|
43
52
|
return `${schedule} ${cmd}`;
|
|
44
53
|
}
|
|
45
54
|
renderBlock(entries) {
|
|
@@ -80,8 +89,12 @@ export class LinuxScheduler extends PosixSchedulerBase {
|
|
|
80
89
|
const legacyBegin = "# >>> opencode-scheduler >>>";
|
|
81
90
|
const legacyEnd = "# <<< opencode-scheduler <<<";
|
|
82
91
|
const ownsLegacy = this.ownsLegacyBlock;
|
|
83
|
-
const isBegin = (line) => line === this.blockBegin ||
|
|
84
|
-
|
|
92
|
+
const isBegin = (line) => line === this.blockBegin ||
|
|
93
|
+
line === this.legacyBlockBegin ||
|
|
94
|
+
(ownsLegacy && line === legacyBegin);
|
|
95
|
+
const isEnd = (line) => line === this.blockEnd ||
|
|
96
|
+
line === this.legacyBlockEnd ||
|
|
97
|
+
(ownsLegacy && line === legacyEnd);
|
|
85
98
|
const lines = content.split(/\r?\n/);
|
|
86
99
|
const result = [];
|
|
87
100
|
let inside = false;
|
|
@@ -164,6 +177,22 @@ export class LinuxScheduler extends PosixSchedulerBase {
|
|
|
164
177
|
stderr += String(chunk);
|
|
165
178
|
});
|
|
166
179
|
child.on("error", (err) => {
|
|
180
|
+
// P1-7.T1.2: `at` может отсутствовать (минимальные образы, Alpine и
|
|
181
|
+
// т.п.). Не роняем задачу — планируем отвязанный bash-процесс.
|
|
182
|
+
if (isAtMissingError(err)) {
|
|
183
|
+
void scheduleAtFallback(entry, this.atCommand(entry))
|
|
184
|
+
.then((jobId) => {
|
|
185
|
+
console.warn(`[agent-steward] at не найден — задача "${entry.name}" запланирована через fallback (${jobId}). ` +
|
|
186
|
+
"Fallback не переживает перезагрузку; установите пакет at.");
|
|
187
|
+
resolve(jobId);
|
|
188
|
+
})
|
|
189
|
+
.catch((fallbackErr) => {
|
|
190
|
+
reject(new Error(`Не удалось вызвать at и fallback-планировщик: ${fallbackErr instanceof Error
|
|
191
|
+
? fallbackErr.message
|
|
192
|
+
: String(fallbackErr)}`));
|
|
193
|
+
});
|
|
194
|
+
return;
|
|
195
|
+
}
|
|
167
196
|
reject(new Error(`Не удалось вызвать at (установите пакет at): ${err instanceof Error ? err.message : String(err)}`));
|
|
168
197
|
});
|
|
169
198
|
child.on("close", (code) => {
|
|
@@ -171,7 +200,8 @@ export class LinuxScheduler extends PosixSchedulerBase {
|
|
|
171
200
|
reject(new Error(`at завершился с кодом ${code}: ${stderr.trim() || stdout.trim()}`));
|
|
172
201
|
return;
|
|
173
202
|
}
|
|
174
|
-
|
|
203
|
+
// GNU at пишет «job N at …» в stderr, а не в stdout — ищем в обоих потоках.
|
|
204
|
+
const match = /job\s+(\d+)/i.exec(stdout + "\n" + stderr);
|
|
175
205
|
if (!match) {
|
|
176
206
|
reject(new Error(`at не вернул id задания: ${stdout.trim()}`));
|
|
177
207
|
return;
|
|
@@ -185,6 +215,12 @@ export class LinuxScheduler extends PosixSchedulerBase {
|
|
|
185
215
|
async cancelAt(entry) {
|
|
186
216
|
if (!entry.atJobId)
|
|
187
217
|
return;
|
|
218
|
+
if (isPidJobId(entry.atJobId)) {
|
|
219
|
+
// P1-7.T1.2: снимаем fallback-процесс, а не at-задание.
|
|
220
|
+
cancelAtFallback(entry.atJobId);
|
|
221
|
+
delete entry.atJobId;
|
|
222
|
+
return;
|
|
223
|
+
}
|
|
188
224
|
try {
|
|
189
225
|
await execFileAsync("atrm", [entry.atJobId]);
|
|
190
226
|
}
|
|
@@ -1,15 +1,21 @@
|
|
|
1
1
|
import { PosixSchedulerBase } from "./posix.js";
|
|
2
2
|
import type { RegistryEntry } from "./registry.js";
|
|
3
|
+
/** Один элемент StartCalendarInterval. */
|
|
4
|
+
interface LaunchdCalendar {
|
|
5
|
+
Minute?: number;
|
|
6
|
+
Hour?: number;
|
|
7
|
+
Weekday?: number;
|
|
8
|
+
Month?: number;
|
|
9
|
+
Day?: number;
|
|
10
|
+
}
|
|
3
11
|
/** Расписание launchd, полученное из cron-выражения. */
|
|
4
12
|
interface LaunchdSchedule {
|
|
5
|
-
/** StartInterval в секундах (для
|
|
13
|
+
/** StartInterval в секундах (для poll-режима «каждую минуту»). */
|
|
6
14
|
interval?: number;
|
|
7
|
-
/** StartCalendarInterval (
|
|
8
|
-
calendar?:
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
Weekday?: number;
|
|
12
|
-
};
|
|
15
|
+
/** Одиночный StartCalendarInterval (фиксированное время). */
|
|
16
|
+
calendar?: LaunchdCalendar;
|
|
17
|
+
/** Массив StartCalendarInterval (например, минуты 0,15,30,45). */
|
|
18
|
+
calendars?: LaunchdCalendar[];
|
|
13
19
|
}
|
|
14
20
|
/**
|
|
15
21
|
* Преобразует поддерживаемое 5-полевое cron-выражение в расписание launchd.
|
|
@@ -25,7 +31,7 @@ export declare function cronToLaunchdSchedule(cron: string): LaunchdSchedule;
|
|
|
25
31
|
*/
|
|
26
32
|
export declare class MacScheduler extends PosixSchedulerBase {
|
|
27
33
|
readonly platform: NodeJS.Platform;
|
|
28
|
-
readonly title = "
|
|
34
|
+
readonly title = "agent-steward by DeadSno";
|
|
29
35
|
constructor(profile?: string);
|
|
30
36
|
private readonly profile;
|
|
31
37
|
private label;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mac.d.ts","sourceRoot":"","sources":["../../../src/core/scheduler/mac.ts"],"names":[],"mappings":"
|
|
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;AAgBnD,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;;;;;;GAMG;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,gFAAgF;YAClE,SAAS;cAQP,YAAY,CAAC,KAAK,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;cAQjD,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;CAQjF"}
|