agent-steward 0.0.3 → 0.0.4
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 +20 -0
- package/README.md +3 -3
- package/ROADMAP-STRATEGY.md +9 -9
- package/ROADMAP.md +50 -34
- package/dist/core/dlq-api.d.ts +44 -0
- package/dist/core/dlq-api.d.ts.map +1 -0
- package/dist/core/dlq-api.js +68 -0
- package/dist/core/dry-run.d.ts.map +1 -1
- package/dist/core/dry-run.js +18 -1
- package/dist/core/lock.d.ts +20 -4
- package/dist/core/lock.d.ts.map +1 -1
- package/dist/core/lock.js +97 -22
- package/dist/core/one-shot.d.ts +5 -1
- package/dist/core/one-shot.d.ts.map +1 -1
- package/dist/core/one-shot.js +33 -8
- package/dist/core/opencode-cli.d.ts +28 -0
- package/dist/core/opencode-cli.d.ts.map +1 -0
- package/dist/core/opencode-cli.js +74 -0
- package/dist/core/opencode-models.d.ts +62 -0
- package/dist/core/opencode-models.d.ts.map +1 -0
- package/dist/core/opencode-models.js +277 -0
- package/dist/core/ps-wrapper.d.ts +1 -1
- package/dist/core/ps-wrapper.d.ts.map +1 -1
- package/dist/core/ps-wrapper.js +11 -1
- package/dist/core/record-history.d.ts +15 -0
- package/dist/core/record-history.d.ts.map +1 -1
- package/dist/core/record-history.js +56 -32
- package/dist/core/router/dispatch.d.ts +36 -0
- package/dist/core/router/dispatch.d.ts.map +1 -0
- package/dist/core/router/dispatch.js +59 -0
- package/dist/core/router/escalation.d.ts +47 -0
- package/dist/core/router/escalation.d.ts.map +1 -0
- package/dist/core/router/escalation.js +87 -0
- package/dist/core/router/planner.d.ts +53 -0
- package/dist/core/router/planner.d.ts.map +1 -0
- package/dist/core/router/planner.js +113 -0
- package/dist/core/router/rules.d.ts +46 -0
- package/dist/core/router/rules.d.ts.map +1 -0
- package/dist/core/router/rules.js +85 -0
- package/dist/core/run-panel-api.d.ts +94 -0
- package/dist/core/run-panel-api.d.ts.map +1 -0
- package/dist/core/run-panel-api.js +169 -0
- package/dist/core/schedule-gate.js +5 -1
- package/dist/core/schedule-v2.d.ts +34 -0
- package/dist/core/schedule-v2.d.ts.map +1 -1
- package/dist/core/schedule-v2.js +91 -5
- package/dist/core/scheduler/at-fallback.d.ts +55 -2
- package/dist/core/scheduler/at-fallback.d.ts.map +1 -1
- package/dist/core/scheduler/at-fallback.js +135 -5
- package/dist/core/scheduler/linux.d.ts +10 -1
- package/dist/core/scheduler/linux.d.ts.map +1 -1
- package/dist/core/scheduler/linux.js +29 -11
- package/dist/core/scheduler/posix.d.ts.map +1 -1
- package/dist/core/scheduler/posix.js +25 -1
- package/dist/core/scheduler/registry.d.ts +11 -0
- package/dist/core/scheduler/registry.d.ts.map +1 -1
- package/dist/core/scheduler/registry.js +83 -21
- package/dist/core/scheduler/run-now.d.ts +16 -0
- package/dist/core/scheduler/run-now.d.ts.map +1 -0
- package/dist/core/scheduler/run-now.js +28 -0
- package/dist/core/secrets.d.ts.map +1 -1
- package/dist/core/secrets.js +125 -28
- package/dist/core/session.d.ts.map +1 -1
- package/dist/core/session.js +18 -11
- package/dist/core/task-name.d.ts +24 -0
- package/dist/core/task-name.d.ts.map +1 -0
- package/dist/core/task-name.js +40 -0
- package/dist/core/wrappers/bash.d.ts.map +1 -1
- package/dist/core/wrappers/bash.js +49 -4
- package/dist/db/capability-repo.d.ts +83 -0
- package/dist/db/capability-repo.d.ts.map +1 -0
- package/dist/db/capability-repo.js +182 -0
- package/dist/db/history-repo.d.ts +8 -0
- package/dist/db/history-repo.d.ts.map +1 -1
- package/dist/db/history-repo.js +19 -0
- package/dist/db/index.d.ts +4 -0
- package/dist/db/index.d.ts.map +1 -1
- package/dist/db/index.js +39 -1
- package/dist/db/migrate.d.ts.map +1 -1
- package/dist/db/migrate.js +3 -1
- package/dist/db/run-context.d.ts +103 -0
- package/dist/db/run-context.d.ts.map +1 -0
- package/dist/db/run-context.js +224 -0
- package/dist/db/run-dlq.d.ts +100 -0
- package/dist/db/run-dlq.d.ts.map +1 -0
- package/dist/db/run-dlq.js +191 -0
- package/dist/db/run-resume.d.ts +5 -2
- package/dist/db/run-resume.d.ts.map +1 -1
- package/dist/db/run-resume.js +30 -11
- package/dist/db/runs-repo.d.ts +13 -5
- package/dist/db/runs-repo.d.ts.map +1 -1
- package/dist/db/runs-repo.js +28 -5
- package/dist/db/schema.d.ts +2 -2
- package/dist/db/schema.d.ts.map +1 -1
- package/dist/db/schema.js +154 -2
- package/dist/db/settings-repo.d.ts +11 -0
- package/dist/db/settings-repo.d.ts.map +1 -1
- package/dist/db/settings-repo.js +25 -0
- package/dist/db/step-idempotency.d.ts +51 -0
- package/dist/db/step-idempotency.d.ts.map +1 -0
- package/dist/db/step-idempotency.js +136 -0
- package/dist/index.d.ts +4 -4
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +102 -4
- package/dist/rpc.d.ts +678 -0
- package/dist/rpc.d.ts.map +1 -1
- package/dist/rpc.js +235 -0
- package/dist/server.d.ts +31 -0
- package/dist/server.d.ts.map +1 -1
- package/dist/server.js +95 -35
- package/dist/types.d.ts.map +1 -1
- package/dist/types.js +7 -0
- package/dist/workspaces.d.ts +25 -3
- package/dist/workspaces.d.ts.map +1 -1
- package/dist/workspaces.js +43 -8
- package/docs/ARCHITECTURE.md +229 -5
- package/docs/CONCEPT.md +171 -91
- package/docs/EXECUTION-LOOP.md +196 -0
- package/docs/README.ru.md +2 -2
- package/docs/README.zh.md +3 -3
- package/docs/SAFETY.md +122 -0
- package/docs/SAVINGS.md +29 -0
- package/docs/SAVINGS.ru.md +29 -0
- package/docs/SAVINGS.zh.md +18 -0
- package/gui-experimental.cjs +8 -8
- package/locales/en.json +67 -0
- package/locales/ru.json +67 -0
- package/locales/zh.json +67 -0
- package/package.json +28 -3
- package/scripts/audit-bundle.mjs +215 -0
- package/src/core/dlq-api.ts +98 -0
- package/src/core/dry-run.ts +25 -1
- package/src/core/lock.ts +95 -22
- package/src/core/one-shot.ts +36 -8
- package/src/core/opencode-cli.ts +103 -0
- package/src/core/opencode-models.ts +315 -0
- package/src/core/ps-wrapper.ts +11 -1
- package/src/core/record-history.ts +75 -37
- package/src/core/router/dispatch.ts +94 -0
- package/src/core/router/escalation.ts +129 -0
- package/src/core/router/planner.ts +166 -0
- package/src/core/router/rules.ts +109 -0
- package/src/core/run-panel-api.ts +262 -0
- package/src/core/schedule-gate.ts +6 -2
- package/src/core/schedule-v2.ts +114 -5
- package/src/core/scheduler/at-fallback.ts +190 -5
- package/src/core/scheduler/linux.ts +32 -10
- package/src/core/scheduler/posix.ts +20 -1
- package/src/core/scheduler/registry.ts +107 -26
- package/src/core/scheduler/run-now.ts +32 -0
- package/src/core/secrets.ts +127 -27
- package/src/core/session.ts +23 -10
- package/src/core/task-name.ts +67 -0
- package/src/core/wrappers/bash.ts +49 -4
- package/src/db/capability-repo.ts +285 -0
- package/src/db/history-repo.ts +22 -0
- package/src/db/index.ts +37 -1
- package/src/db/migrate.ts +3 -1
- package/src/db/run-context.ts +370 -0
- package/src/db/run-dlq.ts +310 -0
- package/src/db/run-resume.ts +48 -12
- package/src/db/runs-repo.ts +30 -7
- package/src/db/schema.ts +154 -2
- package/src/db/settings-repo.ts +31 -0
- package/src/db/step-idempotency.ts +185 -0
- package/src/gui.tsx +515 -0
- package/src/index.ts +124 -4
- package/src/rpc.ts +251 -0
- package/src/server.ts +112 -36
- package/src/types.ts +9 -0
- package/src/workspaces.ts +58 -9
|
@@ -0,0 +1,285 @@
|
|
|
1
|
+
import { normalizeTaskType } from "../core/router/rules.js";
|
|
2
|
+
import { getDb, withTransaction } from "./index.js";
|
|
3
|
+
|
|
4
|
+
/**
|
|
5
|
+
* Capability Map — слой 2 роутера (Спринт 36.5.b).
|
|
6
|
+
*
|
|
7
|
+
* Таблица `capability_map` хранит, как исполнитель справлялся с типом задачи:
|
|
8
|
+
* сколько запусков было, сколько прошло гейт, среднюю стоимость и время, а
|
|
9
|
+
* также последние 10 исходов. Роутер читает карту и выбирает маршрут
|
|
10
|
+
* (local / cloud / review) по порогам — без вызова модели, то есть 0 токенов
|
|
11
|
+
* на само решение.
|
|
12
|
+
*
|
|
13
|
+
* Карта обучается на исходах гейта: каждый прогон шага вызывает
|
|
14
|
+
* {@link recordCapabilityOutcome}, статистика обновляется скользящим средним.
|
|
15
|
+
* Данных мало — карта честно говорит «не знаю» и отдаёт решение слою 3
|
|
16
|
+
* (Explore-режим).
|
|
17
|
+
*/
|
|
18
|
+
|
|
19
|
+
/** Куда исполнять шаг. `review` — данных достаточно, но успех нестабилен. */
|
|
20
|
+
export type CapabilityTarget = "local" | "cloud" | "review" | "explore";
|
|
21
|
+
|
|
22
|
+
/** Порог, выше которого шаг считается надёжным для локали. */
|
|
23
|
+
export const LOCAL_SUCCESS_THRESHOLD = 0.85;
|
|
24
|
+
|
|
25
|
+
/** Порог, ниже которого локальный исполнитель считается безнадёжным. */
|
|
26
|
+
export const CLOUD_FAILURE_THRESHOLD = 0.3;
|
|
27
|
+
|
|
28
|
+
/** Минимум исходов, чтобы карта вообще бралась судить. */
|
|
29
|
+
export const MIN_RUNS_FOR_DECISION = 3;
|
|
30
|
+
|
|
31
|
+
/** Сколько последних исходов хранить (1 — гейт пройден, 0 — провал). */
|
|
32
|
+
export const RECENT_RUNS_LIMIT = 10;
|
|
33
|
+
|
|
34
|
+
export interface CapabilityRecord {
|
|
35
|
+
taskType: string;
|
|
36
|
+
/** Исполнитель, который последним обрабатывал тип задачи. */
|
|
37
|
+
model: string;
|
|
38
|
+
runsTotal: number;
|
|
39
|
+
runsPassed: number;
|
|
40
|
+
successRate: number;
|
|
41
|
+
avgCostUsd: number;
|
|
42
|
+
avgTimeMs: number;
|
|
43
|
+
/** Последние исходы, старые слева, новые справа, максимум 10. */
|
|
44
|
+
last10Runs: number[];
|
|
45
|
+
createdAt: string;
|
|
46
|
+
updatedAt: string;
|
|
47
|
+
}
|
|
48
|
+
|
|
49
|
+
/** Один исход гейта: пройден/провален + необязательные стоимость и время. */
|
|
50
|
+
export interface CapabilityOutcome {
|
|
51
|
+
taskType: string;
|
|
52
|
+
model?: string;
|
|
53
|
+
passed: boolean;
|
|
54
|
+
costUsd?: number;
|
|
55
|
+
timeMs?: number;
|
|
56
|
+
}
|
|
57
|
+
|
|
58
|
+
export interface CapabilityThresholds {
|
|
59
|
+
localSuccess?: number;
|
|
60
|
+
cloudFailure?: number;
|
|
61
|
+
minRuns?: number;
|
|
62
|
+
}
|
|
63
|
+
|
|
64
|
+
export interface CapabilityDecision {
|
|
65
|
+
taskType: string;
|
|
66
|
+
target: CapabilityTarget;
|
|
67
|
+
/** Машиночитаемая причина: no-data | local-reliable | escalate | review. */
|
|
68
|
+
reason: "no-data" | "local-reliable" | "escalate" | "review";
|
|
69
|
+
successRate: number;
|
|
70
|
+
runsTotal: number;
|
|
71
|
+
capability: CapabilityRecord | null;
|
|
72
|
+
}
|
|
73
|
+
|
|
74
|
+
const DEFAULT_MODEL = "local";
|
|
75
|
+
|
|
76
|
+
function nowIso(): string {
|
|
77
|
+
return new Date().toISOString();
|
|
78
|
+
}
|
|
79
|
+
|
|
80
|
+
function requireTaskType(taskType: string): string {
|
|
81
|
+
if (typeof taskType !== "string" || taskType.trim() === "") {
|
|
82
|
+
throw new Error("Пустой тип задачи: Capability Map требует непустой taskType.");
|
|
83
|
+
}
|
|
84
|
+
return normalizeTaskType(taskType);
|
|
85
|
+
}
|
|
86
|
+
|
|
87
|
+
function requireNonNegative(value: number, field: string): number {
|
|
88
|
+
if (!Number.isFinite(value) || value < 0) {
|
|
89
|
+
throw new Error(`Некорректное значение ${field}: ожидалось неотрицательное число, получено ${value}.`);
|
|
90
|
+
}
|
|
91
|
+
return value;
|
|
92
|
+
}
|
|
93
|
+
|
|
94
|
+
function parseRecentRuns(raw: unknown): number[] {
|
|
95
|
+
if (typeof raw !== "string" || raw.trim() === "") {
|
|
96
|
+
return [];
|
|
97
|
+
}
|
|
98
|
+
try {
|
|
99
|
+
const parsed: unknown = JSON.parse(raw);
|
|
100
|
+
if (!Array.isArray(parsed)) {
|
|
101
|
+
return [];
|
|
102
|
+
}
|
|
103
|
+
return parsed
|
|
104
|
+
.map((value) => (typeof value === "number" ? value : Number(value)))
|
|
105
|
+
.filter((value) => value === 0 || value === 1)
|
|
106
|
+
.slice(-RECENT_RUNS_LIMIT);
|
|
107
|
+
} catch {
|
|
108
|
+
return [];
|
|
109
|
+
}
|
|
110
|
+
}
|
|
111
|
+
|
|
112
|
+
function rowToRecord(row: Record<string, unknown>): CapabilityRecord {
|
|
113
|
+
const runsTotal = Number(row.runs_total) || 0;
|
|
114
|
+
const runsPassed = Number(row.runs_passed) || 0;
|
|
115
|
+
return {
|
|
116
|
+
taskType: String(row.task_type),
|
|
117
|
+
model: String(row.model ?? DEFAULT_MODEL),
|
|
118
|
+
runsTotal,
|
|
119
|
+
runsPassed,
|
|
120
|
+
successRate: Number(row.success_rate) || (runsTotal > 0 ? runsPassed / runsTotal : 0),
|
|
121
|
+
avgCostUsd: Number(row.avg_cost_usd) || 0,
|
|
122
|
+
avgTimeMs: Number(row.avg_time_ms) || 0,
|
|
123
|
+
last10Runs: parseRecentRuns(row.last_10_runs),
|
|
124
|
+
createdAt: String(row.created_at),
|
|
125
|
+
updatedAt: String(row.updated_at),
|
|
126
|
+
};
|
|
127
|
+
}
|
|
128
|
+
|
|
129
|
+
/** Читает статистику по типу задачи или `null`, если данных ещё нет. */
|
|
130
|
+
export function getCapability(taskType: string): CapabilityRecord | null {
|
|
131
|
+
const key = requireTaskType(taskType);
|
|
132
|
+
const row = getDb()
|
|
133
|
+
.prepare("SELECT * FROM capability_map WHERE task_type = ?")
|
|
134
|
+
.get(key) as Record<string, unknown> | undefined;
|
|
135
|
+
return row ? rowToRecord(row) : null;
|
|
136
|
+
}
|
|
137
|
+
|
|
138
|
+
/** Все известные типы задач, сначала самые надёжные. */
|
|
139
|
+
export function listCapabilities(limit = 100): CapabilityRecord[] {
|
|
140
|
+
const capped = Math.max(1, Math.floor(limit));
|
|
141
|
+
const rows = getDb()
|
|
142
|
+
.prepare("SELECT * FROM capability_map ORDER BY success_rate DESC, runs_total DESC, task_type ASC LIMIT ?")
|
|
143
|
+
.all(capped) as Record<string, unknown>[];
|
|
144
|
+
return rows.map(rowToRecord);
|
|
145
|
+
}
|
|
146
|
+
|
|
147
|
+
/**
|
|
148
|
+
* Записывает исход гейта и обновляет статистику скользящим средним.
|
|
149
|
+
*
|
|
150
|
+
* Возвращает актуальную запись карты — её же удобно логировать вместе с
|
|
151
|
+
* решением роутера, чтобы видеть, на каких данных он остановился.
|
|
152
|
+
*/
|
|
153
|
+
export function recordCapabilityOutcome(outcome: CapabilityOutcome): CapabilityRecord {
|
|
154
|
+
const key = requireTaskType(outcome.taskType);
|
|
155
|
+
if (typeof outcome.passed !== "boolean") {
|
|
156
|
+
throw new Error("Исход гейта должен быть boolean (passed).");
|
|
157
|
+
}
|
|
158
|
+
const cost = outcome.costUsd === undefined ? 0 : requireNonNegative(outcome.costUsd, "costUsd");
|
|
159
|
+
const time = outcome.timeMs === undefined ? 0 : requireNonNegative(outcome.timeMs, "timeMs");
|
|
160
|
+
const model = (outcome.model ?? DEFAULT_MODEL).trim() || DEFAULT_MODEL;
|
|
161
|
+
const passed = outcome.passed ? 1 : 0;
|
|
162
|
+
|
|
163
|
+
return withTransaction(() => {
|
|
164
|
+
const db = getDb();
|
|
165
|
+
const timestamp = nowIso();
|
|
166
|
+
const existing = getCapability(key);
|
|
167
|
+
if (!existing) {
|
|
168
|
+
db.prepare(
|
|
169
|
+
`INSERT INTO capability_map (
|
|
170
|
+
task_type, model, runs_total, runs_passed, success_rate,
|
|
171
|
+
avg_cost_usd, avg_time_ms, last_10_runs, created_at, updated_at
|
|
172
|
+
) VALUES (?, ?, 1, ?, ?, ?, ?, ?, ?, ?)`,
|
|
173
|
+
).run(
|
|
174
|
+
key,
|
|
175
|
+
model,
|
|
176
|
+
passed,
|
|
177
|
+
passed,
|
|
178
|
+
cost,
|
|
179
|
+
time,
|
|
180
|
+
JSON.stringify([passed]),
|
|
181
|
+
timestamp,
|
|
182
|
+
timestamp,
|
|
183
|
+
);
|
|
184
|
+
} else {
|
|
185
|
+
const runsTotal = existing.runsTotal + 1;
|
|
186
|
+
const runsPassed = existing.runsPassed + passed;
|
|
187
|
+
const avgCost = (existing.avgCostUsd * existing.runsTotal + cost) / runsTotal;
|
|
188
|
+
const avgTime = (existing.avgTimeMs * existing.runsTotal + time) / runsTotal;
|
|
189
|
+
const recent = [...existing.last10Runs, passed].slice(-RECENT_RUNS_LIMIT);
|
|
190
|
+
db.prepare(
|
|
191
|
+
`UPDATE capability_map
|
|
192
|
+
SET model = ?, runs_total = ?, runs_passed = ?, success_rate = ?,
|
|
193
|
+
avg_cost_usd = ?, avg_time_ms = ?, last_10_runs = ?, updated_at = ?
|
|
194
|
+
WHERE task_type = ?`,
|
|
195
|
+
).run(
|
|
196
|
+
model,
|
|
197
|
+
runsTotal,
|
|
198
|
+
runsPassed,
|
|
199
|
+
runsPassed / runsTotal,
|
|
200
|
+
avgCost,
|
|
201
|
+
avgTime,
|
|
202
|
+
JSON.stringify(recent),
|
|
203
|
+
timestamp,
|
|
204
|
+
key,
|
|
205
|
+
);
|
|
206
|
+
}
|
|
207
|
+
const record = getCapability(key);
|
|
208
|
+
if (!record) {
|
|
209
|
+
throw new Error(`Capability Map: запись для ${key} не сохранилась.`);
|
|
210
|
+
}
|
|
211
|
+
return record;
|
|
212
|
+
});
|
|
213
|
+
}
|
|
214
|
+
|
|
215
|
+
/**
|
|
216
|
+
* Решение слоя 2 по порогам (0 токенов).
|
|
217
|
+
*
|
|
218
|
+
* - данных меньше `minRuns` → `explore` (решает слой 3);
|
|
219
|
+
* - `success_rate ≥ 0.85` → `local`;
|
|
220
|
+
* - `success_rate ≤ 0.30` → `cloud` (эскалация);
|
|
221
|
+
* - между порогами → `review` (нужен человек или облачный ревьюер).
|
|
222
|
+
*/
|
|
223
|
+
export function decideCapabilityRoute(
|
|
224
|
+
taskType: string,
|
|
225
|
+
thresholds: CapabilityThresholds = {},
|
|
226
|
+
): CapabilityDecision {
|
|
227
|
+
const key = requireTaskType(taskType);
|
|
228
|
+
const localSuccess = thresholds.localSuccess ?? LOCAL_SUCCESS_THRESHOLD;
|
|
229
|
+
const cloudFailure = thresholds.cloudFailure ?? CLOUD_FAILURE_THRESHOLD;
|
|
230
|
+
const minRuns = thresholds.minRuns ?? MIN_RUNS_FOR_DECISION;
|
|
231
|
+
if (localSuccess <= cloudFailure) {
|
|
232
|
+
throw new Error("Порог localSuccess должен быть больше cloudFailure.");
|
|
233
|
+
}
|
|
234
|
+
|
|
235
|
+
const capability = getCapability(key);
|
|
236
|
+
if (!capability || capability.runsTotal < minRuns) {
|
|
237
|
+
return {
|
|
238
|
+
taskType: key,
|
|
239
|
+
target: "explore",
|
|
240
|
+
reason: "no-data",
|
|
241
|
+
successRate: capability?.successRate ?? 0,
|
|
242
|
+
runsTotal: capability?.runsTotal ?? 0,
|
|
243
|
+
capability,
|
|
244
|
+
};
|
|
245
|
+
}
|
|
246
|
+
|
|
247
|
+
if (capability.successRate >= localSuccess) {
|
|
248
|
+
return {
|
|
249
|
+
taskType: key,
|
|
250
|
+
target: "local",
|
|
251
|
+
reason: "local-reliable",
|
|
252
|
+
successRate: capability.successRate,
|
|
253
|
+
runsTotal: capability.runsTotal,
|
|
254
|
+
capability,
|
|
255
|
+
};
|
|
256
|
+
}
|
|
257
|
+
|
|
258
|
+
if (capability.successRate <= cloudFailure) {
|
|
259
|
+
return {
|
|
260
|
+
taskType: key,
|
|
261
|
+
target: "cloud",
|
|
262
|
+
reason: "escalate",
|
|
263
|
+
successRate: capability.successRate,
|
|
264
|
+
runsTotal: capability.runsTotal,
|
|
265
|
+
capability,
|
|
266
|
+
};
|
|
267
|
+
}
|
|
268
|
+
|
|
269
|
+
return {
|
|
270
|
+
taskType: key,
|
|
271
|
+
target: "review",
|
|
272
|
+
reason: "review",
|
|
273
|
+
successRate: capability.successRate,
|
|
274
|
+
runsTotal: capability.runsTotal,
|
|
275
|
+
capability,
|
|
276
|
+
};
|
|
277
|
+
}
|
|
278
|
+
|
|
279
|
+
/** Готова ли таблица карты (для диагностики и тестов миграции). */
|
|
280
|
+
export function isCapabilityMapReady(): boolean {
|
|
281
|
+
const rows = getDb()
|
|
282
|
+
.prepare("SELECT name FROM sqlite_master WHERE type = 'table' AND name = 'capability_map'")
|
|
283
|
+
.all() as { name?: string }[];
|
|
284
|
+
return rows.length > 0;
|
|
285
|
+
}
|
package/src/db/history-repo.ts
CHANGED
|
@@ -326,6 +326,28 @@ export function getHistory(
|
|
|
326
326
|
return rows.map(rowToRecord);
|
|
327
327
|
}
|
|
328
328
|
|
|
329
|
+
/**
|
|
330
|
+
* Последняя запись по каждой задаче (P2-29).
|
|
331
|
+
*
|
|
332
|
+
* DAG-зависимости нельзя проверять по «последним N записям»: на частой задаче
|
|
333
|
+
* успех зависимости вымывается из окна, и зависимая задача не стартует.
|
|
334
|
+
* Здесь SQL сам выбирает по одной самой свежей записи на задачу.
|
|
335
|
+
*/
|
|
336
|
+
export function getLatestHistoryByTask(limit = 5000): StoredHistoryRecord[] {
|
|
337
|
+
const safeLimit = Math.max(1, Math.min(100000, Math.floor(limit) || 1));
|
|
338
|
+
const rows = getDb()
|
|
339
|
+
.prepare(
|
|
340
|
+
`SELECT * FROM history
|
|
341
|
+
WHERE id IN (
|
|
342
|
+
SELECT MAX(id) FROM history GROUP BY lower(task_name)
|
|
343
|
+
)
|
|
344
|
+
ORDER BY started_at DESC, id DESC
|
|
345
|
+
LIMIT ?`,
|
|
346
|
+
)
|
|
347
|
+
.all(safeLimit);
|
|
348
|
+
return rows.map(rowToRecord);
|
|
349
|
+
}
|
|
350
|
+
|
|
329
351
|
/** История запусков, начатых не раньше timestamp (ISO-строка). */
|
|
330
352
|
export function getHistorySince(
|
|
331
353
|
timestamp: string,
|
package/src/db/index.ts
CHANGED
|
@@ -55,6 +55,8 @@ const DEFAULT_DB_FILE = process.env.OPENCODE_SCHEDULER_DB?.trim()
|
|
|
55
55
|
|
|
56
56
|
let dbFile = DEFAULT_DB_FILE;
|
|
57
57
|
let db: SqliteDatabase | null = null;
|
|
58
|
+
/** Глубина вложенности withTransaction: 0 — транзакции нет, >0 — SAVEPOINT. */
|
|
59
|
+
let transactionDepth = 0;
|
|
58
60
|
|
|
59
61
|
/** Открывает (или переоткрывает) соединение и применяет схему. */
|
|
60
62
|
export function initDb(file: string = dbFile): SqliteDatabase {
|
|
@@ -67,6 +69,11 @@ export function initDb(file: string = dbFile): SqliteDatabase {
|
|
|
67
69
|
const DatabaseSync = loadSqlite();
|
|
68
70
|
const instance = new DatabaseSync(file);
|
|
69
71
|
|
|
72
|
+
// busy_timeout ДОЛЖЕН быть установлен до WAL: при одновременном старте
|
|
73
|
+
// нескольких процессов (каждое завершение задачи — отдельный
|
|
74
|
+
// `node record-history`) переключение journal_mode требует эксклюзивной
|
|
75
|
+
// блокировки. Без таймаута SQLite сразу падает с "database is locked".
|
|
76
|
+
instance.exec("PRAGMA busy_timeout = 5000;");
|
|
70
77
|
// WAL — конкурентное чтение во время записи и устойчивость к сбоям.
|
|
71
78
|
// synchronous = NORMAL в WAL гарантирует, что закоммиченная транзакция
|
|
72
79
|
// переживает падение процесса (шаг 36.1.b); при потере питания может
|
|
@@ -74,7 +81,6 @@ export function initDb(file: string = dbFile): SqliteDatabase {
|
|
|
74
81
|
instance.exec("PRAGMA journal_mode = WAL;");
|
|
75
82
|
instance.exec("PRAGMA synchronous = NORMAL;");
|
|
76
83
|
instance.exec("PRAGMA foreign_keys = ON;");
|
|
77
|
-
instance.exec("PRAGMA busy_timeout = 5000;");
|
|
78
84
|
applySchema(instance);
|
|
79
85
|
|
|
80
86
|
db = instance;
|
|
@@ -88,6 +94,7 @@ export function getDb(): SqliteDatabase {
|
|
|
88
94
|
|
|
89
95
|
/** Закрывает соединение (вызывается при выгрузке плагина). */
|
|
90
96
|
export function closeDb(): void {
|
|
97
|
+
transactionDepth = 0;
|
|
91
98
|
if (!db) return;
|
|
92
99
|
try {
|
|
93
100
|
db.exec("PRAGMA wal_checkpoint(TRUNCATE);");
|
|
@@ -143,10 +150,37 @@ export function getDbStatus(): {
|
|
|
143
150
|
/**
|
|
144
151
|
* Выполняет функцию в транзакции BEGIN IMMEDIATE.
|
|
145
152
|
* При любой ошибке откатывает изменения и пробрасывает исключение дальше.
|
|
153
|
+
*
|
|
154
|
+
* Вложенный вызов не открывает вторую транзакцию (SQLite это запрещает), а
|
|
155
|
+
* создаёт SAVEPOINT: так композиция вроде «retry из DLQ → reopenRun → retryStep»
|
|
156
|
+
* остаётся атомарной, а внутренний откат не рушит внешнюю транзакцию.
|
|
146
157
|
*/
|
|
147
158
|
export function withTransaction<T>(fn: () => T): T {
|
|
148
159
|
const instance = getDb();
|
|
160
|
+
|
|
161
|
+
if (transactionDepth > 0) {
|
|
162
|
+
const savepoint = `sp_nested_${transactionDepth}`;
|
|
163
|
+
instance.exec(`SAVEPOINT ${savepoint};`);
|
|
164
|
+
transactionDepth += 1;
|
|
165
|
+
try {
|
|
166
|
+
const result = fn();
|
|
167
|
+
instance.exec(`RELEASE ${savepoint};`);
|
|
168
|
+
return result;
|
|
169
|
+
} catch (err) {
|
|
170
|
+
try {
|
|
171
|
+
instance.exec(`ROLLBACK TO ${savepoint};`);
|
|
172
|
+
instance.exec(`RELEASE ${savepoint};`);
|
|
173
|
+
} catch {
|
|
174
|
+
// SAVEPOINT уже снят вместе с внешней транзакцией.
|
|
175
|
+
}
|
|
176
|
+
throw err;
|
|
177
|
+
} finally {
|
|
178
|
+
transactionDepth -= 1;
|
|
179
|
+
}
|
|
180
|
+
}
|
|
181
|
+
|
|
149
182
|
instance.exec("BEGIN IMMEDIATE;");
|
|
183
|
+
transactionDepth = 1;
|
|
150
184
|
try {
|
|
151
185
|
const result = fn();
|
|
152
186
|
instance.exec("COMMIT;");
|
|
@@ -158,6 +192,8 @@ export function withTransaction<T>(fn: () => T): T {
|
|
|
158
192
|
// Откат мог не понадобиться (например, SQLite уже откатил сам).
|
|
159
193
|
}
|
|
160
194
|
throw err;
|
|
195
|
+
} finally {
|
|
196
|
+
transactionDepth = 0;
|
|
161
197
|
}
|
|
162
198
|
}
|
|
163
199
|
|
package/src/db/migrate.ts
CHANGED
|
@@ -90,7 +90,9 @@ function normalizeHistoryRow(raw: any): any | null {
|
|
|
90
90
|
if (!taskName || !startedAt) return null;
|
|
91
91
|
|
|
92
92
|
const status =
|
|
93
|
-
raw.status === "success" || raw.status === "
|
|
93
|
+
raw.status === "success" || raw.status === "partial" || raw.status === "timeout"
|
|
94
|
+
? raw.status
|
|
95
|
+
: "error";
|
|
94
96
|
|
|
95
97
|
return {
|
|
96
98
|
taskName,
|