agent-steward 0.0.3 → 0.0.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +154 -2
- package/CROSS_PLATFORM.md +19 -0
- package/README.md +54 -9
- package/ROADMAP-STRATEGY.md +23 -20
- package/ROADMAP.md +140 -143
- package/dist/cli.d.ts +3 -0
- package/dist/cli.d.ts.map +1 -0
- package/dist/cli.js +351 -0
- 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/execution.d.ts +203 -0
- package/dist/core/execution.d.ts.map +1 -0
- package/dist/core/execution.js +309 -0
- package/dist/core/gate-integrity.d.ts +35 -0
- package/dist/core/gate-integrity.d.ts.map +1 -0
- package/dist/core/gate-integrity.js +132 -0
- package/dist/core/git-trigger.d.ts.map +1 -1
- package/dist/core/git-trigger.js +14 -2
- package/dist/core/guard-run.d.ts +4 -0
- package/dist/core/guard-run.d.ts.map +1 -0
- package/dist/core/guard-run.js +101 -0
- package/dist/core/guard.d.ts +52 -0
- package/dist/core/guard.d.ts.map +1 -0
- package/dist/core/guard.js +362 -0
- package/dist/core/lock.d.ts +61 -4
- package/dist/core/lock.d.ts.map +1 -1
- package/dist/core/lock.js +213 -26
- package/dist/core/matrix.d.ts.map +1 -1
- package/dist/core/matrix.js +75 -15
- package/dist/core/mission.d.ts +83 -0
- package/dist/core/mission.d.ts.map +1 -0
- package/dist/core/mission.js +334 -0
- 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/pipeline-apply.d.ts +38 -0
- package/dist/core/pipeline-apply.d.ts.map +1 -0
- package/dist/core/pipeline-apply.js +117 -0
- package/dist/core/pipeline-io.d.ts +13 -0
- package/dist/core/pipeline-io.d.ts.map +1 -0
- package/dist/core/pipeline-io.js +64 -0
- package/dist/core/pipeline-map.d.ts +46 -0
- package/dist/core/pipeline-map.d.ts.map +1 -0
- package/dist/core/pipeline-map.js +196 -0
- package/dist/core/pipeline-spec.d.ts +109 -0
- package/dist/core/pipeline-spec.d.ts.map +1 -0
- package/dist/core/pipeline-spec.js +554 -0
- package/dist/core/ps-wrapper.d.ts +19 -2
- package/dist/core/ps-wrapper.d.ts.map +1 -1
- package/dist/core/ps-wrapper.js +261 -63
- 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 +183 -58
- 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 +91 -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 +18 -2
- package/dist/core/scheduler/linux.d.ts.map +1 -1
- package/dist/core/scheduler/linux.js +63 -20
- package/dist/core/scheduler/mac.d.ts +44 -2
- package/dist/core/scheduler/mac.d.ts.map +1 -1
- package/dist/core/scheduler/mac.js +126 -15
- package/dist/core/scheduler/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/scheduler/windows.d.ts.map +1 -1
- package/dist/core/scheduler/windows.js +15 -12
- package/dist/core/secrets.d.ts.map +1 -1
- package/dist/core/secrets.js +125 -28
- package/dist/core/session.d.ts.map +1 -1
- package/dist/core/session.js +18 -11
- package/dist/core/structured-log.d.ts +7 -1
- package/dist/core/structured-log.d.ts.map +1 -1
- 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/worktree-run.d.ts +4 -0
- package/dist/core/worktree-run.d.ts.map +1 -0
- package/dist/core/worktree-run.js +164 -0
- package/dist/core/worktree.d.ts +115 -0
- package/dist/core/worktree.d.ts.map +1 -0
- package/dist/core/worktree.js +462 -0
- package/dist/core/wrappers/bash.d.ts +17 -0
- package/dist/core/wrappers/bash.d.ts.map +1 -1
- package/dist/core/wrappers/bash.js +224 -28
- package/dist/db/capability-repo.d.ts +124 -0
- package/dist/db/capability-repo.d.ts.map +1 -0
- package/dist/db/capability-repo.js +267 -0
- package/dist/db/history-repo.d.ts +46 -5
- package/dist/db/history-repo.d.ts.map +1 -1
- package/dist/db/history-repo.js +107 -25
- 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/metrics-repo.js +2 -2
- package/dist/db/migrate.d.ts.map +1 -1
- package/dist/db/migrate.js +3 -1
- package/dist/db/recovery.d.ts.map +1 -1
- package/dist/db/recovery.js +5 -4
- 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-journal.d.ts +33 -5
- package/dist/db/run-journal.d.ts.map +1 -1
- package/dist/db/run-journal.js +78 -14
- package/dist/db/run-resume.d.ts +10 -2
- package/dist/db/run-resume.d.ts.map +1 -1
- package/dist/db/run-resume.js +39 -13
- package/dist/db/runs-repo.d.ts +32 -7
- package/dist/db/runs-repo.d.ts.map +1 -1
- package/dist/db/runs-repo.js +50 -11
- package/dist/db/schema.d.ts +2 -2
- package/dist/db/schema.d.ts.map +1 -1
- package/dist/db/schema.js +216 -3
- 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/history.d.ts +1 -1
- package/dist/history.d.ts.map +1 -1
- package/dist/i18n.d.ts +5 -0
- package/dist/i18n.d.ts.map +1 -1
- package/dist/i18n.js +11 -4
- package/dist/index.d.ts +140 -6
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +480 -18
- package/dist/notifications.d.ts +22 -0
- package/dist/notifications.d.ts.map +1 -1
- package/dist/notifications.js +36 -8
- package/dist/profiles.d.ts.map +1 -1
- package/dist/profiles.js +25 -4
- package/dist/rpc.d.ts +924 -0
- package/dist/rpc.d.ts.map +1 -1
- package/dist/rpc.js +352 -0
- package/dist/server.d.ts +46 -0
- package/dist/server.d.ts.map +1 -1
- package/dist/server.js +172 -53
- package/dist/settings.d.ts +2 -2
- package/dist/settings.d.ts.map +1 -1
- package/dist/settings.js +3 -3
- package/dist/shared/jobs-view.d.ts +1 -1
- package/dist/shared/jobs-view.d.ts.map +1 -1
- package/dist/shared/jobs-view.js +2 -0
- package/dist/task-transfer.d.ts +16 -0
- package/dist/task-transfer.d.ts.map +1 -1
- package/dist/task-transfer.js +16 -0
- 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 +498 -58
- package/docs/COMPATIBILITY.md +2 -2
- package/docs/CONCEPT.md +185 -91
- package/docs/CROSS_PLATFORM.ru.md +20 -0
- package/docs/CROSS_PLATFORM.zh.md +18 -0
- package/docs/EXECUTION-LOOP.md +211 -0
- package/docs/FEATURES.md +65 -4
- package/docs/FEATURES.zh.md +52 -4
- package/docs/MIGRATION.md +2 -2
- package/docs/PIPELINE.md +293 -0
- package/docs/README.ru.md +44 -5
- package/docs/README.zh.md +46 -6
- package/docs/SAFETY.md +142 -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 +9 -8
- package/locales/en.json +84 -1
- package/locales/ru.json +84 -1
- package/locales/zh.json +84 -1
- package/opencode.pipeline.yaml +35 -0
- package/package.json +46 -2
- package/scripts/audit-bundle.mjs +215 -0
- package/scripts/test-home.mjs +83 -0
- package/src/cli.ts +412 -0
- package/src/core/dlq-api.ts +98 -0
- package/src/core/dry-run.ts +27 -3
- package/src/core/execution.ts +538 -0
- package/src/core/file-watcher.ts +2 -2
- package/src/core/gate-integrity.ts +160 -0
- package/src/core/git-trigger.ts +18 -5
- package/src/core/guard-run.ts +119 -0
- package/src/core/guard.ts +431 -0
- package/src/core/lock.ts +244 -30
- package/src/core/matrix.ts +95 -50
- package/src/core/mission.ts +485 -0
- package/src/core/native-notify.ts +1 -1
- 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/pipeline-apply.ts +158 -0
- package/src/core/pipeline-io.ts +79 -0
- package/src/core/pipeline-map.ts +264 -0
- package/src/core/pipeline-spec.ts +775 -0
- package/src/core/ps-wrapper.ts +274 -64
- package/src/core/record-history.ts +229 -104
- 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 +115 -0
- package/src/core/run-panel-api.ts +262 -0
- package/src/core/schedule-gate.ts +7 -3
- package/src/core/schedule-v2.ts +114 -5
- package/src/core/scheduler/at-fallback.ts +190 -5
- package/src/core/scheduler/linux.ts +72 -21
- package/src/core/scheduler/logs.ts +2 -2
- package/src/core/scheduler/mac.ts +174 -14
- 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/scheduler/windows.ts +19 -15
- package/src/core/secrets.ts +131 -31
- package/src/core/session.ts +23 -10
- package/src/core/structured-log.ts +22 -5
- package/src/core/task-name.ts +67 -0
- package/src/core/telegram.ts +2 -2
- package/src/core/triage-worker.ts +7 -7
- package/src/core/triage.ts +2 -2
- package/src/core/worktree-run.ts +199 -0
- package/src/core/worktree.ts +600 -0
- package/src/core/wrappers/bash.ts +239 -27
- package/src/db/capability-repo.ts +402 -0
- package/src/db/history-repo.ts +151 -22
- package/src/db/index.ts +37 -1
- package/src/db/metrics-repo.ts +2 -2
- package/src/db/migrate.ts +3 -1
- package/src/db/recovery.ts +5 -4
- package/src/db/run-context.ts +370 -0
- package/src/db/run-dlq.ts +310 -0
- package/src/db/run-journal.ts +100 -13
- package/src/db/run-resume.ts +65 -13
- package/src/db/runs-repo.ts +66 -13
- package/src/db/schema.ts +218 -3
- package/src/db/settings-repo.ts +31 -0
- package/src/db/step-idempotency.ts +185 -0
- package/src/gui.tsx +692 -13
- package/src/history.ts +1 -1
- package/src/i18n.ts +12 -4
- package/src/index.ts +648 -8
- package/src/notifications.ts +38 -8
- package/src/profiles.ts +26 -4
- package/src/rpc.ts +379 -0
- package/src/server.ts +206 -54
- package/src/settings.ts +5 -5
- package/src/shared/jobs-view.ts +3 -1
- package/src/task-transfer.ts +31 -0
- package/src/types.ts +9 -0
- package/src/workspaces.ts +58 -9
package/src/db/runs-repo.ts
CHANGED
|
@@ -12,8 +12,8 @@ import { getDb, withTransaction } from "./index.js";
|
|
|
12
12
|
* пришлось бы переписывать при каждом новом статусе (например, DLQ в 36.4).
|
|
13
13
|
*/
|
|
14
14
|
|
|
15
|
-
/** Статусы запуска: pending → running → passed/failed;
|
|
16
|
-
export type RunStatus = "pending" | "running" | "passed" | "failed" | "cancelled";
|
|
15
|
+
/** Статусы запуска: pending → running → passed/failed; paused — пауза с контекстом (36.7). */
|
|
16
|
+
export type RunStatus = "pending" | "running" | "paused" | "passed" | "failed" | "cancelled";
|
|
17
17
|
|
|
18
18
|
/** Статусы шага: pending → running → passed/failed; skipped — осознанный пропуск. */
|
|
19
19
|
export type StepStatus = "pending" | "running" | "passed" | "failed" | "skipped";
|
|
@@ -26,8 +26,12 @@ const TERMINAL_STEP_STATUSES: ReadonlySet<StepStatus> = new Set([
|
|
|
26
26
|
]);
|
|
27
27
|
|
|
28
28
|
const RUN_TRANSITIONS: Record<RunStatus, readonly RunStatus[]> = {
|
|
29
|
-
pending
|
|
30
|
-
|
|
29
|
+
// Из pending можно как стартовать, так и сразу поставить на паузу (36.7).
|
|
30
|
+
pending: ["running", "paused", "cancelled"],
|
|
31
|
+
// paused → running — явное возобновление; paused → passed — пауза после
|
|
32
|
+
// последнего шага, когда продолжать уже нечего.
|
|
33
|
+
running: ["paused", "passed", "failed", "cancelled"],
|
|
34
|
+
paused: ["running", "passed", "cancelled"],
|
|
31
35
|
passed: [],
|
|
32
36
|
// failed → running — явное возобновление после краха (36.2), только через reopenRun.
|
|
33
37
|
failed: ["running"],
|
|
@@ -75,7 +79,12 @@ export interface RunStepRecord {
|
|
|
75
79
|
position: number;
|
|
76
80
|
status: StepStatus;
|
|
77
81
|
attempt: number;
|
|
82
|
+
/** Ключ идемпотентности (36.3); уникален в пределах запуска. */
|
|
78
83
|
idempotencyKey: string | null;
|
|
84
|
+
/** B12: идентификатор процесса-владельца шага (`host:pid:startedAt`). */
|
|
85
|
+
ownerId: string | null;
|
|
86
|
+
/** B12: момент, до которого владелец обязан продлить lease (ISO). */
|
|
87
|
+
leaseUntil: string | null;
|
|
79
88
|
startedAt: string | null;
|
|
80
89
|
finishedAt: string | null;
|
|
81
90
|
error: string | null;
|
|
@@ -111,6 +120,12 @@ export interface FinishOptions {
|
|
|
111
120
|
output?: unknown;
|
|
112
121
|
}
|
|
113
122
|
|
|
123
|
+
/** B12: владелец шага и срок его lease. */
|
|
124
|
+
export interface StepLease {
|
|
125
|
+
ownerId: string;
|
|
126
|
+
leaseUntil: string;
|
|
127
|
+
}
|
|
128
|
+
|
|
114
129
|
function nowIso(): string {
|
|
115
130
|
return new Date().toISOString();
|
|
116
131
|
}
|
|
@@ -158,6 +173,8 @@ function stepRowToRecord(row: any): RunStepRecord {
|
|
|
158
173
|
status: String(row.status) as StepStatus,
|
|
159
174
|
attempt: Number(row.attempt) || 1,
|
|
160
175
|
idempotencyKey: row.idempotency_key == null ? null : String(row.idempotency_key),
|
|
176
|
+
ownerId: row.owner_id == null ? null : String(row.owner_id),
|
|
177
|
+
leaseUntil: row.lease_until == null ? null : String(row.lease_until),
|
|
161
178
|
startedAt: row.started_at == null ? null : String(row.started_at),
|
|
162
179
|
finishedAt: row.finished_at == null ? null : String(row.finished_at),
|
|
163
180
|
error: row.error == null ? null : String(row.error),
|
|
@@ -315,6 +332,25 @@ export function startRun(id: string, startedAt = nowIso()): boolean {
|
|
|
315
332
|
});
|
|
316
333
|
}
|
|
317
334
|
|
|
335
|
+
/**
|
|
336
|
+
* pending/running → paused (Спринт 36.7).
|
|
337
|
+
*
|
|
338
|
+
* Пауза ставится только между шагами: если шаг уже выполняется, вызывающий
|
|
339
|
+
* код должен дождаться его завершения. `finished_at` не заполняется — запуск
|
|
340
|
+
* не завершён, а приостановлен.
|
|
341
|
+
*/
|
|
342
|
+
export function pauseRunRecord(id: string, pausedAt = nowIso()): boolean {
|
|
343
|
+
return withTransaction(() => {
|
|
344
|
+
const run = getRun(id);
|
|
345
|
+
if (!run) return false;
|
|
346
|
+
assertTransition("run", run.status, "paused", RUN_TRANSITIONS[run.status]);
|
|
347
|
+
getDb()
|
|
348
|
+
.prepare("UPDATE runs SET status = 'paused', updated_at = ? WHERE id = ?")
|
|
349
|
+
.run(pausedAt, id);
|
|
350
|
+
return true;
|
|
351
|
+
});
|
|
352
|
+
}
|
|
353
|
+
|
|
318
354
|
/** Завершает запуск (passed/failed/cancelled) и фиксирует finished_at. */
|
|
319
355
|
export function finishRun(
|
|
320
356
|
id: string,
|
|
@@ -334,10 +370,10 @@ export function finishRun(
|
|
|
334
370
|
}
|
|
335
371
|
|
|
336
372
|
/**
|
|
337
|
-
* failed → running: возобновление прогона после краха (36.2).
|
|
373
|
+
* failed/paused → running: возобновление прогона после краха или паузы (36.2, 36.7).
|
|
338
374
|
*
|
|
339
|
-
*
|
|
340
|
-
*
|
|
375
|
+
* Не сбрасывает номера попыток шагов — они растут через `retryStep` при
|
|
376
|
+
* повторе конкретного шага.
|
|
341
377
|
*/
|
|
342
378
|
export function reopenRun(id: string, startedAt = nowIso()): boolean {
|
|
343
379
|
return withTransaction(() => {
|
|
@@ -387,7 +423,7 @@ export function findStepByIdempotencyKey(
|
|
|
387
423
|
}
|
|
388
424
|
|
|
389
425
|
/** pending → running. Возвращает false, если шаг не найден. */
|
|
390
|
-
export function startStep(id: string, startedAt = nowIso()): boolean {
|
|
426
|
+
export function startStep(id: string, startedAt = nowIso(), lease?: StepLease): boolean {
|
|
391
427
|
return withTransaction(() => {
|
|
392
428
|
const step = getStepById(id);
|
|
393
429
|
if (!step) return false;
|
|
@@ -395,9 +431,9 @@ export function startStep(id: string, startedAt = nowIso()): boolean {
|
|
|
395
431
|
getDb()
|
|
396
432
|
.prepare(
|
|
397
433
|
`UPDATE run_steps SET status = 'running', started_at = ?, finished_at = NULL,
|
|
398
|
-
error = NULL, updated_at = ? WHERE id = ?`,
|
|
434
|
+
error = NULL, owner_id = ?, lease_until = ?, updated_at = ? WHERE id = ?`,
|
|
399
435
|
)
|
|
400
|
-
.run(startedAt, nowIso(), id);
|
|
436
|
+
.run(startedAt, lease?.ownerId ?? null, lease?.leaseUntil ?? null, nowIso(), id);
|
|
401
437
|
return true;
|
|
402
438
|
});
|
|
403
439
|
}
|
|
@@ -436,7 +472,7 @@ export function finishStep(
|
|
|
436
472
|
* Это единственный переход из финального статуса шага. Предыдущая попытка
|
|
437
473
|
* остаётся видимой в счётчике attempt; для 36.4 (DLQ) здесь появится лимит.
|
|
438
474
|
*/
|
|
439
|
-
export function retryStep(id: string, startedAt = nowIso()): boolean {
|
|
475
|
+
export function retryStep(id: string, startedAt = nowIso(), lease?: StepLease): boolean {
|
|
440
476
|
return withTransaction(() => {
|
|
441
477
|
const step = getStepById(id);
|
|
442
478
|
if (!step) return false;
|
|
@@ -446,13 +482,30 @@ export function retryStep(id: string, startedAt = nowIso()): boolean {
|
|
|
446
482
|
getDb()
|
|
447
483
|
.prepare(
|
|
448
484
|
`UPDATE run_steps SET status = 'running', attempt = attempt + 1,
|
|
449
|
-
started_at = ?, finished_at = NULL, error = NULL,
|
|
485
|
+
started_at = ?, finished_at = NULL, error = NULL,
|
|
486
|
+
owner_id = ?, lease_until = ?, updated_at = ? WHERE id = ?`,
|
|
450
487
|
)
|
|
451
|
-
.run(startedAt, nowIso(), id);
|
|
488
|
+
.run(startedAt, lease?.ownerId ?? null, lease?.leaseUntil ?? null, nowIso(), id);
|
|
452
489
|
return true;
|
|
453
490
|
});
|
|
454
491
|
}
|
|
455
492
|
|
|
493
|
+
/**
|
|
494
|
+
* B12: продлевает lease выполняющегося шага.
|
|
495
|
+
*
|
|
496
|
+
* Возвращает false, если шаг уже не `running` (например, recovery успел
|
|
497
|
+
* финализировать его после истечения lease): продлевать нечего.
|
|
498
|
+
*/
|
|
499
|
+
export function renewStepLease(id: string, lease: StepLease): boolean {
|
|
500
|
+
const result = getDb()
|
|
501
|
+
.prepare(
|
|
502
|
+
`UPDATE run_steps SET owner_id = ?, lease_until = ?, updated_at = ?
|
|
503
|
+
WHERE id = ? AND status = 'running'`,
|
|
504
|
+
)
|
|
505
|
+
.run(lease.ownerId, lease.leaseUntil, nowIso(), id);
|
|
506
|
+
return Number(result.changes) > 0;
|
|
507
|
+
}
|
|
508
|
+
|
|
456
509
|
/** Количество шагов запуска (для health/отчётов). */
|
|
457
510
|
export function countRunSteps(runId: string): number {
|
|
458
511
|
const row = getDb()
|
package/src/db/schema.ts
CHANGED
|
@@ -31,7 +31,12 @@ CREATE TABLE IF NOT EXISTS history (
|
|
|
31
31
|
next_task TEXT,
|
|
32
32
|
workspace_id TEXT,
|
|
33
33
|
allowed_tools TEXT,
|
|
34
|
-
denied_tools TEXT
|
|
34
|
+
denied_tools TEXT,
|
|
35
|
+
-- Схема v8: владелец незавершённого запуска. Нужен recovery, чтобы не
|
|
36
|
+
-- финализировать прогон, чей процесс ещё жив (B1).
|
|
37
|
+
owner_pid INTEGER,
|
|
38
|
+
owner_host TEXT,
|
|
39
|
+
owner_started_at TEXT
|
|
35
40
|
);
|
|
36
41
|
|
|
37
42
|
CREATE INDEX IF NOT EXISTS idx_history_task ON history(task_name, started_at DESC);
|
|
@@ -154,6 +159,10 @@ CREATE TABLE IF NOT EXISTS run_steps (
|
|
|
154
159
|
status TEXT NOT NULL,
|
|
155
160
|
attempt INTEGER NOT NULL DEFAULT 1,
|
|
156
161
|
idempotency_key TEXT,
|
|
162
|
+
-- B12: владелец и lease шага. Живой процесс продлевает lease; recovery
|
|
163
|
+
-- финализирует только шаги с истёкшим lease, не трогая чужие живые.
|
|
164
|
+
owner_id TEXT,
|
|
165
|
+
lease_until TEXT,
|
|
157
166
|
started_at TEXT,
|
|
158
167
|
finished_at TEXT,
|
|
159
168
|
error TEXT,
|
|
@@ -165,7 +174,68 @@ CREATE TABLE IF NOT EXISTS run_steps (
|
|
|
165
174
|
|
|
166
175
|
CREATE INDEX IF NOT EXISTS idx_run_steps_run ON run_steps(run_id, created_at);
|
|
167
176
|
CREATE INDEX IF NOT EXISTS idx_run_steps_status ON run_steps(status);
|
|
168
|
-
|
|
177
|
+
|
|
178
|
+
-- Спринт 36.4 (DLQ): шаги, которые упали детерминированно (исчерпали попытки),
|
|
179
|
+
-- ждут ручного retry или отказа. Открытая запись на шаг может быть только одна,
|
|
180
|
+
-- поэтому ручной retry не создаёт дублей.
|
|
181
|
+
CREATE TABLE IF NOT EXISTS run_dlq (
|
|
182
|
+
id TEXT PRIMARY KEY,
|
|
183
|
+
run_id TEXT NOT NULL REFERENCES runs(id) ON DELETE CASCADE,
|
|
184
|
+
step_name TEXT NOT NULL,
|
|
185
|
+
status TEXT NOT NULL,
|
|
186
|
+
reason TEXT,
|
|
187
|
+
error TEXT,
|
|
188
|
+
attempts INTEGER NOT NULL DEFAULT 0,
|
|
189
|
+
created_at TEXT NOT NULL,
|
|
190
|
+
updated_at TEXT NOT NULL,
|
|
191
|
+
resolved_at TEXT,
|
|
192
|
+
resolution TEXT
|
|
193
|
+
);
|
|
194
|
+
|
|
195
|
+
CREATE INDEX IF NOT EXISTS idx_run_dlq_status ON run_dlq(status, created_at DESC);
|
|
196
|
+
CREATE UNIQUE INDEX IF NOT EXISTS idx_run_dlq_open_unique
|
|
197
|
+
ON run_dlq(run_id, step_name) WHERE status = 'open';
|
|
198
|
+
|
|
199
|
+
-- Спринт 36.7 (пауза с инъекцией контекста): комментарий, файл или
|
|
200
|
+
-- структурированный артефакт, оставленный на паузе. Запись адресована
|
|
201
|
+
-- конкретному шагу и передаётся ему при resume ровно один раз.
|
|
202
|
+
CREATE TABLE IF NOT EXISTS run_injections (
|
|
203
|
+
id TEXT PRIMARY KEY,
|
|
204
|
+
run_id TEXT NOT NULL REFERENCES runs(id) ON DELETE CASCADE,
|
|
205
|
+
step_name TEXT NOT NULL,
|
|
206
|
+
kind TEXT NOT NULL,
|
|
207
|
+
content TEXT NOT NULL,
|
|
208
|
+
author TEXT NOT NULL,
|
|
209
|
+
metadata_json TEXT,
|
|
210
|
+
created_at TEXT NOT NULL,
|
|
211
|
+
consumed_at TEXT,
|
|
212
|
+
consumed_by_step TEXT,
|
|
213
|
+
consumed_attempt INTEGER
|
|
214
|
+
);
|
|
215
|
+
|
|
216
|
+
CREATE INDEX IF NOT EXISTS idx_run_injections_run
|
|
217
|
+
ON run_injections(run_id, created_at);
|
|
218
|
+
CREATE INDEX IF NOT EXISTS idx_run_injections_pending
|
|
219
|
+
ON run_injections(run_id, step_name) WHERE consumed_at IS NULL;
|
|
220
|
+
|
|
221
|
+
-- Спринт 36.5.b (Capability Map): исходы гейта по типам задач.
|
|
222
|
+
-- Слой 2 роутера читает success_rate и avg_* и выбирает local/cloud/review
|
|
223
|
+
-- без вызова модели. last_10_runs — JSON-массив 1 (гейт пройден) / 0 (провал).
|
|
224
|
+
CREATE TABLE IF NOT EXISTS capability_map (
|
|
225
|
+
task_type TEXT PRIMARY KEY,
|
|
226
|
+
model TEXT NOT NULL,
|
|
227
|
+
runs_total INTEGER NOT NULL DEFAULT 0,
|
|
228
|
+
runs_passed INTEGER NOT NULL DEFAULT 0,
|
|
229
|
+
first_pass_count INTEGER,
|
|
230
|
+
success_rate REAL NOT NULL DEFAULT 0,
|
|
231
|
+
avg_cost_usd REAL NOT NULL DEFAULT 0,
|
|
232
|
+
avg_time_ms REAL NOT NULL DEFAULT 0,
|
|
233
|
+
last_10_runs TEXT NOT NULL DEFAULT '[]',
|
|
234
|
+
created_at TEXT NOT NULL,
|
|
235
|
+
updated_at TEXT NOT NULL
|
|
236
|
+
);
|
|
237
|
+
|
|
238
|
+
CREATE INDEX IF NOT EXISTS idx_capability_success ON capability_map(success_rate DESC);
|
|
169
239
|
`;
|
|
170
240
|
|
|
171
241
|
interface SchemaDb {
|
|
@@ -181,7 +251,7 @@ interface SchemaDb {
|
|
|
181
251
|
* миграций. Увеличивайте при добавлении новой ступени в {@link MIGRATIONS}
|
|
182
252
|
* и добавляйте соответствующую запись в массив.
|
|
183
253
|
*/
|
|
184
|
-
export const SCHEMA_VERSION =
|
|
254
|
+
export const SCHEMA_VERSION = 10;
|
|
185
255
|
|
|
186
256
|
/** Возвращает сохранённую версию схемы (0 у legacy-БД без user_version). */
|
|
187
257
|
export function getSchemaVersion(db: SchemaDb): number {
|
|
@@ -309,6 +379,151 @@ const MIGRATIONS: { to: number; migrate: (db: SchemaDb) => void }[] = [
|
|
|
309
379
|
}
|
|
310
380
|
},
|
|
311
381
|
},
|
|
382
|
+
{
|
|
383
|
+
// Ступень 4 — Спринт 36.3: ключ идемпотентности уникален в пределах запуска.
|
|
384
|
+
// Дубли (если были) обнуляются, оставляем первый по rowid; затем старый
|
|
385
|
+
// неуникальный индекс заменяется частичным уникальным.
|
|
386
|
+
to: 4,
|
|
387
|
+
migrate(db) {
|
|
388
|
+
db.exec(`UPDATE run_steps SET idempotency_key = NULL
|
|
389
|
+
WHERE idempotency_key IS NOT NULL
|
|
390
|
+
AND rowid NOT IN (
|
|
391
|
+
SELECT MIN(rowid) FROM run_steps
|
|
392
|
+
WHERE idempotency_key IS NOT NULL
|
|
393
|
+
GROUP BY run_id, idempotency_key
|
|
394
|
+
)`);
|
|
395
|
+
db.exec("DROP INDEX IF EXISTS idx_run_steps_key");
|
|
396
|
+
db.exec(`CREATE UNIQUE INDEX IF NOT EXISTS idx_run_steps_key_unique
|
|
397
|
+
ON run_steps(run_id, idempotency_key) WHERE idempotency_key IS NOT NULL`);
|
|
398
|
+
},
|
|
399
|
+
},
|
|
400
|
+
{
|
|
401
|
+
// Ступень 5 — Спринт 36.4: DLQ для детерминированно упавших шагов.
|
|
402
|
+
// Таблица и индексы идемпотентны; уникальный открытый индекс не даёт
|
|
403
|
+
// завести вторую запись на тот же шаг после ручного retry.
|
|
404
|
+
to: 5,
|
|
405
|
+
migrate(db) {
|
|
406
|
+
db.exec(`
|
|
407
|
+
CREATE TABLE IF NOT EXISTS run_dlq (
|
|
408
|
+
id TEXT PRIMARY KEY,
|
|
409
|
+
run_id TEXT NOT NULL REFERENCES runs(id) ON DELETE CASCADE,
|
|
410
|
+
step_name TEXT NOT NULL,
|
|
411
|
+
status TEXT NOT NULL,
|
|
412
|
+
reason TEXT,
|
|
413
|
+
error TEXT,
|
|
414
|
+
attempts INTEGER NOT NULL DEFAULT 0,
|
|
415
|
+
created_at TEXT NOT NULL,
|
|
416
|
+
updated_at TEXT NOT NULL,
|
|
417
|
+
resolved_at TEXT,
|
|
418
|
+
resolution TEXT
|
|
419
|
+
);
|
|
420
|
+
CREATE INDEX IF NOT EXISTS idx_run_dlq_status ON run_dlq(status, created_at DESC);
|
|
421
|
+
CREATE UNIQUE INDEX IF NOT EXISTS idx_run_dlq_open_unique
|
|
422
|
+
ON run_dlq(run_id, step_name) WHERE status = 'open';
|
|
423
|
+
`);
|
|
424
|
+
},
|
|
425
|
+
},
|
|
426
|
+
{
|
|
427
|
+
// Ступень 6 — Спринт 36.5.b: Capability Map роутера. Таблица только
|
|
428
|
+
// добавляется, поэтому ступень идемпотентна и безопасна для старых БД.
|
|
429
|
+
to: 6,
|
|
430
|
+
migrate(db) {
|
|
431
|
+
db.exec(`
|
|
432
|
+
CREATE TABLE IF NOT EXISTS capability_map (
|
|
433
|
+
task_type TEXT PRIMARY KEY,
|
|
434
|
+
model TEXT NOT NULL,
|
|
435
|
+
runs_total INTEGER NOT NULL DEFAULT 0,
|
|
436
|
+
runs_passed INTEGER NOT NULL DEFAULT 0,
|
|
437
|
+
success_rate REAL NOT NULL DEFAULT 0,
|
|
438
|
+
avg_cost_usd REAL NOT NULL DEFAULT 0,
|
|
439
|
+
avg_time_ms REAL NOT NULL DEFAULT 0,
|
|
440
|
+
last_10_runs TEXT NOT NULL DEFAULT '[]',
|
|
441
|
+
created_at TEXT NOT NULL,
|
|
442
|
+
updated_at TEXT NOT NULL
|
|
443
|
+
);
|
|
444
|
+
CREATE INDEX IF NOT EXISTS idx_capability_success ON capability_map(success_rate DESC);
|
|
445
|
+
`);
|
|
446
|
+
},
|
|
447
|
+
},
|
|
448
|
+
{
|
|
449
|
+
// Ступень 7 — Спринт 36.7: контекст паузы. Таблица только добавляется,
|
|
450
|
+
// поэтому ступень идемпотентна и безопасна для старых БД.
|
|
451
|
+
to: 7,
|
|
452
|
+
migrate(db) {
|
|
453
|
+
db.exec(`
|
|
454
|
+
CREATE TABLE IF NOT EXISTS run_injections (
|
|
455
|
+
id TEXT PRIMARY KEY,
|
|
456
|
+
run_id TEXT NOT NULL REFERENCES runs(id) ON DELETE CASCADE,
|
|
457
|
+
step_name TEXT NOT NULL,
|
|
458
|
+
kind TEXT NOT NULL,
|
|
459
|
+
content TEXT NOT NULL,
|
|
460
|
+
author TEXT NOT NULL,
|
|
461
|
+
metadata_json TEXT,
|
|
462
|
+
created_at TEXT NOT NULL,
|
|
463
|
+
consumed_at TEXT,
|
|
464
|
+
consumed_by_step TEXT,
|
|
465
|
+
consumed_attempt INTEGER
|
|
466
|
+
);
|
|
467
|
+
CREATE INDEX IF NOT EXISTS idx_run_injections_run
|
|
468
|
+
ON run_injections(run_id, created_at);
|
|
469
|
+
CREATE INDEX IF NOT EXISTS idx_run_injections_pending
|
|
470
|
+
ON run_injections(run_id, step_name) WHERE consumed_at IS NULL;
|
|
471
|
+
`);
|
|
472
|
+
},
|
|
473
|
+
},
|
|
474
|
+
{
|
|
475
|
+
// Ступень 8 — владелец незавершённого запуска (B1). Recovery должен
|
|
476
|
+
// отличать живой прогон от осиротевшего: PID процесса-обёртки, метка
|
|
477
|
+
// хоста и время старта владельца. Колонки аддитивные, поэтому ступень
|
|
478
|
+
// идемпотентна и безопасна для старых БД.
|
|
479
|
+
to: 8,
|
|
480
|
+
migrate(db) {
|
|
481
|
+
const columnNames = tableColumns(db, "history");
|
|
482
|
+
if (!columnNames.includes("owner_pid")) {
|
|
483
|
+
db.exec("ALTER TABLE history ADD COLUMN owner_pid INTEGER");
|
|
484
|
+
}
|
|
485
|
+
if (!columnNames.includes("owner_host")) {
|
|
486
|
+
db.exec("ALTER TABLE history ADD COLUMN owner_host TEXT");
|
|
487
|
+
}
|
|
488
|
+
if (!columnNames.includes("owner_started_at")) {
|
|
489
|
+
db.exec("ALTER TABLE history ADD COLUMN owner_started_at TEXT");
|
|
490
|
+
}
|
|
491
|
+
},
|
|
492
|
+
},
|
|
493
|
+
{
|
|
494
|
+
// Ступень 9 — lease/владелец шага (B12). Recovery больше не убивает
|
|
495
|
+
// `running`-шаги вслепую: у шага есть owner_id и lease_until, а живой
|
|
496
|
+
// процесс продлевает lease. Колонки аддитивные — ступень идемпотентна.
|
|
497
|
+
to: 9,
|
|
498
|
+
migrate(db) {
|
|
499
|
+
const columnNames = tableColumns(db, "run_steps");
|
|
500
|
+
if (!columnNames.includes("owner_id")) {
|
|
501
|
+
db.exec("ALTER TABLE run_steps ADD COLUMN owner_id TEXT");
|
|
502
|
+
}
|
|
503
|
+
if (!columnNames.includes("lease_until")) {
|
|
504
|
+
db.exec("ALTER TABLE run_steps ADD COLUMN lease_until TEXT");
|
|
505
|
+
}
|
|
506
|
+
},
|
|
507
|
+
},
|
|
508
|
+
{
|
|
509
|
+
// Ступень 10 — first-pass статистика Capability Map (B13). Успех с первой
|
|
510
|
+
// попытки нельзя восстановить из runs_passed, поэтому для legacy-строк
|
|
511
|
+
// считаем все прошлые успехи первыми (first_pass_count = runs_passed).
|
|
512
|
+
// NULL отличает «не заполнено миграцией» от честного нуля.
|
|
513
|
+
to: 10,
|
|
514
|
+
migrate(db) {
|
|
515
|
+
const columnNames = tableColumns(db, "capability_map");
|
|
516
|
+
if (!columnNames.includes("first_pass_count")) {
|
|
517
|
+
db.exec("ALTER TABLE capability_map ADD COLUMN first_pass_count INTEGER");
|
|
518
|
+
}
|
|
519
|
+
const columnsAfter = tableColumns(db, "capability_map");
|
|
520
|
+
if (columnsAfter.includes("first_pass_count")) {
|
|
521
|
+
db.exec(
|
|
522
|
+
"UPDATE capability_map SET first_pass_count = runs_passed WHERE first_pass_count IS NULL",
|
|
523
|
+
);
|
|
524
|
+
}
|
|
525
|
+
},
|
|
526
|
+
},
|
|
312
527
|
];
|
|
313
528
|
|
|
314
529
|
/** Имена колонок таблицы (пустой массив, если таблицы нет). */
|
package/src/db/settings-repo.ts
CHANGED
|
@@ -29,3 +29,34 @@ export function setSetting(key: string, value: unknown): void {
|
|
|
29
29
|
export function deleteSetting(key: string): void {
|
|
30
30
|
getDb().prepare("DELETE FROM settings WHERE key = ?").run(key);
|
|
31
31
|
}
|
|
32
|
+
|
|
33
|
+
/**
|
|
34
|
+
* Атомарно уменьшает целочисленный счётчик в settings.
|
|
35
|
+
*
|
|
36
|
+
* P2-30: раньше retry_state был одним JSON-объектом, который читали и
|
|
37
|
+
* перезаписывали целиком разные процессы record-history. При параллельных
|
|
38
|
+
* завершениях задач декременты терялись. Здесь счётчик живёт отдельной
|
|
39
|
+
* строкой, а уменьшение делает один UPDATE — гонки между процессами нет.
|
|
40
|
+
*
|
|
41
|
+
* Возвращает новое значение или null, если счётчик уже исчерпан.
|
|
42
|
+
*/
|
|
43
|
+
export function decrementCounterSetting(key: string, initial: number): number | null {
|
|
44
|
+
const db = getDb();
|
|
45
|
+
db.prepare(
|
|
46
|
+
`INSERT INTO settings (key, value_json) VALUES (?, ?)
|
|
47
|
+
ON CONFLICT(key) DO NOTHING`,
|
|
48
|
+
).run(key, JSON.stringify(Math.max(0, Math.floor(initial))));
|
|
49
|
+
|
|
50
|
+
const row = db
|
|
51
|
+
.prepare(
|
|
52
|
+
`UPDATE settings
|
|
53
|
+
SET value_json = CAST(CAST(value_json AS INTEGER) - 1 AS TEXT)
|
|
54
|
+
WHERE key = ?
|
|
55
|
+
AND CAST(value_json AS INTEGER) > 0
|
|
56
|
+
RETURNING CAST(value_json AS INTEGER) AS value`,
|
|
57
|
+
)
|
|
58
|
+
.get(key);
|
|
59
|
+
|
|
60
|
+
if (!row) return null;
|
|
61
|
+
return Number(row.value);
|
|
62
|
+
}
|
|
@@ -0,0 +1,185 @@
|
|
|
1
|
+
import {
|
|
2
|
+
createStep,
|
|
3
|
+
findStepByIdempotencyKey,
|
|
4
|
+
type RunStepRecord,
|
|
5
|
+
} from "./runs-repo.js";
|
|
6
|
+
import {
|
|
7
|
+
beginStepAttempt,
|
|
8
|
+
recordStepFailure,
|
|
9
|
+
recordStepSuccess,
|
|
10
|
+
} from "./run-journal.js";
|
|
11
|
+
|
|
12
|
+
/**
|
|
13
|
+
* Идемпотентное выполнение шага (Sprint 36.3).
|
|
14
|
+
*
|
|
15
|
+
* Ключ идемпотентности уникален в пределах запуска (частичный UNIQUE-индекс
|
|
16
|
+
* `idx_run_steps_key_unique`). Повторный вызов с тем же ключом не выполняет
|
|
17
|
+
* тело шага второй раз: возвращается сохранённый `output_json` с
|
|
18
|
+
* `replayed: true`. Это защищает от дублей побочных эффектов при ретраях,
|
|
19
|
+
* resume и параллельных вызовах.
|
|
20
|
+
*/
|
|
21
|
+
|
|
22
|
+
/** Ключ уже занят другим шагом запуска. */
|
|
23
|
+
export class IdempotencyConflictError extends Error {
|
|
24
|
+
constructor(runId: string, key: string, stepName?: string) {
|
|
25
|
+
super(
|
|
26
|
+
stepName
|
|
27
|
+
? `Ключ идемпотентности "${key}" в запуске ${runId} уже принадлежит шагу "${stepName}".`
|
|
28
|
+
: `Ключ идемпотентности "${key}" в запуске ${runId} уже используется.`,
|
|
29
|
+
);
|
|
30
|
+
this.name = "IdempotencyConflictError";
|
|
31
|
+
}
|
|
32
|
+
}
|
|
33
|
+
|
|
34
|
+
/** Шаг с этим ключом выполняется прямо сейчас (параллельный дубль). */
|
|
35
|
+
export class StepInFlightError extends Error {
|
|
36
|
+
constructor(runId: string, key: string) {
|
|
37
|
+
super(`Шаг с ключом идемпотентности "${key}" уже выполняется в запуске ${runId}.`);
|
|
38
|
+
this.name = "StepInFlightError";
|
|
39
|
+
}
|
|
40
|
+
}
|
|
41
|
+
|
|
42
|
+
/** Опции идемпотентного шага. */
|
|
43
|
+
export interface StepOnceOptions {
|
|
44
|
+
/** Обязательный ключ; уникален в пределах запуска. */
|
|
45
|
+
idempotencyKey: string;
|
|
46
|
+
/** Начать запуск, если он pending (по умолчанию true). */
|
|
47
|
+
startRun?: boolean;
|
|
48
|
+
}
|
|
49
|
+
|
|
50
|
+
/** Результат `runStepOnce`. */
|
|
51
|
+
export interface StepOnceExecution<T> {
|
|
52
|
+
/** Актуальное состояние шага. */
|
|
53
|
+
step: RunStepRecord;
|
|
54
|
+
/** Результат тела либо сохранённый output при повторе. */
|
|
55
|
+
result: T | null;
|
|
56
|
+
/** true — тело не вызывалось, результат взят из БД. */
|
|
57
|
+
replayed: boolean;
|
|
58
|
+
/** true — тело шага действительно выполнялось. */
|
|
59
|
+
executed: boolean;
|
|
60
|
+
/** Номер попытки, с которым шаг выполнен (или был выполнен раньше). */
|
|
61
|
+
attempt: number;
|
|
62
|
+
}
|
|
63
|
+
|
|
64
|
+
/** Ключи, выполняющиеся в этом процессе: `runId\u0000key`. */
|
|
65
|
+
const inFlight = new Set<string>();
|
|
66
|
+
|
|
67
|
+
function normalizeKey(key: string): string {
|
|
68
|
+
const value = String(key ?? "").trim();
|
|
69
|
+
if (!value) throw new Error("idempotencyKey обязателен для идемпотентного шага.");
|
|
70
|
+
return value;
|
|
71
|
+
}
|
|
72
|
+
|
|
73
|
+
function flightKey(runId: string, key: string): string {
|
|
74
|
+
return `${runId}\u0000${key}`;
|
|
75
|
+
}
|
|
76
|
+
|
|
77
|
+
/**
|
|
78
|
+
* Выполняет шаг ровно один раз на ключ.
|
|
79
|
+
*
|
|
80
|
+
* - новый ключ → шаг создаётся и выполняется;
|
|
81
|
+
* - шаг уже `passed`/`skipped` → тело не вызывается, возвращается кэш;
|
|
82
|
+
* - шаг `failed` → повтор с `attempt + 1` (осознанный ретрай);
|
|
83
|
+
* - шаг `running` или параллельный вызов в этом процессе → `StepInFlightError`;
|
|
84
|
+
* - ключ принадлежит другому шагу → `IdempotencyConflictError`.
|
|
85
|
+
*/
|
|
86
|
+
export function runStepOnce<T>(
|
|
87
|
+
runId: string,
|
|
88
|
+
stepName: string,
|
|
89
|
+
options: StepOnceOptions,
|
|
90
|
+
body: () => T,
|
|
91
|
+
): StepOnceExecution<T> {
|
|
92
|
+
const key = normalizeKey(options.idempotencyKey);
|
|
93
|
+
const flight = flightKey(runId, key);
|
|
94
|
+
if (inFlight.has(flight)) throw new StepInFlightError(runId, key);
|
|
95
|
+
inFlight.add(flight);
|
|
96
|
+
|
|
97
|
+
try {
|
|
98
|
+
const existing = findStepByIdempotencyKey(runId, key);
|
|
99
|
+
if (existing && existing.stepName !== stepName) {
|
|
100
|
+
throw new IdempotencyConflictError(runId, key, existing.stepName);
|
|
101
|
+
}
|
|
102
|
+
if (existing && (existing.status === "passed" || existing.status === "skipped")) {
|
|
103
|
+
return {
|
|
104
|
+
step: existing,
|
|
105
|
+
result: (existing.output as T | null) ?? null,
|
|
106
|
+
replayed: true,
|
|
107
|
+
executed: false,
|
|
108
|
+
attempt: existing.attempt,
|
|
109
|
+
};
|
|
110
|
+
}
|
|
111
|
+
if (existing && existing.status === "running") {
|
|
112
|
+
throw new StepInFlightError(runId, key);
|
|
113
|
+
}
|
|
114
|
+
if (!existing) {
|
|
115
|
+
createStep(runId, { stepName, idempotencyKey: key });
|
|
116
|
+
}
|
|
117
|
+
|
|
118
|
+
const attempt = beginStepAttempt(runId, stepName, {
|
|
119
|
+
startRun: options.startRun,
|
|
120
|
+
}).attempt;
|
|
121
|
+
|
|
122
|
+
let result: T;
|
|
123
|
+
try {
|
|
124
|
+
result = body();
|
|
125
|
+
} catch (err) {
|
|
126
|
+
recordStepFailure(runId, stepName, err);
|
|
127
|
+
throw err;
|
|
128
|
+
}
|
|
129
|
+
const step = recordStepSuccess(runId, stepName, result);
|
|
130
|
+
return { step, result, replayed: false, executed: true, attempt };
|
|
131
|
+
} finally {
|
|
132
|
+
inFlight.delete(flight);
|
|
133
|
+
}
|
|
134
|
+
}
|
|
135
|
+
|
|
136
|
+
/** Асинхронный вариант `runStepOnce` для шагов с I/O. */
|
|
137
|
+
export async function runStepOnceAsync<T>(
|
|
138
|
+
runId: string,
|
|
139
|
+
stepName: string,
|
|
140
|
+
options: StepOnceOptions,
|
|
141
|
+
body: () => Promise<T> | T,
|
|
142
|
+
): Promise<StepOnceExecution<T>> {
|
|
143
|
+
const key = normalizeKey(options.idempotencyKey);
|
|
144
|
+
const flight = flightKey(runId, key);
|
|
145
|
+
if (inFlight.has(flight)) throw new StepInFlightError(runId, key);
|
|
146
|
+
inFlight.add(flight);
|
|
147
|
+
|
|
148
|
+
try {
|
|
149
|
+
const existing = findStepByIdempotencyKey(runId, key);
|
|
150
|
+
if (existing && existing.stepName !== stepName) {
|
|
151
|
+
throw new IdempotencyConflictError(runId, key, existing.stepName);
|
|
152
|
+
}
|
|
153
|
+
if (existing && (existing.status === "passed" || existing.status === "skipped")) {
|
|
154
|
+
return {
|
|
155
|
+
step: existing,
|
|
156
|
+
result: (existing.output as T | null) ?? null,
|
|
157
|
+
replayed: true,
|
|
158
|
+
executed: false,
|
|
159
|
+
attempt: existing.attempt,
|
|
160
|
+
};
|
|
161
|
+
}
|
|
162
|
+
if (existing && existing.status === "running") {
|
|
163
|
+
throw new StepInFlightError(runId, key);
|
|
164
|
+
}
|
|
165
|
+
if (!existing) {
|
|
166
|
+
createStep(runId, { stepName, idempotencyKey: key });
|
|
167
|
+
}
|
|
168
|
+
|
|
169
|
+
const attempt = beginStepAttempt(runId, stepName, {
|
|
170
|
+
startRun: options.startRun,
|
|
171
|
+
}).attempt;
|
|
172
|
+
|
|
173
|
+
let result: T;
|
|
174
|
+
try {
|
|
175
|
+
result = await body();
|
|
176
|
+
} catch (err) {
|
|
177
|
+
recordStepFailure(runId, stepName, err);
|
|
178
|
+
throw err;
|
|
179
|
+
}
|
|
180
|
+
const step = recordStepSuccess(runId, stepName, result);
|
|
181
|
+
return { step, result, replayed: false, executed: true, attempt };
|
|
182
|
+
} finally {
|
|
183
|
+
inFlight.delete(flight);
|
|
184
|
+
}
|
|
185
|
+
}
|