agent-steward 0.0.2 → 0.0.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +25 -2
- package/CROSS_PLATFORM.md +11 -9
- package/README.md +9 -8
- package/ROADMAP-STRATEGY.md +93 -44
- package/ROADMAP.md +114 -999
- package/dist/core/cron-to-schtasks.d.ts +0 -8
- package/dist/core/cron-to-schtasks.d.ts.map +1 -1
- package/dist/core/cron-to-schtasks.js +11 -86
- package/dist/core/dry-run.js +1 -1
- package/dist/core/file-watcher.js +9 -9
- package/dist/core/git-trigger.js +4 -4
- package/dist/core/lock.js +2 -4
- package/dist/core/one-shot.d.ts +27 -5
- package/dist/core/one-shot.d.ts.map +1 -1
- package/dist/core/one-shot.js +53 -10
- package/dist/core/otel.js +2 -2
- package/dist/core/ps-wrapper.d.ts +1 -1
- package/dist/core/ps-wrapper.d.ts.map +1 -1
- package/dist/core/ps-wrapper.js +55 -35
- package/dist/core/record-history.js +22 -22
- package/dist/core/schedule-v2.d.ts +2 -2
- package/dist/core/schedule-v2.d.ts.map +1 -1
- package/dist/core/schedule-v2.js +7 -7
- package/dist/core/scheduler/at-fallback.d.ts +42 -0
- package/dist/core/scheduler/at-fallback.d.ts.map +1 -0
- package/dist/core/scheduler/at-fallback.js +70 -0
- package/dist/core/scheduler/linux.d.ts +3 -1
- package/dist/core/scheduler/linux.d.ts.map +1 -1
- package/dist/core/scheduler/linux.js +43 -7
- package/dist/core/scheduler/mac.d.ts +14 -8
- package/dist/core/scheduler/mac.d.ts.map +1 -1
- package/dist/core/scheduler/mac.js +71 -22
- package/dist/core/scheduler/posix.d.ts.map +1 -1
- package/dist/core/scheduler/posix.js +12 -1
- package/dist/core/scheduler/registry.d.ts +2 -0
- package/dist/core/scheduler/registry.d.ts.map +1 -1
- package/dist/core/scheduler/windows.d.ts +16 -3
- package/dist/core/scheduler/windows.d.ts.map +1 -1
- package/dist/core/scheduler/windows.js +249 -96
- package/dist/core/secrets.js +2 -2
- package/dist/core/self-analysis.js +55 -55
- package/dist/core/summary.js +1 -1
- package/dist/core/triage-chain.js +1 -1
- package/dist/core/triage-worker.js +2 -2
- package/dist/core/triage.js +1 -1
- package/dist/core/wrappers/bash.js +33 -33
- package/dist/db/index.d.ts +2 -0
- package/dist/db/index.d.ts.map +1 -1
- package/dist/db/index.js +9 -1
- package/dist/db/run-journal.d.ts +60 -0
- package/dist/db/run-journal.d.ts.map +1 -0
- package/dist/db/run-journal.js +143 -0
- package/dist/db/run-resume.d.ts +48 -0
- package/dist/db/run-resume.d.ts.map +1 -0
- package/dist/db/run-resume.js +137 -0
- package/dist/db/runs-repo.d.ts +120 -0
- package/dist/db/runs-repo.d.ts.map +1 -0
- package/dist/db/runs-repo.js +319 -0
- package/dist/db/schema.d.ts +16 -2
- package/dist/db/schema.d.ts.map +1 -1
- package/dist/db/schema.js +190 -35
- package/dist/index.d.ts +1 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +66 -36
- package/dist/notifications.js +18 -18
- package/dist/profiles.d.ts +7 -3
- package/dist/profiles.d.ts.map +1 -1
- package/dist/profiles.js +85 -7
- package/dist/rpc.d.ts +109 -0
- package/dist/rpc.d.ts.map +1 -1
- package/dist/rpc.js +89 -0
- package/dist/server.d.ts +2 -2
- package/dist/server.d.ts.map +1 -1
- package/dist/server.js +20 -19
- package/dist/shared/jobs-view.d.ts.map +1 -1
- package/dist/skill.js +1 -1
- package/dist/task-transfer.d.ts +1 -1
- package/dist/task-transfer.d.ts.map +1 -1
- package/dist/task-transfer.js +14 -10
- package/dist/types.d.ts +20 -4
- package/dist/types.d.ts.map +1 -1
- package/dist/types.js +37 -9
- package/dist/workspaces.js +1 -1
- package/docs/ARCHITECTURE.md +110 -8
- package/docs/COMPATIBILITY.md +10 -6
- package/docs/CONCEPT.md +15 -3
- package/docs/CROSS_PLATFORM.ru.md +11 -9
- package/docs/CROSS_PLATFORM.zh.md +11 -9
- package/docs/FAQ.md +2 -2
- package/docs/FAQ.ru.md +2 -2
- package/docs/FAQ.zh.md +2 -2
- package/docs/FEATURES.md +5 -4
- package/docs/FEATURES.zh.md +5 -4
- package/docs/MIGRATION.md +34 -26
- package/docs/README.ru.md +26 -7
- package/docs/README.zh.md +9 -8
- package/docs/V1-V2-COMPATIBILITY-PLAN.md +6 -6
- package/gui-experimental.cjs +8 -8
- package/index.js +1 -0
- package/locales/en.json +1 -0
- package/locales/ru.json +1 -0
- package/locales/zh.json +1 -0
- package/package.json +31 -10
- package/src/core/analytics.ts +2 -2
- package/src/core/audit.ts +17 -17
- package/src/core/cron-to-schtasks.ts +14 -93
- package/src/core/dry-run.ts +26 -26
- package/src/core/file-watcher.ts +17 -17
- package/src/core/git-trigger.ts +9 -9
- package/src/core/glob.ts +1 -1
- package/src/core/local-ai.ts +2 -2
- package/src/core/lock.ts +9 -9
- package/src/core/matrix.ts +31 -31
- package/src/core/native-notify.ts +2 -2
- package/src/core/one-shot.ts +63 -13
- package/src/core/otel.ts +4 -4
- package/src/core/permissions.ts +5 -5
- package/src/core/prometheus.ts +17 -17
- package/src/core/ps-wrapper.ts +57 -37
- package/src/core/record-history.ts +40 -40
- package/src/core/retention.ts +3 -3
- package/src/core/savings.ts +1 -1
- package/src/core/schedule-gate.ts +12 -12
- package/src/core/schedule-v2.ts +24 -24
- package/src/core/scheduler/at-fallback.ts +113 -0
- package/src/core/scheduler/index.ts +3 -3
- package/src/core/scheduler/linux.ts +64 -13
- package/src/core/scheduler/logs.ts +1 -1
- package/src/core/scheduler/mac.ts +112 -60
- package/src/core/scheduler/posix.ts +15 -1
- package/src/core/scheduler/registry.ts +6 -4
- package/src/core/scheduler/windows.ts +295 -125
- package/src/core/secrets.ts +13 -13
- package/src/core/self-analysis.ts +61 -61
- package/src/core/session.ts +3 -3
- package/src/core/structured-log.ts +3 -3
- package/src/core/summary.ts +25 -25
- package/src/core/telegram.ts +16 -16
- package/src/core/triage-chain.ts +4 -4
- package/src/core/triage-compare.ts +8 -8
- package/src/core/triage-rules.ts +4 -4
- package/src/core/triage-shadow.ts +7 -7
- package/src/core/triage-worker.ts +6 -6
- package/src/core/triage.ts +23 -23
- package/src/core/watch-paths.ts +1 -1
- package/src/core/wrappers/bash.ts +41 -41
- package/src/db/git-state-repo.ts +1 -1
- package/src/db/history-repo.ts +22 -22
- package/src/db/index.ts +16 -6
- package/src/db/metrics-repo.ts +10 -10
- package/src/db/migrate.ts +10 -10
- package/src/db/recovery.ts +3 -3
- package/src/db/run-journal.ts +212 -0
- package/src/db/run-resume.ts +220 -0
- package/src/db/runs-repo.ts +481 -0
- package/src/db/schema.ts +205 -44
- package/src/db/settings-repo.ts +2 -2
- package/src/db/tasks-repo.ts +10 -10
- package/src/db/templates-repo.ts +7 -7
- package/src/gui.tsx +1 -1
- package/src/history.ts +4 -4
- package/src/i18n.ts +7 -7
- package/src/index.ts +341 -304
- package/src/integrations.ts +6 -6
- package/src/notifications.ts +76 -76
- package/src/profiles.ts +98 -7
- package/src/rpc.ts +96 -1
- package/src/schtasks.ts +2 -2
- package/src/server.ts +43 -42
- package/src/settings.ts +44 -44
- package/src/shared/jobs-view.ts +60 -60
- package/src/skill.ts +1 -1
- package/src/task-transfer.ts +58 -56
- package/src/templates.ts +1 -1
- package/src/types.ts +45 -10
- package/src/workspaces.ts +16 -16
- package/dist/core/self-analysis.test.d.ts +0 -2
- package/dist/core/self-analysis.test.d.ts.map +0 -1
- package/dist/core/self-analysis.test.js +0 -219
- package/dist/gui-experimental.cjs +0 -1
|
@@ -0,0 +1,319 @@
|
|
|
1
|
+
import { randomUUID } from "node:crypto";
|
|
2
|
+
import { getDb, withTransaction } from "./index.js";
|
|
3
|
+
/** Финальные статусы шага — из них нет переходов, кроме явного retry. */
|
|
4
|
+
const TERMINAL_STEP_STATUSES = new Set([
|
|
5
|
+
"passed",
|
|
6
|
+
"failed",
|
|
7
|
+
"skipped",
|
|
8
|
+
]);
|
|
9
|
+
const RUN_TRANSITIONS = {
|
|
10
|
+
pending: ["running", "cancelled"],
|
|
11
|
+
running: ["passed", "failed", "cancelled"],
|
|
12
|
+
passed: [],
|
|
13
|
+
// failed → running — явное возобновление после краха (36.2), только через reopenRun.
|
|
14
|
+
failed: ["running"],
|
|
15
|
+
cancelled: [],
|
|
16
|
+
};
|
|
17
|
+
const STEP_TRANSITIONS = {
|
|
18
|
+
pending: ["running", "failed", "skipped"],
|
|
19
|
+
running: ["passed", "failed"],
|
|
20
|
+
passed: [],
|
|
21
|
+
failed: [],
|
|
22
|
+
skipped: [],
|
|
23
|
+
};
|
|
24
|
+
export class InvalidTransitionError extends Error {
|
|
25
|
+
constructor(entity, from, to) {
|
|
26
|
+
super(`Недопустимый переход ${entity}: ${from} → ${to}`);
|
|
27
|
+
this.entity = entity;
|
|
28
|
+
this.from = from;
|
|
29
|
+
this.to = to;
|
|
30
|
+
this.name = "InvalidTransitionError";
|
|
31
|
+
}
|
|
32
|
+
}
|
|
33
|
+
function nowIso() {
|
|
34
|
+
return new Date().toISOString();
|
|
35
|
+
}
|
|
36
|
+
function parseJson(value) {
|
|
37
|
+
if (value == null)
|
|
38
|
+
return null;
|
|
39
|
+
try {
|
|
40
|
+
return JSON.parse(String(value));
|
|
41
|
+
}
|
|
42
|
+
catch {
|
|
43
|
+
return String(value);
|
|
44
|
+
}
|
|
45
|
+
}
|
|
46
|
+
function serializeJson(value) {
|
|
47
|
+
if (value === undefined)
|
|
48
|
+
return null;
|
|
49
|
+
try {
|
|
50
|
+
return JSON.stringify(value);
|
|
51
|
+
}
|
|
52
|
+
catch {
|
|
53
|
+
return null;
|
|
54
|
+
}
|
|
55
|
+
}
|
|
56
|
+
function runRowToRecord(row) {
|
|
57
|
+
return {
|
|
58
|
+
id: String(row.id),
|
|
59
|
+
taskName: String(row.task_name),
|
|
60
|
+
status: String(row.status),
|
|
61
|
+
parentRunId: row.parent_run_id == null ? null : String(row.parent_run_id),
|
|
62
|
+
workspaceId: row.workspace_id == null ? null : String(row.workspace_id),
|
|
63
|
+
startedAt: row.started_at == null ? null : String(row.started_at),
|
|
64
|
+
finishedAt: row.finished_at == null ? null : String(row.finished_at),
|
|
65
|
+
error: row.error == null ? null : String(row.error),
|
|
66
|
+
metadata: parseJson(row.metadata_json),
|
|
67
|
+
createdAt: String(row.created_at),
|
|
68
|
+
updatedAt: String(row.updated_at),
|
|
69
|
+
};
|
|
70
|
+
}
|
|
71
|
+
function stepRowToRecord(row) {
|
|
72
|
+
return {
|
|
73
|
+
id: String(row.id),
|
|
74
|
+
runId: String(row.run_id),
|
|
75
|
+
stepName: String(row.step_name),
|
|
76
|
+
position: Number(row.position) || 0,
|
|
77
|
+
status: String(row.status),
|
|
78
|
+
attempt: Number(row.attempt) || 1,
|
|
79
|
+
idempotencyKey: row.idempotency_key == null ? null : String(row.idempotency_key),
|
|
80
|
+
startedAt: row.started_at == null ? null : String(row.started_at),
|
|
81
|
+
finishedAt: row.finished_at == null ? null : String(row.finished_at),
|
|
82
|
+
error: row.error == null ? null : String(row.error),
|
|
83
|
+
output: parseJson(row.output_json),
|
|
84
|
+
createdAt: String(row.created_at),
|
|
85
|
+
updatedAt: String(row.updated_at),
|
|
86
|
+
};
|
|
87
|
+
}
|
|
88
|
+
function assertTransition(entity, from, to, allowed) {
|
|
89
|
+
if (!allowed.includes(to))
|
|
90
|
+
throw new InvalidTransitionError(entity, from, to);
|
|
91
|
+
}
|
|
92
|
+
const INSERT_RUN_SQL = `INSERT INTO runs (
|
|
93
|
+
id, task_name, status, parent_run_id, workspace_id,
|
|
94
|
+
started_at, finished_at, error, metadata_json, created_at, updated_at
|
|
95
|
+
) VALUES (?, ?, ?, ?, ?, ?, NULL, NULL, ?, ?, ?)`;
|
|
96
|
+
const INSERT_STEP_SQL = `INSERT INTO run_steps (
|
|
97
|
+
id, run_id, step_name, position, status, attempt, idempotency_key,
|
|
98
|
+
started_at, finished_at, error, output_json, created_at, updated_at
|
|
99
|
+
) VALUES (?, ?, ?, ?, ?, ?, ?, ?, NULL, NULL, ?, ?, ?)`;
|
|
100
|
+
/** Создаёт запуск и (опционально) его шаги одной транзакцией. */
|
|
101
|
+
export function createRun(options) {
|
|
102
|
+
const id = randomUUID();
|
|
103
|
+
const timestamp = nowIso();
|
|
104
|
+
const status = options.status ?? "pending";
|
|
105
|
+
const startedAt = options.startedAt ?? (status === "running" ? timestamp : null);
|
|
106
|
+
withTransaction(() => {
|
|
107
|
+
getDb()
|
|
108
|
+
.prepare(INSERT_RUN_SQL)
|
|
109
|
+
.run(id, options.taskName, status, options.parentRunId ?? null, options.workspaceId ?? null, startedAt, serializeJson(options.metadata), timestamp, timestamp);
|
|
110
|
+
let position = 0;
|
|
111
|
+
for (const step of options.steps ?? []) {
|
|
112
|
+
insertStepUnsafe(id, step, timestamp, position);
|
|
113
|
+
position += 1;
|
|
114
|
+
}
|
|
115
|
+
});
|
|
116
|
+
const created = getRun(id);
|
|
117
|
+
if (!created)
|
|
118
|
+
throw new Error("Запуск не найден сразу после создания");
|
|
119
|
+
return created;
|
|
120
|
+
}
|
|
121
|
+
function insertStepUnsafe(runId, options, timestamp, position) {
|
|
122
|
+
const id = randomUUID();
|
|
123
|
+
const status = options.status ?? "pending";
|
|
124
|
+
const startedAt = status === "running" ? timestamp : null;
|
|
125
|
+
getDb()
|
|
126
|
+
.prepare(INSERT_STEP_SQL)
|
|
127
|
+
.run(id, runId, options.stepName, position, status, 1, options.idempotencyKey ?? null, startedAt, serializeJson(options.output), timestamp, timestamp);
|
|
128
|
+
return id;
|
|
129
|
+
}
|
|
130
|
+
/** Следующая позиция шага в цепочке запуска. */
|
|
131
|
+
function nextStepPosition(runId) {
|
|
132
|
+
const row = getDb()
|
|
133
|
+
.prepare("SELECT COALESCE(MAX(position), -1) + 1 AS next FROM run_steps WHERE run_id = ?")
|
|
134
|
+
.get(runId);
|
|
135
|
+
return Number(row?.next) || 0;
|
|
136
|
+
}
|
|
137
|
+
/** Добавляет шаг в существующий запуск. Имя шага уникально внутри запуска. */
|
|
138
|
+
export function createStep(runId, options) {
|
|
139
|
+
const id = withTransaction(() => insertStepUnsafe(runId, options, nowIso(), nextStepPosition(runId)));
|
|
140
|
+
const step = getStepById(id);
|
|
141
|
+
if (!step)
|
|
142
|
+
throw new Error("Шаг не найден сразу после создания");
|
|
143
|
+
return step;
|
|
144
|
+
}
|
|
145
|
+
/** Создаёт все шаги запуска в одной транзакции (для DAG-описания). */
|
|
146
|
+
export function createSteps(runId, steps) {
|
|
147
|
+
const timestamp = nowIso();
|
|
148
|
+
withTransaction(() => {
|
|
149
|
+
let position = nextStepPosition(runId);
|
|
150
|
+
for (const step of steps) {
|
|
151
|
+
insertStepUnsafe(runId, step, timestamp, position);
|
|
152
|
+
position += 1;
|
|
153
|
+
}
|
|
154
|
+
});
|
|
155
|
+
return listRunSteps(runId);
|
|
156
|
+
}
|
|
157
|
+
export function getRun(id) {
|
|
158
|
+
const row = getDb().prepare("SELECT * FROM runs WHERE id = ?").get(id);
|
|
159
|
+
return row ? runRowToRecord(row) : undefined;
|
|
160
|
+
}
|
|
161
|
+
/** Список запусков (новые сверху). Без taskName — по всем задачам. */
|
|
162
|
+
export function listRuns(taskName, limit = 100) {
|
|
163
|
+
const safeLimit = Math.max(1, Math.min(10000, Math.floor(limit) || 1));
|
|
164
|
+
if (taskName) {
|
|
165
|
+
return getDb()
|
|
166
|
+
.prepare(`SELECT * FROM runs WHERE lower(task_name) = lower(?)
|
|
167
|
+
ORDER BY created_at DESC, id DESC LIMIT ?`)
|
|
168
|
+
.all(taskName, safeLimit)
|
|
169
|
+
.map(runRowToRecord);
|
|
170
|
+
}
|
|
171
|
+
return getDb()
|
|
172
|
+
.prepare("SELECT * FROM runs ORDER BY created_at DESC, id DESC LIMIT ?")
|
|
173
|
+
.all(safeLimit)
|
|
174
|
+
.map(runRowToRecord);
|
|
175
|
+
}
|
|
176
|
+
/** pending → running. Возвращает false, если запуск не найден. */
|
|
177
|
+
export function startRun(id, startedAt = nowIso()) {
|
|
178
|
+
return withTransaction(() => {
|
|
179
|
+
const run = getRun(id);
|
|
180
|
+
if (!run)
|
|
181
|
+
return false;
|
|
182
|
+
assertTransition("run", run.status, "running", RUN_TRANSITIONS[run.status]);
|
|
183
|
+
getDb()
|
|
184
|
+
.prepare("UPDATE runs SET status = 'running', started_at = ?, updated_at = ? WHERE id = ?")
|
|
185
|
+
.run(startedAt, nowIso(), id);
|
|
186
|
+
return true;
|
|
187
|
+
});
|
|
188
|
+
}
|
|
189
|
+
/** Завершает запуск (passed/failed/cancelled) и фиксирует finished_at. */
|
|
190
|
+
export function finishRun(id, status, options = {}) {
|
|
191
|
+
return withTransaction(() => {
|
|
192
|
+
const run = getRun(id);
|
|
193
|
+
if (!run)
|
|
194
|
+
return false;
|
|
195
|
+
assertTransition("run", run.status, status, RUN_TRANSITIONS[run.status]);
|
|
196
|
+
const timestamp = nowIso();
|
|
197
|
+
getDb()
|
|
198
|
+
.prepare("UPDATE runs SET status = ?, finished_at = ?, error = ?, updated_at = ? WHERE id = ?")
|
|
199
|
+
.run(status, timestamp, options.error ?? null, timestamp, id);
|
|
200
|
+
return true;
|
|
201
|
+
});
|
|
202
|
+
}
|
|
203
|
+
/**
|
|
204
|
+
* failed → running: возобновление прогона после краха (36.2).
|
|
205
|
+
*
|
|
206
|
+
* Разрешено только из failed и не сбрасывает номера попыток шагов —
|
|
207
|
+
* они растут через `retryStep` при повторе конкретного шага.
|
|
208
|
+
*/
|
|
209
|
+
export function reopenRun(id, startedAt = nowIso()) {
|
|
210
|
+
return withTransaction(() => {
|
|
211
|
+
const run = getRun(id);
|
|
212
|
+
if (!run)
|
|
213
|
+
return false;
|
|
214
|
+
assertTransition("run", run.status, "running", RUN_TRANSITIONS[run.status]);
|
|
215
|
+
getDb()
|
|
216
|
+
.prepare(`UPDATE runs SET status = 'running', started_at = COALESCE(started_at, ?),
|
|
217
|
+
finished_at = NULL, error = NULL, updated_at = ? WHERE id = ?`)
|
|
218
|
+
.run(startedAt, nowIso(), id);
|
|
219
|
+
return true;
|
|
220
|
+
});
|
|
221
|
+
}
|
|
222
|
+
export function getStepById(id) {
|
|
223
|
+
const row = getDb().prepare("SELECT * FROM run_steps WHERE id = ?").get(id);
|
|
224
|
+
return row ? stepRowToRecord(row) : undefined;
|
|
225
|
+
}
|
|
226
|
+
/** Шаг по имени внутри запуска (имя уникально). */
|
|
227
|
+
export function getStep(runId, stepName) {
|
|
228
|
+
const row = getDb()
|
|
229
|
+
.prepare("SELECT * FROM run_steps WHERE run_id = ? AND step_name = ?")
|
|
230
|
+
.get(runId, stepName);
|
|
231
|
+
return row ? stepRowToRecord(row) : undefined;
|
|
232
|
+
}
|
|
233
|
+
/** Все шаги запуска в порядке создания. */
|
|
234
|
+
export function listRunSteps(runId) {
|
|
235
|
+
return getDb()
|
|
236
|
+
.prepare("SELECT * FROM run_steps WHERE run_id = ? ORDER BY position ASC, rowid ASC")
|
|
237
|
+
.all(runId)
|
|
238
|
+
.map(stepRowToRecord);
|
|
239
|
+
}
|
|
240
|
+
/** Поиск шага по ключу идемпотентности (36.3) в пределах запуска. */
|
|
241
|
+
export function findStepByIdempotencyKey(runId, idempotencyKey) {
|
|
242
|
+
const row = getDb()
|
|
243
|
+
.prepare("SELECT * FROM run_steps WHERE run_id = ? AND idempotency_key = ? LIMIT 1")
|
|
244
|
+
.get(runId, idempotencyKey);
|
|
245
|
+
return row ? stepRowToRecord(row) : undefined;
|
|
246
|
+
}
|
|
247
|
+
/** pending → running. Возвращает false, если шаг не найден. */
|
|
248
|
+
export function startStep(id, startedAt = nowIso()) {
|
|
249
|
+
return withTransaction(() => {
|
|
250
|
+
const step = getStepById(id);
|
|
251
|
+
if (!step)
|
|
252
|
+
return false;
|
|
253
|
+
assertTransition("step", step.status, "running", STEP_TRANSITIONS[step.status]);
|
|
254
|
+
getDb()
|
|
255
|
+
.prepare(`UPDATE run_steps SET status = 'running', started_at = ?, finished_at = NULL,
|
|
256
|
+
error = NULL, updated_at = ? WHERE id = ?`)
|
|
257
|
+
.run(startedAt, nowIso(), id);
|
|
258
|
+
return true;
|
|
259
|
+
});
|
|
260
|
+
}
|
|
261
|
+
/** running → passed/failed; pending → skipped допустим. */
|
|
262
|
+
export function finishStep(id, status, options = {}) {
|
|
263
|
+
return withTransaction(() => {
|
|
264
|
+
const step = getStepById(id);
|
|
265
|
+
if (!step)
|
|
266
|
+
return false;
|
|
267
|
+
assertTransition("step", step.status, status, STEP_TRANSITIONS[step.status]);
|
|
268
|
+
const timestamp = nowIso();
|
|
269
|
+
getDb()
|
|
270
|
+
.prepare(`UPDATE run_steps SET status = ?, finished_at = ?, error = ?, output_json = ?,
|
|
271
|
+
updated_at = ? WHERE id = ?`)
|
|
272
|
+
.run(status, timestamp, options.error ?? null, options.output === undefined ? null : serializeJson(options.output), timestamp, id);
|
|
273
|
+
return true;
|
|
274
|
+
});
|
|
275
|
+
}
|
|
276
|
+
/**
|
|
277
|
+
* Повтор упавшего шага: failed → running, attempt + 1.
|
|
278
|
+
*
|
|
279
|
+
* Это единственный переход из финального статуса шага. Предыдущая попытка
|
|
280
|
+
* остаётся видимой в счётчике attempt; для 36.4 (DLQ) здесь появится лимит.
|
|
281
|
+
*/
|
|
282
|
+
export function retryStep(id, startedAt = nowIso()) {
|
|
283
|
+
return withTransaction(() => {
|
|
284
|
+
const step = getStepById(id);
|
|
285
|
+
if (!step)
|
|
286
|
+
return false;
|
|
287
|
+
if (step.status !== "failed") {
|
|
288
|
+
throw new InvalidTransitionError("step", step.status, "running");
|
|
289
|
+
}
|
|
290
|
+
getDb()
|
|
291
|
+
.prepare(`UPDATE run_steps SET status = 'running', attempt = attempt + 1,
|
|
292
|
+
started_at = ?, finished_at = NULL, error = NULL, updated_at = ? WHERE id = ?`)
|
|
293
|
+
.run(startedAt, nowIso(), id);
|
|
294
|
+
return true;
|
|
295
|
+
});
|
|
296
|
+
}
|
|
297
|
+
/** Количество шагов запуска (для health/отчётов). */
|
|
298
|
+
export function countRunSteps(runId) {
|
|
299
|
+
const row = getDb()
|
|
300
|
+
.prepare("SELECT COUNT(*) AS count FROM run_steps WHERE run_id = ?")
|
|
301
|
+
.get(runId);
|
|
302
|
+
return Number(row?.count) || 0;
|
|
303
|
+
}
|
|
304
|
+
/** Удаляет запуск; шаги удаляются каскадом (ON DELETE CASCADE). */
|
|
305
|
+
export function deleteRun(id) {
|
|
306
|
+
const result = getDb().prepare("DELETE FROM runs WHERE id = ?").run(id);
|
|
307
|
+
return Number(result.changes) > 0;
|
|
308
|
+
}
|
|
309
|
+
/** Готова ли схема к работе с durable DAG (runs + run_steps). */
|
|
310
|
+
export function isRunStateReady() {
|
|
311
|
+
const rows = getDb()
|
|
312
|
+
.prepare("SELECT name FROM sqlite_master WHERE type = 'table' AND name IN ('runs', 'run_steps')")
|
|
313
|
+
.all();
|
|
314
|
+
return rows.length === 2;
|
|
315
|
+
}
|
|
316
|
+
/** Терминальный ли статус шага (для resume/cleanup в следующих подзадачах). */
|
|
317
|
+
export function isTerminalStepStatus(status) {
|
|
318
|
+
return TERMINAL_STEP_STATUSES.has(status);
|
|
319
|
+
}
|
package/dist/db/schema.d.ts
CHANGED
|
@@ -5,19 +5,33 @@
|
|
|
5
5
|
* безопасно выполнять при каждом открытии соединения — это же служит
|
|
6
6
|
* механизмом «мини-миграций» при обновлении плагина.
|
|
7
7
|
*/
|
|
8
|
-
export declare const SCHEMA_SQL = "\nCREATE TABLE IF NOT EXISTS tasks (\n name TEXT PRIMARY KEY,\n definition_json TEXT NOT NULL,\n created_at TEXT NOT NULL,\n updated_at TEXT NOT NULL,\n matrix_parent_id TEXT,\n is_matrix_parent INTEGER DEFAULT 0\n);\n\nCREATE TABLE IF NOT EXISTS history (\n id INTEGER PRIMARY KEY AUTOINCREMENT,\n task_name TEXT NOT NULL,\n status TEXT NOT NULL,\n started_at TEXT NOT NULL,\n finished_at TEXT,\n duration_ms INTEGER,\n error TEXT,\n tokens INTEGER,\n cost_usd REAL,\n model TEXT,\n pre_flight_status TEXT,\n post_flight_status TEXT,\n next_task TEXT,\n workspace_id TEXT,\n allowed_tools TEXT,\n denied_tools TEXT\n);\n\nCREATE INDEX IF NOT EXISTS idx_history_task ON history(task_name, started_at DESC);\n\nCREATE TABLE IF NOT EXISTS metrics (\n task_name TEXT PRIMARY KEY,\n total INTEGER DEFAULT 0,\n success INTEGER DEFAULT 0,\n error INTEGER DEFAULT 0,\n partial INTEGER DEFAULT 0,\n total_tokens INTEGER DEFAULT 0,\n total_cost REAL DEFAULT 0\n);\n\nCREATE TABLE IF NOT EXISTS templates (\n id TEXT PRIMARY KEY,\n name TEXT NOT NULL,\n definition_json TEXT NOT NULL\n);\n\nCREATE TABLE IF NOT EXISTS settings (\n key TEXT PRIMARY KEY,\n value_json TEXT NOT NULL\n);\n\nCREATE TABLE IF NOT EXISTS workspaces (\n id TEXT PRIMARY KEY,\n name TEXT NOT NULL,\n path TEXT NOT NULL UNIQUE,\n git_remote TEXT,\n color TEXT,\n env_json TEXT,\n env_file TEXT,\n created_at TEXT NOT NULL\n);\n\nCREATE TABLE IF NOT EXISTS audit_log (\n id INTEGER PRIMARY KEY AUTOINCREMENT,\n ts TEXT NOT NULL,\n action TEXT NOT NULL,\n target_type TEXT,\n target TEXT,\n actor TEXT NOT NULL,\n source TEXT,\n details_json TEXT,\n remote TEXT\n);\n\nCREATE INDEX IF NOT EXISTS idx_audit_ts ON audit_log(ts DESC);\nCREATE INDEX IF NOT EXISTS idx_audit_action ON audit_log(action, ts DESC);\n\n-- \u0421\u043F\u0440\u0438\u043D\u0442 27: \u043F\u043E\u0441\u043B\u0435\u0434\u043D\u0438\u0439 \u043E\u0431\u0440\u0430\u0431\u043E\u0442\u0430\u043D\u043D\u044B\u0439 \u043A\u043E\u043C\u043C\u0438\u0442 \u0434\u043B\u044F git-\u0442\u0440\u0438\u0433\u0433\u0435\u0440\u043E\u0432.\nCREATE TABLE IF NOT EXISTS git_state (\n task_name TEXT PRIMARY KEY,\n commit_sha TEXT NOT NULL,\n branch TEXT,\n updated_at TEXT NOT NULL\n);\n\n-- \u0421\u043F\u0440\u0438\u043D\u0442 31.2: \u0434\u0435\u0434\u0443\u043F \u0443\u0432\u0435\u0434\u043E\u043C\u043B\u0435\u043D\u0438\u0439 (\u043E\u0442\u0441\u043B\u0435\u0436\u0438\u0432\u0430\u043D\u0438\u0435 \u043F\u043E\u0432\u0442\u043E\u0440\u043E\u0432 \u043C\u0435\u0436\u0434\u0443 \u043F\u0440\u043E\u0446\u0435\u0441\u0441\u0430\u043C\u0438).\nCREATE TABLE IF NOT EXISTS notification_dedup (\n key TEXT PRIMARY KEY,\n task_name TEXT NOT NULL,\n status TEXT NOT NULL,\n count INTEGER NOT NULL DEFAULT 1,\n first_at TEXT NOT NULL,\n last_at TEXT NOT NULL,\n window_minutes INTEGER NOT NULL DEFAULT 60\n);\n\nCREATE INDEX IF NOT EXISTS idx_notification_dedup_key ON notification_dedup(key);\nCREATE INDEX IF NOT EXISTS idx_notification_dedup_last_at ON notification_dedup(last_at);\n\n-- \u0412\u0435\u043A\u0442\u043E\u0440\u044B \u0441\u043E\u043E\u0431\u0449\u0435\u043D\u0438\u0439 \u0434\u043B\u044F \u0441\u0435\u043C\u0430\u043D\u0442\u0438\u0447\u0435\u0441\u043A\u043E\u0433\u043E \u0434\u0435\u0434\u0443\u043F\u0430 (\u0421\u043F\u0440\u0438\u043D\u0442 31.1).\n-- \u0425\u0440\u0430\u043D\u044F\u0442\u0441\u044F \u043D\u043E\u0440\u043C\u0430\u043B\u0438\u0437\u043E\u0432\u0430\u043D\u043D\u044B\u0435 \u044D\u043C\u0431\u0435\u0434\u0434\u0438\u043D\u0433\u0438 (JSON-\u043C\u0430\u0441\u0441\u0438\u0432 \u0447\u0438\u0441\u0435\u043B) \u0438 \u0442\u0435\u043A\u0441\u0442 \u0441\u043E\u043E\u0431\u0449\u0435\u043D\u0438\u044F.\n-- \u0421\u0440\u0430\u0432\u043D\u0435\u043D\u0438\u0435 \u043F\u043E \u043A\u043E\u0441\u0438\u043D\u0443\u0441\u0443 \u0431\u0440\u0443\u0442\u0444\u043E\u0440\u0441\u043E\u043C \u043F\u043E \u0432\u0441\u0435\u043C \u0432\u0435\u043A\u0442\u043E\u0440\u0430\u043C \u0432 \u043E\u043A\u043D\u0435.\nCREATE TABLE IF NOT EXISTS notification_embeddings (\n key TEXT PRIMARY KEY,\n task_name TEXT NOT NULL,\n status TEXT NOT NULL,\n message_text TEXT NOT NULL,\n embedding_json TEXT NOT NULL,\n dimension INTEGER NOT NULL,\n created_at TEXT NOT NULL,\n window_minutes INTEGER NOT NULL DEFAULT 60\n);\n\nCREATE INDEX IF NOT EXISTS idx_notification_embeddings_task ON notification_embeddings(task_name, created_at DESC);\nCREATE INDEX IF NOT EXISTS idx_notification_embeddings_created ON notification_embeddings(created_at DESC);\n";
|
|
8
|
+
export declare const SCHEMA_SQL = "\nCREATE TABLE IF NOT EXISTS tasks (\n name TEXT PRIMARY KEY,\n definition_json TEXT NOT NULL,\n created_at TEXT NOT NULL,\n updated_at TEXT NOT NULL,\n matrix_parent_id TEXT,\n is_matrix_parent INTEGER DEFAULT 0\n);\n\nCREATE TABLE IF NOT EXISTS history (\n id INTEGER PRIMARY KEY AUTOINCREMENT,\n task_name TEXT NOT NULL,\n status TEXT NOT NULL,\n started_at TEXT NOT NULL,\n finished_at TEXT,\n duration_ms INTEGER,\n error TEXT,\n tokens INTEGER,\n cost_usd REAL,\n model TEXT,\n pre_flight_status TEXT,\n post_flight_status TEXT,\n next_task TEXT,\n workspace_id TEXT,\n allowed_tools TEXT,\n denied_tools TEXT\n);\n\nCREATE INDEX IF NOT EXISTS idx_history_task ON history(task_name, started_at DESC);\n\nCREATE TABLE IF NOT EXISTS metrics (\n task_name TEXT PRIMARY KEY,\n total INTEGER DEFAULT 0,\n success INTEGER DEFAULT 0,\n error INTEGER DEFAULT 0,\n partial INTEGER DEFAULT 0,\n total_tokens INTEGER DEFAULT 0,\n total_cost REAL DEFAULT 0\n);\n\nCREATE TABLE IF NOT EXISTS templates (\n id TEXT PRIMARY KEY,\n name TEXT NOT NULL,\n definition_json TEXT NOT NULL\n);\n\nCREATE TABLE IF NOT EXISTS settings (\n key TEXT PRIMARY KEY,\n value_json TEXT NOT NULL\n);\n\nCREATE TABLE IF NOT EXISTS workspaces (\n id TEXT PRIMARY KEY,\n name TEXT NOT NULL,\n path TEXT NOT NULL UNIQUE,\n git_remote TEXT,\n color TEXT,\n env_json TEXT,\n env_file TEXT,\n created_at TEXT NOT NULL\n);\n\nCREATE TABLE IF NOT EXISTS audit_log (\n id INTEGER PRIMARY KEY AUTOINCREMENT,\n ts TEXT NOT NULL,\n action TEXT NOT NULL,\n target_type TEXT,\n target TEXT,\n actor TEXT NOT NULL,\n source TEXT,\n details_json TEXT,\n remote TEXT\n);\n\nCREATE INDEX IF NOT EXISTS idx_audit_ts ON audit_log(ts DESC);\nCREATE INDEX IF NOT EXISTS idx_audit_action ON audit_log(action, ts DESC);\n\n-- \u0421\u043F\u0440\u0438\u043D\u0442 27: \u043F\u043E\u0441\u043B\u0435\u0434\u043D\u0438\u0439 \u043E\u0431\u0440\u0430\u0431\u043E\u0442\u0430\u043D\u043D\u044B\u0439 \u043A\u043E\u043C\u043C\u0438\u0442 \u0434\u043B\u044F git-\u0442\u0440\u0438\u0433\u0433\u0435\u0440\u043E\u0432.\nCREATE TABLE IF NOT EXISTS git_state (\n task_name TEXT PRIMARY KEY,\n commit_sha TEXT NOT NULL,\n branch TEXT,\n updated_at TEXT NOT NULL\n);\n\n-- \u0421\u043F\u0440\u0438\u043D\u0442 31.2: \u0434\u0435\u0434\u0443\u043F \u0443\u0432\u0435\u0434\u043E\u043C\u043B\u0435\u043D\u0438\u0439 (\u043E\u0442\u0441\u043B\u0435\u0436\u0438\u0432\u0430\u043D\u0438\u0435 \u043F\u043E\u0432\u0442\u043E\u0440\u043E\u0432 \u043C\u0435\u0436\u0434\u0443 \u043F\u0440\u043E\u0446\u0435\u0441\u0441\u0430\u043C\u0438).\nCREATE TABLE IF NOT EXISTS notification_dedup (\n key TEXT PRIMARY KEY,\n task_name TEXT NOT NULL,\n status TEXT NOT NULL,\n count INTEGER NOT NULL DEFAULT 1,\n first_at TEXT NOT NULL,\n last_at TEXT NOT NULL,\n window_minutes INTEGER NOT NULL DEFAULT 60\n);\n\nCREATE INDEX IF NOT EXISTS idx_notification_dedup_key ON notification_dedup(key);\nCREATE INDEX IF NOT EXISTS idx_notification_dedup_last_at ON notification_dedup(last_at);\n\n-- \u0412\u0435\u043A\u0442\u043E\u0440\u044B \u0441\u043E\u043E\u0431\u0449\u0435\u043D\u0438\u0439 \u0434\u043B\u044F \u0441\u0435\u043C\u0430\u043D\u0442\u0438\u0447\u0435\u0441\u043A\u043E\u0433\u043E \u0434\u0435\u0434\u0443\u043F\u0430 (\u0421\u043F\u0440\u0438\u043D\u0442 31.1).\n-- \u0425\u0440\u0430\u043D\u044F\u0442\u0441\u044F \u043D\u043E\u0440\u043C\u0430\u043B\u0438\u0437\u043E\u0432\u0430\u043D\u043D\u044B\u0435 \u044D\u043C\u0431\u0435\u0434\u0434\u0438\u043D\u0433\u0438 (JSON-\u043C\u0430\u0441\u0441\u0438\u0432 \u0447\u0438\u0441\u0435\u043B) \u0438 \u0442\u0435\u043A\u0441\u0442 \u0441\u043E\u043E\u0431\u0449\u0435\u043D\u0438\u044F.\n-- \u0421\u0440\u0430\u0432\u043D\u0435\u043D\u0438\u0435 \u043F\u043E \u043A\u043E\u0441\u0438\u043D\u0443\u0441\u0443 \u0431\u0440\u0443\u0442\u0444\u043E\u0440\u0441\u043E\u043C \u043F\u043E \u0432\u0441\u0435\u043C \u0432\u0435\u043A\u0442\u043E\u0440\u0430\u043C \u0432 \u043E\u043A\u043D\u0435.\nCREATE TABLE IF NOT EXISTS notification_embeddings (\n key TEXT PRIMARY KEY,\n task_name TEXT NOT NULL,\n status TEXT NOT NULL,\n message_text TEXT NOT NULL,\n embedding_json TEXT NOT NULL,\n dimension INTEGER NOT NULL,\n created_at TEXT NOT NULL,\n window_minutes INTEGER NOT NULL DEFAULT 60\n);\n\nCREATE INDEX IF NOT EXISTS idx_notification_embeddings_task ON notification_embeddings(task_name, created_at DESC);\nCREATE INDEX IF NOT EXISTS idx_notification_embeddings_created ON notification_embeddings(created_at DESC);\n\n-- \u0421\u043F\u0440\u0438\u043D\u0442 36.1 (durable DAG): \u0437\u0430\u043F\u0443\u0441\u043A \u043A\u0430\u043A \u0435\u0434\u0438\u043D\u0438\u0446\u0430 \u0432\u044B\u043F\u043E\u043B\u043D\u0435\u043D\u0438\u044F.\n-- \u0421\u0442\u0440\u043E\u043A\u0430 \u0441\u043E\u0437\u0434\u0430\u0451\u0442\u0441\u044F \u0434\u043E \u0441\u0442\u0430\u0440\u0442\u0430 \u0448\u0430\u0433\u043E\u0432 \u0438 \u043F\u0435\u0440\u0435\u0436\u0438\u0432\u0430\u0435\u0442 \u0441\u0431\u043E\u0439 \u043F\u0440\u043E\u0446\u0435\u0441\u0441\u0430 \u2014 \u044D\u0442\u043E \u043E\u0441\u043D\u043E\u0432\u0430\n-- \u0434\u043B\u044F resume \u0432 36.2. \u0421\u0442\u0430\u0442\u0443\u0441\u044B: pending \u2192 running \u2192 passed/failed/cancelled.\nCREATE TABLE IF NOT EXISTS runs (\n id TEXT PRIMARY KEY,\n task_name TEXT NOT NULL,\n status TEXT NOT NULL,\n parent_run_id TEXT,\n workspace_id TEXT,\n started_at TEXT,\n finished_at TEXT,\n error TEXT,\n metadata_json TEXT,\n created_at TEXT NOT NULL,\n updated_at TEXT NOT NULL\n);\n\nCREATE INDEX IF NOT EXISTS idx_runs_task ON runs(task_name, started_at DESC);\nCREATE INDEX IF NOT EXISTS idx_runs_status ON runs(status, started_at DESC);\n\n-- \u0421\u043F\u0440\u0438\u043D\u0442 36.1: \u0448\u0430\u0433 \u0437\u0430\u043F\u0443\u0441\u043A\u0430. \u041F\u043E\u043B\u0435 attempt \u043F\u043E\u0437\u0432\u043E\u043B\u044F\u0435\u0442 \u043F\u043E\u0432\u0442\u043E\u0440\u0438\u0442\u044C \u0448\u0430\u0433, \u043D\u0435 \u0442\u0435\u0440\u044F\u044F\n-- \u0438\u0441\u0442\u043E\u0440\u0438\u044E \u043F\u0440\u0435\u0434\u044B\u0434\u0443\u0449\u0438\u0445 \u043F\u043E\u043F\u044B\u0442\u043E\u043A; idempotency_key \u0437\u0430\u0449\u0438\u0449\u0430\u0435\u0442 \u043E\u0442 \u043F\u043E\u0432\u0442\u043E\u0440\u043D\u043E\u0433\u043E\n-- \u0432\u044B\u043F\u043E\u043B\u043D\u0435\u043D\u0438\u044F \u0442\u043E\u0433\u043E \u0436\u0435 \u0448\u0430\u0433\u0430 (36.3). \u0421\u0442\u0430\u0442\u0443\u0441\u044B: pending \u2192 running \u2192 passed/failed/skipped.\nCREATE TABLE IF NOT EXISTS run_steps (\n id TEXT PRIMARY KEY,\n run_id TEXT NOT NULL REFERENCES runs(id) ON DELETE CASCADE,\n step_name TEXT NOT NULL,\n -- \u041F\u043E\u0440\u044F\u0434\u043E\u043A \u0448\u0430\u0433\u0430 \u0432 \u043B\u0438\u043D\u0435\u0439\u043D\u043E\u0439 \u0446\u0435\u043F\u043E\u0447\u043A\u0435 (36.2): 0, 1, 2... \u0421\u0442\u0430\u0431\u0438\u043B\u0435\u043D \u0434\u043B\u044F resume.\n position INTEGER NOT NULL DEFAULT 0,\n status TEXT NOT NULL,\n attempt INTEGER NOT NULL DEFAULT 1,\n idempotency_key TEXT,\n started_at TEXT,\n finished_at TEXT,\n error TEXT,\n output_json TEXT,\n created_at TEXT NOT NULL,\n updated_at TEXT NOT NULL,\n UNIQUE(run_id, step_name)\n);\n\nCREATE INDEX IF NOT EXISTS idx_run_steps_run ON run_steps(run_id, created_at);\nCREATE INDEX IF NOT EXISTS idx_run_steps_status ON run_steps(status);\nCREATE INDEX IF NOT EXISTS idx_run_steps_key ON run_steps(run_id, idempotency_key);\n";
|
|
9
9
|
interface SchemaDb {
|
|
10
10
|
exec(sql: string): void;
|
|
11
11
|
prepare(sql: string): {
|
|
12
12
|
all(): unknown[];
|
|
13
13
|
};
|
|
14
14
|
}
|
|
15
|
+
/**
|
|
16
|
+
* Текущая версия схемы БД (`PRAGMA user_version`).
|
|
17
|
+
*
|
|
18
|
+
* Версия пишется в заголовок SQLite-файла без отдельной таблицы, поэтому
|
|
19
|
+
* переживает пересоздание соединения и видна до применения каких-либо
|
|
20
|
+
* миграций. Увеличивайте при добавлении новой ступени в {@link MIGRATIONS}
|
|
21
|
+
* и добавляйте соответствующую запись в массив.
|
|
22
|
+
*/
|
|
23
|
+
export declare const SCHEMA_VERSION = 3;
|
|
24
|
+
/** Возвращает сохранённую версию схемы (0 у legacy-БД без user_version). */
|
|
25
|
+
export declare function getSchemaVersion(db: SchemaDb): number;
|
|
15
26
|
/**
|
|
16
27
|
* Применяет схему к открытому соединению.
|
|
17
28
|
*
|
|
18
29
|
* CREATE TABLE IF NOT EXISTS не добавляет новые колонки в уже существующие
|
|
19
|
-
* таблицы, поэтому
|
|
30
|
+
* таблицы, поэтому структурные изменения идут отдельными ступенями миграции
|
|
20
31
|
* после проверки PRAGMA table_info. Это безопасно и для старых БД Спринта 12.
|
|
32
|
+
*
|
|
33
|
+
* После успешных миграций версия фиксируется в `PRAGMA user_version`, чтобы
|
|
34
|
+
* будущие ступени могли выполняться инкрементально, а не перебирать колонки.
|
|
21
35
|
*/
|
|
22
36
|
export declare function applySchema(db: SchemaDb): void;
|
|
23
37
|
export {};
|
package/dist/db/schema.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../src/db/schema.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AACH,eAAO,MAAM,UAAU,
|
|
1
|
+
{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../src/db/schema.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AACH,eAAO,MAAM,UAAU,y5OAiKtB,CAAC;AAEF,UAAU,QAAQ;IAChB,IAAI,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,OAAO,CAAC,GAAG,EAAE,MAAM,GAAG;QAAE,GAAG,IAAI,OAAO,EAAE,CAAA;KAAE,CAAC;CAC5C;AAED;;;;;;;GAOG;AACH,eAAO,MAAM,cAAc,IAAI,CAAC;AAEhC,4EAA4E;AAC5E,wBAAgB,gBAAgB,CAAC,EAAE,EAAE,QAAQ,GAAG,MAAM,CAIrD;AAiID;;;;;;;;;GASG;AACH,wBAAgB,WAAW,CAAC,EAAE,EAAE,QAAQ,GAAG,IAAI,CAmB9C"}
|
package/dist/db/schema.js
CHANGED
|
@@ -121,50 +121,205 @@ CREATE TABLE IF NOT EXISTS notification_embeddings (
|
|
|
121
121
|
|
|
122
122
|
CREATE INDEX IF NOT EXISTS idx_notification_embeddings_task ON notification_embeddings(task_name, created_at DESC);
|
|
123
123
|
CREATE INDEX IF NOT EXISTS idx_notification_embeddings_created ON notification_embeddings(created_at DESC);
|
|
124
|
+
|
|
125
|
+
-- Спринт 36.1 (durable DAG): запуск как единица выполнения.
|
|
126
|
+
-- Строка создаётся до старта шагов и переживает сбой процесса — это основа
|
|
127
|
+
-- для resume в 36.2. Статусы: pending → running → passed/failed/cancelled.
|
|
128
|
+
CREATE TABLE IF NOT EXISTS runs (
|
|
129
|
+
id TEXT PRIMARY KEY,
|
|
130
|
+
task_name TEXT NOT NULL,
|
|
131
|
+
status TEXT NOT NULL,
|
|
132
|
+
parent_run_id TEXT,
|
|
133
|
+
workspace_id TEXT,
|
|
134
|
+
started_at TEXT,
|
|
135
|
+
finished_at TEXT,
|
|
136
|
+
error TEXT,
|
|
137
|
+
metadata_json TEXT,
|
|
138
|
+
created_at TEXT NOT NULL,
|
|
139
|
+
updated_at TEXT NOT NULL
|
|
140
|
+
);
|
|
141
|
+
|
|
142
|
+
CREATE INDEX IF NOT EXISTS idx_runs_task ON runs(task_name, started_at DESC);
|
|
143
|
+
CREATE INDEX IF NOT EXISTS idx_runs_status ON runs(status, started_at DESC);
|
|
144
|
+
|
|
145
|
+
-- Спринт 36.1: шаг запуска. Поле attempt позволяет повторить шаг, не теряя
|
|
146
|
+
-- историю предыдущих попыток; idempotency_key защищает от повторного
|
|
147
|
+
-- выполнения того же шага (36.3). Статусы: pending → running → passed/failed/skipped.
|
|
148
|
+
CREATE TABLE IF NOT EXISTS run_steps (
|
|
149
|
+
id TEXT PRIMARY KEY,
|
|
150
|
+
run_id TEXT NOT NULL REFERENCES runs(id) ON DELETE CASCADE,
|
|
151
|
+
step_name TEXT NOT NULL,
|
|
152
|
+
-- Порядок шага в линейной цепочке (36.2): 0, 1, 2... Стабилен для resume.
|
|
153
|
+
position INTEGER NOT NULL DEFAULT 0,
|
|
154
|
+
status TEXT NOT NULL,
|
|
155
|
+
attempt INTEGER NOT NULL DEFAULT 1,
|
|
156
|
+
idempotency_key TEXT,
|
|
157
|
+
started_at TEXT,
|
|
158
|
+
finished_at TEXT,
|
|
159
|
+
error TEXT,
|
|
160
|
+
output_json TEXT,
|
|
161
|
+
created_at TEXT NOT NULL,
|
|
162
|
+
updated_at TEXT NOT NULL,
|
|
163
|
+
UNIQUE(run_id, step_name)
|
|
164
|
+
);
|
|
165
|
+
|
|
166
|
+
CREATE INDEX IF NOT EXISTS idx_run_steps_run ON run_steps(run_id, created_at);
|
|
167
|
+
CREATE INDEX IF NOT EXISTS idx_run_steps_status ON run_steps(status);
|
|
168
|
+
CREATE INDEX IF NOT EXISTS idx_run_steps_key ON run_steps(run_id, idempotency_key);
|
|
124
169
|
`;
|
|
170
|
+
/**
|
|
171
|
+
* Текущая версия схемы БД (`PRAGMA user_version`).
|
|
172
|
+
*
|
|
173
|
+
* Версия пишется в заголовок SQLite-файла без отдельной таблицы, поэтому
|
|
174
|
+
* переживает пересоздание соединения и видна до применения каких-либо
|
|
175
|
+
* миграций. Увеличивайте при добавлении новой ступени в {@link MIGRATIONS}
|
|
176
|
+
* и добавляйте соответствующую запись в массив.
|
|
177
|
+
*/
|
|
178
|
+
export const SCHEMA_VERSION = 3;
|
|
179
|
+
/** Возвращает сохранённую версию схемы (0 у legacy-БД без user_version). */
|
|
180
|
+
export function getSchemaVersion(db) {
|
|
181
|
+
const rows = db.prepare("PRAGMA user_version").all();
|
|
182
|
+
const value = rows[0]?.user_version;
|
|
183
|
+
return typeof value === "number" ? value : 0;
|
|
184
|
+
}
|
|
185
|
+
/**
|
|
186
|
+
* Ступени миграции: `to` — целевая версия, `migrate` — изменения.
|
|
187
|
+
*
|
|
188
|
+
* Каждая ступень идемпотентна (проверяет PRAGMA table_info), поэтому её
|
|
189
|
+
* безопасно повторно прогонять на legacy-БД, где user_version ещё равен 0,
|
|
190
|
+
* но колонки уже добавлены прошлыми запусками.
|
|
191
|
+
*/
|
|
192
|
+
const MIGRATIONS = [
|
|
193
|
+
{
|
|
194
|
+
// Ступень 1 — состояние Спринта 25: колонки, добавленные ad-hoc ALTER'ами
|
|
195
|
+
// до появления версионирования (Спринты 12/15/21/25).
|
|
196
|
+
to: 1,
|
|
197
|
+
migrate(db) {
|
|
198
|
+
const columns = db.prepare("PRAGMA table_info(history)").all();
|
|
199
|
+
const columnNames = columns.map((c) => c.name).filter(Boolean);
|
|
200
|
+
if (!columnNames.includes("workspace_id")) {
|
|
201
|
+
db.exec("ALTER TABLE history ADD COLUMN workspace_id TEXT");
|
|
202
|
+
}
|
|
203
|
+
if (!columnNames.includes("allowed_tools")) {
|
|
204
|
+
db.exec("ALTER TABLE history ADD COLUMN allowed_tools TEXT");
|
|
205
|
+
}
|
|
206
|
+
if (!columnNames.includes("denied_tools")) {
|
|
207
|
+
db.exec("ALTER TABLE history ADD COLUMN denied_tools TEXT");
|
|
208
|
+
}
|
|
209
|
+
// Спринт 15: флаги matrix на tasks (клоны и родитель-шаблон).
|
|
210
|
+
const taskColumns = db.prepare("PRAGMA table_info(tasks)").all();
|
|
211
|
+
const taskColumnNames = taskColumns.map((c) => c.name).filter(Boolean);
|
|
212
|
+
if (!taskColumnNames.includes("matrix_parent_id")) {
|
|
213
|
+
db.exec("ALTER TABLE tasks ADD COLUMN matrix_parent_id TEXT");
|
|
214
|
+
}
|
|
215
|
+
if (!taskColumnNames.includes("is_matrix_parent")) {
|
|
216
|
+
db.exec("ALTER TABLE tasks ADD COLUMN is_matrix_parent INTEGER DEFAULT 0");
|
|
217
|
+
}
|
|
218
|
+
// Спринт 21: env-переменные на workspace (пары ключ-значение и .env-файл).
|
|
219
|
+
const workspaceColumns = db.prepare("PRAGMA table_info(workspaces)").all();
|
|
220
|
+
const workspaceColumnNames = workspaceColumns.map((c) => c.name).filter(Boolean);
|
|
221
|
+
if (!workspaceColumnNames.includes("env_json")) {
|
|
222
|
+
db.exec("ALTER TABLE workspaces ADD COLUMN env_json TEXT");
|
|
223
|
+
}
|
|
224
|
+
if (!workspaceColumnNames.includes("env_file")) {
|
|
225
|
+
db.exec("ALTER TABLE workspaces ADD COLUMN env_file TEXT");
|
|
226
|
+
}
|
|
227
|
+
// Спринт 25: partial вынесен из error, чтобы дашборд не смешивал
|
|
228
|
+
// частичные выполнения с ошибками и таймаутами.
|
|
229
|
+
const metricsColumns = db.prepare("PRAGMA table_info(metrics)").all();
|
|
230
|
+
const metricsColumnNames = metricsColumns.map((c) => c.name).filter(Boolean);
|
|
231
|
+
if (!metricsColumnNames.includes("partial")) {
|
|
232
|
+
db.exec("ALTER TABLE metrics ADD COLUMN partial INTEGER DEFAULT 0");
|
|
233
|
+
}
|
|
234
|
+
},
|
|
235
|
+
},
|
|
236
|
+
{
|
|
237
|
+
// Ступень 2 — Спринт 36.1: durable DAG. Таблицы создаются идемпотентно,
|
|
238
|
+
// чтобы legacy-БД (user_version = 0/1) получила их и индексы при обновлении,
|
|
239
|
+
// а не только при создании файла с нуля.
|
|
240
|
+
to: 2,
|
|
241
|
+
migrate(db) {
|
|
242
|
+
db.exec(`
|
|
243
|
+
CREATE TABLE IF NOT EXISTS runs (
|
|
244
|
+
id TEXT PRIMARY KEY,
|
|
245
|
+
task_name TEXT NOT NULL,
|
|
246
|
+
status TEXT NOT NULL,
|
|
247
|
+
parent_run_id TEXT,
|
|
248
|
+
workspace_id TEXT,
|
|
249
|
+
started_at TEXT,
|
|
250
|
+
finished_at TEXT,
|
|
251
|
+
error TEXT,
|
|
252
|
+
metadata_json TEXT,
|
|
253
|
+
created_at TEXT NOT NULL,
|
|
254
|
+
updated_at TEXT NOT NULL
|
|
255
|
+
);
|
|
256
|
+
CREATE INDEX IF NOT EXISTS idx_runs_task ON runs(task_name, started_at DESC);
|
|
257
|
+
CREATE INDEX IF NOT EXISTS idx_runs_status ON runs(status, started_at DESC);
|
|
258
|
+
|
|
259
|
+
CREATE TABLE IF NOT EXISTS run_steps (
|
|
260
|
+
id TEXT PRIMARY KEY,
|
|
261
|
+
run_id TEXT NOT NULL REFERENCES runs(id) ON DELETE CASCADE,
|
|
262
|
+
step_name TEXT NOT NULL,
|
|
263
|
+
status TEXT NOT NULL,
|
|
264
|
+
attempt INTEGER NOT NULL DEFAULT 1,
|
|
265
|
+
idempotency_key TEXT,
|
|
266
|
+
started_at TEXT,
|
|
267
|
+
finished_at TEXT,
|
|
268
|
+
error TEXT,
|
|
269
|
+
output_json TEXT,
|
|
270
|
+
created_at TEXT NOT NULL,
|
|
271
|
+
updated_at TEXT NOT NULL,
|
|
272
|
+
UNIQUE(run_id, step_name)
|
|
273
|
+
);
|
|
274
|
+
CREATE INDEX IF NOT EXISTS idx_run_steps_run ON run_steps(run_id, created_at);
|
|
275
|
+
CREATE INDEX IF NOT EXISTS idx_run_steps_status ON run_steps(status);
|
|
276
|
+
CREATE INDEX IF NOT EXISTS idx_run_steps_key ON run_steps(run_id, idempotency_key);
|
|
277
|
+
`);
|
|
278
|
+
},
|
|
279
|
+
},
|
|
280
|
+
{
|
|
281
|
+
// Ступень 3 — Спринт 36.2: явный порядок шага в линейной цепочке.
|
|
282
|
+
// created_at может совпасть у шагов одной транзакции, поэтому resume
|
|
283
|
+
// не может опираться на время; position фиксирует порядок создания.
|
|
284
|
+
to: 3,
|
|
285
|
+
migrate(db) {
|
|
286
|
+
if (!tableColumns(db, "run_steps").includes("position")) {
|
|
287
|
+
db.exec("ALTER TABLE run_steps ADD COLUMN position INTEGER NOT NULL DEFAULT 0");
|
|
288
|
+
// Для уже существующих строк порядок = порядок вставки (rowid).
|
|
289
|
+
db.exec("UPDATE run_steps SET position = rowid");
|
|
290
|
+
}
|
|
291
|
+
},
|
|
292
|
+
},
|
|
293
|
+
];
|
|
294
|
+
/** Имена колонок таблицы (пустой массив, если таблицы нет). */
|
|
295
|
+
function tableColumns(db, table) {
|
|
296
|
+
const columns = db.prepare(`PRAGMA table_info(${table})`).all();
|
|
297
|
+
return columns.map((column) => column.name).filter((name) => Boolean(name));
|
|
298
|
+
}
|
|
125
299
|
/**
|
|
126
300
|
* Применяет схему к открытому соединению.
|
|
127
301
|
*
|
|
128
302
|
* CREATE TABLE IF NOT EXISTS не добавляет новые колонки в уже существующие
|
|
129
|
-
* таблицы, поэтому
|
|
303
|
+
* таблицы, поэтому структурные изменения идут отдельными ступенями миграции
|
|
130
304
|
* после проверки PRAGMA table_info. Это безопасно и для старых БД Спринта 12.
|
|
305
|
+
*
|
|
306
|
+
* После успешных миграций версия фиксируется в `PRAGMA user_version`, чтобы
|
|
307
|
+
* будущие ступени могли выполняться инкрементально, а не перебирать колонки.
|
|
131
308
|
*/
|
|
132
309
|
export function applySchema(db) {
|
|
133
310
|
db.exec(SCHEMA_SQL);
|
|
134
|
-
const
|
|
135
|
-
const
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
if (!columnNames.includes("allowed_tools")) {
|
|
140
|
-
db.exec("ALTER TABLE history ADD COLUMN allowed_tools TEXT");
|
|
141
|
-
}
|
|
142
|
-
if (!columnNames.includes("denied_tools")) {
|
|
143
|
-
db.exec("ALTER TABLE history ADD COLUMN denied_tools TEXT");
|
|
144
|
-
}
|
|
145
|
-
// Спринт 15: флаги matrix на tasks (клоны и родитель-шаблон).
|
|
146
|
-
const taskColumns = db.prepare("PRAGMA table_info(tasks)").all();
|
|
147
|
-
const taskColumnNames = taskColumns.map((c) => c.name).filter(Boolean);
|
|
148
|
-
if (!taskColumnNames.includes("matrix_parent_id")) {
|
|
149
|
-
db.exec("ALTER TABLE tasks ADD COLUMN matrix_parent_id TEXT");
|
|
150
|
-
}
|
|
151
|
-
if (!taskColumnNames.includes("is_matrix_parent")) {
|
|
152
|
-
db.exec("ALTER TABLE tasks ADD COLUMN is_matrix_parent INTEGER DEFAULT 0");
|
|
153
|
-
}
|
|
154
|
-
// Спринт 21: env-переменные на workspace (пары ключ-значение и .env-файл).
|
|
155
|
-
const workspaceColumns = db.prepare("PRAGMA table_info(workspaces)").all();
|
|
156
|
-
const workspaceColumnNames = workspaceColumns.map((c) => c.name).filter(Boolean);
|
|
157
|
-
if (!workspaceColumnNames.includes("env_json")) {
|
|
158
|
-
db.exec("ALTER TABLE workspaces ADD COLUMN env_json TEXT");
|
|
159
|
-
}
|
|
160
|
-
if (!workspaceColumnNames.includes("env_file")) {
|
|
161
|
-
db.exec("ALTER TABLE workspaces ADD COLUMN env_file TEXT");
|
|
311
|
+
const fromVersion = getSchemaVersion(db);
|
|
312
|
+
for (const step of MIGRATIONS) {
|
|
313
|
+
if (fromVersion < step.to) {
|
|
314
|
+
step.migrate(db);
|
|
315
|
+
}
|
|
162
316
|
}
|
|
163
|
-
//
|
|
164
|
-
//
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
if (
|
|
168
|
-
|
|
317
|
+
// Индекс по position нельзя объявлять в SCHEMA_SQL: на старой БД таблица
|
|
318
|
+
// run_steps ещё без этой колонки, и CREATE INDEX упал бы до миграции.
|
|
319
|
+
// Поэтому создаём его после миграций — заодно лечим БД, где индекс потерян.
|
|
320
|
+
db.exec("CREATE INDEX IF NOT EXISTS idx_run_steps_position ON run_steps(run_id, position)");
|
|
321
|
+
if (fromVersion !== SCHEMA_VERSION) {
|
|
322
|
+
// PRAGMA не принимает параметры — подставляем проверенное число.
|
|
323
|
+
db.exec(`PRAGMA user_version = ${SCHEMA_VERSION}`);
|
|
169
324
|
}
|
|
170
325
|
}
|
package/dist/index.d.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { Plugin } from "@opencode/plugin";
|
|
2
2
|
import { type Hooks as V1Hooks, type PluginInput as V1PluginInput } from "@opencode-ai/plugin";
|
|
3
3
|
import { z } from "zod";
|
|
4
|
-
import { Tool } from "@opencode/schema/tool";
|
|
4
|
+
import type { Tool } from "@opencode/schema/tool";
|
|
5
5
|
import { type LocalAiPatch } from "./core/local-ai.js";
|
|
6
6
|
import type { AuditEntryInput } from "./core/audit.js";
|
|
7
7
|
/** Per-workspace overrides for matrix clones (Sprint 17). */
|