agent-steward 0.0.3 → 0.0.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (287) hide show
  1. package/CHANGELOG.md +154 -2
  2. package/CROSS_PLATFORM.md +19 -0
  3. package/README.md +54 -9
  4. package/ROADMAP-STRATEGY.md +23 -20
  5. package/ROADMAP.md +140 -143
  6. package/dist/cli.d.ts +3 -0
  7. package/dist/cli.d.ts.map +1 -0
  8. package/dist/cli.js +351 -0
  9. package/dist/core/dlq-api.d.ts +44 -0
  10. package/dist/core/dlq-api.d.ts.map +1 -0
  11. package/dist/core/dlq-api.js +68 -0
  12. package/dist/core/dry-run.d.ts.map +1 -1
  13. package/dist/core/dry-run.js +18 -1
  14. package/dist/core/execution.d.ts +203 -0
  15. package/dist/core/execution.d.ts.map +1 -0
  16. package/dist/core/execution.js +309 -0
  17. package/dist/core/gate-integrity.d.ts +35 -0
  18. package/dist/core/gate-integrity.d.ts.map +1 -0
  19. package/dist/core/gate-integrity.js +132 -0
  20. package/dist/core/git-trigger.d.ts.map +1 -1
  21. package/dist/core/git-trigger.js +14 -2
  22. package/dist/core/guard-run.d.ts +4 -0
  23. package/dist/core/guard-run.d.ts.map +1 -0
  24. package/dist/core/guard-run.js +101 -0
  25. package/dist/core/guard.d.ts +52 -0
  26. package/dist/core/guard.d.ts.map +1 -0
  27. package/dist/core/guard.js +362 -0
  28. package/dist/core/lock.d.ts +61 -4
  29. package/dist/core/lock.d.ts.map +1 -1
  30. package/dist/core/lock.js +213 -26
  31. package/dist/core/matrix.d.ts.map +1 -1
  32. package/dist/core/matrix.js +75 -15
  33. package/dist/core/mission.d.ts +83 -0
  34. package/dist/core/mission.d.ts.map +1 -0
  35. package/dist/core/mission.js +334 -0
  36. package/dist/core/one-shot.d.ts +5 -1
  37. package/dist/core/one-shot.d.ts.map +1 -1
  38. package/dist/core/one-shot.js +33 -8
  39. package/dist/core/opencode-cli.d.ts +28 -0
  40. package/dist/core/opencode-cli.d.ts.map +1 -0
  41. package/dist/core/opencode-cli.js +74 -0
  42. package/dist/core/opencode-models.d.ts +62 -0
  43. package/dist/core/opencode-models.d.ts.map +1 -0
  44. package/dist/core/opencode-models.js +277 -0
  45. package/dist/core/pipeline-apply.d.ts +38 -0
  46. package/dist/core/pipeline-apply.d.ts.map +1 -0
  47. package/dist/core/pipeline-apply.js +117 -0
  48. package/dist/core/pipeline-io.d.ts +13 -0
  49. package/dist/core/pipeline-io.d.ts.map +1 -0
  50. package/dist/core/pipeline-io.js +64 -0
  51. package/dist/core/pipeline-map.d.ts +46 -0
  52. package/dist/core/pipeline-map.d.ts.map +1 -0
  53. package/dist/core/pipeline-map.js +196 -0
  54. package/dist/core/pipeline-spec.d.ts +109 -0
  55. package/dist/core/pipeline-spec.d.ts.map +1 -0
  56. package/dist/core/pipeline-spec.js +554 -0
  57. package/dist/core/ps-wrapper.d.ts +19 -2
  58. package/dist/core/ps-wrapper.d.ts.map +1 -1
  59. package/dist/core/ps-wrapper.js +261 -63
  60. package/dist/core/record-history.d.ts +15 -0
  61. package/dist/core/record-history.d.ts.map +1 -1
  62. package/dist/core/record-history.js +183 -58
  63. package/dist/core/router/dispatch.d.ts +36 -0
  64. package/dist/core/router/dispatch.d.ts.map +1 -0
  65. package/dist/core/router/dispatch.js +59 -0
  66. package/dist/core/router/escalation.d.ts +47 -0
  67. package/dist/core/router/escalation.d.ts.map +1 -0
  68. package/dist/core/router/escalation.js +87 -0
  69. package/dist/core/router/planner.d.ts +53 -0
  70. package/dist/core/router/planner.d.ts.map +1 -0
  71. package/dist/core/router/planner.js +113 -0
  72. package/dist/core/router/rules.d.ts +46 -0
  73. package/dist/core/router/rules.d.ts.map +1 -0
  74. package/dist/core/router/rules.js +91 -0
  75. package/dist/core/run-panel-api.d.ts +94 -0
  76. package/dist/core/run-panel-api.d.ts.map +1 -0
  77. package/dist/core/run-panel-api.js +169 -0
  78. package/dist/core/schedule-gate.js +5 -1
  79. package/dist/core/schedule-v2.d.ts +34 -0
  80. package/dist/core/schedule-v2.d.ts.map +1 -1
  81. package/dist/core/schedule-v2.js +91 -5
  82. package/dist/core/scheduler/at-fallback.d.ts +55 -2
  83. package/dist/core/scheduler/at-fallback.d.ts.map +1 -1
  84. package/dist/core/scheduler/at-fallback.js +135 -5
  85. package/dist/core/scheduler/linux.d.ts +18 -2
  86. package/dist/core/scheduler/linux.d.ts.map +1 -1
  87. package/dist/core/scheduler/linux.js +63 -20
  88. package/dist/core/scheduler/mac.d.ts +44 -2
  89. package/dist/core/scheduler/mac.d.ts.map +1 -1
  90. package/dist/core/scheduler/mac.js +126 -15
  91. package/dist/core/scheduler/posix.d.ts.map +1 -1
  92. package/dist/core/scheduler/posix.js +25 -1
  93. package/dist/core/scheduler/registry.d.ts +11 -0
  94. package/dist/core/scheduler/registry.d.ts.map +1 -1
  95. package/dist/core/scheduler/registry.js +83 -21
  96. package/dist/core/scheduler/run-now.d.ts +16 -0
  97. package/dist/core/scheduler/run-now.d.ts.map +1 -0
  98. package/dist/core/scheduler/run-now.js +28 -0
  99. package/dist/core/scheduler/windows.d.ts.map +1 -1
  100. package/dist/core/scheduler/windows.js +15 -12
  101. package/dist/core/secrets.d.ts.map +1 -1
  102. package/dist/core/secrets.js +125 -28
  103. package/dist/core/session.d.ts.map +1 -1
  104. package/dist/core/session.js +18 -11
  105. package/dist/core/structured-log.d.ts +7 -1
  106. package/dist/core/structured-log.d.ts.map +1 -1
  107. package/dist/core/task-name.d.ts +24 -0
  108. package/dist/core/task-name.d.ts.map +1 -0
  109. package/dist/core/task-name.js +40 -0
  110. package/dist/core/worktree-run.d.ts +4 -0
  111. package/dist/core/worktree-run.d.ts.map +1 -0
  112. package/dist/core/worktree-run.js +164 -0
  113. package/dist/core/worktree.d.ts +115 -0
  114. package/dist/core/worktree.d.ts.map +1 -0
  115. package/dist/core/worktree.js +462 -0
  116. package/dist/core/wrappers/bash.d.ts +17 -0
  117. package/dist/core/wrappers/bash.d.ts.map +1 -1
  118. package/dist/core/wrappers/bash.js +224 -28
  119. package/dist/db/capability-repo.d.ts +124 -0
  120. package/dist/db/capability-repo.d.ts.map +1 -0
  121. package/dist/db/capability-repo.js +267 -0
  122. package/dist/db/history-repo.d.ts +46 -5
  123. package/dist/db/history-repo.d.ts.map +1 -1
  124. package/dist/db/history-repo.js +107 -25
  125. package/dist/db/index.d.ts +4 -0
  126. package/dist/db/index.d.ts.map +1 -1
  127. package/dist/db/index.js +39 -1
  128. package/dist/db/metrics-repo.js +2 -2
  129. package/dist/db/migrate.d.ts.map +1 -1
  130. package/dist/db/migrate.js +3 -1
  131. package/dist/db/recovery.d.ts.map +1 -1
  132. package/dist/db/recovery.js +5 -4
  133. package/dist/db/run-context.d.ts +103 -0
  134. package/dist/db/run-context.d.ts.map +1 -0
  135. package/dist/db/run-context.js +224 -0
  136. package/dist/db/run-dlq.d.ts +100 -0
  137. package/dist/db/run-dlq.d.ts.map +1 -0
  138. package/dist/db/run-dlq.js +191 -0
  139. package/dist/db/run-journal.d.ts +33 -5
  140. package/dist/db/run-journal.d.ts.map +1 -1
  141. package/dist/db/run-journal.js +78 -14
  142. package/dist/db/run-resume.d.ts +10 -2
  143. package/dist/db/run-resume.d.ts.map +1 -1
  144. package/dist/db/run-resume.js +39 -13
  145. package/dist/db/runs-repo.d.ts +32 -7
  146. package/dist/db/runs-repo.d.ts.map +1 -1
  147. package/dist/db/runs-repo.js +50 -11
  148. package/dist/db/schema.d.ts +2 -2
  149. package/dist/db/schema.d.ts.map +1 -1
  150. package/dist/db/schema.js +216 -3
  151. package/dist/db/settings-repo.d.ts +11 -0
  152. package/dist/db/settings-repo.d.ts.map +1 -1
  153. package/dist/db/settings-repo.js +25 -0
  154. package/dist/db/step-idempotency.d.ts +51 -0
  155. package/dist/db/step-idempotency.d.ts.map +1 -0
  156. package/dist/db/step-idempotency.js +136 -0
  157. package/dist/history.d.ts +1 -1
  158. package/dist/history.d.ts.map +1 -1
  159. package/dist/i18n.d.ts +5 -0
  160. package/dist/i18n.d.ts.map +1 -1
  161. package/dist/i18n.js +11 -4
  162. package/dist/index.d.ts +140 -6
  163. package/dist/index.d.ts.map +1 -1
  164. package/dist/index.js +480 -18
  165. package/dist/notifications.d.ts +22 -0
  166. package/dist/notifications.d.ts.map +1 -1
  167. package/dist/notifications.js +36 -8
  168. package/dist/profiles.d.ts.map +1 -1
  169. package/dist/profiles.js +25 -4
  170. package/dist/rpc.d.ts +924 -0
  171. package/dist/rpc.d.ts.map +1 -1
  172. package/dist/rpc.js +352 -0
  173. package/dist/server.d.ts +46 -0
  174. package/dist/server.d.ts.map +1 -1
  175. package/dist/server.js +172 -53
  176. package/dist/settings.d.ts +2 -2
  177. package/dist/settings.d.ts.map +1 -1
  178. package/dist/settings.js +3 -3
  179. package/dist/shared/jobs-view.d.ts +1 -1
  180. package/dist/shared/jobs-view.d.ts.map +1 -1
  181. package/dist/shared/jobs-view.js +2 -0
  182. package/dist/task-transfer.d.ts +16 -0
  183. package/dist/task-transfer.d.ts.map +1 -1
  184. package/dist/task-transfer.js +16 -0
  185. package/dist/types.d.ts.map +1 -1
  186. package/dist/types.js +7 -0
  187. package/dist/workspaces.d.ts +25 -3
  188. package/dist/workspaces.d.ts.map +1 -1
  189. package/dist/workspaces.js +43 -8
  190. package/docs/ARCHITECTURE.md +498 -58
  191. package/docs/COMPATIBILITY.md +2 -2
  192. package/docs/CONCEPT.md +185 -91
  193. package/docs/CROSS_PLATFORM.ru.md +20 -0
  194. package/docs/CROSS_PLATFORM.zh.md +18 -0
  195. package/docs/EXECUTION-LOOP.md +211 -0
  196. package/docs/FEATURES.md +65 -4
  197. package/docs/FEATURES.zh.md +52 -4
  198. package/docs/MIGRATION.md +2 -2
  199. package/docs/PIPELINE.md +293 -0
  200. package/docs/README.ru.md +44 -5
  201. package/docs/README.zh.md +46 -6
  202. package/docs/SAFETY.md +142 -0
  203. package/docs/SAVINGS.md +29 -0
  204. package/docs/SAVINGS.ru.md +29 -0
  205. package/docs/SAVINGS.zh.md +18 -0
  206. package/gui-experimental.cjs +9 -8
  207. package/locales/en.json +84 -1
  208. package/locales/ru.json +84 -1
  209. package/locales/zh.json +84 -1
  210. package/opencode.pipeline.yaml +35 -0
  211. package/package.json +46 -2
  212. package/scripts/audit-bundle.mjs +215 -0
  213. package/scripts/test-home.mjs +83 -0
  214. package/src/cli.ts +412 -0
  215. package/src/core/dlq-api.ts +98 -0
  216. package/src/core/dry-run.ts +27 -3
  217. package/src/core/execution.ts +538 -0
  218. package/src/core/file-watcher.ts +2 -2
  219. package/src/core/gate-integrity.ts +160 -0
  220. package/src/core/git-trigger.ts +18 -5
  221. package/src/core/guard-run.ts +119 -0
  222. package/src/core/guard.ts +431 -0
  223. package/src/core/lock.ts +244 -30
  224. package/src/core/matrix.ts +95 -50
  225. package/src/core/mission.ts +485 -0
  226. package/src/core/native-notify.ts +1 -1
  227. package/src/core/one-shot.ts +36 -8
  228. package/src/core/opencode-cli.ts +103 -0
  229. package/src/core/opencode-models.ts +315 -0
  230. package/src/core/pipeline-apply.ts +158 -0
  231. package/src/core/pipeline-io.ts +79 -0
  232. package/src/core/pipeline-map.ts +264 -0
  233. package/src/core/pipeline-spec.ts +775 -0
  234. package/src/core/ps-wrapper.ts +274 -64
  235. package/src/core/record-history.ts +229 -104
  236. package/src/core/router/dispatch.ts +94 -0
  237. package/src/core/router/escalation.ts +129 -0
  238. package/src/core/router/planner.ts +166 -0
  239. package/src/core/router/rules.ts +115 -0
  240. package/src/core/run-panel-api.ts +262 -0
  241. package/src/core/schedule-gate.ts +7 -3
  242. package/src/core/schedule-v2.ts +114 -5
  243. package/src/core/scheduler/at-fallback.ts +190 -5
  244. package/src/core/scheduler/linux.ts +72 -21
  245. package/src/core/scheduler/logs.ts +2 -2
  246. package/src/core/scheduler/mac.ts +174 -14
  247. package/src/core/scheduler/posix.ts +20 -1
  248. package/src/core/scheduler/registry.ts +107 -26
  249. package/src/core/scheduler/run-now.ts +32 -0
  250. package/src/core/scheduler/windows.ts +19 -15
  251. package/src/core/secrets.ts +131 -31
  252. package/src/core/session.ts +23 -10
  253. package/src/core/structured-log.ts +22 -5
  254. package/src/core/task-name.ts +67 -0
  255. package/src/core/telegram.ts +2 -2
  256. package/src/core/triage-worker.ts +7 -7
  257. package/src/core/triage.ts +2 -2
  258. package/src/core/worktree-run.ts +199 -0
  259. package/src/core/worktree.ts +600 -0
  260. package/src/core/wrappers/bash.ts +239 -27
  261. package/src/db/capability-repo.ts +402 -0
  262. package/src/db/history-repo.ts +151 -22
  263. package/src/db/index.ts +37 -1
  264. package/src/db/metrics-repo.ts +2 -2
  265. package/src/db/migrate.ts +3 -1
  266. package/src/db/recovery.ts +5 -4
  267. package/src/db/run-context.ts +370 -0
  268. package/src/db/run-dlq.ts +310 -0
  269. package/src/db/run-journal.ts +100 -13
  270. package/src/db/run-resume.ts +65 -13
  271. package/src/db/runs-repo.ts +66 -13
  272. package/src/db/schema.ts +218 -3
  273. package/src/db/settings-repo.ts +31 -0
  274. package/src/db/step-idempotency.ts +185 -0
  275. package/src/gui.tsx +692 -13
  276. package/src/history.ts +1 -1
  277. package/src/i18n.ts +12 -4
  278. package/src/index.ts +648 -8
  279. package/src/notifications.ts +38 -8
  280. package/src/profiles.ts +26 -4
  281. package/src/rpc.ts +379 -0
  282. package/src/server.ts +206 -54
  283. package/src/settings.ts +5 -5
  284. package/src/shared/jobs-view.ts +3 -1
  285. package/src/task-transfer.ts +31 -0
  286. package/src/types.ts +9 -0
  287. package/src/workspaces.ts +58 -9
@@ -0,0 +1,267 @@
1
+ import { normalizeTaskType } from "../core/router/rules.js";
2
+ import { getDb, withTransaction } from "./index.js";
3
+ /** Порог, выше которого шаг считается надёжным для локали. */
4
+ export const LOCAL_SUCCESS_THRESHOLD = 0.85;
5
+ /** Порог, ниже которого локальный исполнитель считается безнадёжным. */
6
+ export const CLOUD_FAILURE_THRESHOLD = 0.3;
7
+ /** Минимум исходов, чтобы карта вообще бралась судить. */
8
+ export const MIN_RUNS_FOR_DECISION = 3;
9
+ /** Сколько последних исходов хранить (1 — гейт пройден, 0 — провал). */
10
+ export const RECENT_RUNS_LIMIT = 10;
11
+ /**
12
+ * B13: полураспад веса исхода в последних прогонах. Исход давностью
13
+ * `SUCCESS_HALF_LIFE_RUNS` прогонов весит вдвое меньше свежего.
14
+ */
15
+ export const SUCCESS_HALF_LIFE_RUNS = 8;
16
+ /** B13: доля затухающего success rate в итоговой надёжности. */
17
+ export const DECAY_WEIGHT = 0.7;
18
+ /** B13: доля first-pass rate в итоговой надёжности. */
19
+ export const FIRST_PASS_WEIGHT = 0.3;
20
+ const DEFAULT_MODEL = "local";
21
+ function nowIso() {
22
+ return new Date().toISOString();
23
+ }
24
+ function requireTaskType(taskType) {
25
+ if (typeof taskType !== "string" || taskType.trim() === "") {
26
+ throw new Error("Пустой тип задачи: Capability Map требует непустой taskType.");
27
+ }
28
+ return normalizeTaskType(taskType);
29
+ }
30
+ function requireNonNegative(value, field) {
31
+ if (!Number.isFinite(value) || value < 0) {
32
+ throw new Error(`Некорректное значение ${field}: ожидалось неотрицательное число, получено ${value}.`);
33
+ }
34
+ return value;
35
+ }
36
+ /** B13: номер попытки — целое ≥ 1. */
37
+ function requireAttempts(value) {
38
+ if (!Number.isInteger(value) || value < 1) {
39
+ throw new Error(`Некорректное значение attempts: ожидалось целое ≥ 1, получено ${value}.`);
40
+ }
41
+ return value;
42
+ }
43
+ function parseRecentRuns(raw) {
44
+ if (typeof raw !== "string" || raw.trim() === "") {
45
+ return [];
46
+ }
47
+ try {
48
+ const parsed = JSON.parse(raw);
49
+ if (!Array.isArray(parsed)) {
50
+ return [];
51
+ }
52
+ return parsed
53
+ .map((value) => (typeof value === "number" ? value : Number(value)))
54
+ .filter((value) => value === 0 || value === 1)
55
+ .slice(-RECENT_RUNS_LIMIT);
56
+ }
57
+ catch {
58
+ return [];
59
+ }
60
+ }
61
+ /**
62
+ * B13: экспоненциально взвешенный success rate последних исходов.
63
+ *
64
+ * Свежий исход весит 1, исход давностью `halfLife` прогонов — 0.5.
65
+ * Так старые успехи не перевешивают свежие провалы, а `last_10_runs`
66
+ * участвует в решении, а не только хранится для отчёта.
67
+ */
68
+ export function decayedSuccessRate(runs, halfLife = SUCCESS_HALF_LIFE_RUNS) {
69
+ const recent = runs
70
+ .filter((value) => value === 0 || value === 1)
71
+ .slice(-RECENT_RUNS_LIMIT);
72
+ if (recent.length === 0)
73
+ return 0;
74
+ const hl = Number.isFinite(halfLife) && halfLife > 0 ? halfLife : SUCCESS_HALF_LIFE_RUNS;
75
+ let weighted = 0;
76
+ let weights = 0;
77
+ recent.forEach((value, index) => {
78
+ const age = recent.length - 1 - index;
79
+ const weight = Math.pow(0.5, age / hl);
80
+ weighted += weight * value;
81
+ weights += weight;
82
+ });
83
+ return weights > 0 ? weighted / weights : 0;
84
+ }
85
+ /** B13: надёжность для маршрутизации — затухание плюс успех с первой попытки. */
86
+ export function effectiveReliability(decayedRate, firstPassRate) {
87
+ const decayed = Math.min(1, Math.max(0, decayedRate));
88
+ const firstPass = Math.min(1, Math.max(0, firstPassRate));
89
+ return DECAY_WEIGHT * decayed + FIRST_PASS_WEIGHT * firstPass;
90
+ }
91
+ function rowToRecord(row) {
92
+ const runsTotal = Number(row.runs_total) || 0;
93
+ const runsPassed = Number(row.runs_passed) || 0;
94
+ const successRate = Number(row.success_rate) || (runsTotal > 0 ? runsPassed / runsTotal : 0);
95
+ const firstPassCount = Number(row.first_pass_count) || 0;
96
+ const firstPassRate = runsTotal > 0 ? Math.min(1, firstPassCount / runsTotal) : 0;
97
+ const last10Runs = parseRecentRuns(row.last_10_runs);
98
+ const decayed = last10Runs.length > 0 ? decayedSuccessRate(last10Runs) : successRate;
99
+ return {
100
+ taskType: String(row.task_type),
101
+ model: String(row.model ?? DEFAULT_MODEL),
102
+ runsTotal,
103
+ runsPassed,
104
+ firstPassCount,
105
+ firstPassRate,
106
+ successRate,
107
+ decayedSuccessRate: decayed,
108
+ effectiveSuccessRate: effectiveReliability(decayed, firstPassRate),
109
+ avgCostUsd: Number(row.avg_cost_usd) || 0,
110
+ avgTimeMs: Number(row.avg_time_ms) || 0,
111
+ last10Runs,
112
+ createdAt: String(row.created_at),
113
+ updatedAt: String(row.updated_at),
114
+ };
115
+ }
116
+ /** Читает статистику по типу задачи или `null`, если данных ещё нет. */
117
+ export function getCapability(taskType) {
118
+ const key = requireTaskType(taskType);
119
+ const row = getDb()
120
+ .prepare("SELECT * FROM capability_map WHERE task_type = ?")
121
+ .get(key);
122
+ return row ? rowToRecord(row) : null;
123
+ }
124
+ /** Все известные типы задач, сначала самые надёжные. */
125
+ export function listCapabilities(limit = 100) {
126
+ const capped = Math.max(1, Math.floor(limit));
127
+ const rows = getDb()
128
+ .prepare("SELECT * FROM capability_map ORDER BY success_rate DESC, runs_total DESC, task_type ASC LIMIT ?")
129
+ .all(capped);
130
+ return rows.map(rowToRecord);
131
+ }
132
+ /**
133
+ * Записывает исход гейта и обновляет статистику скользящим средним.
134
+ *
135
+ * Возвращает актуальную запись карты — её же удобно логировать вместе с
136
+ * решением роутера, чтобы видеть, на каких данных он остановился.
137
+ */
138
+ export function recordCapabilityOutcome(outcome) {
139
+ const key = requireTaskType(outcome.taskType);
140
+ if (typeof outcome.passed !== "boolean") {
141
+ throw new Error("Исход гейта должен быть boolean (passed).");
142
+ }
143
+ const cost = outcome.costUsd === undefined ? 0 : requireNonNegative(outcome.costUsd, "costUsd");
144
+ const time = outcome.timeMs === undefined ? 0 : requireNonNegative(outcome.timeMs, "timeMs");
145
+ const model = (outcome.model ?? DEFAULT_MODEL).trim() || DEFAULT_MODEL;
146
+ const passed = outcome.passed ? 1 : 0;
147
+ const attempts = outcome.attempts === undefined ? undefined : requireAttempts(outcome.attempts);
148
+ if (outcome.firstPass !== undefined && typeof outcome.firstPass !== "boolean") {
149
+ throw new Error("Признак firstPass должен быть boolean.");
150
+ }
151
+ // B13: без явного признака успех считается первым, если попытка одна
152
+ // (или число попыток не передано — обратная совместимость).
153
+ const firstPass = passed === 1 &&
154
+ (outcome.firstPass ?? (attempts === undefined || attempts === 1));
155
+ const firstPassIncrement = firstPass ? 1 : 0;
156
+ return withTransaction(() => {
157
+ const db = getDb();
158
+ const timestamp = nowIso();
159
+ const existing = getCapability(key);
160
+ if (!existing) {
161
+ db.prepare(`INSERT INTO capability_map (
162
+ task_type, model, runs_total, runs_passed, first_pass_count, success_rate,
163
+ avg_cost_usd, avg_time_ms, last_10_runs, created_at, updated_at
164
+ ) VALUES (?, ?, 1, ?, ?, ?, ?, ?, ?, ?, ?)`).run(key, model, passed, firstPassIncrement, passed, cost, time, JSON.stringify([passed]), timestamp, timestamp);
165
+ }
166
+ else {
167
+ const runsTotal = existing.runsTotal + 1;
168
+ const runsPassed = existing.runsPassed + passed;
169
+ const avgCost = (existing.avgCostUsd * existing.runsTotal + cost) / runsTotal;
170
+ const avgTime = (existing.avgTimeMs * existing.runsTotal + time) / runsTotal;
171
+ const recent = [...existing.last10Runs, passed].slice(-RECENT_RUNS_LIMIT);
172
+ db.prepare(`UPDATE capability_map
173
+ SET model = ?, runs_total = ?, runs_passed = ?,
174
+ first_pass_count = COALESCE(first_pass_count, 0) + ?,
175
+ success_rate = ?, avg_cost_usd = ?, avg_time_ms = ?,
176
+ last_10_runs = ?, updated_at = ?
177
+ WHERE task_type = ?`).run(model, runsTotal, runsPassed, firstPassIncrement, runsPassed / runsTotal, avgCost, avgTime, JSON.stringify(recent), timestamp, key);
178
+ }
179
+ const record = getCapability(key);
180
+ if (!record) {
181
+ throw new Error(`Capability Map: запись для ${key} не сохранилась.`);
182
+ }
183
+ return record;
184
+ });
185
+ }
186
+ /**
187
+ * Решение слоя 2 по порогам (0 токенов).
188
+ *
189
+ * Пороги применяются к `effectiveSuccessRate` — 0.7 затухающего success rate
190
+ * последних прогонов плюс 0.3 first-pass rate (B13), а не к кумулятивному
191
+ * success rate. Поэтому старые успехи не перевешивают свежие провалы.
192
+ *
193
+ * - данных меньше `minRuns` → `explore` (решает слой 3);
194
+ * - `effectiveSuccessRate ≥ 0.85` → `local`;
195
+ * - `effectiveSuccessRate ≤ 0.30` → `cloud` (эскалация);
196
+ * - между порогами → `review` (нужен человек или облачный ревьюер).
197
+ */
198
+ export function decideCapabilityRoute(taskType, thresholds = {}) {
199
+ const key = requireTaskType(taskType);
200
+ const localSuccess = thresholds.localSuccess ?? LOCAL_SUCCESS_THRESHOLD;
201
+ const cloudFailure = thresholds.cloudFailure ?? CLOUD_FAILURE_THRESHOLD;
202
+ const minRuns = thresholds.minRuns ?? MIN_RUNS_FOR_DECISION;
203
+ if (localSuccess <= cloudFailure) {
204
+ throw new Error("Порог localSuccess должен быть больше cloudFailure.");
205
+ }
206
+ const capability = getCapability(key);
207
+ const effectiveSuccessRate = capability?.effectiveSuccessRate ?? 0;
208
+ const decayedSuccessRate = capability?.decayedSuccessRate ?? 0;
209
+ const firstPassRate = capability?.firstPassRate ?? 0;
210
+ if (!capability || capability.runsTotal < minRuns) {
211
+ return {
212
+ taskType: key,
213
+ target: "explore",
214
+ reason: "no-data",
215
+ successRate: capability?.successRate ?? 0,
216
+ effectiveSuccessRate,
217
+ decayedSuccessRate,
218
+ firstPassRate,
219
+ runsTotal: capability?.runsTotal ?? 0,
220
+ capability,
221
+ };
222
+ }
223
+ if (effectiveSuccessRate >= localSuccess) {
224
+ return {
225
+ taskType: key,
226
+ target: "local",
227
+ reason: "local-reliable",
228
+ successRate: capability.successRate,
229
+ effectiveSuccessRate,
230
+ decayedSuccessRate,
231
+ firstPassRate,
232
+ runsTotal: capability.runsTotal,
233
+ capability,
234
+ };
235
+ }
236
+ if (effectiveSuccessRate <= cloudFailure) {
237
+ return {
238
+ taskType: key,
239
+ target: "cloud",
240
+ reason: "escalate",
241
+ successRate: capability.successRate,
242
+ effectiveSuccessRate,
243
+ decayedSuccessRate,
244
+ firstPassRate,
245
+ runsTotal: capability.runsTotal,
246
+ capability,
247
+ };
248
+ }
249
+ return {
250
+ taskType: key,
251
+ target: "review",
252
+ reason: "review",
253
+ successRate: capability.successRate,
254
+ effectiveSuccessRate,
255
+ decayedSuccessRate,
256
+ firstPassRate,
257
+ runsTotal: capability.runsTotal,
258
+ capability,
259
+ };
260
+ }
261
+ /** Готова ли таблица карты (для диагностики и тестов миграции). */
262
+ export function isCapabilityMapReady() {
263
+ const rows = getDb()
264
+ .prepare("SELECT name FROM sqlite_master WHERE type = 'table' AND name = 'capability_map'")
265
+ .all();
266
+ return rows.length > 0;
267
+ }
@@ -24,6 +24,10 @@ export interface StoredHistoryRecord {
24
24
  workspaceId?: string | null;
25
25
  allowedTools?: string[] | null;
26
26
  deniedTools?: string[] | null;
27
+ /** Владелец незавершённого запуска (схема v8). */
28
+ ownerPid?: number | null;
29
+ ownerHost?: string | null;
30
+ ownerStartedAt?: string | null;
27
31
  }
28
32
  /** Поля, которые пишутся в history при завершении запуска. */
29
33
  export interface RunResult {
@@ -43,7 +47,11 @@ export interface RunResult {
43
47
  /** Вставляет запись истории без инкремента метрик (совместимость с appendHistory). */
44
48
  export declare function insertHistory(record: StoredHistoryRecord): number;
45
49
  /** Начало запуска: строка с finished_at = NULL (переживёт сбой процесса). */
46
- export declare function startRun(taskName: string, startedAt?: string, workspaceId?: string | null, allowedTools?: string[] | null, deniedTools?: string[] | null): number;
50
+ export declare function startRun(taskName: string, startedAt?: string, workspaceId?: string | null, allowedTools?: string[] | null, deniedTools?: string[] | null, owner?: {
51
+ pid?: number | null;
52
+ host?: string | null;
53
+ startedAt?: string | null;
54
+ }): number;
47
55
  /**
48
56
  * Завершает ранее начатый запуск и инкрементирует метрики.
49
57
  * Возвращает false, если запись уже завершена/не найдена (защита от двойного учёта).
@@ -56,14 +64,47 @@ export declare function finishRun(id: number, status: TaskStatus, durationMs: nu
56
64
  export declare function recordRun(taskName: string, status: TaskStatus, startedAt: string, durationMs: number, error?: string | null, nextTask?: string | null, tokens?: number, costUsd?: number, model?: string, preFlightStatus?: "success" | "error" | "skipped", postFlightStatus?: "success" | "error" | "skipped", finishedAt?: string, workspaceId?: string | null, allowedTools?: string[] | null, deniedTools?: string[] | null): number;
57
65
  /** История запусков (новые сверху). Без taskName — по всем задачам. */
58
66
  export declare function getHistory(taskName?: string | null, limit?: number, status?: string | null): StoredHistoryRecord[];
67
+ /**
68
+ * Последняя запись по каждой задаче (P2-29).
69
+ *
70
+ * DAG-зависимости нельзя проверять по «последним N записям»: на частой задаче
71
+ * успех зависимости вымывается из окна, и зависимая задача не стартует.
72
+ * Здесь SQL сам выбирает по одной самой свежей записи на задачу.
73
+ */
74
+ export declare function getLatestHistoryByTask(limit?: number): StoredHistoryRecord[];
59
75
  /** История запусков, начатых не раньше timestamp (ISO-строка). */
60
76
  export declare function getHistorySince(timestamp: string, limit?: number): StoredHistoryRecord[];
61
77
  /**
62
- * Crash recovery: все незавершённые записи (finished_at IS NULL) помечаются
63
- * как error. Длительность считается от started_at до текущего момента.
64
- * Возвращает количество восстановленных записей.
78
+ * Crash recovery для истории.
79
+ *
80
+ * Незавершённая запись (finished_at IS NULL) финализируется как error, только
81
+ * если её владелец больше не может её завершить:
82
+ * - владелец известен, жив и на этом же хосте → запись оставляем (B1);
83
+ * - владелец известен и мёртв → финализируем сразу;
84
+ * - владелец неизвестен (legacy-строка или другой хост) → финализируем,
85
+ * только когда запись старше `maxUnverifiableAgeMs`.
65
86
  */
66
- export declare function recoverInterrupted(): number;
87
+ /** Возраст, после которого запись с непроверяемым владельцем считается осиротевшей. */
88
+ export declare const UNVERIFIABLE_OWNER_MAX_AGE_MS: number;
89
+ export interface RecoverInterruptedResult {
90
+ /** Сколько записей финализировано как error. */
91
+ recovered: number;
92
+ /** Сколько записей оставлено живым владельцам. */
93
+ keptAlive: number;
94
+ }
95
+ export interface RecoverInterruptedOptions {
96
+ /** Текущий момент (для тестов). */
97
+ now?: Date;
98
+ /** Порог возраста для записей с непроверяемым владельцем. */
99
+ maxUnverifiableAgeMs?: number;
100
+ /** Имя текущего хоста (для тестов). */
101
+ hostname?: string;
102
+ /** Проверка живости PID (для тестов). */
103
+ isAlive?: (pid: number) => boolean;
104
+ }
105
+ /** Проверяет существование процесса: signal 0 не убивает, только пробует. */
106
+ export declare function isProcessAlive(pid: number): boolean;
107
+ export declare function recoverInterrupted(options?: RecoverInterruptedOptions): RecoverInterruptedResult;
67
108
  /** Количество записей истории (для миграции и тестов). */
68
109
  export declare function countHistory(): number;
69
110
  /** Число активных (незавершённых) запусков: глубина очереди для /api/health. */
@@ -1 +1 @@
1
- {"version":3,"file":"history-repo.d.ts","sourceRoot":"","sources":["../../src/db/history-repo.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"history-repo.d.ts","sourceRoot":"","sources":["../../src/db/history-repo.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAEhD;;;;;;GAMG;AAEH,MAAM,MAAM,aAAa,GAAG,UAAU,GAAG,SAAS,CAAC;AAEnD,MAAM,WAAW,mBAAmB;IAClC,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,aAAa,CAAC;IACtB,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,eAAe,CAAC,EAAE,SAAS,GAAG,OAAO,GAAG,SAAS,CAAC;IAClD,gBAAgB,CAAC,EAAE,SAAS,GAAG,OAAO,GAAG,SAAS,CAAC;IACnD,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,YAAY,CAAC,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;IAC/B,WAAW,CAAC,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;IAC9B,kDAAkD;IAClD,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,cAAc,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CAChC;AAED,8DAA8D;AAC9D,MAAM,WAAW,SAAS;IACxB,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,UAAU,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,eAAe,CAAC,EAAE,SAAS,GAAG,OAAO,GAAG,SAAS,CAAC;IAClD,gBAAgB,CAAC,EAAE,SAAS,GAAG,OAAO,GAAG,SAAS,CAAC;IACnD,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AA2CD,sFAAsF;AACtF,wBAAgB,aAAa,CAAC,MAAM,EAAE,mBAAmB,GAAG,MAAM,CAwBjE;AAED,6EAA6E;AAC7E,wBAAgB,QAAQ,CACtB,QAAQ,EAAE,MAAM,EAChB,SAAS,SAA2B,EACpC,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,EAC3B,YAAY,CAAC,EAAE,MAAM,EAAE,GAAG,IAAI,EAC9B,WAAW,CAAC,EAAE,MAAM,EAAE,GAAG,IAAI,EAC7B,KAAK,CAAC,EAAE;IAAE,GAAG,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,GAC/E,MAAM,CAuBR;AAED;;;GAGG;AACH,wBAAgB,SAAS,CACvB,EAAE,EAAE,MAAM,EACV,MAAM,EAAE,UAAU,EAClB,UAAU,EAAE,MAAM,EAClB,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,EACrB,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,EACxB,MAAM,CAAC,EAAE,MAAM,EACf,OAAO,CAAC,EAAE,MAAM,EAChB,KAAK,CAAC,EAAE,MAAM,EACd,eAAe,CAAC,EAAE,SAAS,GAAG,OAAO,GAAG,SAAS,EACjD,gBAAgB,CAAC,EAAE,SAAS,GAAG,OAAO,GAAG,SAAS,GACjD,OAAO,CAiET;AAED;;;GAGG;AACH,wBAAgB,SAAS,CACvB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,UAAU,EAClB,SAAS,EAAE,MAAM,EACjB,UAAU,EAAE,MAAM,EAClB,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,EACrB,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,EACxB,MAAM,CAAC,EAAE,MAAM,EACf,OAAO,CAAC,EAAE,MAAM,EAChB,KAAK,CAAC,EAAE,MAAM,EACd,eAAe,CAAC,EAAE,SAAS,GAAG,OAAO,GAAG,SAAS,EACjD,gBAAgB,CAAC,EAAE,SAAS,GAAG,OAAO,GAAG,SAAS,EAClD,UAAU,SAA2B,EACrC,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,EAC3B,YAAY,CAAC,EAAE,MAAM,EAAE,GAAG,IAAI,EAC9B,WAAW,CAAC,EAAE,MAAM,EAAE,GAAG,IAAI,GAC5B,MAAM,CAgDR;AAED,uEAAuE;AACvE,wBAAgB,UAAU,CACxB,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,EACxB,KAAK,SAAM,EACX,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,GACrB,mBAAmB,EAAE,CAgCvB;AAED;;;;;;GAMG;AACH,wBAAgB,sBAAsB,CAAC,KAAK,SAAO,GAAG,mBAAmB,EAAE,CAa1E;AAED,kEAAkE;AAClE,wBAAgB,eAAe,CAC7B,SAAS,EAAE,MAAM,EACjB,KAAK,SAAO,GACX,mBAAmB,EAAE,CAWvB;AAED;;;;;;;;;GASG;AAEH,uFAAuF;AACvF,eAAO,MAAM,6BAA6B,QAAsB,CAAC;AAEjE,MAAM,WAAW,wBAAwB;IACvC,gDAAgD;IAChD,SAAS,EAAE,MAAM,CAAC;IAClB,kDAAkD;IAClD,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,yBAAyB;IACxC,mCAAmC;IACnC,GAAG,CAAC,EAAE,IAAI,CAAC;IACX,6DAA6D;IAC7D,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,uCAAuC;IACvC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,yCAAyC;IACzC,OAAO,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC;CACpC;AAED,6EAA6E;AAC7E,wBAAgB,cAAc,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CASnD;AAED,wBAAgB,kBAAkB,CAChC,OAAO,GAAE,yBAA8B,GACtC,wBAAwB,CAkE1B;AAED,0DAA0D;AAC1D,wBAAgB,YAAY,IAAI,MAAM,CAGrC;AAED,gFAAgF;AAChF,wBAAgB,mBAAmB,IAAI,MAAM,CAK5C;AAED,kFAAkF;AAClF,MAAM,WAAW,oBAAoB;IACnC,EAAE,EAAE,MAAM,CAAC;IACX,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,2EAA2E;AAC3E,wBAAgB,kBAAkB,IAAI,oBAAoB,EAAE,CAa3D;AAED,wEAAwE;AACxE,MAAM,WAAW,mBAAmB;IAClC,gDAAgD;IAChD,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,6CAA6C;IAC7C,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,2CAA2C;IAC3C,GAAG,CAAC,EAAE,IAAI,CAAC;CACZ;AAED,MAAM,WAAW,kBAAkB;IACjC,YAAY,EAAE,MAAM,CAAC;IACrB,cAAc,EAAE,MAAM,CAAC;IACvB,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,wEAAwE;IACxE,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;CACvB;AAED;;;;;;GAMG;AACH,wBAAgB,YAAY,CAAC,OAAO,GAAE,mBAAwB,GAAG,kBAAkB,CA2ClF;AAED;;;;GAIG;AACH,wBAAgB,aAAa,IAAI,OAAO,CAOvC"}
@@ -1,6 +1,7 @@
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";
4
5
  function rowToRecord(row) {
5
6
  const status = String(row.status);
6
7
  return {
@@ -24,13 +25,16 @@ function rowToRecord(row) {
24
25
  workspaceId: row.workspace_id == null ? null : String(row.workspace_id),
25
26
  allowedTools: row.allowed_tools == null ? null : JSON.parse(String(row.allowed_tools)),
26
27
  deniedTools: row.denied_tools == null ? null : JSON.parse(String(row.denied_tools)),
28
+ ownerPid: row.owner_pid == null ? null : Number(row.owner_pid),
29
+ ownerHost: row.owner_host == null ? null : String(row.owner_host),
30
+ ownerStartedAt: row.owner_started_at == null ? null : String(row.owner_started_at),
27
31
  };
28
32
  }
29
33
  const INSERT_SQL = `INSERT INTO history (
30
34
  task_name, status, started_at, finished_at, duration_ms, error,
31
35
  tokens, cost_usd, model, pre_flight_status, post_flight_status, next_task,
32
- workspace_id, allowed_tools, denied_tools
33
- ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`;
36
+ workspace_id, allowed_tools, denied_tools, owner_pid, owner_host, owner_started_at
37
+ ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`;
34
38
  function lastId(result) {
35
39
  return Number(result.lastInsertRowid) || 0;
36
40
  }
@@ -38,11 +42,11 @@ function lastId(result) {
38
42
  export function insertHistory(record) {
39
43
  const result = getDb()
40
44
  .prepare(INSERT_SQL)
41
- .run(record.taskName, record.status, record.startedAt, record.finishedAt ?? null, record.durationMs ?? null, record.error ?? null, 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));
45
+ .run(record.taskName, record.status, record.startedAt, record.finishedAt ?? null, record.durationMs ?? null, record.error ?? null, 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
46
  return lastId(result);
43
47
  }
44
48
  /** Начало запуска: строка с finished_at = NULL (переживёт сбой процесса). */
45
- export function startRun(taskName, startedAt = new Date().toISOString(), workspaceId, allowedTools, deniedTools) {
49
+ export function startRun(taskName, startedAt = new Date().toISOString(), workspaceId, allowedTools, deniedTools, owner) {
46
50
  const id = insertHistory({
47
51
  taskName,
48
52
  status: "running",
@@ -51,6 +55,9 @@ export function startRun(taskName, startedAt = new Date().toISOString(), workspa
51
55
  workspaceId,
52
56
  allowedTools,
53
57
  deniedTools,
58
+ ownerPid: owner?.pid ?? null,
59
+ ownerHost: owner?.host ?? null,
60
+ ownerStartedAt: owner?.startedAt ?? null,
54
61
  });
55
62
  appendStructuredLog({
56
63
  event: "run.started",
@@ -125,7 +132,9 @@ export function recordRun(taskName, status, startedAt, durationMs, error, nextTa
125
132
  const id = withTransaction(() => {
126
133
  const result = getDb()
127
134
  .prepare(INSERT_SQL)
128
- .run(taskName, status, startedAt, finishedAt, safeDuration, error ?? null, 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));
135
+ .run(taskName, status, startedAt, finishedAt, safeDuration, error ?? null, 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),
136
+ // owner-колонки относятся только к незавершённым запускам (startRun).
137
+ null, null, null);
129
138
  incrementMetricsUnsafe(taskName, status, tokens, costUsd);
130
139
  return lastId(result);
131
140
  });
@@ -181,6 +190,25 @@ export function getHistory(taskName, limit = 200, status) {
181
190
  .all(...params);
182
191
  return rows.map(rowToRecord);
183
192
  }
193
+ /**
194
+ * Последняя запись по каждой задаче (P2-29).
195
+ *
196
+ * DAG-зависимости нельзя проверять по «последним N записям»: на частой задаче
197
+ * успех зависимости вымывается из окна, и зависимая задача не стартует.
198
+ * Здесь SQL сам выбирает по одной самой свежей записи на задачу.
199
+ */
200
+ export function getLatestHistoryByTask(limit = 5000) {
201
+ const safeLimit = Math.max(1, Math.min(100000, Math.floor(limit) || 1));
202
+ const rows = getDb()
203
+ .prepare(`SELECT * FROM history
204
+ WHERE id IN (
205
+ SELECT MAX(id) FROM history GROUP BY lower(task_name)
206
+ )
207
+ ORDER BY started_at DESC, id DESC
208
+ LIMIT ?`)
209
+ .all(safeLimit);
210
+ return rows.map(rowToRecord);
211
+ }
184
212
  /** История запусков, начатых не раньше timestamp (ISO-строка). */
185
213
  export function getHistorySince(timestamp, limit = 5000) {
186
214
  const safeLimit = Math.max(1, Math.min(100000, Math.floor(limit) || 1));
@@ -193,27 +221,81 @@ export function getHistorySince(timestamp, limit = 5000) {
193
221
  return rows.map(rowToRecord);
194
222
  }
195
223
  /**
196
- * Crash recovery: все незавершённые записи (finished_at IS NULL) помечаются
197
- * как error. Длительность считается от started_at до текущего момента.
198
- * Возвращает количество восстановленных записей.
224
+ * Crash recovery для истории.
225
+ *
226
+ * Незавершённая запись (finished_at IS NULL) финализируется как error, только
227
+ * если её владелец больше не может её завершить:
228
+ * - владелец известен, жив и на этом же хосте → запись оставляем (B1);
229
+ * - владелец известен и мёртв → финализируем сразу;
230
+ * - владелец неизвестен (legacy-строка или другой хост) → финализируем,
231
+ * только когда запись старше `maxUnverifiableAgeMs`.
199
232
  */
200
- export function recoverInterrupted() {
201
- const now = new Date().toISOString();
202
- const result = getDb()
203
- .prepare(`UPDATE history SET
204
- status = 'error',
205
- error = CASE
206
- WHEN error IS NULL OR error = '' THEN 'Прервано (сбой/перезагрузка)'
207
- ELSE error
208
- END,
209
- finished_at = COALESCE(finished_at, ?),
210
- duration_ms = COALESCE(
211
- duration_ms,
212
- CAST((julianday(?) - julianday(started_at)) * 86400000 AS INTEGER)
213
- )
214
- WHERE finished_at IS NULL`)
215
- .run(now, now);
216
- return Number(result.changes) || 0;
233
+ /** Возраст, после которого запись с непроверяемым владельцем считается осиротевшей. */
234
+ export const UNVERIFIABLE_OWNER_MAX_AGE_MS = 24 * 60 * 60 * 1000;
235
+ /** Проверяет существование процесса: signal 0 не убивает, только пробует. */
236
+ export function isProcessAlive(pid) {
237
+ if (!Number.isInteger(pid) || pid <= 0)
238
+ return false;
239
+ try {
240
+ process.kill(pid, 0);
241
+ return true;
242
+ }
243
+ catch (error) {
244
+ // EPERM — процесс существует, но сигнал запрещён; ESRCH — процесса нет.
245
+ return error?.code === "EPERM";
246
+ }
247
+ }
248
+ export function recoverInterrupted(options = {}) {
249
+ const now = options.now ?? new Date();
250
+ const nowIso = now.toISOString();
251
+ const maxAge = typeof options.maxUnverifiableAgeMs === "number" &&
252
+ Number.isFinite(options.maxUnverifiableAgeMs)
253
+ ? Math.max(0, options.maxUnverifiableAgeMs)
254
+ : UNVERIFIABLE_OWNER_MAX_AGE_MS;
255
+ const hostname = options.hostname ?? os.hostname();
256
+ const isAlive = options.isAlive ?? isProcessAlive;
257
+ const db = getDb();
258
+ const rows = db
259
+ .prepare(`SELECT id, started_at, owner_pid, owner_host, owner_started_at
260
+ FROM history WHERE finished_at IS NULL`)
261
+ .all();
262
+ const update = db.prepare(`UPDATE history SET
263
+ status = 'error',
264
+ error = CASE
265
+ WHEN error IS NULL OR error = '' THEN 'Прервано (сбой/перезагрузка)'
266
+ ELSE error
267
+ END,
268
+ finished_at = COALESCE(finished_at, ?),
269
+ duration_ms = COALESCE(
270
+ duration_ms,
271
+ CAST((julianday(?) - julianday(started_at)) * 86400000 AS INTEGER)
272
+ )
273
+ WHERE id = ? AND finished_at IS NULL`);
274
+ let recovered = 0;
275
+ let keptAlive = 0;
276
+ withTransaction(() => {
277
+ for (const row of rows) {
278
+ const ownerPid = row.owner_pid == null ? null : Number(row.owner_pid);
279
+ const ownerHost = row.owner_host == null ? null : String(row.owner_host);
280
+ const verifiable = ownerPid != null && ownerPid > 0 && ownerHost != null && ownerHost === hostname;
281
+ if (verifiable && ownerPid != null && isAlive(ownerPid)) {
282
+ keptAlive += 1;
283
+ continue;
284
+ }
285
+ if (!verifiable) {
286
+ const since = Date.parse(String(row.owner_started_at ?? row.started_at ?? ""));
287
+ const age = Number.isFinite(since) ? now.getTime() - since : Infinity;
288
+ if (age < maxAge) {
289
+ keptAlive += 1;
290
+ continue;
291
+ }
292
+ }
293
+ const result = update.run(nowIso, nowIso, row.id);
294
+ if (Number(result.changes) > 0)
295
+ recovered += 1;
296
+ }
297
+ });
298
+ return { recovered, keptAlive };
217
299
  }
218
300
  /** Количество записей истории (для миграции и тестов). */
219
301
  export function countHistory() {
@@ -42,6 +42,10 @@ export declare function getDbStatus(): {
42
42
  /**
43
43
  * Выполняет функцию в транзакции BEGIN IMMEDIATE.
44
44
  * При любой ошибке откатывает изменения и пробрасывает исключение дальше.
45
+ *
46
+ * Вложенный вызов не открывает вторую транзакцию (SQLite это запрещает), а
47
+ * создаёт SAVEPOINT: так композиция вроде «retry из DLQ → reopenRun → retryStep»
48
+ * остаётся атомарной, а внутренний откат не рушит внешнюю транзакцию.
45
49
  */
46
50
  export declare function withTransaction<T>(fn: () => T): T;
47
51
  /** Пуста ли БД (не считая служебных настроек вроде retry_state). */
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/db/index.ts"],"names":[],"mappings":"AAMA;;;;;;GAMG;AACH,MAAM,WAAW,eAAe;IAC9B,OAAO,EAAE,MAAM,GAAG,MAAM,CAAC;IACzB,eAAe,EAAE,MAAM,GAAG,MAAM,CAAC;CAClC;AAED,MAAM,WAAW,eAAe;IAC9B,GAAG,CAAC,GAAG,MAAM,EAAE,GAAG,EAAE,GAAG,eAAe,CAAC;IACvC,GAAG,CAAC,GAAG,MAAM,EAAE,GAAG,EAAE,GAAG,GAAG,CAAC;IAC3B,GAAG,CAAC,GAAG,MAAM,EAAE,GAAG,EAAE,GAAG,GAAG,EAAE,CAAC;IAC7B,OAAO,CAAC,GAAG,MAAM,EAAE,GAAG,EAAE,GAAG,gBAAgB,CAAC,GAAG,CAAC,CAAC;CAClD;AAED,MAAM,WAAW,cAAc;IAC7B,IAAI,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,OAAO,CAAC,GAAG,EAAE,MAAM,GAAG,eAAe,CAAC;IACtC,KAAK,IAAI,IAAI,CAAC;CACf;AA6BD,kEAAkE;AAClE,wBAAgB,MAAM,CAAC,IAAI,GAAE,MAAe,GAAG,cAAc,CAsB5D;AAED,mEAAmE;AACnE,wBAAgB,KAAK,IAAI,cAAc,CAEtC;AAED,8DAA8D;AAC9D,wBAAgB,OAAO,IAAI,IAAI,CAa9B;AAED,+BAA+B;AAC/B,wBAAgB,SAAS,IAAI,MAAM,CAElC;AAED,uEAAuE;AACvE,wBAAgB,YAAY,IAAI,IAAI,CAEnC;AAED,gEAAgE;AAChE,wBAAgB,WAAW,IAAI;IAC7B,MAAM,EAAE,QAAQ,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,GAAG,EAAE,OAAO,CAAC;IACb,aAAa,EAAE,MAAM,CAAC;IACtB,qBAAqB,EAAE,MAAM,CAAC;CAC7B,CAkBF;AAED;;;GAGG;AACH,wBAAgB,eAAe,CAAC,CAAC,EAAE,EAAE,EAAE,MAAM,CAAC,GAAG,CAAC,CAejD;AAED,oEAAoE;AACpE,wBAAgB,eAAe,IAAI,OAAO,CAWzC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/db/index.ts"],"names":[],"mappings":"AAMA;;;;;;GAMG;AACH,MAAM,WAAW,eAAe;IAC9B,OAAO,EAAE,MAAM,GAAG,MAAM,CAAC;IACzB,eAAe,EAAE,MAAM,GAAG,MAAM,CAAC;CAClC;AAED,MAAM,WAAW,eAAe;IAC9B,GAAG,CAAC,GAAG,MAAM,EAAE,GAAG,EAAE,GAAG,eAAe,CAAC;IACvC,GAAG,CAAC,GAAG,MAAM,EAAE,GAAG,EAAE,GAAG,GAAG,CAAC;IAC3B,GAAG,CAAC,GAAG,MAAM,EAAE,GAAG,EAAE,GAAG,GAAG,EAAE,CAAC;IAC7B,OAAO,CAAC,GAAG,MAAM,EAAE,GAAG,EAAE,GAAG,gBAAgB,CAAC,GAAG,CAAC,CAAC;CAClD;AAED,MAAM,WAAW,cAAc;IAC7B,IAAI,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,OAAO,CAAC,GAAG,EAAE,MAAM,GAAG,eAAe,CAAC;IACtC,KAAK,IAAI,IAAI,CAAC;CACf;AA+BD,kEAAkE;AAClE,wBAAgB,MAAM,CAAC,IAAI,GAAE,MAAe,GAAG,cAAc,CA0B5D;AAED,mEAAmE;AACnE,wBAAgB,KAAK,IAAI,cAAc,CAEtC;AAED,8DAA8D;AAC9D,wBAAgB,OAAO,IAAI,IAAI,CAc9B;AAED,+BAA+B;AAC/B,wBAAgB,SAAS,IAAI,MAAM,CAElC;AAED,uEAAuE;AACvE,wBAAgB,YAAY,IAAI,IAAI,CAEnC;AAED,gEAAgE;AAChE,wBAAgB,WAAW,IAAI;IAC7B,MAAM,EAAE,QAAQ,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,GAAG,EAAE,OAAO,CAAC;IACb,aAAa,EAAE,MAAM,CAAC;IACtB,qBAAqB,EAAE,MAAM,CAAC;CAC7B,CAkBF;AAED;;;;;;;GAOG;AACH,wBAAgB,eAAe,CAAC,CAAC,EAAE,EAAE,EAAE,MAAM,CAAC,GAAG,CAAC,CAwCjD;AAED,oEAAoE;AACpE,wBAAgB,eAAe,IAAI,OAAO,CAWzC"}
package/dist/db/index.js CHANGED
@@ -20,6 +20,8 @@ const DEFAULT_DB_FILE = process.env.OPENCODE_SCHEDULER_DB?.trim()
20
20
  : path.join(PLUGIN_DIR, "scheduler.db");
21
21
  let dbFile = DEFAULT_DB_FILE;
22
22
  let db = null;
23
+ /** Глубина вложенности withTransaction: 0 — транзакции нет, >0 — SAVEPOINT. */
24
+ let transactionDepth = 0;
23
25
  /** Открывает (или переоткрывает) соединение и применяет схему. */
24
26
  export function initDb(file = dbFile) {
25
27
  if (db && file === dbFile)
@@ -30,6 +32,11 @@ export function initDb(file = dbFile) {
30
32
  fs.mkdirSync(path.dirname(file), { recursive: true });
31
33
  const DatabaseSync = loadSqlite();
32
34
  const instance = new DatabaseSync(file);
35
+ // busy_timeout ДОЛЖЕН быть установлен до WAL: при одновременном старте
36
+ // нескольких процессов (каждое завершение задачи — отдельный
37
+ // `node record-history`) переключение journal_mode требует эксклюзивной
38
+ // блокировки. Без таймаута SQLite сразу падает с "database is locked".
39
+ instance.exec("PRAGMA busy_timeout = 5000;");
33
40
  // WAL — конкурентное чтение во время записи и устойчивость к сбоям.
34
41
  // synchronous = NORMAL в WAL гарантирует, что закоммиченная транзакция
35
42
  // переживает падение процесса (шаг 36.1.b); при потере питания может
@@ -37,7 +44,6 @@ export function initDb(file = dbFile) {
37
44
  instance.exec("PRAGMA journal_mode = WAL;");
38
45
  instance.exec("PRAGMA synchronous = NORMAL;");
39
46
  instance.exec("PRAGMA foreign_keys = ON;");
40
- instance.exec("PRAGMA busy_timeout = 5000;");
41
47
  applySchema(instance);
42
48
  db = instance;
43
49
  return instance;
@@ -48,6 +54,7 @@ export function getDb() {
48
54
  }
49
55
  /** Закрывает соединение (вызывается при выгрузке плагина). */
50
56
  export function closeDb() {
57
+ transactionDepth = 0;
51
58
  if (!db)
52
59
  return;
53
60
  try {
@@ -96,10 +103,38 @@ export function getDbStatus() {
96
103
  /**
97
104
  * Выполняет функцию в транзакции BEGIN IMMEDIATE.
98
105
  * При любой ошибке откатывает изменения и пробрасывает исключение дальше.
106
+ *
107
+ * Вложенный вызов не открывает вторую транзакцию (SQLite это запрещает), а
108
+ * создаёт SAVEPOINT: так композиция вроде «retry из DLQ → reopenRun → retryStep»
109
+ * остаётся атомарной, а внутренний откат не рушит внешнюю транзакцию.
99
110
  */
100
111
  export function withTransaction(fn) {
101
112
  const instance = getDb();
113
+ if (transactionDepth > 0) {
114
+ const savepoint = `sp_nested_${transactionDepth}`;
115
+ instance.exec(`SAVEPOINT ${savepoint};`);
116
+ transactionDepth += 1;
117
+ try {
118
+ const result = fn();
119
+ instance.exec(`RELEASE ${savepoint};`);
120
+ return result;
121
+ }
122
+ catch (err) {
123
+ try {
124
+ instance.exec(`ROLLBACK TO ${savepoint};`);
125
+ instance.exec(`RELEASE ${savepoint};`);
126
+ }
127
+ catch {
128
+ // SAVEPOINT уже снят вместе с внешней транзакцией.
129
+ }
130
+ throw err;
131
+ }
132
+ finally {
133
+ transactionDepth -= 1;
134
+ }
135
+ }
102
136
  instance.exec("BEGIN IMMEDIATE;");
137
+ transactionDepth = 1;
103
138
  try {
104
139
  const result = fn();
105
140
  instance.exec("COMMIT;");
@@ -114,6 +149,9 @@ export function withTransaction(fn) {
114
149
  }
115
150
  throw err;
116
151
  }
152
+ finally {
153
+ transactionDepth = 0;
154
+ }
117
155
  }
118
156
  /** Пуста ли БД (не считая служебных настроек вроде retry_state). */
119
157
  export function isDatabaseEmpty() {