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
package/dist/db/run-resume.js
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { finishRun, listRunSteps, reopenRun, startRun, } from "./runs-repo.js";
|
|
2
2
|
import { recoverInterruptedSteps, requireRun, runStepStatefully, runStepStatefullyAsync, } from "./run-journal.js";
|
|
3
|
+
import { consumeInjections, consumeOrphanInjections, pendingInjectionsForStep, } from "./run-context.js";
|
|
3
4
|
/** Завершён ли шаг успешно (повторять не нужно). */
|
|
4
5
|
function isStepDone(status) {
|
|
5
6
|
return status === "passed" || status === "skipped";
|
|
@@ -27,7 +28,9 @@ function prepareResume(runId, options) {
|
|
|
27
28
|
}
|
|
28
29
|
}
|
|
29
30
|
// Упавший запуск открываем заново: шаги можно перезапускать, attempt не сбрасывается.
|
|
30
|
-
|
|
31
|
+
// Паузу снимаем тем же переходом paused → running (36.7).
|
|
32
|
+
const current = requireRun(runId);
|
|
33
|
+
if (current.status === "failed" || current.status === "paused")
|
|
31
34
|
reopenRun(runId);
|
|
32
35
|
}
|
|
33
36
|
return { steps, startIndex };
|
|
@@ -40,7 +43,7 @@ function prepareResume(runId, options) {
|
|
|
40
43
|
export function resumeRunSync(runId, options) {
|
|
41
44
|
const { steps, startIndex } = prepareResume(runId, options);
|
|
42
45
|
if (startIndex === -1) {
|
|
43
|
-
return finalize(runId, null, null, [], steps.map((step) => step.stepName));
|
|
46
|
+
return finalize(runId, null, null, [], steps.map((step) => step.stepName), []);
|
|
44
47
|
}
|
|
45
48
|
const resumedFrom = steps[startIndex].stepName;
|
|
46
49
|
const executed = [];
|
|
@@ -48,6 +51,7 @@ export function resumeRunSync(runId, options) {
|
|
|
48
51
|
.slice(0, startIndex)
|
|
49
52
|
.filter((step) => isStepDone(step.status))
|
|
50
53
|
.map((step) => step.stepName);
|
|
54
|
+
const injected = [];
|
|
51
55
|
let resumedFromAttempt = null;
|
|
52
56
|
for (let index = startIndex; index < steps.length; index += 1) {
|
|
53
57
|
const step = steps[index];
|
|
@@ -56,24 +60,29 @@ export function resumeRunSync(runId, options) {
|
|
|
56
60
|
continue;
|
|
57
61
|
}
|
|
58
62
|
executed.push(step.stepName);
|
|
63
|
+
const context = pendingInjectionsForStep(runId, step.stepName);
|
|
59
64
|
try {
|
|
60
|
-
const execution = runStepStatefully(runId, step.stepName, () => options.handlers[step.stepName](step));
|
|
65
|
+
const execution = runStepStatefully(runId, step.stepName, () => options.handlers[step.stepName](step, { injections: context }));
|
|
61
66
|
if (resumedFromAttempt === null)
|
|
62
67
|
resumedFromAttempt = execution.attempt;
|
|
68
|
+
if (context.length > 0) {
|
|
69
|
+
consumeInjections(context.map((injection) => injection.id), step.stepName, execution.attempt);
|
|
70
|
+
injected.push(...context.map((injection) => injection.id));
|
|
71
|
+
}
|
|
63
72
|
}
|
|
64
73
|
catch {
|
|
65
74
|
if (options.stopOnError === false)
|
|
66
75
|
continue;
|
|
67
|
-
return finalize(runId, resumedFrom, resumedFromAttempt, executed, skipped);
|
|
76
|
+
return finalize(runId, resumedFrom, resumedFromAttempt, executed, skipped, injected);
|
|
68
77
|
}
|
|
69
78
|
}
|
|
70
|
-
return finalize(runId, resumedFrom, resumedFromAttempt, executed, skipped);
|
|
79
|
+
return finalize(runId, resumedFrom, resumedFromAttempt, executed, skipped, injected);
|
|
71
80
|
}
|
|
72
81
|
/** Асинхронный вариант `resumeRunSync` для шагов с I/O. */
|
|
73
82
|
export async function resumeRun(runId, options) {
|
|
74
83
|
const { steps, startIndex } = prepareResume(runId, options);
|
|
75
84
|
if (startIndex === -1) {
|
|
76
|
-
return finalize(runId, null, null, [], steps.map((step) => step.stepName));
|
|
85
|
+
return finalize(runId, null, null, [], steps.map((step) => step.stepName), []);
|
|
77
86
|
}
|
|
78
87
|
const resumedFrom = steps[startIndex].stepName;
|
|
79
88
|
const executed = [];
|
|
@@ -81,6 +90,7 @@ export async function resumeRun(runId, options) {
|
|
|
81
90
|
.slice(0, startIndex)
|
|
82
91
|
.filter((step) => isStepDone(step.status))
|
|
83
92
|
.map((step) => step.stepName);
|
|
93
|
+
const injected = [];
|
|
84
94
|
let resumedFromAttempt = null;
|
|
85
95
|
for (let index = startIndex; index < steps.length; index += 1) {
|
|
86
96
|
const step = steps[index];
|
|
@@ -89,21 +99,28 @@ export async function resumeRun(runId, options) {
|
|
|
89
99
|
continue;
|
|
90
100
|
}
|
|
91
101
|
executed.push(step.stepName);
|
|
102
|
+
const context = pendingInjectionsForStep(runId, step.stepName);
|
|
92
103
|
try {
|
|
93
|
-
const execution = await runStepStatefullyAsync(runId, step.stepName, () => options.handlers[step.stepName](step));
|
|
104
|
+
const execution = await runStepStatefullyAsync(runId, step.stepName, () => options.handlers[step.stepName](step, { injections: context }));
|
|
94
105
|
if (resumedFromAttempt === null)
|
|
95
106
|
resumedFromAttempt = execution.attempt;
|
|
107
|
+
if (context.length > 0) {
|
|
108
|
+
consumeInjections(context.map((injection) => injection.id), step.stepName, execution.attempt);
|
|
109
|
+
injected.push(...context.map((injection) => injection.id));
|
|
110
|
+
}
|
|
96
111
|
}
|
|
97
112
|
catch {
|
|
98
113
|
if (options.stopOnError === false)
|
|
99
114
|
continue;
|
|
100
|
-
return finalize(runId, resumedFrom, resumedFromAttempt, executed, skipped);
|
|
115
|
+
return finalize(runId, resumedFrom, resumedFromAttempt, executed, skipped, injected);
|
|
101
116
|
}
|
|
102
117
|
}
|
|
103
|
-
return finalize(runId, resumedFrom, resumedFromAttempt, executed, skipped);
|
|
118
|
+
return finalize(runId, resumedFrom, resumedFromAttempt, executed, skipped, injected);
|
|
104
119
|
}
|
|
105
120
|
/** Закрывает прогон по фактическому состоянию шагов и собирает результат. */
|
|
106
|
-
function finalize(runId, resumedFrom, resumedFromAttempt, executed, skipped) {
|
|
121
|
+
function finalize(runId, resumedFrom, resumedFromAttempt, executed, skipped, injected) {
|
|
122
|
+
// Вставки, адресованные уже завершённым шагам, не должны висеть в истории.
|
|
123
|
+
consumeOrphanInjections(runId);
|
|
107
124
|
let steps = listRunSteps(runId);
|
|
108
125
|
const failed = steps.find((step) => step.status === "failed") ?? null;
|
|
109
126
|
const unfinished = steps.some((step) => step.status === "pending" || step.status === "running");
|
|
@@ -113,7 +130,8 @@ function finalize(runId, resumedFrom, resumedFromAttempt, executed, skipped) {
|
|
|
113
130
|
startRun(runId);
|
|
114
131
|
run = requireRun(runId);
|
|
115
132
|
}
|
|
116
|
-
|
|
133
|
+
// Пауза после последнего шага: продолжать нечего, запуск успешен.
|
|
134
|
+
if (run.status === "running" || run.status === "paused") {
|
|
117
135
|
finishRun(runId, "passed");
|
|
118
136
|
run = requireRun(runId);
|
|
119
137
|
}
|
|
@@ -131,6 +149,7 @@ function finalize(runId, resumedFrom, resumedFromAttempt, executed, skipped) {
|
|
|
131
149
|
resumedFromAttempt,
|
|
132
150
|
executed,
|
|
133
151
|
skipped,
|
|
152
|
+
injected,
|
|
134
153
|
failedStep: failed?.stepName ?? null,
|
|
135
154
|
error: failed?.error ?? null,
|
|
136
155
|
};
|
package/dist/db/runs-repo.d.ts
CHANGED
|
@@ -8,8 +8,8 @@
|
|
|
8
8
|
* Переходы статусов проверяются здесь, а не в SQL: CHECK-ограничения в SQLite
|
|
9
9
|
* пришлось бы переписывать при каждом новом статусе (например, DLQ в 36.4).
|
|
10
10
|
*/
|
|
11
|
-
/** Статусы запуска: pending → running → passed/failed;
|
|
12
|
-
export type RunStatus = "pending" | "running" | "passed" | "failed" | "cancelled";
|
|
11
|
+
/** Статусы запуска: pending → running → passed/failed; paused — пауза с контекстом (36.7). */
|
|
12
|
+
export type RunStatus = "pending" | "running" | "paused" | "passed" | "failed" | "cancelled";
|
|
13
13
|
/** Статусы шага: pending → running → passed/failed; skipped — осознанный пропуск. */
|
|
14
14
|
export type StepStatus = "pending" | "running" | "passed" | "failed" | "skipped";
|
|
15
15
|
export declare class InvalidTransitionError extends Error {
|
|
@@ -82,13 +82,21 @@ export declare function getRun(id: string): RunRecord | undefined;
|
|
|
82
82
|
export declare function listRuns(taskName?: string | null, limit?: number): RunRecord[];
|
|
83
83
|
/** pending → running. Возвращает false, если запуск не найден. */
|
|
84
84
|
export declare function startRun(id: string, startedAt?: string): boolean;
|
|
85
|
+
/**
|
|
86
|
+
* pending/running → paused (Спринт 36.7).
|
|
87
|
+
*
|
|
88
|
+
* Пауза ставится только между шагами: если шаг уже выполняется, вызывающий
|
|
89
|
+
* код должен дождаться его завершения. `finished_at` не заполняется — запуск
|
|
90
|
+
* не завершён, а приостановлен.
|
|
91
|
+
*/
|
|
92
|
+
export declare function pauseRunRecord(id: string, pausedAt?: string): boolean;
|
|
85
93
|
/** Завершает запуск (passed/failed/cancelled) и фиксирует finished_at. */
|
|
86
94
|
export declare function finishRun(id: string, status: Extract<RunStatus, "passed" | "failed" | "cancelled">, options?: FinishOptions): boolean;
|
|
87
95
|
/**
|
|
88
|
-
* failed → running: возобновление прогона после краха (36.2).
|
|
96
|
+
* failed/paused → running: возобновление прогона после краха или паузы (36.2, 36.7).
|
|
89
97
|
*
|
|
90
|
-
*
|
|
91
|
-
*
|
|
98
|
+
* Не сбрасывает номера попыток шагов — они растут через `retryStep` при
|
|
99
|
+
* повторе конкретного шага.
|
|
92
100
|
*/
|
|
93
101
|
export declare function reopenRun(id: string, startedAt?: string): boolean;
|
|
94
102
|
export declare function getStepById(id: string): RunStepRecord | undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runs-repo.d.ts","sourceRoot":"","sources":["../../src/db/runs-repo.ts"],"names":[],"mappings":"AAGA;;;;;;;;;GASG;AAEH,
|
|
1
|
+
{"version":3,"file":"runs-repo.d.ts","sourceRoot":"","sources":["../../src/db/runs-repo.ts"],"names":[],"mappings":"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"}
|
package/dist/db/runs-repo.js
CHANGED
|
@@ -7,8 +7,12 @@ const TERMINAL_STEP_STATUSES = new Set([
|
|
|
7
7
|
"skipped",
|
|
8
8
|
]);
|
|
9
9
|
const RUN_TRANSITIONS = {
|
|
10
|
-
pending
|
|
11
|
-
|
|
10
|
+
// Из pending можно как стартовать, так и сразу поставить на паузу (36.7).
|
|
11
|
+
pending: ["running", "paused", "cancelled"],
|
|
12
|
+
// paused → running — явное возобновление; paused → passed — пауза после
|
|
13
|
+
// последнего шага, когда продолжать уже нечего.
|
|
14
|
+
running: ["paused", "passed", "failed", "cancelled"],
|
|
15
|
+
paused: ["running", "passed", "cancelled"],
|
|
12
16
|
passed: [],
|
|
13
17
|
// failed → running — явное возобновление после краха (36.2), только через reopenRun.
|
|
14
18
|
failed: ["running"],
|
|
@@ -186,6 +190,25 @@ export function startRun(id, startedAt = nowIso()) {
|
|
|
186
190
|
return true;
|
|
187
191
|
});
|
|
188
192
|
}
|
|
193
|
+
/**
|
|
194
|
+
* pending/running → paused (Спринт 36.7).
|
|
195
|
+
*
|
|
196
|
+
* Пауза ставится только между шагами: если шаг уже выполняется, вызывающий
|
|
197
|
+
* код должен дождаться его завершения. `finished_at` не заполняется — запуск
|
|
198
|
+
* не завершён, а приостановлен.
|
|
199
|
+
*/
|
|
200
|
+
export function pauseRunRecord(id, pausedAt = nowIso()) {
|
|
201
|
+
return withTransaction(() => {
|
|
202
|
+
const run = getRun(id);
|
|
203
|
+
if (!run)
|
|
204
|
+
return false;
|
|
205
|
+
assertTransition("run", run.status, "paused", RUN_TRANSITIONS[run.status]);
|
|
206
|
+
getDb()
|
|
207
|
+
.prepare("UPDATE runs SET status = 'paused', updated_at = ? WHERE id = ?")
|
|
208
|
+
.run(pausedAt, id);
|
|
209
|
+
return true;
|
|
210
|
+
});
|
|
211
|
+
}
|
|
189
212
|
/** Завершает запуск (passed/failed/cancelled) и фиксирует finished_at. */
|
|
190
213
|
export function finishRun(id, status, options = {}) {
|
|
191
214
|
return withTransaction(() => {
|
|
@@ -201,10 +224,10 @@ export function finishRun(id, status, options = {}) {
|
|
|
201
224
|
});
|
|
202
225
|
}
|
|
203
226
|
/**
|
|
204
|
-
* failed → running: возобновление прогона после краха (36.2).
|
|
227
|
+
* failed/paused → running: возобновление прогона после краха или паузы (36.2, 36.7).
|
|
205
228
|
*
|
|
206
|
-
*
|
|
207
|
-
*
|
|
229
|
+
* Не сбрасывает номера попыток шагов — они растут через `retryStep` при
|
|
230
|
+
* повторе конкретного шага.
|
|
208
231
|
*/
|
|
209
232
|
export function reopenRun(id, startedAt = nowIso()) {
|
|
210
233
|
return withTransaction(() => {
|
package/dist/db/schema.d.ts
CHANGED
|
@@ -5,7 +5,7 @@
|
|
|
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\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";
|
|
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);\n\n-- \u0421\u043F\u0440\u0438\u043D\u0442 36.4 (DLQ): \u0448\u0430\u0433\u0438, \u043A\u043E\u0442\u043E\u0440\u044B\u0435 \u0443\u043F\u0430\u043B\u0438 \u0434\u0435\u0442\u0435\u0440\u043C\u0438\u043D\u0438\u0440\u043E\u0432\u0430\u043D\u043D\u043E (\u0438\u0441\u0447\u0435\u0440\u043F\u0430\u043B\u0438 \u043F\u043E\u043F\u044B\u0442\u043A\u0438),\n-- \u0436\u0434\u0443\u0442 \u0440\u0443\u0447\u043D\u043E\u0433\u043E retry \u0438\u043B\u0438 \u043E\u0442\u043A\u0430\u0437\u0430. \u041E\u0442\u043A\u0440\u044B\u0442\u0430\u044F \u0437\u0430\u043F\u0438\u0441\u044C \u043D\u0430 \u0448\u0430\u0433 \u043C\u043E\u0436\u0435\u0442 \u0431\u044B\u0442\u044C \u0442\u043E\u043B\u044C\u043A\u043E \u043E\u0434\u043D\u0430,\n-- \u043F\u043E\u044D\u0442\u043E\u043C\u0443 \u0440\u0443\u0447\u043D\u043E\u0439 retry \u043D\u0435 \u0441\u043E\u0437\u0434\u0430\u0451\u0442 \u0434\u0443\u0431\u043B\u0435\u0439.\nCREATE TABLE IF NOT EXISTS run_dlq (\n id TEXT PRIMARY KEY,\n run_id TEXT NOT NULL REFERENCES runs(id) ON DELETE CASCADE,\n step_name TEXT NOT NULL,\n status TEXT NOT NULL,\n reason TEXT,\n error TEXT,\n attempts INTEGER NOT NULL DEFAULT 0,\n created_at TEXT NOT NULL,\n updated_at TEXT NOT NULL,\n resolved_at TEXT,\n resolution TEXT\n);\n\nCREATE INDEX IF NOT EXISTS idx_run_dlq_status ON run_dlq(status, created_at DESC);\nCREATE UNIQUE INDEX IF NOT EXISTS idx_run_dlq_open_unique\n ON run_dlq(run_id, step_name) WHERE status = 'open';\n\n-- \u0421\u043F\u0440\u0438\u043D\u0442 36.7 (\u043F\u0430\u0443\u0437\u0430 \u0441 \u0438\u043D\u044A\u0435\u043A\u0446\u0438\u0435\u0439 \u043A\u043E\u043D\u0442\u0435\u043A\u0441\u0442\u0430): \u043A\u043E\u043C\u043C\u0435\u043D\u0442\u0430\u0440\u0438\u0439, \u0444\u0430\u0439\u043B \u0438\u043B\u0438\n-- \u0441\u0442\u0440\u0443\u043A\u0442\u0443\u0440\u0438\u0440\u043E\u0432\u0430\u043D\u043D\u044B\u0439 \u0430\u0440\u0442\u0435\u0444\u0430\u043A\u0442, \u043E\u0441\u0442\u0430\u0432\u043B\u0435\u043D\u043D\u044B\u0439 \u043D\u0430 \u043F\u0430\u0443\u0437\u0435. \u0417\u0430\u043F\u0438\u0441\u044C \u0430\u0434\u0440\u0435\u0441\u043E\u0432\u0430\u043D\u0430\n-- \u043A\u043E\u043D\u043A\u0440\u0435\u0442\u043D\u043E\u043C\u0443 \u0448\u0430\u0433\u0443 \u0438 \u043F\u0435\u0440\u0435\u0434\u0430\u0451\u0442\u0441\u044F \u0435\u043C\u0443 \u043F\u0440\u0438 resume \u0440\u043E\u0432\u043D\u043E \u043E\u0434\u0438\u043D \u0440\u0430\u0437.\nCREATE TABLE IF NOT EXISTS run_injections (\n id TEXT PRIMARY KEY,\n run_id TEXT NOT NULL REFERENCES runs(id) ON DELETE CASCADE,\n step_name TEXT NOT NULL,\n kind TEXT NOT NULL,\n content TEXT NOT NULL,\n author TEXT NOT NULL,\n metadata_json TEXT,\n created_at TEXT NOT NULL,\n consumed_at TEXT,\n consumed_by_step TEXT,\n consumed_attempt INTEGER\n);\n\nCREATE INDEX IF NOT EXISTS idx_run_injections_run\n ON run_injections(run_id, created_at);\nCREATE INDEX IF NOT EXISTS idx_run_injections_pending\n ON run_injections(run_id, step_name) WHERE consumed_at IS NULL;\n\n-- \u0421\u043F\u0440\u0438\u043D\u0442 36.5.b (Capability Map): \u0438\u0441\u0445\u043E\u0434\u044B \u0433\u0435\u0439\u0442\u0430 \u043F\u043E \u0442\u0438\u043F\u0430\u043C \u0437\u0430\u0434\u0430\u0447.\n-- \u0421\u043B\u043E\u0439 2 \u0440\u043E\u0443\u0442\u0435\u0440\u0430 \u0447\u0438\u0442\u0430\u0435\u0442 success_rate \u0438 avg_* \u0438 \u0432\u044B\u0431\u0438\u0440\u0430\u0435\u0442 local/cloud/review\n-- \u0431\u0435\u0437 \u0432\u044B\u0437\u043E\u0432\u0430 \u043C\u043E\u0434\u0435\u043B\u0438. last_10_runs \u2014 JSON-\u043C\u0430\u0441\u0441\u0438\u0432 1 (\u0433\u0435\u0439\u0442 \u043F\u0440\u043E\u0439\u0434\u0435\u043D) / 0 (\u043F\u0440\u043E\u0432\u0430\u043B).\nCREATE TABLE IF NOT EXISTS capability_map (\n task_type TEXT PRIMARY KEY,\n model TEXT NOT NULL,\n runs_total INTEGER NOT NULL DEFAULT 0,\n runs_passed INTEGER NOT NULL DEFAULT 0,\n success_rate REAL NOT NULL DEFAULT 0,\n avg_cost_usd REAL NOT NULL DEFAULT 0,\n avg_time_ms REAL NOT NULL DEFAULT 0,\n last_10_runs TEXT NOT NULL DEFAULT '[]',\n created_at TEXT NOT NULL,\n updated_at TEXT NOT NULL\n);\n\nCREATE INDEX IF NOT EXISTS idx_capability_success ON capability_map(success_rate DESC);\n";
|
|
9
9
|
interface SchemaDb {
|
|
10
10
|
exec(sql: string): void;
|
|
11
11
|
prepare(sql: string): {
|
|
@@ -20,7 +20,7 @@ interface SchemaDb {
|
|
|
20
20
|
* миграций. Увеличивайте при добавлении новой ступени в {@link MIGRATIONS}
|
|
21
21
|
* и добавляйте соответствующую запись в массив.
|
|
22
22
|
*/
|
|
23
|
-
export declare const SCHEMA_VERSION =
|
|
23
|
+
export declare const SCHEMA_VERSION = 7;
|
|
24
24
|
/** Возвращает сохранённую версию схемы (0 у legacy-БД без user_version). */
|
|
25
25
|
export declare function getSchemaVersion(db: SchemaDb): number;
|
|
26
26
|
/**
|
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,q7WA6NtB,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;AA6ND;;;;;;;;;GASG;AACH,wBAAgB,WAAW,CAAC,EAAE,EAAE,QAAQ,GAAG,IAAI,CAmB9C"}
|
package/dist/db/schema.js
CHANGED
|
@@ -165,7 +165,67 @@ CREATE TABLE IF NOT EXISTS run_steps (
|
|
|
165
165
|
|
|
166
166
|
CREATE INDEX IF NOT EXISTS idx_run_steps_run ON run_steps(run_id, created_at);
|
|
167
167
|
CREATE INDEX IF NOT EXISTS idx_run_steps_status ON run_steps(status);
|
|
168
|
-
|
|
168
|
+
|
|
169
|
+
-- Спринт 36.4 (DLQ): шаги, которые упали детерминированно (исчерпали попытки),
|
|
170
|
+
-- ждут ручного retry или отказа. Открытая запись на шаг может быть только одна,
|
|
171
|
+
-- поэтому ручной retry не создаёт дублей.
|
|
172
|
+
CREATE TABLE IF NOT EXISTS run_dlq (
|
|
173
|
+
id TEXT PRIMARY KEY,
|
|
174
|
+
run_id TEXT NOT NULL REFERENCES runs(id) ON DELETE CASCADE,
|
|
175
|
+
step_name TEXT NOT NULL,
|
|
176
|
+
status TEXT NOT NULL,
|
|
177
|
+
reason TEXT,
|
|
178
|
+
error TEXT,
|
|
179
|
+
attempts INTEGER NOT NULL DEFAULT 0,
|
|
180
|
+
created_at TEXT NOT NULL,
|
|
181
|
+
updated_at TEXT NOT NULL,
|
|
182
|
+
resolved_at TEXT,
|
|
183
|
+
resolution TEXT
|
|
184
|
+
);
|
|
185
|
+
|
|
186
|
+
CREATE INDEX IF NOT EXISTS idx_run_dlq_status ON run_dlq(status, created_at DESC);
|
|
187
|
+
CREATE UNIQUE INDEX IF NOT EXISTS idx_run_dlq_open_unique
|
|
188
|
+
ON run_dlq(run_id, step_name) WHERE status = 'open';
|
|
189
|
+
|
|
190
|
+
-- Спринт 36.7 (пауза с инъекцией контекста): комментарий, файл или
|
|
191
|
+
-- структурированный артефакт, оставленный на паузе. Запись адресована
|
|
192
|
+
-- конкретному шагу и передаётся ему при resume ровно один раз.
|
|
193
|
+
CREATE TABLE IF NOT EXISTS run_injections (
|
|
194
|
+
id TEXT PRIMARY KEY,
|
|
195
|
+
run_id TEXT NOT NULL REFERENCES runs(id) ON DELETE CASCADE,
|
|
196
|
+
step_name TEXT NOT NULL,
|
|
197
|
+
kind TEXT NOT NULL,
|
|
198
|
+
content TEXT NOT NULL,
|
|
199
|
+
author TEXT NOT NULL,
|
|
200
|
+
metadata_json TEXT,
|
|
201
|
+
created_at TEXT NOT NULL,
|
|
202
|
+
consumed_at TEXT,
|
|
203
|
+
consumed_by_step TEXT,
|
|
204
|
+
consumed_attempt INTEGER
|
|
205
|
+
);
|
|
206
|
+
|
|
207
|
+
CREATE INDEX IF NOT EXISTS idx_run_injections_run
|
|
208
|
+
ON run_injections(run_id, created_at);
|
|
209
|
+
CREATE INDEX IF NOT EXISTS idx_run_injections_pending
|
|
210
|
+
ON run_injections(run_id, step_name) WHERE consumed_at IS NULL;
|
|
211
|
+
|
|
212
|
+
-- Спринт 36.5.b (Capability Map): исходы гейта по типам задач.
|
|
213
|
+
-- Слой 2 роутера читает success_rate и avg_* и выбирает local/cloud/review
|
|
214
|
+
-- без вызова модели. last_10_runs — JSON-массив 1 (гейт пройден) / 0 (провал).
|
|
215
|
+
CREATE TABLE IF NOT EXISTS capability_map (
|
|
216
|
+
task_type TEXT PRIMARY KEY,
|
|
217
|
+
model TEXT NOT NULL,
|
|
218
|
+
runs_total INTEGER NOT NULL DEFAULT 0,
|
|
219
|
+
runs_passed INTEGER NOT NULL DEFAULT 0,
|
|
220
|
+
success_rate REAL NOT NULL DEFAULT 0,
|
|
221
|
+
avg_cost_usd REAL NOT NULL DEFAULT 0,
|
|
222
|
+
avg_time_ms REAL NOT NULL DEFAULT 0,
|
|
223
|
+
last_10_runs TEXT NOT NULL DEFAULT '[]',
|
|
224
|
+
created_at TEXT NOT NULL,
|
|
225
|
+
updated_at TEXT NOT NULL
|
|
226
|
+
);
|
|
227
|
+
|
|
228
|
+
CREATE INDEX IF NOT EXISTS idx_capability_success ON capability_map(success_rate DESC);
|
|
169
229
|
`;
|
|
170
230
|
/**
|
|
171
231
|
* Текущая версия схемы БД (`PRAGMA user_version`).
|
|
@@ -175,7 +235,7 @@ CREATE INDEX IF NOT EXISTS idx_run_steps_key ON run_steps(run_id, idempotency_ke
|
|
|
175
235
|
* миграций. Увеличивайте при добавлении новой ступени в {@link MIGRATIONS}
|
|
176
236
|
* и добавляйте соответствующую запись в массив.
|
|
177
237
|
*/
|
|
178
|
-
export const SCHEMA_VERSION =
|
|
238
|
+
export const SCHEMA_VERSION = 7;
|
|
179
239
|
/** Возвращает сохранённую версию схемы (0 у legacy-БД без user_version). */
|
|
180
240
|
export function getSchemaVersion(db) {
|
|
181
241
|
const rows = db.prepare("PRAGMA user_version").all();
|
|
@@ -290,6 +350,98 @@ const MIGRATIONS = [
|
|
|
290
350
|
}
|
|
291
351
|
},
|
|
292
352
|
},
|
|
353
|
+
{
|
|
354
|
+
// Ступень 4 — Спринт 36.3: ключ идемпотентности уникален в пределах запуска.
|
|
355
|
+
// Дубли (если были) обнуляются, оставляем первый по rowid; затем старый
|
|
356
|
+
// неуникальный индекс заменяется частичным уникальным.
|
|
357
|
+
to: 4,
|
|
358
|
+
migrate(db) {
|
|
359
|
+
db.exec(`UPDATE run_steps SET idempotency_key = NULL
|
|
360
|
+
WHERE idempotency_key IS NOT NULL
|
|
361
|
+
AND rowid NOT IN (
|
|
362
|
+
SELECT MIN(rowid) FROM run_steps
|
|
363
|
+
WHERE idempotency_key IS NOT NULL
|
|
364
|
+
GROUP BY run_id, idempotency_key
|
|
365
|
+
)`);
|
|
366
|
+
db.exec("DROP INDEX IF EXISTS idx_run_steps_key");
|
|
367
|
+
db.exec(`CREATE UNIQUE INDEX IF NOT EXISTS idx_run_steps_key_unique
|
|
368
|
+
ON run_steps(run_id, idempotency_key) WHERE idempotency_key IS NOT NULL`);
|
|
369
|
+
},
|
|
370
|
+
},
|
|
371
|
+
{
|
|
372
|
+
// Ступень 5 — Спринт 36.4: DLQ для детерминированно упавших шагов.
|
|
373
|
+
// Таблица и индексы идемпотентны; уникальный открытый индекс не даёт
|
|
374
|
+
// завести вторую запись на тот же шаг после ручного retry.
|
|
375
|
+
to: 5,
|
|
376
|
+
migrate(db) {
|
|
377
|
+
db.exec(`
|
|
378
|
+
CREATE TABLE IF NOT EXISTS run_dlq (
|
|
379
|
+
id TEXT PRIMARY KEY,
|
|
380
|
+
run_id TEXT NOT NULL REFERENCES runs(id) ON DELETE CASCADE,
|
|
381
|
+
step_name TEXT NOT NULL,
|
|
382
|
+
status TEXT NOT NULL,
|
|
383
|
+
reason TEXT,
|
|
384
|
+
error TEXT,
|
|
385
|
+
attempts INTEGER NOT NULL DEFAULT 0,
|
|
386
|
+
created_at TEXT NOT NULL,
|
|
387
|
+
updated_at TEXT NOT NULL,
|
|
388
|
+
resolved_at TEXT,
|
|
389
|
+
resolution TEXT
|
|
390
|
+
);
|
|
391
|
+
CREATE INDEX IF NOT EXISTS idx_run_dlq_status ON run_dlq(status, created_at DESC);
|
|
392
|
+
CREATE UNIQUE INDEX IF NOT EXISTS idx_run_dlq_open_unique
|
|
393
|
+
ON run_dlq(run_id, step_name) WHERE status = 'open';
|
|
394
|
+
`);
|
|
395
|
+
},
|
|
396
|
+
},
|
|
397
|
+
{
|
|
398
|
+
// Ступень 6 — Спринт 36.5.b: Capability Map роутера. Таблица только
|
|
399
|
+
// добавляется, поэтому ступень идемпотентна и безопасна для старых БД.
|
|
400
|
+
to: 6,
|
|
401
|
+
migrate(db) {
|
|
402
|
+
db.exec(`
|
|
403
|
+
CREATE TABLE IF NOT EXISTS capability_map (
|
|
404
|
+
task_type TEXT PRIMARY KEY,
|
|
405
|
+
model TEXT NOT NULL,
|
|
406
|
+
runs_total INTEGER NOT NULL DEFAULT 0,
|
|
407
|
+
runs_passed INTEGER NOT NULL DEFAULT 0,
|
|
408
|
+
success_rate REAL NOT NULL DEFAULT 0,
|
|
409
|
+
avg_cost_usd REAL NOT NULL DEFAULT 0,
|
|
410
|
+
avg_time_ms REAL NOT NULL DEFAULT 0,
|
|
411
|
+
last_10_runs TEXT NOT NULL DEFAULT '[]',
|
|
412
|
+
created_at TEXT NOT NULL,
|
|
413
|
+
updated_at TEXT NOT NULL
|
|
414
|
+
);
|
|
415
|
+
CREATE INDEX IF NOT EXISTS idx_capability_success ON capability_map(success_rate DESC);
|
|
416
|
+
`);
|
|
417
|
+
},
|
|
418
|
+
},
|
|
419
|
+
{
|
|
420
|
+
// Ступень 7 — Спринт 36.7: контекст паузы. Таблица только добавляется,
|
|
421
|
+
// поэтому ступень идемпотентна и безопасна для старых БД.
|
|
422
|
+
to: 7,
|
|
423
|
+
migrate(db) {
|
|
424
|
+
db.exec(`
|
|
425
|
+
CREATE TABLE IF NOT EXISTS run_injections (
|
|
426
|
+
id TEXT PRIMARY KEY,
|
|
427
|
+
run_id TEXT NOT NULL REFERENCES runs(id) ON DELETE CASCADE,
|
|
428
|
+
step_name TEXT NOT NULL,
|
|
429
|
+
kind TEXT NOT NULL,
|
|
430
|
+
content TEXT NOT NULL,
|
|
431
|
+
author TEXT NOT NULL,
|
|
432
|
+
metadata_json TEXT,
|
|
433
|
+
created_at TEXT NOT NULL,
|
|
434
|
+
consumed_at TEXT,
|
|
435
|
+
consumed_by_step TEXT,
|
|
436
|
+
consumed_attempt INTEGER
|
|
437
|
+
);
|
|
438
|
+
CREATE INDEX IF NOT EXISTS idx_run_injections_run
|
|
439
|
+
ON run_injections(run_id, created_at);
|
|
440
|
+
CREATE INDEX IF NOT EXISTS idx_run_injections_pending
|
|
441
|
+
ON run_injections(run_id, step_name) WHERE consumed_at IS NULL;
|
|
442
|
+
`);
|
|
443
|
+
},
|
|
444
|
+
},
|
|
293
445
|
];
|
|
294
446
|
/** Имена колонок таблицы (пустой массив, если таблицы нет). */
|
|
295
447
|
function tableColumns(db, table) {
|
|
@@ -5,4 +5,15 @@
|
|
|
5
5
|
export declare function getSetting<T>(key: string, fallback: T): T;
|
|
6
6
|
export declare function setSetting(key: string, value: unknown): void;
|
|
7
7
|
export declare function deleteSetting(key: string): void;
|
|
8
|
+
/**
|
|
9
|
+
* Атомарно уменьшает целочисленный счётчик в settings.
|
|
10
|
+
*
|
|
11
|
+
* P2-30: раньше retry_state был одним JSON-объектом, который читали и
|
|
12
|
+
* перезаписывали целиком разные процессы record-history. При параллельных
|
|
13
|
+
* завершениях задач декременты терялись. Здесь счётчик живёт отдельной
|
|
14
|
+
* строкой, а уменьшение делает один UPDATE — гонки между процессами нет.
|
|
15
|
+
*
|
|
16
|
+
* Возвращает новое значение или null, если счётчик уже исчерпан.
|
|
17
|
+
*/
|
|
18
|
+
export declare function decrementCounterSetting(key: string, initial: number): number | null;
|
|
8
19
|
//# sourceMappingURL=settings-repo.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"settings-repo.d.ts","sourceRoot":"","sources":["../../src/db/settings-repo.ts"],"names":[],"mappings":"AAEA;;;GAGG;AAEH,wBAAgB,UAAU,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,GAAG,CAAC,CAUzD;AAED,wBAAgB,UAAU,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,GAAG,IAAI,CAO5D;AAED,wBAAgB,aAAa,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAE/C"}
|
|
1
|
+
{"version":3,"file":"settings-repo.d.ts","sourceRoot":"","sources":["../../src/db/settings-repo.ts"],"names":[],"mappings":"AAEA;;;GAGG;AAEH,wBAAgB,UAAU,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,GAAG,CAAC,CAUzD;AAED,wBAAgB,UAAU,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,GAAG,IAAI,CAO5D;AAED,wBAAgB,aAAa,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAE/C;AAED;;;;;;;;;GASG;AACH,wBAAgB,uBAAuB,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAmBnF"}
|
package/dist/db/settings-repo.js
CHANGED
|
@@ -25,3 +25,28 @@ export function setSetting(key, value) {
|
|
|
25
25
|
export function deleteSetting(key) {
|
|
26
26
|
getDb().prepare("DELETE FROM settings WHERE key = ?").run(key);
|
|
27
27
|
}
|
|
28
|
+
/**
|
|
29
|
+
* Атомарно уменьшает целочисленный счётчик в settings.
|
|
30
|
+
*
|
|
31
|
+
* P2-30: раньше retry_state был одним JSON-объектом, который читали и
|
|
32
|
+
* перезаписывали целиком разные процессы record-history. При параллельных
|
|
33
|
+
* завершениях задач декременты терялись. Здесь счётчик живёт отдельной
|
|
34
|
+
* строкой, а уменьшение делает один UPDATE — гонки между процессами нет.
|
|
35
|
+
*
|
|
36
|
+
* Возвращает новое значение или null, если счётчик уже исчерпан.
|
|
37
|
+
*/
|
|
38
|
+
export function decrementCounterSetting(key, initial) {
|
|
39
|
+
const db = getDb();
|
|
40
|
+
db.prepare(`INSERT INTO settings (key, value_json) VALUES (?, ?)
|
|
41
|
+
ON CONFLICT(key) DO NOTHING`).run(key, JSON.stringify(Math.max(0, Math.floor(initial))));
|
|
42
|
+
const row = db
|
|
43
|
+
.prepare(`UPDATE settings
|
|
44
|
+
SET value_json = CAST(CAST(value_json AS INTEGER) - 1 AS TEXT)
|
|
45
|
+
WHERE key = ?
|
|
46
|
+
AND CAST(value_json AS INTEGER) > 0
|
|
47
|
+
RETURNING CAST(value_json AS INTEGER) AS value`)
|
|
48
|
+
.get(key);
|
|
49
|
+
if (!row)
|
|
50
|
+
return null;
|
|
51
|
+
return Number(row.value);
|
|
52
|
+
}
|
|
@@ -0,0 +1,51 @@
|
|
|
1
|
+
import { type RunStepRecord } from "./runs-repo.js";
|
|
2
|
+
/**
|
|
3
|
+
* Идемпотентное выполнение шага (Sprint 36.3).
|
|
4
|
+
*
|
|
5
|
+
* Ключ идемпотентности уникален в пределах запуска (частичный UNIQUE-индекс
|
|
6
|
+
* `idx_run_steps_key_unique`). Повторный вызов с тем же ключом не выполняет
|
|
7
|
+
* тело шага второй раз: возвращается сохранённый `output_json` с
|
|
8
|
+
* `replayed: true`. Это защищает от дублей побочных эффектов при ретраях,
|
|
9
|
+
* resume и параллельных вызовах.
|
|
10
|
+
*/
|
|
11
|
+
/** Ключ уже занят другим шагом запуска. */
|
|
12
|
+
export declare class IdempotencyConflictError extends Error {
|
|
13
|
+
constructor(runId: string, key: string, stepName?: string);
|
|
14
|
+
}
|
|
15
|
+
/** Шаг с этим ключом выполняется прямо сейчас (параллельный дубль). */
|
|
16
|
+
export declare class StepInFlightError extends Error {
|
|
17
|
+
constructor(runId: string, key: string);
|
|
18
|
+
}
|
|
19
|
+
/** Опции идемпотентного шага. */
|
|
20
|
+
export interface StepOnceOptions {
|
|
21
|
+
/** Обязательный ключ; уникален в пределах запуска. */
|
|
22
|
+
idempotencyKey: string;
|
|
23
|
+
/** Начать запуск, если он pending (по умолчанию true). */
|
|
24
|
+
startRun?: boolean;
|
|
25
|
+
}
|
|
26
|
+
/** Результат `runStepOnce`. */
|
|
27
|
+
export interface StepOnceExecution<T> {
|
|
28
|
+
/** Актуальное состояние шага. */
|
|
29
|
+
step: RunStepRecord;
|
|
30
|
+
/** Результат тела либо сохранённый output при повторе. */
|
|
31
|
+
result: T | null;
|
|
32
|
+
/** true — тело не вызывалось, результат взят из БД. */
|
|
33
|
+
replayed: boolean;
|
|
34
|
+
/** true — тело шага действительно выполнялось. */
|
|
35
|
+
executed: boolean;
|
|
36
|
+
/** Номер попытки, с которым шаг выполнен (или был выполнен раньше). */
|
|
37
|
+
attempt: number;
|
|
38
|
+
}
|
|
39
|
+
/**
|
|
40
|
+
* Выполняет шаг ровно один раз на ключ.
|
|
41
|
+
*
|
|
42
|
+
* - новый ключ → шаг создаётся и выполняется;
|
|
43
|
+
* - шаг уже `passed`/`skipped` → тело не вызывается, возвращается кэш;
|
|
44
|
+
* - шаг `failed` → повтор с `attempt + 1` (осознанный ретрай);
|
|
45
|
+
* - шаг `running` или параллельный вызов в этом процессе → `StepInFlightError`;
|
|
46
|
+
* - ключ принадлежит другому шагу → `IdempotencyConflictError`.
|
|
47
|
+
*/
|
|
48
|
+
export declare function runStepOnce<T>(runId: string, stepName: string, options: StepOnceOptions, body: () => T): StepOnceExecution<T>;
|
|
49
|
+
/** Асинхронный вариант `runStepOnce` для шагов с I/O. */
|
|
50
|
+
export declare function runStepOnceAsync<T>(runId: string, stepName: string, options: StepOnceOptions, body: () => Promise<T> | T): Promise<StepOnceExecution<T>>;
|
|
51
|
+
//# sourceMappingURL=step-idempotency.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"step-idempotency.d.ts","sourceRoot":"","sources":["../../src/db/step-idempotency.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,aAAa,EACnB,MAAM,gBAAgB,CAAC;AAOxB;;;;;;;;GAQG;AAEH,2CAA2C;AAC3C,qBAAa,wBAAyB,SAAQ,KAAK;gBACrC,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM;CAQ1D;AAED,uEAAuE;AACvE,qBAAa,iBAAkB,SAAQ,KAAK;gBAC9B,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM;CAIvC;AAED,iCAAiC;AACjC,MAAM,WAAW,eAAe;IAC9B,sDAAsD;IACtD,cAAc,EAAE,MAAM,CAAC;IACvB,0DAA0D;IAC1D,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AAED,+BAA+B;AAC/B,MAAM,WAAW,iBAAiB,CAAC,CAAC;IAClC,iCAAiC;IACjC,IAAI,EAAE,aAAa,CAAC;IACpB,0DAA0D;IAC1D,MAAM,EAAE,CAAC,GAAG,IAAI,CAAC;IACjB,uDAAuD;IACvD,QAAQ,EAAE,OAAO,CAAC;IAClB,kDAAkD;IAClD,QAAQ,EAAE,OAAO,CAAC;IAClB,uEAAuE;IACvE,OAAO,EAAE,MAAM,CAAC;CACjB;AAeD;;;;;;;;GAQG;AACH,wBAAgB,WAAW,CAAC,CAAC,EAC3B,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,eAAe,EACxB,IAAI,EAAE,MAAM,CAAC,GACZ,iBAAiB,CAAC,CAAC,CAAC,CA2CtB;AAED,yDAAyD;AACzD,wBAAsB,gBAAgB,CAAC,CAAC,EACtC,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,eAAe,EACxB,IAAI,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,GACzB,OAAO,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,CA2C/B"}
|