agent-steward 0.0.4 → 0.0.6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +309 -2
- package/CROSS_PLATFORM.md +19 -0
- package/README.md +55 -8
- package/ROADMAP-STRATEGY.md +22 -19
- package/ROADMAP.md +230 -159
- package/dist/cli.d.ts +3 -0
- package/dist/cli.d.ts.map +1 -0
- package/dist/cli.js +356 -0
- package/dist/core/analytics.d.ts +6 -0
- package/dist/core/analytics.d.ts.map +1 -1
- package/dist/core/analytics.js +20 -3
- package/dist/core/audit.d.ts +6 -0
- package/dist/core/audit.d.ts.map +1 -1
- package/dist/core/audit.js +24 -0
- package/dist/core/budget.d.ts +118 -0
- package/dist/core/budget.d.ts.map +1 -0
- package/dist/core/budget.js +206 -0
- package/dist/core/cron-to-schtasks.d.ts.map +1 -1
- package/dist/core/cron-to-schtasks.js +38 -0
- package/dist/core/dry-run.d.ts +26 -1
- package/dist/core/dry-run.d.ts.map +1 -1
- package/dist/core/dry-run.js +199 -8
- package/dist/core/execution.d.ts +203 -0
- package/dist/core/execution.d.ts.map +1 -0
- package/dist/core/execution.js +309 -0
- package/dist/core/feedback.d.ts +192 -0
- package/dist/core/feedback.d.ts.map +1 -0
- package/dist/core/feedback.js +426 -0
- package/dist/core/gate-integrity.d.ts +71 -0
- package/dist/core/gate-integrity.d.ts.map +1 -0
- package/dist/core/gate-integrity.js +275 -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/local-ai.d.ts.map +1 -1
- package/dist/core/local-ai.js +7 -3
- 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 +8 -0
- package/dist/core/matrix.d.ts.map +1 -1
- package/dist/core/matrix.js +132 -17
- package/dist/core/mission.d.ts +103 -0
- package/dist/core/mission.d.ts.map +1 -0
- package/dist/core/mission.js +374 -0
- package/dist/core/opencode-models.d.ts +2 -2
- package/dist/core/opencode-models.d.ts.map +1 -1
- package/dist/core/opencode-models.js +28 -21
- package/dist/core/opencode-usage.d.ts +35 -0
- package/dist/core/opencode-usage.d.ts.map +1 -0
- package/dist/core/opencode-usage.js +132 -0
- package/dist/core/pipeline-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 +78 -0
- package/dist/core/pipeline-map.d.ts +52 -0
- package/dist/core/pipeline-map.d.ts.map +1 -0
- package/dist/core/pipeline-map.js +208 -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 +27 -2
- package/dist/core/ps-wrapper.d.ts.map +1 -1
- package/dist/core/ps-wrapper.js +424 -65
- package/dist/core/record-history.d.ts.map +1 -1
- package/dist/core/record-history.js +206 -33
- package/dist/core/router/rules.d.ts.map +1 -1
- package/dist/core/router/rules.js +6 -0
- package/dist/core/run-mode.d.ts +12 -0
- package/dist/core/run-mode.d.ts.map +1 -0
- package/dist/core/run-mode.js +17 -0
- package/dist/core/scheduler/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/logs.d.ts +4 -0
- package/dist/core/scheduler/logs.d.ts.map +1 -1
- package/dist/core/scheduler/logs.js +25 -1
- package/dist/core/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/secrets.d.ts.map +1 -1
- package/dist/core/secrets.js +18 -8
- package/dist/core/self-analysis.d.ts +32 -2
- package/dist/core/self-analysis.d.ts.map +1 -1
- package/dist/core/self-analysis.js +38 -27
- package/dist/core/shutdown.d.ts +33 -2
- package/dist/core/shutdown.d.ts.map +1 -1
- package/dist/core/shutdown.js +58 -2
- package/dist/core/structured-log.d.ts +37 -1
- package/dist/core/structured-log.d.ts.map +1 -1
- package/dist/core/structured-log.js +37 -0
- package/dist/core/usage-surface.d.ts +25 -0
- package/dist/core/usage-surface.d.ts.map +1 -0
- package/dist/core/usage-surface.js +41 -0
- package/dist/core/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 +19 -0
- package/dist/core/wrappers/bash.d.ts.map +1 -1
- package/dist/core/wrappers/bash.js +230 -27
- 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 +70 -5
- package/dist/db/history-repo.d.ts.map +1 -1
- package/dist/db/history-repo.js +170 -29
- package/dist/db/metrics-repo.d.ts +20 -2
- package/dist/db/metrics-repo.d.ts.map +1 -1
- package/dist/db/metrics-repo.js +35 -13
- package/dist/db/migrate.d.ts.map +1 -1
- package/dist/db/migrate.js +37 -17
- package/dist/db/recovery.d.ts +3 -1
- package/dist/db/recovery.d.ts.map +1 -1
- package/dist/db/recovery.js +11 -5
- 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 +91 -60
- package/dist/db/schema.d.ts +2 -2
- package/dist/db/schema.d.ts.map +1 -1
- package/dist/db/schema.js +132 -2
- package/dist/db/templates-repo.d.ts +2 -2
- package/dist/db/templates-repo.d.ts.map +1 -1
- package/dist/db/templates-repo.js +5 -3
- package/dist/history.d.ts +7 -2
- package/dist/history.d.ts.map +1 -1
- package/dist/history.js +4 -2
- package/dist/hook-output.d.ts +2 -0
- package/dist/hook-output.d.ts.map +1 -0
- package/dist/hook-output.js +31 -0
- package/dist/i18n.d.ts +5 -0
- package/dist/i18n.d.ts.map +1 -1
- package/dist/i18n.js +11 -4
- package/dist/index.d.ts +375 -47
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +1344 -192
- package/dist/notifications.d.ts +53 -2
- package/dist/notifications.d.ts.map +1 -1
- package/dist/notifications.js +168 -21
- package/dist/profiles.d.ts.map +1 -1
- package/dist/profiles.js +82 -10
- package/dist/rpc.d.ts +354 -0
- package/dist/rpc.d.ts.map +1 -1
- package/dist/rpc.js +145 -0
- package/dist/server.d.ts +32 -2
- package/dist/server.d.ts.map +1 -1
- package/dist/server.js +154 -30
- package/dist/settings.d.ts +44 -2
- package/dist/settings.d.ts.map +1 -1
- package/dist/settings.js +85 -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 +21 -0
- package/dist/task-transfer.d.ts.map +1 -1
- package/dist/task-transfer.js +64 -3
- package/dist/templates.d.ts +2 -2
- package/dist/templates.d.ts.map +1 -1
- package/dist/templates.js +3 -3
- package/dist/types.d.ts +22 -2
- package/dist/types.d.ts.map +1 -1
- package/dist/workspaces.d.ts.map +1 -1
- package/dist/workspaces.js +34 -11
- package/docs/ARCHITECTURE.md +319 -66
- 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 +28 -10
- package/docs/FEATURES.md +129 -7
- package/docs/FEATURES.zh.md +97 -6
- package/docs/MIGRATION.md +2 -2
- package/docs/PIPELINE.md +293 -0
- package/docs/QA-A2-GUI-TUI.md +205 -0
- package/docs/README.ru.md +43 -4
- package/docs/README.zh.md +44 -4
- package/docs/SAFETY.md +23 -3
- package/gui-experimental.cjs +9 -8
- package/locales/en.json +58 -3
- package/locales/ru.json +58 -3
- package/locales/zh.json +58 -3
- package/opencode.pipeline.yaml +35 -0
- package/package.json +36 -4
- package/scripts/check-eslint-baseline.mjs +139 -0
- package/scripts/gen-test-plan-counters.mjs +117 -0
- package/scripts/github-ci-fetch.ps1 +37 -0
- package/scripts/pl-commit.ps1 +112 -0
- package/scripts/qa-a2-commit.ps1 +104 -0
- package/scripts/test-home.mjs +107 -0
- package/skills/scheduled-job-best-practices/SKILL.md +95 -1
- package/skills/scheduled-job-best-practices/references/recipes.md +139 -0
- package/src/cli.ts +417 -0
- package/src/core/analytics.ts +27 -4
- package/src/core/audit.ts +25 -0
- package/src/core/budget.ts +340 -0
- package/src/core/cron-to-schtasks.ts +42 -0
- package/src/core/dry-run.ts +235 -12
- package/src/core/execution.ts +538 -0
- package/src/core/feedback.ts +582 -0
- package/src/core/file-watcher.ts +2 -2
- package/src/core/gate-integrity.ts +330 -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/local-ai.ts +7 -3
- package/src/core/lock.ts +178 -37
- package/src/core/matrix.ts +158 -52
- package/src/core/mission.ts +531 -0
- package/src/core/native-notify.ts +1 -1
- package/src/core/opencode-models.ts +30 -21
- package/src/core/opencode-usage.ts +182 -0
- package/src/core/pipeline-apply.ts +158 -0
- package/src/core/pipeline-io.ts +96 -0
- package/src/core/pipeline-map.ts +283 -0
- package/src/core/pipeline-spec.ts +775 -0
- package/src/core/ps-wrapper.ts +435 -66
- package/src/core/record-history.ts +258 -81
- package/src/core/router/rules.ts +6 -0
- package/src/core/run-mode.ts +19 -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 +34 -3
- 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 +26 -19
- package/src/core/self-analysis.ts +75 -29
- package/src/core/shutdown.ts +90 -4
- package/src/core/structured-log.ts +89 -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/usage-surface.ts +70 -0
- package/src/core/worktree-run.ts +199 -0
- package/src/core/worktree.ts +600 -0
- package/src/core/wrappers/bash.ts +248 -26
- package/src/db/capability-repo.ts +127 -10
- package/src/db/history-repo.ts +281 -40
- package/src/db/metrics-repo.ts +40 -13
- package/src/db/migrate.ts +57 -32
- package/src/db/recovery.ts +12 -5
- package/src/db/run-journal.ts +100 -13
- package/src/db/run-resume.ts +17 -1
- package/src/db/runs-repo.ts +147 -65
- package/src/db/schema.ts +134 -2
- package/src/db/templates-repo.ts +5 -3
- package/src/gui.tsx +438 -18
- package/src/history.ts +11 -4
- package/src/hook-output.ts +39 -0
- package/src/i18n.ts +12 -4
- package/src/index.ts +1902 -320
- package/src/notifications.ts +227 -47
- package/src/profiles.ts +88 -10
- package/src/rpc.ts +158 -0
- package/src/server.ts +201 -41
- package/src/settings.ts +125 -5
- package/src/shared/jobs-view.ts +3 -1
- package/src/task-transfer.ts +90 -6
- package/src/templates.ts +3 -3
- package/src/types.ts +23 -2
- package/src/workspaces.ts +37 -14
|
@@ -1,6 +1,29 @@
|
|
|
1
1
|
import fs from "node:fs/promises";
|
|
2
2
|
import path from "node:path";
|
|
3
3
|
import { LOG_DIR, sanitizeName } from "../../types.js";
|
|
4
|
+
import { extractLastRunLog } from "../mission.js";
|
|
5
|
+
/** Codes returned by Windows/PowerShell while a log file is still held by the writer. */
|
|
6
|
+
export function isRetriableLogReadError(code) {
|
|
7
|
+
return code === "EBUSY" || code === "EPERM" || code === "EACCES";
|
|
8
|
+
}
|
|
9
|
+
/** Retry fs.readFile while the writer still holds the log (emit_event / immediate get_task_logs race). */
|
|
10
|
+
export async function readLogWithRetry(logPath, attempts = 6, delayMs = 50) {
|
|
11
|
+
let lastErr;
|
|
12
|
+
for (let i = 0; i < attempts; i++) {
|
|
13
|
+
try {
|
|
14
|
+
return await fs.readFile(logPath, "utf8");
|
|
15
|
+
}
|
|
16
|
+
catch (err) {
|
|
17
|
+
lastErr = err;
|
|
18
|
+
if (!isRetriableLogReadError(err.code) ||
|
|
19
|
+
i === attempts - 1) {
|
|
20
|
+
throw err;
|
|
21
|
+
}
|
|
22
|
+
await new Promise((resolve) => setTimeout(resolve, delayMs * (i + 1)));
|
|
23
|
+
}
|
|
24
|
+
}
|
|
25
|
+
throw lastErr;
|
|
26
|
+
}
|
|
4
27
|
/**
|
|
5
28
|
* Читает файл лога задачи и возвращает последние 50 строк.
|
|
6
29
|
*
|
|
@@ -11,7 +34,8 @@ export async function getTaskLogs(name, limit = 50) {
|
|
|
11
34
|
const logPath = path.join(LOG_DIR, `${sanitizeName(name)}.log`);
|
|
12
35
|
try {
|
|
13
36
|
// PowerShell 5.1 пишет UTF-8 с BOM — убираем его, чтобы GUI не показывал мусор.
|
|
14
|
-
|
|
37
|
+
// Лог дописывается между запусками: показываем только последний прогон.
|
|
38
|
+
const content = extractLastRunLog(await readLogWithRetry(logPath));
|
|
15
39
|
const lines = content.split(/\r?\n/).filter((line) => line.trim());
|
|
16
40
|
if (lines.length === 0) {
|
|
17
41
|
return {
|
|
@@ -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"}
|
|
@@ -10,6 +10,11 @@ import { buildLaunchdCalendar, buildOneShotGuardCommand, launchdLabel } from "..
|
|
|
10
10
|
import { systemTimeZone, } from "../schedule-v2.js";
|
|
11
11
|
import { PosixSchedulerBase } from "./posix.js";
|
|
12
12
|
const execFileAsync = promisify(execFile);
|
|
13
|
+
/** O-2: неудачная уборка temp/plist не проглатывается молча. */
|
|
14
|
+
function warnCleanupFailure(target, error) {
|
|
15
|
+
const reason = error instanceof Error ? error.message : String(error);
|
|
16
|
+
console.warn(`[agent-steward] Не удалось удалить plist «${target}»: ${reason}`);
|
|
17
|
+
}
|
|
13
18
|
/** Папка пользовательских LaunchAgents. */
|
|
14
19
|
const LAUNCH_AGENTS_DIR = path.join(os.homedir(), "Library", "LaunchAgents");
|
|
15
20
|
/** Экранирует текст для XML. */
|
|
@@ -186,12 +191,108 @@ function buildPlist(label, entry) {
|
|
|
186
191
|
"",
|
|
187
192
|
].join("\n");
|
|
188
193
|
}
|
|
194
|
+
/** Ошибка запуска launchctl с командой, кодом выхода и stderr. */
|
|
195
|
+
export function describeLaunchctlError(args, err) {
|
|
196
|
+
const error = err;
|
|
197
|
+
const stderr = String(error.stderr ?? "").trim();
|
|
198
|
+
const stdout = String(error.stdout ?? "").trim();
|
|
199
|
+
const detail = stderr || stdout || error.message || "вывод пуст";
|
|
200
|
+
const status = error.code !== undefined
|
|
201
|
+
? `код ${String(error.code)}`
|
|
202
|
+
: error.signal
|
|
203
|
+
? `сигнал ${error.signal}`
|
|
204
|
+
: "без кода выхода";
|
|
205
|
+
return `launchctl ${args.join(" ")}: ${status}: ${detail}`;
|
|
206
|
+
}
|
|
207
|
+
/**
|
|
208
|
+
* Запускает launchctl и либо пробрасывает ошибку с stderr/exit code,
|
|
209
|
+
* либо глотает её (unload незагруженного агента — штатная ситуация).
|
|
210
|
+
*/
|
|
211
|
+
export async function runLaunchctl(runner, args, options = {}) {
|
|
212
|
+
try {
|
|
213
|
+
await runner(args);
|
|
214
|
+
}
|
|
215
|
+
catch (err) {
|
|
216
|
+
if (options.tolerateFailure)
|
|
217
|
+
return;
|
|
218
|
+
const failure = new Error(describeLaunchctlError(args, err));
|
|
219
|
+
// target/lib проекта не включает ErrorOptions, поэтому cause ставим вручную.
|
|
220
|
+
failure.cause = err;
|
|
221
|
+
throw failure;
|
|
222
|
+
}
|
|
223
|
+
}
|
|
224
|
+
/**
|
|
225
|
+
* B5: `load -w` не только загружает агент, но и снимает Disabled,
|
|
226
|
+
* поэтому для приостановленной задачи его вызывать нельзя — иначе
|
|
227
|
+
* установка молча возобновляет задачу. Вместо этого `unload -w`
|
|
228
|
+
* фиксирует Disabled, чтобы launchd не загрузил агент при следующем входе.
|
|
229
|
+
*/
|
|
230
|
+
export function planLaunchctlInstall(paused, plistPath) {
|
|
231
|
+
if (paused) {
|
|
232
|
+
return {
|
|
233
|
+
beforeWrite: ["unload", "-w", plistPath],
|
|
234
|
+
afterWrite: null,
|
|
235
|
+
};
|
|
236
|
+
}
|
|
237
|
+
return {
|
|
238
|
+
beforeWrite: ["unload", plistPath],
|
|
239
|
+
afterWrite: ["load", "-w", plistPath],
|
|
240
|
+
};
|
|
241
|
+
}
|
|
242
|
+
/**
|
|
243
|
+
* ML-1: macOS 13 (Darwin 22) заменяет `load`/`unload` на `bootstrap`/`bootout`
|
|
244
|
+
* с явным доменом `gui/<uid>`. `-w` у legacy-команды здесь не нужен: bootstrap
|
|
245
|
+
* сам регистрирует агент, а bootout — снимает регистрацию.
|
|
246
|
+
*/
|
|
247
|
+
export function modernLaunchctlArgs(args, uid = process.getuid?.() ?? 501) {
|
|
248
|
+
const [command, ...rest] = args;
|
|
249
|
+
if (command !== "load" && command !== "unload")
|
|
250
|
+
return args;
|
|
251
|
+
const plist = rest.filter((part) => part !== "-w");
|
|
252
|
+
return [command === "load" ? "bootstrap" : "bootout", `gui/${uid}`, ...plist];
|
|
253
|
+
}
|
|
254
|
+
/** Современные команды доступны на macOS 13+ (Darwin 22+). */
|
|
255
|
+
export function supportsModernLaunchctl(platform = process.platform, release = os.release()) {
|
|
256
|
+
if (platform !== "darwin")
|
|
257
|
+
return true;
|
|
258
|
+
const darwinMajor = Number.parseInt(release.split(".")[0] ?? "", 10);
|
|
259
|
+
return Number.isFinite(darwinMajor) ? darwinMajor >= 22 : true;
|
|
260
|
+
}
|
|
261
|
+
/** Признак того, что launchctl не знает bootstrap/bootout (максимально старая macOS). */
|
|
262
|
+
function needsLegacyLaunchctlFallback(error) {
|
|
263
|
+
const source = error;
|
|
264
|
+
const text = `${String(source?.message ?? "")}\n${String(source?.stderr ?? "")}`;
|
|
265
|
+
return /unrecognized subcommand|unknown subcommand|invalid subcommand|unrecognized option|Usage:/i.test(text);
|
|
266
|
+
}
|
|
267
|
+
/**
|
|
268
|
+
* Выполняет launchctl через современные команды; при отсутствии поддержки
|
|
269
|
+
* (macOS < 13 или «unrecognized subcommand») повторяет legacy-аргументы.
|
|
270
|
+
*/
|
|
271
|
+
export async function runLaunchctlModern(runner, args, options = {}) {
|
|
272
|
+
const modern = supportsModernLaunchctl() ? modernLaunchctlArgs(args) : args;
|
|
273
|
+
await runLaunchctl(async (call) => {
|
|
274
|
+
try {
|
|
275
|
+
await runner(call);
|
|
276
|
+
}
|
|
277
|
+
catch (err) {
|
|
278
|
+
if (modern !== args && needsLegacyLaunchctlFallback(err)) {
|
|
279
|
+
await runner(args);
|
|
280
|
+
return;
|
|
281
|
+
}
|
|
282
|
+
throw err;
|
|
283
|
+
}
|
|
284
|
+
}, modern, options);
|
|
285
|
+
}
|
|
189
286
|
/**
|
|
190
287
|
* Бэкенд планировщика macOS на основе launchd.
|
|
191
288
|
*
|
|
192
289
|
* Каждая задача — отдельный LaunchAgent:
|
|
193
290
|
* ~/Library/LaunchAgents/com.opencode.scheduler.<name>.plist
|
|
194
|
-
* Управление — через launchctl
|
|
291
|
+
* Управление — через `launchctl bootstrap/bootout` (macOS ≥13), с фолбэком
|
|
292
|
+
* на legacy `load/unload -w` для более старых систем. `planLaunchctlInstall`
|
|
293
|
+
* намеренно остаётся на legacy-командах: обратная совместимость контракта.
|
|
294
|
+
* Ошибки загрузки не глотаются: битый plist должен вернуть ошибку установки,
|
|
295
|
+
* а не оставить задачу молча незапланированной.
|
|
195
296
|
*/
|
|
196
297
|
export class MacScheduler extends PosixSchedulerBase {
|
|
197
298
|
constructor(profile = getProfileName()) {
|
|
@@ -223,33 +324,43 @@ export class MacScheduler extends PosixSchedulerBase {
|
|
|
223
324
|
plistPath(name) {
|
|
224
325
|
return path.join(LAUNCH_AGENTS_DIR, `${this.label(name)}.plist`);
|
|
225
326
|
}
|
|
226
|
-
/** Выполняет launchctl
|
|
227
|
-
async launchctl(args) {
|
|
228
|
-
|
|
229
|
-
await execFileAsync("launchctl", args, { maxBuffer: 1024 * 1024 });
|
|
230
|
-
}
|
|
231
|
-
catch {
|
|
232
|
-
// launchctl возвращает ошибку, если агент ещё не загружен — это нормально.
|
|
233
|
-
}
|
|
327
|
+
/** Выполняет launchctl; tolerateFailure оставлен только для bootout/unload. */
|
|
328
|
+
async launchctl(args, options = {}) {
|
|
329
|
+
await runLaunchctlModern((call) => execFileAsync("launchctl", call, { maxBuffer: 1024 * 1024 }), args, options);
|
|
234
330
|
}
|
|
235
331
|
async installEntry(entry) {
|
|
236
332
|
await fs.mkdir(LAUNCH_AGENTS_DIR, { recursive: true });
|
|
237
333
|
const plistPath = this.plistPath(entry.name);
|
|
238
|
-
|
|
239
|
-
|
|
240
|
-
await this.launchctl(
|
|
334
|
+
const plan = planLaunchctlInstall(entry.paused, plistPath);
|
|
335
|
+
// Агент мог быть не загружен — это не ошибка.
|
|
336
|
+
await this.launchctl(plan.beforeWrite, { tolerateFailure: true });
|
|
337
|
+
// Пишем в уникальный temp и переименовываем: launchctl не должен увидеть
|
|
338
|
+
// полузаписанный plist, если процесс упадёт посреди записи.
|
|
339
|
+
const tmpPath = `${plistPath}.${process.pid}.${Date.now()}.tmp`;
|
|
340
|
+
try {
|
|
341
|
+
await fs.writeFile(tmpPath, buildPlist(this.label(entry.name), entry), "utf8");
|
|
342
|
+
await fs.rename(tmpPath, plistPath);
|
|
343
|
+
}
|
|
344
|
+
catch (error) {
|
|
345
|
+
await fs.rm(tmpPath, { force: true }).catch((cleanupError) => warnCleanupFailure(tmpPath, cleanupError));
|
|
346
|
+
throw error;
|
|
347
|
+
}
|
|
348
|
+
if (plan.afterWrite) {
|
|
349
|
+
await this.launchctl(plan.afterWrite);
|
|
350
|
+
}
|
|
241
351
|
}
|
|
242
352
|
async uninstallEntry(entry) {
|
|
243
353
|
const plistPath = this.plistPath(entry.name);
|
|
244
|
-
await this.launchctl(["unload", "-w", plistPath]);
|
|
245
|
-
await fs.unlink(plistPath).catch(() =>
|
|
354
|
+
await this.launchctl(["unload", "-w", plistPath], { tolerateFailure: true });
|
|
355
|
+
await fs.unlink(plistPath).catch((error) => warnCleanupFailure(plistPath, error));
|
|
246
356
|
}
|
|
247
357
|
async applyPause(entry, paused) {
|
|
248
358
|
const plistPath = this.plistPath(entry.name);
|
|
249
359
|
if (paused) {
|
|
250
|
-
await this.launchctl(["unload", "-w", plistPath]);
|
|
360
|
+
await this.launchctl(["unload", "-w", plistPath], { tolerateFailure: true });
|
|
251
361
|
}
|
|
252
362
|
else {
|
|
363
|
+
// Возобновление не должно «удаваться» молча при битом plist.
|
|
253
364
|
await this.launchctl(["load", "-w", plistPath]);
|
|
254
365
|
}
|
|
255
366
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"windows.d.ts","sourceRoot":"","sources":["../../../src/core/scheduler/windows.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AAMxD,OAAO,KAAK,EACV,iBAAiB,EACjB,aAAa,EACb,gBAAgB,EACjB,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"windows.d.ts","sourceRoot":"","sources":["../../../src/core/scheduler/windows.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,22 +7,25 @@ import { buildScheduleFlags, convertCronToSchTasks } from "../cron-to-schtasks.j
|
|
|
7
7
|
import { buildWindowsOneShotFlags } from "../one-shot.js";
|
|
8
8
|
import { needsPollMode } from "../schedule-v2.js";
|
|
9
9
|
const execFileAsync = promisify(execFile);
|
|
10
|
-
/** Кэш формата даты локали Windows (ShortDatePattern), полученного через PowerShell.
|
|
10
|
+
/** Кэш формата даты локали Windows (ShortDatePattern), полученного через PowerShell.
|
|
11
|
+
* Храним промис, а не готовую строку: параллельные вызовы ждут один и тот же
|
|
12
|
+
* результат и не запускают PowerShell по несколько раз (гонка при await). */
|
|
11
13
|
let windowsDateFormatCache = null;
|
|
12
14
|
/** Определяет формат даты системной локали через PowerShell (P1-8). */
|
|
13
15
|
async function getWindowsDateFormat() {
|
|
14
|
-
if (windowsDateFormatCache
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
16
|
+
if (windowsDateFormatCache === null) {
|
|
17
|
+
windowsDateFormatCache = (async () => {
|
|
18
|
+
try {
|
|
19
|
+
const { stdout } = await execFileAsync("powershell.exe", ["-NoProfile", "-Command", "(Get-Culture).DateTimeFormat.ShortDatePattern"], { maxBuffer: MAX_OUTPUT_BUFFER });
|
|
20
|
+
const pattern = String(stdout).trim();
|
|
21
|
+
return pattern || "dd.MM.yyyy";
|
|
22
|
+
}
|
|
23
|
+
catch {
|
|
24
|
+
return "dd.MM.yyyy";
|
|
25
|
+
}
|
|
26
|
+
})();
|
|
25
27
|
}
|
|
28
|
+
return windowsDateFormatCache;
|
|
26
29
|
}
|
|
27
30
|
/** Форматирует дату «никогда» (заглушка для file/git/mcp-триггеров) в формате локали. */
|
|
28
31
|
async function buildNeverDate(format) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"secrets.d.ts","sourceRoot":"","sources":["../../src/core/secrets.ts"],"names":[],"mappings":"AAQA;;;;;;;;;;;;;GAaG;AAEH,eAAO,MAAM,YAAY,QAAwC,CAAC;AAClE,eAAO,MAAM,gBAAgB,QAAuC,CAAC;AACrE,eAAO,MAAM,aAAa,QAAyC,CAAC;
|
|
1
|
+
{"version":3,"file":"secrets.d.ts","sourceRoot":"","sources":["../../src/core/secrets.ts"],"names":[],"mappings":"AAQA;;;;;;;;;;;;;GAaG;AAEH,eAAO,MAAM,YAAY,QAAwC,CAAC;AAClE,eAAO,MAAM,gBAAgB,QAAuC,CAAC;AACrE,eAAO,MAAM,aAAa,QAAyC,CAAC;AAyGpE,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,qEAAqE;IACrE,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;CACnB;AAoBD,0DAA0D;AAC1D,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAQvD;AAED,wEAAwE;AACxE,wBAAgB,YAAY,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAIpD;AAoOD,qEAAqE;AACrE,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,cAAc,CAoBrE;AAED,yEAAyE;AACzE,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAW1D;AAED,uDAAuD;AACvD,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAE/C;AAED,0CAA0C;AAC1C,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CASlD;AASD,6EAA6E;AAC7E,wBAAgB,WAAW,IAAI,cAAc,EAAE,CAc9C;AAED,kMAAkM;AAClM,wBAAgB,gBAAgB,CAC9B,KAAK,EAAE,MAAM,EACb,kBAAkB,CAAC,EAAE,MAAM,EAAE,GAC5B;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,EAAE,CAAA;CAAE,CAkBtC;AAED;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAC/B,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAC3B,kBAAkB,CAAC,EAAE,MAAM,EAAE,GAC5B;IAAE,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAAC,OAAO,EAAE,MAAM,EAAE,CAAA;CAAE,CASpD;AA8BD;;;GAGG;AACH,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,OAAO,GAAG,MAAM,CA+BzD;AAED,qEAAqE;AACrE,wBAAgB,iBAAiB,IAAI,IAAI,CAIxC;AAED;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,GAAG,MAAM,EAAE,CAAC,MAAM,GAAG,SAAS,CAAC,EAAE,GAAG,MAAM,EAAE,CAW9E"}
|
package/dist/core/secrets.js
CHANGED
|
@@ -33,8 +33,9 @@ const KEY_BYTES = 32;
|
|
|
33
33
|
* используется из CLI/GUI/плагина, переписывать его на async нельзя.
|
|
34
34
|
*/
|
|
35
35
|
const SECRETS_LOCK_FILE = `${SECRETS_FILE}.lock`;
|
|
36
|
-
|
|
37
|
-
|
|
36
|
+
// icacls на Windows под параллельной нагрузкой CI может занять секунды;
|
|
37
|
+
// 5 с приводило к ложным «Не удалось получить блокировку» даже без краша.
|
|
38
|
+
const SECRETS_LOCK_TIMEOUT_MS = 30000;
|
|
38
39
|
let secretsLockDepth = 0;
|
|
39
40
|
function sleepSync(ms) {
|
|
40
41
|
Atomics.wait(new Int32Array(new SharedArrayBuffer(4)), 0, 0, ms);
|
|
@@ -69,13 +70,22 @@ function withSecretsLock(fn) {
|
|
|
69
70
|
throw err;
|
|
70
71
|
try {
|
|
71
72
|
const stat = fs.statSync(SECRETS_LOCK_FILE);
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
73
|
+
const rawOwner = fs.readFileSync(SECRETS_LOCK_FILE, "utf8").trim();
|
|
74
|
+
const owner = /^\d+$/.test(rawOwner) ? Number(rawOwner) : NaN;
|
|
75
|
+
// Мёртвый владелец — лок осиротел. PID проверяем независимо от времени
|
|
76
|
+
// жизни файла: свежий лок упавшего процесса раньше блокировал запись
|
|
77
|
+
// на 10 с (stale) + 5 с (timeout) и ложно падал на загруженном CI.
|
|
78
|
+
if (Number.isInteger(owner) && owner > 0 && !isProcessAlive(owner)) {
|
|
79
|
+
fs.rmSync(SECRETS_LOCK_FILE, { force: true });
|
|
80
|
+
continue;
|
|
78
81
|
}
|
|
82
|
+
// Пустой/битый лок с только что созданным mtime может ещё не содержать
|
|
83
|
+
// PID — даём процессу-создателю окно, прежде чем считать его осиротевшим.
|
|
84
|
+
if (Date.now() - stat.mtimeMs > 1000 && !Number.isInteger(owner)) {
|
|
85
|
+
fs.rmSync(SECRETS_LOCK_FILE, { force: true });
|
|
86
|
+
continue;
|
|
87
|
+
}
|
|
88
|
+
// Лок с живым владельцем не крадём, даже если он создан давно.
|
|
79
89
|
}
|
|
80
90
|
catch {
|
|
81
91
|
// Лок исчез между stat и read — повторяем попытку.
|
|
@@ -11,13 +11,38 @@ export interface HealthScore {
|
|
|
11
11
|
score: number;
|
|
12
12
|
/** Описание уровня здоровья. */
|
|
13
13
|
level: "excellent" | "good" | "fair" | "poor" | "critical";
|
|
14
|
-
/**
|
|
14
|
+
/**
|
|
15
|
+
* Детальные метрики, из которых сложился балл.
|
|
16
|
+
*
|
|
17
|
+
* ВАЖНО (QA 2026-11-19, roadmap-qa-01; уточнено QA-P1.4): successRate/errorRate —
|
|
18
|
+
* это НОРМАЛИЗОВАННЫЕ БАЛЛЫ 0..100 (чем выше, тем лучше; обратная совместимость
|
|
19
|
+
* с self_analysis tool), а avgDurationMs/timeoutRate/crashRecoveryRate —
|
|
20
|
+
* РЕАЛЬНЫЕ значения из отчёта (мс и доли 0..1), ранее сюда ошибочно писались
|
|
21
|
+
* score-значения, из-за чего avgDurationMs показывал 66 вместо 101597.
|
|
22
|
+
*
|
|
23
|
+
* QA-P1.4: `errorRate` — НЕ доля ошибок, а инвертированный балл
|
|
24
|
+
* `100 - 100 * error / total`. Поэтому при 322 success / 250 error из 573
|
|
25
|
+
* получаются `successRate=56.2` и `errorRate=56.37` — это согласуемые значения:
|
|
26
|
+
* доля ошибок 43.63%, а балл ошибок 56.37. Не путать с `totals.errorRate`,
|
|
27
|
+
* если он когда-либо будет добавлен как реальная доля.
|
|
28
|
+
*/
|
|
15
29
|
components: {
|
|
30
|
+
/** Балл успешности 0..100 (нормализованный). */
|
|
16
31
|
successRate: number;
|
|
32
|
+
/** Балл частоты ошибок 0..100 (нормализованный, чем выше, тем меньше ошибок). */
|
|
17
33
|
errorRate: number;
|
|
34
|
+
/** Реальная средняя длительность запуска в мс. */
|
|
18
35
|
avgDurationMs: number;
|
|
36
|
+
/** Реальная доля таймаутов 0..1. */
|
|
19
37
|
timeoutRate: number;
|
|
38
|
+
/** Реальная доля прерванных (crash recovery) запусков 0..1. */
|
|
20
39
|
crashRecoveryRate: number;
|
|
40
|
+
/** Балл длительности 0..100 (нормализованный, использовался в score). */
|
|
41
|
+
avgDurationScore: number;
|
|
42
|
+
/** Балл таймаутов 0..100 (нормализованный). */
|
|
43
|
+
timeoutScore: number;
|
|
44
|
+
/** Балл восстановления после сбоев 0..100 (нормализованный). */
|
|
45
|
+
crashRecoveryScore: number;
|
|
21
46
|
};
|
|
22
47
|
/** Рекомендации по улучшению. */
|
|
23
48
|
recommendations: string[];
|
|
@@ -83,11 +108,16 @@ export interface SelfAnalysisReport {
|
|
|
83
108
|
recommendations: Recommendation[];
|
|
84
109
|
/** Краткое резюме. */
|
|
85
110
|
summary: string;
|
|
86
|
-
/** Метаданные источников
|
|
111
|
+
/** Метаданные источников данных (PL-13/PL-29/PL-31: единицы указаны в комментариях). */
|
|
87
112
|
sources: {
|
|
113
|
+
/** Записей истории всего (до фильтрации по окну). */
|
|
88
114
|
historyRecords: number;
|
|
115
|
+
/** Записей истории внутри окна days. */
|
|
89
116
|
recordsInWindow: number;
|
|
117
|
+
/** Число definition задач (НЕ уникальных имён в истории). */
|
|
90
118
|
tasksAnalyzed: number;
|
|
119
|
+
/** Явное имя того же счётчика definition — без двусмысленности «analyzed». */
|
|
120
|
+
taskDefinitions: number;
|
|
91
121
|
};
|
|
92
122
|
}
|
|
93
123
|
/** Опции для генерации отчёта самоанализа. */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"self-analysis.d.ts","sourceRoot":"","sources":["../../src/core/self-analysis.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,OAAO,EAEL,KAAK,eAAe,EACpB,KAAK,eAAe,EAErB,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"self-analysis.d.ts","sourceRoot":"","sources":["../../src/core/self-analysis.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,16 +5,23 @@
|
|
|
5
5
|
* рекомендации по оптимизации на основе исторических данных.
|
|
6
6
|
*/
|
|
7
7
|
import { buildAnalytics, } from "./analytics.js";
|
|
8
|
+
import { t } from "../i18n.js";
|
|
8
9
|
// ==================== Health Score ====================
|
|
9
10
|
/** Рассчитывает общий балл здоровья системы. */
|
|
10
11
|
export function calculateHealthScore(report) {
|
|
11
12
|
const { totals, tasks, errors } = report;
|
|
12
|
-
//
|
|
13
|
+
// Реальные метрики (то, что видит пользователь в self_analysis).
|
|
14
|
+
const realAvgDurationMs = totals.avgDurationMs;
|
|
15
|
+
const realTimeoutRate = errors.filter((e) => e.message.includes("timeout")).length /
|
|
16
|
+
Math.max(1, totals.total);
|
|
17
|
+
const realCrashRecoveryRate = errors.filter((e) => e.message.includes("Прервано")).length /
|
|
18
|
+
Math.max(1, totals.total);
|
|
19
|
+
// Компоненты здоровья — нормализованные баллы 0..100 (обратная совместимость).
|
|
13
20
|
const successRateScore = totals.successRate;
|
|
14
21
|
const errorRateScore = Math.max(0, 100 - (totals.error / Math.max(1, totals.total)) * 100);
|
|
15
|
-
const avgDurationScore = Math.min(100, Math.max(0, 100 - (
|
|
16
|
-
const timeoutRateScore = Math.min(100, Math.max(0, 100 -
|
|
17
|
-
const crashRecoveryRateScore = Math.min(100, Math.max(0, 100 -
|
|
22
|
+
const avgDurationScore = Math.min(100, Math.max(0, 100 - (realAvgDurationMs / 300000) * 100)); // 5 минут = 0 баллов
|
|
23
|
+
const timeoutRateScore = Math.min(100, Math.max(0, 100 - realTimeoutRate * 100));
|
|
24
|
+
const crashRecoveryRateScore = Math.min(100, Math.max(0, 100 - realCrashRecoveryRate * 100));
|
|
18
25
|
// Взвешенная сумма
|
|
19
26
|
const score = Math.round(successRateScore * 0.35 +
|
|
20
27
|
errorRateScore * 0.25 +
|
|
@@ -36,19 +43,19 @@ export function calculateHealthScore(report) {
|
|
|
36
43
|
// Рекомендации
|
|
37
44
|
const recommendations = [];
|
|
38
45
|
if (successRateScore < 80) {
|
|
39
|
-
recommendations.push("
|
|
46
|
+
recommendations.push(t("selfAnalysis.rec.successRate"));
|
|
40
47
|
}
|
|
41
48
|
if (errorRateScore < 80) {
|
|
42
|
-
recommendations.push("
|
|
49
|
+
recommendations.push(t("selfAnalysis.rec.errorRate"));
|
|
43
50
|
}
|
|
44
51
|
if (avgDurationScore < 70) {
|
|
45
|
-
recommendations.push("
|
|
52
|
+
recommendations.push(t("selfAnalysis.rec.duration"));
|
|
46
53
|
}
|
|
47
54
|
if (timeoutRateScore < 80) {
|
|
48
|
-
recommendations.push("
|
|
55
|
+
recommendations.push(t("selfAnalysis.rec.timeouts"));
|
|
49
56
|
}
|
|
50
57
|
if (crashRecoveryRateScore < 90) {
|
|
51
|
-
recommendations.push("
|
|
58
|
+
recommendations.push(t("selfAnalysis.rec.crashes"));
|
|
52
59
|
}
|
|
53
60
|
return {
|
|
54
61
|
score,
|
|
@@ -56,9 +63,14 @@ export function calculateHealthScore(report) {
|
|
|
56
63
|
components: {
|
|
57
64
|
successRate: successRateScore,
|
|
58
65
|
errorRate: errorRateScore,
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
66
|
+
// Реальные значения (исправление roadmap-qa-01).
|
|
67
|
+
avgDurationMs: realAvgDurationMs,
|
|
68
|
+
timeoutRate: realTimeoutRate,
|
|
69
|
+
crashRecoveryRate: realCrashRecoveryRate,
|
|
70
|
+
// Нормализованные баллы (прежняя семантика этих трёх полей).
|
|
71
|
+
avgDurationScore,
|
|
72
|
+
timeoutScore: timeoutRateScore,
|
|
73
|
+
crashRecoveryScore: crashRecoveryRateScore,
|
|
62
74
|
},
|
|
63
75
|
recommendations,
|
|
64
76
|
};
|
|
@@ -496,43 +508,42 @@ export function generateSelfAnalysisReport(records, options = {}) {
|
|
|
496
508
|
sources: {
|
|
497
509
|
historyRecords: records.length,
|
|
498
510
|
recordsInWindow: analyticsReport.sources.recordsInWindow,
|
|
499
|
-
|
|
511
|
+
// PL-13/PL-29/PL-31: options.tasks — это definitions, а analyticsReport.tasks —
|
|
512
|
+
// задачи, попавшие в историю; последнее число могло быть больше на 15+.
|
|
513
|
+
tasksAnalyzed: options.tasks?.length ?? analyticsReport.tasks.length,
|
|
514
|
+
taskDefinitions: options.tasks?.length ?? analyticsReport.tasks.length,
|
|
500
515
|
},
|
|
501
516
|
};
|
|
502
517
|
}
|
|
503
518
|
function generateSummary(health, anomalies, trends, recommendations) {
|
|
504
519
|
const parts = [];
|
|
505
520
|
// Здоровье
|
|
506
|
-
|
|
507
|
-
|
|
508
|
-
|
|
509
|
-
|
|
510
|
-
poor: "плохое",
|
|
511
|
-
critical: "критическое",
|
|
512
|
-
};
|
|
513
|
-
parts.push(`Здоровье системы: ${levelNames[health.level]} (${health.score}/100)`);
|
|
521
|
+
parts.push(t("selfAnalysis.health", {
|
|
522
|
+
level: t(`selfAnalysis.level.${health.level}`),
|
|
523
|
+
score: health.score,
|
|
524
|
+
}));
|
|
514
525
|
// Аномалии
|
|
515
526
|
if (anomalies.length > 0) {
|
|
516
527
|
const highSeverity = anomalies.filter(a => a.severity > 70).length;
|
|
517
528
|
if (highSeverity > 0) {
|
|
518
|
-
parts.push(
|
|
529
|
+
parts.push(t("selfAnalysis.anomaliesHigh", { count: highSeverity }));
|
|
519
530
|
}
|
|
520
531
|
else {
|
|
521
|
-
parts.push(
|
|
532
|
+
parts.push(t("selfAnalysis.anomaliesAll", { count: anomalies.length }));
|
|
522
533
|
}
|
|
523
534
|
}
|
|
524
535
|
else {
|
|
525
|
-
parts.push("
|
|
536
|
+
parts.push(t("selfAnalysis.noAnomalies"));
|
|
526
537
|
}
|
|
527
538
|
// Тренды
|
|
528
|
-
const degradingTrends = trends.filter(
|
|
539
|
+
const degradingTrends = trends.filter(trend => trend.direction === "degrading").length;
|
|
529
540
|
if (degradingTrends > 0) {
|
|
530
|
-
parts.push(
|
|
541
|
+
parts.push(t("selfAnalysis.degrading", { count: degradingTrends }));
|
|
531
542
|
}
|
|
532
543
|
// Рекомендации
|
|
533
544
|
const highPriority = recommendations.filter(r => r.priority >= 7).length;
|
|
534
545
|
if (highPriority > 0) {
|
|
535
|
-
parts.push(
|
|
546
|
+
parts.push(t("selfAnalysis.highPriority", { count: highPriority }));
|
|
536
547
|
}
|
|
537
548
|
return parts.join(". ") + ".";
|
|
538
549
|
}
|