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
package/dist/db/history-repo.js
CHANGED
|
@@ -1,6 +1,19 @@
|
|
|
1
1
|
import { getDb, withTransaction } from "./index.js";
|
|
2
2
|
import { incrementMetricsUnsafe } from "./metrics-repo.js";
|
|
3
3
|
import { appendStructuredLog } from "../core/structured-log.js";
|
|
4
|
+
import os from "node:os";
|
|
5
|
+
/**
|
|
6
|
+
* QA-P1.5: прочерк и пустая строка — не текст ошибки, а маркер «нет данных».
|
|
7
|
+
* PowerShell-обёртка исторически передавала "-" для успешных запусков, и он
|
|
8
|
+
* попадал в history и структурированные логи как сообщение об ошибке.
|
|
9
|
+
* Нормализуем и при записи, и при чтении (легаси-записи уже есть в БД).
|
|
10
|
+
*/
|
|
11
|
+
export function normalizeErrorText(error) {
|
|
12
|
+
if (error == null)
|
|
13
|
+
return null;
|
|
14
|
+
const trimmed = String(error).trim();
|
|
15
|
+
return !trimmed || trimmed === "-" ? null : trimmed;
|
|
16
|
+
}
|
|
4
17
|
function rowToRecord(row) {
|
|
5
18
|
const status = String(row.status);
|
|
6
19
|
return {
|
|
@@ -10,7 +23,7 @@ function rowToRecord(row) {
|
|
|
10
23
|
startedAt: String(row.started_at),
|
|
11
24
|
finishedAt: row.finished_at == null ? null : String(row.finished_at),
|
|
12
25
|
durationMs: row.duration_ms == null ? null : Number(row.duration_ms),
|
|
13
|
-
error: row.error == null ? null : String(row.error),
|
|
26
|
+
error: normalizeErrorText(row.error == null ? null : String(row.error)),
|
|
14
27
|
nextTask: row.next_task == null ? null : String(row.next_task),
|
|
15
28
|
tokens: row.tokens == null ? undefined : Number(row.tokens),
|
|
16
29
|
costUsd: row.cost_usd == null ? undefined : Number(row.cost_usd),
|
|
@@ -22,15 +35,19 @@ function rowToRecord(row) {
|
|
|
22
35
|
? undefined
|
|
23
36
|
: String(row.post_flight_status),
|
|
24
37
|
workspaceId: row.workspace_id == null ? null : String(row.workspace_id),
|
|
38
|
+
// QA-A2-T3: JSON.parse возвращает any — сужаем к доменному типу без as any.
|
|
25
39
|
allowedTools: row.allowed_tools == null ? null : JSON.parse(String(row.allowed_tools)),
|
|
26
40
|
deniedTools: row.denied_tools == null ? null : JSON.parse(String(row.denied_tools)),
|
|
41
|
+
ownerPid: row.owner_pid == null ? null : Number(row.owner_pid),
|
|
42
|
+
ownerHost: row.owner_host == null ? null : String(row.owner_host),
|
|
43
|
+
ownerStartedAt: row.owner_started_at == null ? null : String(row.owner_started_at),
|
|
27
44
|
};
|
|
28
45
|
}
|
|
29
46
|
const INSERT_SQL = `INSERT INTO history (
|
|
30
47
|
task_name, status, started_at, finished_at, duration_ms, error,
|
|
31
48
|
tokens, cost_usd, model, pre_flight_status, post_flight_status, next_task,
|
|
32
|
-
workspace_id, allowed_tools, denied_tools
|
|
33
|
-
) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`;
|
|
49
|
+
workspace_id, allowed_tools, denied_tools, owner_pid, owner_host, owner_started_at
|
|
50
|
+
) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`;
|
|
34
51
|
function lastId(result) {
|
|
35
52
|
return Number(result.lastInsertRowid) || 0;
|
|
36
53
|
}
|
|
@@ -38,11 +55,11 @@ function lastId(result) {
|
|
|
38
55
|
export function insertHistory(record) {
|
|
39
56
|
const result = getDb()
|
|
40
57
|
.prepare(INSERT_SQL)
|
|
41
|
-
.run(record.taskName, record.status, record.startedAt, record.finishedAt ?? null, record.durationMs ?? null, record.error
|
|
58
|
+
.run(record.taskName, record.status, record.startedAt, record.finishedAt ?? null, record.durationMs ?? null, normalizeErrorText(record.error), record.tokens ?? null, record.costUsd ?? null, record.model ?? null, record.preFlightStatus ?? null, record.postFlightStatus ?? null, record.nextTask ?? null, record.workspaceId ?? null, record.allowedTools == null ? null : JSON.stringify(record.allowedTools), record.deniedTools == null ? null : JSON.stringify(record.deniedTools), record.ownerPid ?? null, record.ownerHost ?? null, record.ownerStartedAt ?? null);
|
|
42
59
|
return lastId(result);
|
|
43
60
|
}
|
|
44
61
|
/** Начало запуска: строка с finished_at = NULL (переживёт сбой процесса). */
|
|
45
|
-
export function startRun(taskName, startedAt = new Date().toISOString(), workspaceId, allowedTools, deniedTools) {
|
|
62
|
+
export function startRun(taskName, startedAt = new Date().toISOString(), workspaceId, allowedTools, deniedTools, owner) {
|
|
46
63
|
const id = insertHistory({
|
|
47
64
|
taskName,
|
|
48
65
|
status: "running",
|
|
@@ -51,6 +68,9 @@ export function startRun(taskName, startedAt = new Date().toISOString(), workspa
|
|
|
51
68
|
workspaceId,
|
|
52
69
|
allowedTools,
|
|
53
70
|
deniedTools,
|
|
71
|
+
ownerPid: owner?.pid ?? null,
|
|
72
|
+
ownerHost: owner?.host ?? null,
|
|
73
|
+
ownerStartedAt: owner?.startedAt ?? null,
|
|
54
74
|
});
|
|
55
75
|
appendStructuredLog({
|
|
56
76
|
event: "run.started",
|
|
@@ -70,9 +90,11 @@ export function startRun(taskName, startedAt = new Date().toISOString(), workspa
|
|
|
70
90
|
export function finishRun(id, status, durationMs, error, nextTask, tokens, costUsd, model, preFlightStatus, postFlightStatus) {
|
|
71
91
|
const safeDuration = Number.isFinite(durationMs) ? Math.max(0, Math.floor(durationMs)) : 0;
|
|
72
92
|
const finishedAt = new Date().toISOString();
|
|
93
|
+
const cleanError = normalizeErrorText(error);
|
|
73
94
|
let completed = null;
|
|
74
95
|
const ok = withTransaction(() => {
|
|
75
96
|
const instance = getDb();
|
|
97
|
+
// QA-A2-T3: граница node:sqlite — get() возвращает any, сужаем к доменному типу.
|
|
76
98
|
const row = instance
|
|
77
99
|
.prepare("SELECT finished_at FROM history WHERE id = ?")
|
|
78
100
|
.get(id);
|
|
@@ -84,7 +106,7 @@ export function finishRun(id, status, durationMs, error, nextTask, tokens, costU
|
|
|
84
106
|
tokens = ?, cost_usd = ?, model = ?,
|
|
85
107
|
pre_flight_status = ?, post_flight_status = ?
|
|
86
108
|
WHERE id = ?`)
|
|
87
|
-
.run(status, finishedAt, safeDuration,
|
|
109
|
+
.run(status, finishedAt, safeDuration, cleanError, nextTask ?? null, tokens ?? null, costUsd ?? null, model ?? null, preFlightStatus ?? null, postFlightStatus ?? null, id);
|
|
88
110
|
const taskRow = instance
|
|
89
111
|
.prepare("SELECT task_name, started_at FROM history WHERE id = ?")
|
|
90
112
|
.get(id);
|
|
@@ -105,7 +127,7 @@ export function finishRun(id, status, durationMs, error, nextTask, tokens, costU
|
|
|
105
127
|
startedAt: done.startedAt,
|
|
106
128
|
finishedAt,
|
|
107
129
|
durationMs: safeDuration,
|
|
108
|
-
error:
|
|
130
|
+
error: cleanError,
|
|
109
131
|
nextTask: nextTask ?? null,
|
|
110
132
|
tokens,
|
|
111
133
|
costUsd,
|
|
@@ -122,10 +144,13 @@ export function finishRun(id, status, durationMs, error, nextTask, tokens, costU
|
|
|
122
144
|
*/
|
|
123
145
|
export function recordRun(taskName, status, startedAt, durationMs, error, nextTask, tokens, costUsd, model, preFlightStatus, postFlightStatus, finishedAt = new Date().toISOString(), workspaceId, allowedTools, deniedTools) {
|
|
124
146
|
const safeDuration = Math.max(0, Math.floor(Number(durationMs) || 0));
|
|
147
|
+
const cleanError = normalizeErrorText(error);
|
|
125
148
|
const id = withTransaction(() => {
|
|
126
149
|
const result = getDb()
|
|
127
150
|
.prepare(INSERT_SQL)
|
|
128
|
-
.run(taskName, status, startedAt, finishedAt, safeDuration,
|
|
151
|
+
.run(taskName, status, startedAt, finishedAt, safeDuration, cleanError, tokens ?? null, costUsd ?? null, model ?? null, preFlightStatus ?? null, postFlightStatus ?? null, nextTask ?? null, workspaceId ?? null, allowedTools == null ? null : JSON.stringify(allowedTools), deniedTools == null ? null : JSON.stringify(deniedTools),
|
|
152
|
+
// owner-колонки относятся только к незавершённым запускам (startRun).
|
|
153
|
+
null, null, null);
|
|
129
154
|
incrementMetricsUnsafe(taskName, status, tokens, costUsd);
|
|
130
155
|
return lastId(result);
|
|
131
156
|
});
|
|
@@ -137,7 +162,7 @@ export function recordRun(taskName, status, startedAt, durationMs, error, nextTa
|
|
|
137
162
|
startedAt,
|
|
138
163
|
finishedAt,
|
|
139
164
|
durationMs: safeDuration,
|
|
140
|
-
error:
|
|
165
|
+
error: cleanError,
|
|
141
166
|
nextTask: nextTask ?? null,
|
|
142
167
|
tokens,
|
|
143
168
|
costUsd,
|
|
@@ -152,6 +177,7 @@ export function recordRun(taskName, status, startedAt, durationMs, error, nextTa
|
|
|
152
177
|
export function getHistory(taskName, limit = 200, status) {
|
|
153
178
|
const safeLimit = Math.max(1, Math.min(100000, Math.floor(limit) || 1));
|
|
154
179
|
const clauses = [];
|
|
180
|
+
// QA-A2-T3: параметры привязки — только string/number (domain type вместо any[]).
|
|
155
181
|
const params = [];
|
|
156
182
|
if (taskName) {
|
|
157
183
|
clauses.push("lower(task_name) = lower(?)");
|
|
@@ -178,9 +204,28 @@ export function getHistory(taskName, limit = 200, status) {
|
|
|
178
204
|
.prepare(`SELECT * FROM history${where}
|
|
179
205
|
ORDER BY started_at DESC, id DESC
|
|
180
206
|
LIMIT ?`)
|
|
207
|
+
// QA-A2-T3: граница node:sqlite — all() возвращает any[], сужаем к HistoryRow[].
|
|
181
208
|
.all(...params);
|
|
182
209
|
return rows.map(rowToRecord);
|
|
183
210
|
}
|
|
211
|
+
/**
|
|
212
|
+
* История для проверки бюджетов: записи, учётный момент которых
|
|
213
|
+
* (`finished_at`, при отсутствии `started_at`) не раньше `periodStart`.
|
|
214
|
+
*
|
|
215
|
+
* В отличие от `getHistorySince()` учитывает запуски, начатые в предыдущем
|
|
216
|
+
* периоде, но завершённые в текущем — именно по ним считается расход в
|
|
217
|
+
* `src/core/budget.ts`. Лимит 100000 совпадает с максимумом `getHistory`.
|
|
218
|
+
*/
|
|
219
|
+
export function getHistoryForBudget(periodStart, limit = 100000) {
|
|
220
|
+
const safeLimit = Math.max(1, Math.min(100000, Math.floor(limit) || 1));
|
|
221
|
+
const rows = getDb()
|
|
222
|
+
.prepare(`SELECT * FROM history
|
|
223
|
+
WHERE COALESCE(finished_at, started_at) >= ?
|
|
224
|
+
ORDER BY started_at DESC, id DESC
|
|
225
|
+
LIMIT ?`)
|
|
226
|
+
.all(periodStart, safeLimit);
|
|
227
|
+
return rows.map(rowToRecord);
|
|
228
|
+
}
|
|
184
229
|
/**
|
|
185
230
|
* Последняя запись по каждой задаче (P2-29).
|
|
186
231
|
*
|
|
@@ -200,6 +245,20 @@ export function getLatestHistoryByTask(limit = 5000) {
|
|
|
200
245
|
.all(safeLimit);
|
|
201
246
|
return rows.map(rowToRecord);
|
|
202
247
|
}
|
|
248
|
+
/**
|
|
249
|
+
* История для аналитики за окно `days` дней: все запуски, которые могут
|
|
250
|
+
* попасть в период по времени начала. Окно на один день шире запрашиваемого,
|
|
251
|
+
* чтобы полностью покрыть самый ранний UTC-день (buildAnalytics всё равно
|
|
252
|
+
* отфильтрует лишнее по дате). Лимит 100000 снимает потолок в 20000 записей,
|
|
253
|
+
* из-за которого отчёты за 365 дней молча недосчитывали запуски и расход.
|
|
254
|
+
*/
|
|
255
|
+
export function getHistoryForAnalytics(days, now = new Date(), includeInternal = false) {
|
|
256
|
+
const safeDays = Math.max(1, Math.min(365, Math.floor(days) || 1));
|
|
257
|
+
const since = new Date(now.getTime() - (safeDays + 1) * 24 * 60 * 60 * 1000);
|
|
258
|
+
const records = getHistorySince(since.toISOString(), 100000);
|
|
259
|
+
// PL-37: служебные задачи (__*) — артефакты тестов/проб, не пользовательская аналитика.
|
|
260
|
+
return includeInternal ? records : records.filter((record) => !record.taskName.startsWith("__"));
|
|
261
|
+
}
|
|
203
262
|
/** История запусков, начатых не раньше timestamp (ISO-строка). */
|
|
204
263
|
export function getHistorySince(timestamp, limit = 5000) {
|
|
205
264
|
const safeLimit = Math.max(1, Math.min(100000, Math.floor(limit) || 1));
|
|
@@ -212,30 +271,111 @@ export function getHistorySince(timestamp, limit = 5000) {
|
|
|
212
271
|
return rows.map(rowToRecord);
|
|
213
272
|
}
|
|
214
273
|
/**
|
|
215
|
-
* Crash recovery
|
|
216
|
-
*
|
|
217
|
-
*
|
|
274
|
+
* Crash recovery для истории.
|
|
275
|
+
*
|
|
276
|
+
* Незавершённая запись (finished_at IS NULL) финализируется как error, только
|
|
277
|
+
* если её владелец больше не может её завершить:
|
|
278
|
+
* - владелец известен, жив и на этом же хосте → запись оставляем (B1);
|
|
279
|
+
* - владелец известен и мёртв → финализируем сразу;
|
|
280
|
+
* - владелец неизвестен (legacy-строка или другой хост) → финализируем,
|
|
281
|
+
* только когда запись старше `maxUnverifiableAgeMs`.
|
|
218
282
|
*/
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
|
|
222
|
-
|
|
223
|
-
|
|
224
|
-
|
|
225
|
-
|
|
226
|
-
|
|
227
|
-
|
|
228
|
-
|
|
229
|
-
|
|
230
|
-
|
|
231
|
-
|
|
232
|
-
|
|
233
|
-
|
|
234
|
-
|
|
235
|
-
|
|
283
|
+
/** Возраст, после которого запись с непроверяемым владельцем считается осиротевшей. */
|
|
284
|
+
export const UNVERIFIABLE_OWNER_MAX_AGE_MS = 24 * 60 * 60 * 1000;
|
|
285
|
+
/** Проверяет существование процесса: signal 0 не убивает, только пробует. */
|
|
286
|
+
export function isProcessAlive(pid) {
|
|
287
|
+
if (!Number.isInteger(pid) || pid <= 0)
|
|
288
|
+
return false;
|
|
289
|
+
try {
|
|
290
|
+
process.kill(pid, 0);
|
|
291
|
+
return true;
|
|
292
|
+
}
|
|
293
|
+
catch (error) {
|
|
294
|
+
// EPERM — процесс существует, но сигнал запрещён; ESRCH — процесса нет.
|
|
295
|
+
return error?.code === "EPERM";
|
|
296
|
+
}
|
|
297
|
+
}
|
|
298
|
+
export function recoverInterrupted(options = {}) {
|
|
299
|
+
const now = options.now ?? new Date();
|
|
300
|
+
const nowIso = now.toISOString();
|
|
301
|
+
const maxAge = typeof options.maxUnverifiableAgeMs === "number" &&
|
|
302
|
+
Number.isFinite(options.maxUnverifiableAgeMs)
|
|
303
|
+
? Math.max(0, options.maxUnverifiableAgeMs)
|
|
304
|
+
: UNVERIFIABLE_OWNER_MAX_AGE_MS;
|
|
305
|
+
const hostname = options.hostname ?? os.hostname();
|
|
306
|
+
const isAlive = options.isAlive ?? isProcessAlive;
|
|
307
|
+
const db = getDb();
|
|
308
|
+
const rows = db
|
|
309
|
+
.prepare(`SELECT id, started_at, owner_pid, owner_host, owner_started_at
|
|
310
|
+
FROM history WHERE finished_at IS NULL`)
|
|
311
|
+
.all();
|
|
312
|
+
const update = db.prepare(`UPDATE history SET
|
|
313
|
+
status = 'error',
|
|
314
|
+
error = CASE
|
|
315
|
+
WHEN error IS NULL OR error = '' THEN 'Прервано (сбой/перезагрузка)'
|
|
316
|
+
ELSE error
|
|
317
|
+
END,
|
|
318
|
+
finished_at = COALESCE(finished_at, ?),
|
|
319
|
+
duration_ms = COALESCE(
|
|
320
|
+
duration_ms,
|
|
321
|
+
CAST((julianday(?) - julianday(started_at)) * 86400000 AS INTEGER)
|
|
322
|
+
)
|
|
323
|
+
WHERE id = ? AND finished_at IS NULL`);
|
|
324
|
+
// PL-46: «живой» владелец может быть мёртвой записью после schtasks /End —
|
|
325
|
+
// такой прогон помечается timeout, а не error crash recovery.
|
|
326
|
+
const staleUpdate = db.prepare(`UPDATE history SET
|
|
327
|
+
status = 'timeout',
|
|
328
|
+
error = CASE
|
|
329
|
+
WHEN error IS NULL OR error = '' THEN 'Запуск прерван: владелец завершён (schtasks /End или аналог)'
|
|
330
|
+
ELSE error
|
|
331
|
+
END,
|
|
332
|
+
finished_at = COALESCE(finished_at, ?),
|
|
333
|
+
duration_ms = COALESCE(
|
|
334
|
+
duration_ms,
|
|
335
|
+
CAST((julianday(?) - julianday(started_at)) * 86400000 AS INTEGER)
|
|
336
|
+
)
|
|
337
|
+
WHERE id = ? AND finished_at IS NULL`);
|
|
338
|
+
const staleAfter = typeof options.staleAfterMs === "number" && Number.isFinite(options.staleAfterMs)
|
|
339
|
+
? Math.max(0, options.staleAfterMs)
|
|
340
|
+
: 0;
|
|
341
|
+
let recovered = 0;
|
|
342
|
+
let keptAlive = 0;
|
|
343
|
+
withTransaction(() => {
|
|
344
|
+
for (const row of rows) {
|
|
345
|
+
const ownerPid = row.owner_pid == null ? null : Number(row.owner_pid);
|
|
346
|
+
const ownerHost = row.owner_host == null ? null : String(row.owner_host);
|
|
347
|
+
const verifiable = ownerPid != null && ownerPid > 0 && ownerHost != null && ownerHost === hostname;
|
|
348
|
+
if (verifiable && ownerPid != null && isAlive(ownerPid)) {
|
|
349
|
+
const since = Date.parse(String(row.started_at ?? ""));
|
|
350
|
+
const age = Number.isFinite(since) ? now.getTime() - since : 0;
|
|
351
|
+
if (staleAfter > 0 && age >= staleAfter) {
|
|
352
|
+
const result = staleUpdate.run(nowIso, nowIso, row.id);
|
|
353
|
+
if (Number(result.changes) > 0)
|
|
354
|
+
recovered += 1;
|
|
355
|
+
}
|
|
356
|
+
else {
|
|
357
|
+
keptAlive += 1;
|
|
358
|
+
}
|
|
359
|
+
continue;
|
|
360
|
+
}
|
|
361
|
+
if (!verifiable) {
|
|
362
|
+
const since = Date.parse(String(row.owner_started_at ?? row.started_at ?? ""));
|
|
363
|
+
const age = Number.isFinite(since) ? now.getTime() - since : Infinity;
|
|
364
|
+
if (age < maxAge) {
|
|
365
|
+
keptAlive += 1;
|
|
366
|
+
continue;
|
|
367
|
+
}
|
|
368
|
+
}
|
|
369
|
+
const result = update.run(nowIso, nowIso, row.id);
|
|
370
|
+
if (Number(result.changes) > 0)
|
|
371
|
+
recovered += 1;
|
|
372
|
+
}
|
|
373
|
+
});
|
|
374
|
+
return { recovered, keptAlive };
|
|
236
375
|
}
|
|
237
376
|
/** Количество записей истории (для миграции и тестов). */
|
|
238
377
|
export function countHistory() {
|
|
378
|
+
// QA-A2-T3: граница node:sqlite — get() возвращает any, сужаем к строке счётчика.
|
|
239
379
|
const row = getDb().prepare("SELECT COUNT(*) AS count FROM history").get();
|
|
240
380
|
return Number(row?.count) || 0;
|
|
241
381
|
}
|
|
@@ -252,6 +392,7 @@ export function listRunningRecords() {
|
|
|
252
392
|
.prepare(`SELECT id, task_name, started_at FROM history
|
|
253
393
|
WHERE finished_at IS NULL
|
|
254
394
|
ORDER BY started_at ASC, id ASC`)
|
|
395
|
+
// QA-A2-T3: граница node:sqlite — all() возвращает any[], сужаем к доменному типу.
|
|
255
396
|
.all();
|
|
256
397
|
return rows.map((row) => ({
|
|
257
398
|
id: Number(row.id) || 0,
|
|
@@ -21,12 +21,18 @@ export interface TaskMetricsRow {
|
|
|
21
21
|
export interface MetricsTotals {
|
|
22
22
|
total: number;
|
|
23
23
|
success: number;
|
|
24
|
+
/** Реальные отказы (error/timeout/неизвестный статус) без прерванных и пропусков. */
|
|
24
25
|
error: number;
|
|
26
|
+
/** Пропуски (status=skipped) — не падения. */
|
|
27
|
+
skipped: number;
|
|
28
|
+
/** Прерванные crash recovery (error с текстом «Прервано …»). */
|
|
29
|
+
interrupted: number;
|
|
25
30
|
partial: number;
|
|
26
31
|
tokens: number;
|
|
27
32
|
costUsd: number;
|
|
28
33
|
}
|
|
29
34
|
export declare const LEGACY_METRICS_TASK = "__legacy__";
|
|
35
|
+
export declare function isInternalTaskName(taskName: string): boolean;
|
|
30
36
|
/** Инкремент метрик без собственной транзакции (для использования внутри recordRun). */
|
|
31
37
|
export declare function incrementMetricsUnsafe(taskName: string, status: TaskStatus, tokens?: number, costUsd?: number): void;
|
|
32
38
|
/** Атомарно увеличивает счётчики задачи: +1 запуск, +1 success/error, токены, стоимость. */
|
|
@@ -35,8 +41,20 @@ export declare function incrementMetrics(taskName: string, status: TaskStatus, t
|
|
|
35
41
|
export declare function getMetrics(taskName: string): TaskMetricsRow;
|
|
36
42
|
/** Метрики всех реальных задач (служебные строки исключены). */
|
|
37
43
|
export declare function getAllMetrics(includeInternal?: boolean): TaskMetricsRow[];
|
|
38
|
-
/**
|
|
39
|
-
|
|
44
|
+
/**
|
|
45
|
+
* Суммарные метрики по единой выборке истории (QA-P1.1).
|
|
46
|
+
*
|
|
47
|
+
* Раньше итоги брались из таблицы metrics. Но crash recovery помечает
|
|
48
|
+
* незавершённые запуски прямо в history (UPDATE ... status='error') без
|
|
49
|
+
* инкремента metrics, поэтому get_metrics расходился с analytics и
|
|
50
|
+
* self_analysis на число прерванных запусков. Теперь все три источника
|
|
51
|
+
* считают по одной и той же истории: success/partial явные, всё остальное
|
|
52
|
+
* (error/timeout/skipped) — error, running не участвует.
|
|
53
|
+
*
|
|
54
|
+
* Примечание: поточечные метрики getMetrics()/getAllMetrics() остаются
|
|
55
|
+
* таблицей metrics — там хранится в том числе legacy-хвост без истории.
|
|
56
|
+
*/
|
|
57
|
+
export declare function getTotals(includeInternal?: boolean): MetricsTotals;
|
|
40
58
|
/** Старый appendMetric(status) без имени задачи. */
|
|
41
59
|
export declare function incrementGlobalMetrics(status: TaskStatus): void;
|
|
42
60
|
/** Прямая запись строки метрик — используется миграцией. */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"metrics-repo.d.ts","sourceRoot":"","sources":["../../src/db/metrics-repo.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAEhD;;;;;;;;GAQG;AAEH,MAAM,WAAW,cAAc;IAC7B,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,kFAAkF;IAClF,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,aAAa;IAC5B,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;CACjB;AAGD,eAAO,MAAM,mBAAmB,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"metrics-repo.d.ts","sourceRoot":"","sources":["../../src/db/metrics-repo.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAEhD;;;;;;;;GAQG;AAEH,MAAM,WAAW,cAAc;IAC7B,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,kFAAkF;IAClF,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,aAAa;IAC5B,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,qFAAqF;IACrF,KAAK,EAAE,MAAM,CAAC;IACd,8CAA8C;IAC9C,OAAO,EAAE,MAAM,CAAC;IAChB,gEAAgE;IAChE,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;CACjB;AAGD,eAAO,MAAM,mBAAmB,eAAe,CAAC;AAEhD,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAE5D;AAcD,wFAAwF;AACxF,wBAAgB,sBAAsB,CACpC,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,UAAU,EAClB,MAAM,SAAI,EACV,OAAO,SAAI,GACV,IAAI,CAsBN;AAED,4FAA4F;AAC5F,wBAAgB,gBAAgB,CAC9B,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,UAAU,EAClB,MAAM,CAAC,EAAE,MAAM,EACf,OAAO,CAAC,EAAE,MAAM,GACf,IAAI,CAEN;AAED,mEAAmE;AACnE,wBAAgB,UAAU,CAAC,QAAQ,EAAE,MAAM,GAAG,cAAc,CAQ3D;AAED,gEAAgE;AAChE,wBAAgB,aAAa,CAAC,eAAe,UAAQ,GAAG,cAAc,EAAE,CAKvE;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,SAAS,CAAC,eAAe,UAAQ,GAAG,aAAa,CA+BhE;AAED,oDAAoD;AACpD,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,UAAU,GAAG,IAAI,CAE/D;AAED,4DAA4D;AAC5D,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,cAAc,GAAG,IAAI,CAsB1D;AAED,+BAA+B;AAC/B,wBAAgB,YAAY,IAAI,MAAM,CAGrC"}
|
package/dist/db/metrics-repo.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { getDb } from "./index.js";
|
|
2
2
|
const GLOBAL_TASK = "__global__";
|
|
3
3
|
export const LEGACY_METRICS_TASK = "__legacy__";
|
|
4
|
-
function
|
|
4
|
+
export function isInternalTaskName(taskName) {
|
|
5
5
|
return taskName.startsWith("__");
|
|
6
6
|
}
|
|
7
7
|
function rowToMetrics(row) {
|
|
@@ -17,8 +17,8 @@ function rowToMetrics(row) {
|
|
|
17
17
|
}
|
|
18
18
|
/** Инкремент метрик без собственной транзакции (для использования внутри recordRun). */
|
|
19
19
|
export function incrementMetricsUnsafe(taskName, status, tokens = 0, costUsd = 0) {
|
|
20
|
-
// error — только ошибки и таймауты; partial
|
|
21
|
-
//
|
|
20
|
+
// error — только ошибки и таймауты; partial и skipped хранятся отдельно
|
|
21
|
+
// (skipped увеличивает только total: запуск не расходовал токены и не завершился).
|
|
22
22
|
const success = status === "success" ? 1 : 0;
|
|
23
23
|
const partial = status === "partial" ? 1 : 0;
|
|
24
24
|
const error = status === "error" || status === "timeout" ? 1 : 0;
|
|
@@ -55,24 +55,46 @@ export function getAllMetrics(includeInternal = false) {
|
|
|
55
55
|
const rows = getDb()
|
|
56
56
|
.prepare("SELECT * FROM metrics ORDER BY task_name COLLATE NOCASE ASC")
|
|
57
57
|
.all();
|
|
58
|
-
return rows.map(rowToMetrics).filter((row) => includeInternal || !
|
|
58
|
+
return rows.map(rowToMetrics).filter((row) => includeInternal || !isInternalTaskName(row.taskName));
|
|
59
59
|
}
|
|
60
|
-
/**
|
|
61
|
-
|
|
60
|
+
/**
|
|
61
|
+
* Суммарные метрики по единой выборке истории (QA-P1.1).
|
|
62
|
+
*
|
|
63
|
+
* Раньше итоги брались из таблицы metrics. Но crash recovery помечает
|
|
64
|
+
* незавершённые запуски прямо в history (UPDATE ... status='error') без
|
|
65
|
+
* инкремента metrics, поэтому get_metrics расходился с analytics и
|
|
66
|
+
* self_analysis на число прерванных запусков. Теперь все три источника
|
|
67
|
+
* считают по одной и той же истории: success/partial явные, всё остальное
|
|
68
|
+
* (error/timeout/skipped) — error, running не участвует.
|
|
69
|
+
*
|
|
70
|
+
* Примечание: поточечные метрики getMetrics()/getAllMetrics() остаются
|
|
71
|
+
* таблицей metrics — там хранится в том числе legacy-хвост без истории.
|
|
72
|
+
*/
|
|
73
|
+
export function getTotals(includeInternal = false) {
|
|
74
|
+
// PL-37: служебные задачи (__*), используемые тестами/пробами, не должны
|
|
75
|
+
// попадать в агрегированные метрики — getAllMetrics их уже фильтрует.
|
|
76
|
+
const internalFilter = includeInternal ? "" : "AND task_name NOT LIKE '\\_\\_%' ESCAPE '\\'";
|
|
62
77
|
const row = getDb()
|
|
63
78
|
.prepare(`SELECT
|
|
64
|
-
|
|
65
|
-
COALESCE(SUM(success), 0) AS success,
|
|
66
|
-
COALESCE(SUM(
|
|
67
|
-
COALESCE(SUM(
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
79
|
+
COUNT(*) AS total,
|
|
80
|
+
COALESCE(SUM(CASE WHEN status = 'success' THEN 1 ELSE 0 END), 0) AS success,
|
|
81
|
+
COALESCE(SUM(CASE WHEN status = 'partial' THEN 1 ELSE 0 END), 0) AS partial,
|
|
82
|
+
COALESCE(SUM(CASE WHEN status = 'skipped' THEN 1 ELSE 0 END), 0) AS skipped,
|
|
83
|
+
COALESCE(SUM(CASE WHEN status NOT IN ('success', 'partial', 'running', 'skipped')
|
|
84
|
+
AND COALESCE(error, '') NOT LIKE '%Прервано%' THEN 1 ELSE 0 END), 0) AS error,
|
|
85
|
+
COALESCE(SUM(CASE WHEN status NOT IN ('success', 'partial', 'running', 'skipped')
|
|
86
|
+
AND COALESCE(error, '') LIKE '%Прервано%' THEN 1 ELSE 0 END), 0) AS interrupted,
|
|
87
|
+
COALESCE(SUM(CASE WHEN tokens > 0 THEN CAST(tokens AS INTEGER) ELSE 0 END), 0) AS tokens,
|
|
88
|
+
COALESCE(SUM(CASE WHEN cost_usd > 0 THEN cost_usd ELSE 0 END), 0) AS cost_usd
|
|
89
|
+
FROM history
|
|
90
|
+
WHERE status <> 'running' ${internalFilter}`)
|
|
71
91
|
.get();
|
|
72
92
|
return {
|
|
73
93
|
total: Number(row?.total) || 0,
|
|
74
94
|
success: Number(row?.success) || 0,
|
|
75
95
|
error: Number(row?.error) || 0,
|
|
96
|
+
skipped: Number(row?.skipped) || 0,
|
|
97
|
+
interrupted: Number(row?.interrupted) || 0,
|
|
76
98
|
partial: Number(row?.partial) || 0,
|
|
77
99
|
tokens: Number(row?.tokens) || 0,
|
|
78
100
|
costUsd: Number(row?.cost_usd) || 0,
|
package/dist/db/migrate.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"migrate.d.ts","sourceRoot":"","sources":["../../src/db/migrate.ts"],"names":[],"mappings":"AAWA;;;;;;;;;GASG;AAEH,MAAM,WAAW,eAAe;IAC9B,QAAQ,EAAE,OAAO,CAAC;IAClB,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,EAAE,CAAC;CACnB;
|
|
1
|
+
{"version":3,"file":"migrate.d.ts","sourceRoot":"","sources":["../../src/db/migrate.ts"],"names":[],"mappings":"AAWA;;;;;;;;;GASG;AAEH,MAAM,WAAW,eAAe;IAC9B,QAAQ,EAAE,OAAO,CAAC;IAClB,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,EAAE,CAAC;CACnB;AA6GD;;;GAGG;AACH,wBAAsB,eAAe,CACnC,SAAS,GAAE,MAAmB,GAC7B,OAAO,CAAC,eAAe,CAAC,CAkN1B"}
|
package/dist/db/migrate.js
CHANGED
|
@@ -13,6 +13,24 @@ const EMPTY_RESULT = {
|
|
|
13
13
|
backups: [],
|
|
14
14
|
};
|
|
15
15
|
const JSON_FILES = ["tasks.json", "history.json", "metrics.json", "templates.json"];
|
|
16
|
+
function isRecord(value) {
|
|
17
|
+
return typeof value === "object" && value !== null && !Array.isArray(value);
|
|
18
|
+
}
|
|
19
|
+
/** Встроенный Array.isArray возвращает слабый тип массива; свой guard даёт unknown[] (QA-A2.4). */
|
|
20
|
+
function isUnknownArray(value) {
|
|
21
|
+
return Array.isArray(value);
|
|
22
|
+
}
|
|
23
|
+
/**
|
|
24
|
+
* Граница внешнего API (node:fs, JSON.parse, node:sqlite): выброшенное значение
|
|
25
|
+
* не гарантированно Error. Извлечение сообщения сохранено как в legacy-коде.
|
|
26
|
+
*/
|
|
27
|
+
function errorText(err) {
|
|
28
|
+
return err instanceof Error ? err.message : String(err);
|
|
29
|
+
}
|
|
30
|
+
/** node:fs сообщает «файл не найден» через свойство code (внешняя граница API). */
|
|
31
|
+
function isErrnoException(err) {
|
|
32
|
+
return err instanceof Error && "code" in err && typeof err.code === "string";
|
|
33
|
+
}
|
|
16
34
|
async function loadJsonFile(file) {
|
|
17
35
|
try {
|
|
18
36
|
const raw = await fs.readFile(file, "utf8");
|
|
@@ -20,21 +38,21 @@ async function loadJsonFile(file) {
|
|
|
20
38
|
return { path: file, exists: true, value: JSON.parse(raw) };
|
|
21
39
|
}
|
|
22
40
|
catch (err) {
|
|
23
|
-
throw new Error(`Некорректный JSON в ${path.basename(file)}: ${
|
|
41
|
+
throw new Error(`Некорректный JSON в ${path.basename(file)}: ${errorText(err)}`);
|
|
24
42
|
}
|
|
25
43
|
}
|
|
26
44
|
catch (err) {
|
|
27
|
-
if (err
|
|
45
|
+
if (isErrnoException(err) && err.code === "ENOENT") {
|
|
28
46
|
return { path: file, exists: false, value: null };
|
|
47
|
+
}
|
|
29
48
|
throw err;
|
|
30
49
|
}
|
|
31
50
|
}
|
|
32
51
|
function asArray(value) {
|
|
33
|
-
if (
|
|
52
|
+
if (isUnknownArray(value))
|
|
34
53
|
return value;
|
|
35
|
-
if (value &&
|
|
54
|
+
if (isRecord(value) && isUnknownArray(value.tasks))
|
|
36
55
|
return value.tasks;
|
|
37
|
-
}
|
|
38
56
|
return [];
|
|
39
57
|
}
|
|
40
58
|
function toNumber(value) {
|
|
@@ -48,7 +66,7 @@ function toStringOrNull(value) {
|
|
|
48
66
|
}
|
|
49
67
|
/** Приводит старую запись истории к колонкам БД. */
|
|
50
68
|
function normalizeHistoryRow(raw) {
|
|
51
|
-
if (!raw
|
|
69
|
+
if (!isRecord(raw))
|
|
52
70
|
return null;
|
|
53
71
|
const taskName = typeof raw.taskName === "string" ? raw.taskName.trim() : "";
|
|
54
72
|
const startedAt = typeof raw.startedAt === "string" ? raw.startedAt : "";
|
|
@@ -90,10 +108,8 @@ export async function migrateJsonToDb(pluginDir = PLUGIN_DIR) {
|
|
|
90
108
|
.map(normalizeHistoryRow)
|
|
91
109
|
.filter((row) => row !== null);
|
|
92
110
|
const templateItems = asArray(byName.get("templates.json")?.value);
|
|
93
|
-
const
|
|
94
|
-
|
|
95
|
-
? byName.get("metrics.json").value
|
|
96
|
-
: null;
|
|
111
|
+
const metricsValue = byName.get("metrics.json")?.value;
|
|
112
|
+
const legacyMetrics = isRecord(metricsValue) ? metricsValue : null;
|
|
97
113
|
const now = new Date().toISOString();
|
|
98
114
|
let insertedTasks = 0;
|
|
99
115
|
let insertedHistory = 0;
|
|
@@ -102,10 +118,12 @@ export async function migrateJsonToDb(pluginDir = PLUGIN_DIR) {
|
|
|
102
118
|
withTransaction(() => {
|
|
103
119
|
const db = getDb();
|
|
104
120
|
// --- tasks ---
|
|
121
|
+
// Сырой SQL и node:sqlite — граница внешнего API: в БД попадают только
|
|
122
|
+
// значения, прошедшие проверки выше (name/createdAt — string, остальное — JSON).
|
|
105
123
|
const insertTask = db.prepare("INSERT INTO tasks (name, definition_json, created_at, updated_at) VALUES (?, ?, ?, ?)");
|
|
106
124
|
const seenTasks = new Set();
|
|
107
125
|
for (const item of taskItems) {
|
|
108
|
-
if (!item
|
|
126
|
+
if (!isRecord(item))
|
|
109
127
|
continue;
|
|
110
128
|
const name = typeof item.name === "string" ? item.name.trim() : "";
|
|
111
129
|
if (!name || seenTasks.has(name.toLowerCase()))
|
|
@@ -113,10 +131,11 @@ export async function migrateJsonToDb(pluginDir = PLUGIN_DIR) {
|
|
|
113
131
|
seenTasks.add(name.toLowerCase());
|
|
114
132
|
// workdir → workingDirectory, как в старом loadTaskDefinitions().
|
|
115
133
|
const definition = { ...item, name };
|
|
134
|
+
const legacyWorkdir = definition.workdir;
|
|
116
135
|
if (definition.workingDirectory === undefined &&
|
|
117
|
-
typeof
|
|
118
|
-
|
|
119
|
-
definition.workingDirectory =
|
|
136
|
+
typeof legacyWorkdir === "string" &&
|
|
137
|
+
legacyWorkdir.trim()) {
|
|
138
|
+
definition.workingDirectory = legacyWorkdir.trim();
|
|
120
139
|
}
|
|
121
140
|
delete definition.workdir;
|
|
122
141
|
const createdAt = typeof definition.createdAt === "string" && definition.createdAt
|
|
@@ -139,14 +158,15 @@ export async function migrateJsonToDb(pluginDir = PLUGIN_DIR) {
|
|
|
139
158
|
const insertTemplate = db.prepare("INSERT INTO templates (id, name, definition_json) VALUES (?, ?, ?)");
|
|
140
159
|
const seenTemplates = new Set();
|
|
141
160
|
for (const item of templateItems) {
|
|
142
|
-
if (!item
|
|
161
|
+
if (!isRecord(item))
|
|
143
162
|
continue;
|
|
144
163
|
if (typeof item.prompt !== "string")
|
|
145
164
|
continue;
|
|
146
165
|
const name = typeof item.name === "string" ? item.name.trim() : "";
|
|
147
166
|
if (!name)
|
|
148
167
|
continue;
|
|
149
|
-
const
|
|
168
|
+
const legacyId = item.id;
|
|
169
|
+
const id = typeof legacyId === "string" && legacyId.trim() ? legacyId.trim() : randomUUID();
|
|
150
170
|
const key = id.toLowerCase();
|
|
151
171
|
if (seenTemplates.has(key))
|
|
152
172
|
continue;
|
|
@@ -231,7 +251,7 @@ export async function migrateJsonToDb(pluginDir = PLUGIN_DIR) {
|
|
|
231
251
|
backups.push(path.basename(backup));
|
|
232
252
|
}
|
|
233
253
|
catch (err) {
|
|
234
|
-
console.error(`[migrate] Не удалось переименовать ${path.basename(file.path)} в .bak: ${
|
|
254
|
+
console.error(`[migrate] Не удалось переименовать ${path.basename(file.path)} в .bak: ${errorText(err)}`);
|
|
235
255
|
}
|
|
236
256
|
}
|
|
237
257
|
console.log(`[migrate] Перемещено ${insertedTasks} задач, ${insertedHistory} записей истории, ${insertedTemplates} шаблонов.`);
|
package/dist/db/recovery.d.ts
CHANGED
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* Crash recovery: помечает незавершённые записи истории как error.
|
|
3
|
-
* Вызывается при setup() до запуска catch-up и файловых
|
|
3
|
+
* Вызывается при setup() до запуска catch-up и файловых триггеров, а также
|
|
4
|
+
* перед выдачей истории (PL-46), чтобы «висящие» запуски не оставались
|
|
5
|
+
* running после schtasks /End.
|
|
4
6
|
*/
|
|
5
7
|
export declare function recoverInterruptedRuns(): number;
|
|
6
8
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"recovery.d.ts","sourceRoot":"","sources":["../../src/db/recovery.ts"],"names":[],"mappings":"AASA
|
|
1
|
+
{"version":3,"file":"recovery.d.ts","sourceRoot":"","sources":["../../src/db/recovery.ts"],"names":[],"mappings":"AASA;;;;;GAKG;AACH,wBAAgB,sBAAsB,IAAI,MAAM,CAa/C;AAED;;;GAGG;AACH,wBAAgB,gBAAgB,IAAI,OAAO,CAkB1C"}
|
package/dist/db/recovery.js
CHANGED
|
@@ -7,14 +7,20 @@ import { recoverInterrupted } from "./history-repo.js";
|
|
|
7
7
|
const JSON_FILES = ["tasks.json", "history.json", "metrics.json", "templates.json"];
|
|
8
8
|
/**
|
|
9
9
|
* Crash recovery: помечает незавершённые записи истории как error.
|
|
10
|
-
* Вызывается при setup() до запуска catch-up и файловых
|
|
10
|
+
* Вызывается при setup() до запуска catch-up и файловых триггеров, а также
|
|
11
|
+
* перед выдачей истории (PL-46), чтобы «висящие» запуски не оставались
|
|
12
|
+
* running после schtasks /End.
|
|
11
13
|
*/
|
|
12
14
|
export function recoverInterruptedRuns() {
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
15
|
+
// Порог можно переопределить: 0 отключает финализацию живого владельца.
|
|
16
|
+
const configured = Number(process.env.AGENT_STEWARD_STALE_RUN_MS);
|
|
17
|
+
const staleAfterMs = Number.isFinite(configured) && configured > 0 ? configured : 2 * 60 * 60 * 1000;
|
|
18
|
+
const { recovered, keptAlive } = recoverInterrupted({ staleAfterMs });
|
|
19
|
+
if (recovered > 0) {
|
|
20
|
+
console.log(`[recovery] Восстановлено ${recovered} незавершённых записей истории (error/timeout).` +
|
|
21
|
+
(keptAlive > 0 ? ` Оставлено живым владельцам: ${keptAlive}.` : ""));
|
|
16
22
|
}
|
|
17
|
-
return
|
|
23
|
+
return recovered;
|
|
18
24
|
}
|
|
19
25
|
/**
|
|
20
26
|
* Если БД пуста, а .json.bak остались (миграция не удалась или БД удалили),
|