agent-steward 0.0.4 → 0.0.6
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 +309 -2
- package/CROSS_PLATFORM.md +19 -0
- package/README.md +55 -8
- package/ROADMAP-STRATEGY.md +22 -19
- package/ROADMAP.md +230 -159
- package/dist/cli.d.ts +3 -0
- package/dist/cli.d.ts.map +1 -0
- package/dist/cli.js +356 -0
- package/dist/core/analytics.d.ts +6 -0
- package/dist/core/analytics.d.ts.map +1 -1
- package/dist/core/analytics.js +20 -3
- package/dist/core/audit.d.ts +6 -0
- package/dist/core/audit.d.ts.map +1 -1
- package/dist/core/audit.js +24 -0
- package/dist/core/budget.d.ts +118 -0
- package/dist/core/budget.d.ts.map +1 -0
- package/dist/core/budget.js +206 -0
- package/dist/core/cron-to-schtasks.d.ts.map +1 -1
- package/dist/core/cron-to-schtasks.js +38 -0
- package/dist/core/dry-run.d.ts +26 -1
- package/dist/core/dry-run.d.ts.map +1 -1
- package/dist/core/dry-run.js +199 -8
- 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/feedback.d.ts +192 -0
- package/dist/core/feedback.d.ts.map +1 -0
- package/dist/core/feedback.js +426 -0
- package/dist/core/gate-integrity.d.ts +71 -0
- package/dist/core/gate-integrity.d.ts.map +1 -0
- package/dist/core/gate-integrity.js +275 -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/local-ai.d.ts.map +1 -1
- package/dist/core/local-ai.js +7 -3
- package/dist/core/lock.d.ts +41 -0
- package/dist/core/lock.d.ts.map +1 -1
- package/dist/core/lock.js +141 -29
- package/dist/core/matrix.d.ts +8 -0
- package/dist/core/matrix.d.ts.map +1 -1
- package/dist/core/matrix.js +132 -17
- package/dist/core/mission.d.ts +103 -0
- package/dist/core/mission.d.ts.map +1 -0
- package/dist/core/mission.js +374 -0
- package/dist/core/opencode-models.d.ts +2 -2
- package/dist/core/opencode-models.d.ts.map +1 -1
- package/dist/core/opencode-models.js +28 -21
- package/dist/core/opencode-usage.d.ts +35 -0
- package/dist/core/opencode-usage.d.ts.map +1 -0
- package/dist/core/opencode-usage.js +132 -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 +78 -0
- package/dist/core/pipeline-map.d.ts +52 -0
- package/dist/core/pipeline-map.d.ts.map +1 -0
- package/dist/core/pipeline-map.js +208 -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 +27 -2
- package/dist/core/ps-wrapper.d.ts.map +1 -1
- package/dist/core/ps-wrapper.js +424 -65
- package/dist/core/record-history.d.ts.map +1 -1
- package/dist/core/record-history.js +206 -33
- package/dist/core/router/rules.d.ts.map +1 -1
- package/dist/core/router/rules.js +6 -0
- package/dist/core/run-mode.d.ts +12 -0
- package/dist/core/run-mode.d.ts.map +1 -0
- package/dist/core/run-mode.js +17 -0
- package/dist/core/scheduler/linux.d.ts +8 -1
- package/dist/core/scheduler/linux.d.ts.map +1 -1
- package/dist/core/scheduler/linux.js +34 -9
- package/dist/core/scheduler/logs.d.ts +4 -0
- package/dist/core/scheduler/logs.d.ts.map +1 -1
- package/dist/core/scheduler/logs.js +25 -1
- 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/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 +18 -8
- package/dist/core/self-analysis.d.ts +32 -2
- package/dist/core/self-analysis.d.ts.map +1 -1
- package/dist/core/self-analysis.js +38 -27
- package/dist/core/shutdown.d.ts +33 -2
- package/dist/core/shutdown.d.ts.map +1 -1
- package/dist/core/shutdown.js +58 -2
- package/dist/core/structured-log.d.ts +37 -1
- package/dist/core/structured-log.d.ts.map +1 -1
- package/dist/core/structured-log.js +37 -0
- package/dist/core/usage-surface.d.ts +25 -0
- package/dist/core/usage-surface.d.ts.map +1 -0
- package/dist/core/usage-surface.js +41 -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 +19 -0
- package/dist/core/wrappers/bash.d.ts.map +1 -1
- package/dist/core/wrappers/bash.js +230 -27
- package/dist/db/capability-repo.d.ts +43 -2
- package/dist/db/capability-repo.d.ts.map +1 -1
- package/dist/db/capability-repo.js +96 -11
- package/dist/db/history-repo.d.ts +70 -5
- package/dist/db/history-repo.d.ts.map +1 -1
- package/dist/db/history-repo.js +170 -29
- package/dist/db/metrics-repo.d.ts +20 -2
- package/dist/db/metrics-repo.d.ts.map +1 -1
- package/dist/db/metrics-repo.js +35 -13
- package/dist/db/migrate.d.ts.map +1 -1
- package/dist/db/migrate.js +37 -17
- package/dist/db/recovery.d.ts +3 -1
- package/dist/db/recovery.d.ts.map +1 -1
- package/dist/db/recovery.js +11 -5
- 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 +5 -0
- package/dist/db/run-resume.d.ts.map +1 -1
- package/dist/db/run-resume.js +9 -2
- package/dist/db/runs-repo.d.ts +19 -2
- package/dist/db/runs-repo.d.ts.map +1 -1
- package/dist/db/runs-repo.js +91 -60
- package/dist/db/schema.d.ts +2 -2
- package/dist/db/schema.d.ts.map +1 -1
- package/dist/db/schema.js +132 -2
- package/dist/db/templates-repo.d.ts +2 -2
- package/dist/db/templates-repo.d.ts.map +1 -1
- package/dist/db/templates-repo.js +5 -3
- package/dist/history.d.ts +7 -2
- package/dist/history.d.ts.map +1 -1
- package/dist/history.js +4 -2
- package/dist/hook-output.d.ts +2 -0
- package/dist/hook-output.d.ts.map +1 -0
- package/dist/hook-output.js +31 -0
- 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 +375 -47
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +1344 -192
- package/dist/notifications.d.ts +53 -2
- package/dist/notifications.d.ts.map +1 -1
- package/dist/notifications.js +168 -21
- package/dist/profiles.d.ts.map +1 -1
- package/dist/profiles.js +82 -10
- package/dist/rpc.d.ts +354 -0
- package/dist/rpc.d.ts.map +1 -1
- package/dist/rpc.js +145 -0
- package/dist/server.d.ts +32 -2
- package/dist/server.d.ts.map +1 -1
- package/dist/server.js +154 -30
- package/dist/settings.d.ts +44 -2
- package/dist/settings.d.ts.map +1 -1
- package/dist/settings.js +85 -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 +21 -0
- package/dist/task-transfer.d.ts.map +1 -1
- package/dist/task-transfer.js +64 -3
- package/dist/templates.d.ts +2 -2
- package/dist/templates.d.ts.map +1 -1
- package/dist/templates.js +3 -3
- package/dist/types.d.ts +22 -2
- package/dist/types.d.ts.map +1 -1
- package/dist/workspaces.d.ts.map +1 -1
- package/dist/workspaces.js +34 -11
- package/docs/ARCHITECTURE.md +319 -66
- package/docs/COMPATIBILITY.md +2 -2
- package/docs/CONCEPT.md +18 -4
- package/docs/CROSS_PLATFORM.ru.md +20 -0
- package/docs/CROSS_PLATFORM.zh.md +18 -0
- package/docs/EXECUTION-LOOP.md +28 -10
- package/docs/FEATURES.md +129 -7
- package/docs/FEATURES.zh.md +97 -6
- package/docs/MIGRATION.md +2 -2
- package/docs/PIPELINE.md +293 -0
- package/docs/QA-A2-GUI-TUI.md +205 -0
- package/docs/README.ru.md +43 -4
- package/docs/README.zh.md +44 -4
- package/docs/SAFETY.md +23 -3
- package/gui-experimental.cjs +9 -8
- package/locales/en.json +58 -3
- package/locales/ru.json +58 -3
- package/locales/zh.json +58 -3
- package/opencode.pipeline.yaml +35 -0
- package/package.json +36 -4
- package/scripts/check-eslint-baseline.mjs +139 -0
- package/scripts/gen-test-plan-counters.mjs +117 -0
- package/scripts/github-ci-fetch.ps1 +37 -0
- package/scripts/pl-commit.ps1 +112 -0
- package/scripts/qa-a2-commit.ps1 +104 -0
- package/scripts/test-home.mjs +107 -0
- package/skills/scheduled-job-best-practices/SKILL.md +95 -1
- package/skills/scheduled-job-best-practices/references/recipes.md +139 -0
- package/src/cli.ts +417 -0
- package/src/core/analytics.ts +27 -4
- package/src/core/audit.ts +25 -0
- package/src/core/budget.ts +340 -0
- package/src/core/cron-to-schtasks.ts +42 -0
- package/src/core/dry-run.ts +235 -12
- package/src/core/execution.ts +538 -0
- package/src/core/feedback.ts +582 -0
- package/src/core/file-watcher.ts +2 -2
- package/src/core/gate-integrity.ts +330 -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/local-ai.ts +7 -3
- package/src/core/lock.ts +178 -37
- package/src/core/matrix.ts +158 -52
- package/src/core/mission.ts +531 -0
- package/src/core/native-notify.ts +1 -1
- package/src/core/opencode-models.ts +30 -21
- package/src/core/opencode-usage.ts +182 -0
- package/src/core/pipeline-apply.ts +158 -0
- package/src/core/pipeline-io.ts +96 -0
- package/src/core/pipeline-map.ts +283 -0
- package/src/core/pipeline-spec.ts +775 -0
- package/src/core/ps-wrapper.ts +435 -66
- package/src/core/record-history.ts +258 -81
- package/src/core/router/rules.ts +6 -0
- package/src/core/run-mode.ts +19 -0
- package/src/core/schedule-gate.ts +1 -1
- package/src/core/scheduler/at-fallback.ts +1 -1
- package/src/core/scheduler/linux.ts +40 -11
- package/src/core/scheduler/logs.ts +34 -3
- package/src/core/scheduler/mac.ts +174 -14
- package/src/core/scheduler/registry.ts +2 -2
- package/src/core/scheduler/windows.ts +19 -15
- package/src/core/secrets.ts +26 -19
- package/src/core/self-analysis.ts +75 -29
- package/src/core/shutdown.ts +90 -4
- package/src/core/structured-log.ts +89 -5
- 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/usage-surface.ts +70 -0
- package/src/core/worktree-run.ts +199 -0
- package/src/core/worktree.ts +600 -0
- package/src/core/wrappers/bash.ts +248 -26
- package/src/db/capability-repo.ts +127 -10
- package/src/db/history-repo.ts +281 -40
- package/src/db/metrics-repo.ts +40 -13
- package/src/db/migrate.ts +57 -32
- package/src/db/recovery.ts +12 -5
- package/src/db/run-journal.ts +100 -13
- package/src/db/run-resume.ts +17 -1
- package/src/db/runs-repo.ts +147 -65
- package/src/db/schema.ts +134 -2
- package/src/db/templates-repo.ts +5 -3
- package/src/gui.tsx +438 -18
- package/src/history.ts +11 -4
- package/src/hook-output.ts +39 -0
- package/src/i18n.ts +12 -4
- package/src/index.ts +1902 -320
- package/src/notifications.ts +227 -47
- package/src/profiles.ts +88 -10
- package/src/rpc.ts +158 -0
- package/src/server.ts +201 -41
- package/src/settings.ts +125 -5
- package/src/shared/jobs-view.ts +3 -1
- package/src/task-transfer.ts +90 -6
- package/src/templates.ts +3 -3
- package/src/types.ts +23 -2
- package/src/workspaces.ts +37 -14
package/dist/db/run-journal.d.ts
CHANGED
|
@@ -9,10 +9,20 @@ import { type RunRecord, type RunStepRecord } from "./runs-repo.js";
|
|
|
9
9
|
*/
|
|
10
10
|
/** Текст ошибки, которым помечается шаг, прерванный падением процесса. */
|
|
11
11
|
export declare const STEP_INTERRUPTED_ERROR = "\u041F\u0440\u0435\u0440\u0432\u0430\u043D\u043E \u043F\u0430\u0434\u0435\u043D\u0438\u0435\u043C \u043F\u0440\u043E\u0446\u0435\u0441\u0441\u0430";
|
|
12
|
+
/**
|
|
13
|
+
* B12: срок lease шага по умолчанию. Живой процесс продлевает lease
|
|
14
|
+
* (heartbeat в `runStepStatefullyAsync` или явный `renewStepLease`), поэтому
|
|
15
|
+
* recovery финализирует шаг только после истечения этого срока.
|
|
16
|
+
*/
|
|
17
|
+
export declare const STEP_LEASE_MS = 60000;
|
|
18
|
+
/** B12: идентификатор текущего процесса — `host:pid:startedAt`. */
|
|
19
|
+
export declare function getStepOwnerId(): string;
|
|
12
20
|
/** Опции начала попытки. */
|
|
13
21
|
export interface BeginStepOptions {
|
|
14
22
|
/** Начать запуск, если он ещё в статусе pending (по умолчанию true). */
|
|
15
23
|
startRun?: boolean;
|
|
24
|
+
/** B12: срок lease в миллисекундах (по умолчанию {@link STEP_LEASE_MS}). */
|
|
25
|
+
leaseMs?: number;
|
|
16
26
|
}
|
|
17
27
|
/** Результат выполнения шага через `runStepStatefully`. */
|
|
18
28
|
export interface StepExecution<T> {
|
|
@@ -33,6 +43,14 @@ export interface StepExecution<T> {
|
|
|
33
43
|
* попытки увеличивается, а не начинается заново.
|
|
34
44
|
*/
|
|
35
45
|
export declare function beginStepAttempt(runId: string, stepName: string, options?: BeginStepOptions): RunStepRecord;
|
|
46
|
+
/**
|
|
47
|
+
* B12: продлевает lease шага текущего процесса.
|
|
48
|
+
*
|
|
49
|
+
* Нужен долгим синхронным шагам: без продления recovery сочтёт шаг
|
|
50
|
+
* осиротевшим после {@link STEP_LEASE_MS}. Возвращает false, если шаг уже
|
|
51
|
+
* не `running`.
|
|
52
|
+
*/
|
|
53
|
+
export declare function renewStepLease(runId: string, stepName: string, leaseMs?: number): boolean;
|
|
36
54
|
/** Закрывает попытку успехом: running → passed, сохраняет output. */
|
|
37
55
|
export declare function recordStepSuccess(runId: string, stepName: string, output?: unknown): RunStepRecord;
|
|
38
56
|
/** Закрывает попытку ошибкой: running → failed, сохраняет текст ошибки. */
|
|
@@ -45,14 +63,24 @@ export declare function recordStepFailure(runId: string, stepName: string, error
|
|
|
45
63
|
export declare function runStepStatefully<T>(runId: string, stepName: string, body: () => T, options?: BeginStepOptions): StepExecution<T>;
|
|
46
64
|
/** Асинхронный вариант `runStepStatefully` для шагов с I/O. */
|
|
47
65
|
export declare function runStepStatefullyAsync<T>(runId: string, stepName: string, body: () => Promise<T> | T, options?: BeginStepOptions): Promise<StepExecution<T>>;
|
|
66
|
+
export interface RecoverStepsOptions {
|
|
67
|
+
/**
|
|
68
|
+
* B12: текущий момент для проверки lease. По умолчанию now; тесты и
|
|
69
|
+
* отложенный recovery передают «будущее», чтобы lease считался истёкшим.
|
|
70
|
+
*/
|
|
71
|
+
now?: string | Date;
|
|
72
|
+
}
|
|
48
73
|
/**
|
|
49
|
-
* Помечает
|
|
74
|
+
* Помечает осиротевшие `running`-шаги как failed, сохраняя `attempt`.
|
|
75
|
+
*
|
|
76
|
+
* B12: шаг финализируется только при отсутствии lease (legacy-строки) или
|
|
77
|
+
* истёкшем `lease_until`. Шаг с живым lease принадлежит работающему процессу
|
|
78
|
+
* и не трогается. Возвращает обновлённые записи.
|
|
50
79
|
*
|
|
51
|
-
*
|
|
52
|
-
*
|
|
53
|
-
* падение процесса и восстановление.
|
|
80
|
+
* `attempt` не сбрасывается — следующая попытка получит `attempt + 1` через
|
|
81
|
+
* `retryStep`, поэтому номер попытки переживает падение процесса и восстановление.
|
|
54
82
|
*/
|
|
55
|
-
export declare function recoverInterruptedSteps(runId?: string): RunStepRecord[];
|
|
83
|
+
export declare function recoverInterruptedSteps(runId?: string, options?: RecoverStepsOptions): RunStepRecord[];
|
|
56
84
|
/** Список шагов в статусе running (для диагностики и восстановления). */
|
|
57
85
|
export declare function listRunningSteps(runId?: string): RunStepRecord[];
|
|
58
86
|
/** Запуск по id либо ошибка (удобно для журнала и тестов). */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run-journal.d.ts","sourceRoot":"","sources":["../../src/db/run-journal.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"run-journal.d.ts","sourceRoot":"","sources":["../../src/db/run-journal.ts"],"names":[],"mappings":"AAEA,OAAO,EASL,KAAK,SAAS,EACd,KAAK,aAAa,EAEnB,MAAM,gBAAgB,CAAC;AAExB;;;;;;;GAOG;AAEH,0EAA0E;AAC1E,eAAO,MAAM,sBAAsB,uJAA+B,CAAC;AAEnE;;;;GAIG;AACH,eAAO,MAAM,aAAa,QAAS,CAAC;AAIpC,mEAAmE;AACnE,wBAAgB,cAAc,IAAI,MAAM,CAKvC;AAED,4BAA4B;AAC5B,MAAM,WAAW,gBAAgB;IAC/B,wEAAwE;IACxE,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,4EAA4E;IAC5E,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,2DAA2D;AAC3D,MAAM,WAAW,aAAa,CAAC,CAAC;IAC9B,uCAAuC;IACvC,IAAI,EAAE,aAAa,CAAC;IACpB,2CAA2C;IAC3C,MAAM,EAAE,CAAC,CAAC;IACV,+CAA+C;IAC/C,OAAO,EAAE,MAAM,CAAC;CACjB;AAWD;;;;;;;;GAQG;AACH,wBAAgB,gBAAgB,CAC9B,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,MAAM,EAChB,OAAO,GAAE,gBAAqB,GAC7B,aAAa,CAef;AAED;;;;;;GAMG;AACH,wBAAgB,cAAc,CAC5B,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,MAAM,EAChB,OAAO,GAAE,MAAsB,GAC9B,OAAO,CAIT;AAUD,qEAAqE;AACrE,wBAAgB,iBAAiB,CAC/B,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,MAAM,EAChB,MAAM,CAAC,EAAE,OAAO,GACf,aAAa,CAGf;AAED,2EAA2E;AAC3E,wBAAgB,iBAAiB,CAC/B,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,OAAO,GACb,aAAa,CAGf;AAED;;;;GAIG;AACH,wBAAgB,iBAAiB,CAAC,CAAC,EACjC,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,MAAM,CAAC,EACb,OAAO,GAAE,gBAAqB,GAC7B,aAAa,CAAC,CAAC,CAAC,CAWlB;AAED,+DAA+D;AAC/D,wBAAsB,sBAAsB,CAAC,CAAC,EAC5C,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,EAC1B,OAAO,GAAE,gBAAqB,GAC7B,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CA4B3B;AAED,MAAM,WAAW,mBAAmB;IAClC;;;OAGG;IACH,GAAG,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACrB;AAED;;;;;;;;;GASG;AACH,wBAAgB,uBAAuB,CACrC,KAAK,CAAC,EAAE,MAAM,EACd,OAAO,GAAE,mBAAwB,GAChC,aAAa,EAAE,CAuBjB;AAED,yEAAyE;AACzE,wBAAgB,gBAAgB,CAAC,KAAK,CAAC,EAAE,MAAM,GAAG,aAAa,EAAE,CAgBhE;AAED,8DAA8D;AAC9D,wBAAgB,UAAU,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,CAInD"}
|
package/dist/db/run-journal.js
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
|
+
import os from "node:os";
|
|
1
2
|
import { getDb, withTransaction } from "./index.js";
|
|
2
|
-
import { finishStep, getRun, getStep, retryStep, startRun, startStep, } from "./runs-repo.js";
|
|
3
|
+
import { finishStep, getRun, getStep, renewStepLease as renewStepLeaseRow, retryStep, startRun, startStep, } from "./runs-repo.js";
|
|
3
4
|
/**
|
|
4
5
|
* Журнал выполнения шагов (Sprint 36.1.b).
|
|
5
6
|
*
|
|
@@ -10,6 +11,20 @@ import { finishStep, getRun, getStep, retryStep, startRun, startStep, } from "./
|
|
|
10
11
|
*/
|
|
11
12
|
/** Текст ошибки, которым помечается шаг, прерванный падением процесса. */
|
|
12
13
|
export const STEP_INTERRUPTED_ERROR = "Прервано падением процесса";
|
|
14
|
+
/**
|
|
15
|
+
* B12: срок lease шага по умолчанию. Живой процесс продлевает lease
|
|
16
|
+
* (heartbeat в `runStepStatefullyAsync` или явный `renewStepLease`), поэтому
|
|
17
|
+
* recovery финализирует шаг только после истечения этого срока.
|
|
18
|
+
*/
|
|
19
|
+
export const STEP_LEASE_MS = 60000;
|
|
20
|
+
let cachedOwnerId = null;
|
|
21
|
+
/** B12: идентификатор текущего процесса — `host:pid:startedAt`. */
|
|
22
|
+
export function getStepOwnerId() {
|
|
23
|
+
if (!cachedOwnerId) {
|
|
24
|
+
cachedOwnerId = `${os.hostname()}:${process.pid}:${nowIso()}`;
|
|
25
|
+
}
|
|
26
|
+
return cachedOwnerId;
|
|
27
|
+
}
|
|
13
28
|
function nowIso() {
|
|
14
29
|
return new Date().toISOString();
|
|
15
30
|
}
|
|
@@ -34,14 +49,35 @@ export function beginStepAttempt(runId, stepName, options = {}) {
|
|
|
34
49
|
startRun(runId);
|
|
35
50
|
}
|
|
36
51
|
const step = requireStep(runId, stepName);
|
|
52
|
+
const lease = buildLease(options.leaseMs);
|
|
37
53
|
if (step.status === "failed") {
|
|
38
|
-
retryStep(step.id);
|
|
54
|
+
retryStep(step.id, undefined, lease);
|
|
39
55
|
}
|
|
40
56
|
else {
|
|
41
|
-
startStep(step.id);
|
|
57
|
+
startStep(step.id, undefined, lease);
|
|
42
58
|
}
|
|
43
59
|
return requireStep(runId, stepName);
|
|
44
60
|
}
|
|
61
|
+
/**
|
|
62
|
+
* B12: продлевает lease шага текущего процесса.
|
|
63
|
+
*
|
|
64
|
+
* Нужен долгим синхронным шагам: без продления recovery сочтёт шаг
|
|
65
|
+
* осиротевшим после {@link STEP_LEASE_MS}. Возвращает false, если шаг уже
|
|
66
|
+
* не `running`.
|
|
67
|
+
*/
|
|
68
|
+
export function renewStepLease(runId, stepName, leaseMs = STEP_LEASE_MS) {
|
|
69
|
+
const step = requireStep(runId, stepName);
|
|
70
|
+
if (step.status !== "running")
|
|
71
|
+
return false;
|
|
72
|
+
return renewStepLeaseRow(step.id, buildLease(leaseMs));
|
|
73
|
+
}
|
|
74
|
+
function buildLease(leaseMs = STEP_LEASE_MS) {
|
|
75
|
+
const duration = Number.isFinite(leaseMs) && leaseMs > 0 ? leaseMs : STEP_LEASE_MS;
|
|
76
|
+
return {
|
|
77
|
+
ownerId: getStepOwnerId(),
|
|
78
|
+
leaseUntil: new Date(Date.now() + duration).toISOString(),
|
|
79
|
+
};
|
|
80
|
+
}
|
|
45
81
|
/** Закрывает попытку успехом: running → passed, сохраняет output. */
|
|
46
82
|
export function recordStepSuccess(runId, stepName, output) {
|
|
47
83
|
completeStep(runId, stepName, "passed", { output });
|
|
@@ -72,37 +108,65 @@ export function runStepStatefully(runId, stepName, body, options = {}) {
|
|
|
72
108
|
}
|
|
73
109
|
/** Асинхронный вариант `runStepStatefully` для шагов с I/O. */
|
|
74
110
|
export async function runStepStatefullyAsync(runId, stepName, body, options = {}) {
|
|
111
|
+
const leaseMs = options.leaseMs ?? STEP_LEASE_MS;
|
|
75
112
|
const attempt = beginStepAttempt(runId, stepName, options).attempt;
|
|
113
|
+
// B12: heartbeat продлевает lease, пока тело шага реально выполняется.
|
|
114
|
+
const timer = setInterval(() => {
|
|
115
|
+
try {
|
|
116
|
+
renewStepLease(runId, stepName, leaseMs);
|
|
117
|
+
}
|
|
118
|
+
catch {
|
|
119
|
+
// Шаг уже финализирован — продлевать нечего.
|
|
120
|
+
}
|
|
121
|
+
}, Math.max(10, Math.floor(leaseMs / 3)));
|
|
122
|
+
timer.unref?.();
|
|
76
123
|
let result;
|
|
77
124
|
try {
|
|
78
|
-
|
|
125
|
+
try {
|
|
126
|
+
result = await body();
|
|
127
|
+
}
|
|
128
|
+
catch (err) {
|
|
129
|
+
recordStepFailure(runId, stepName, err);
|
|
130
|
+
throw err;
|
|
131
|
+
}
|
|
79
132
|
}
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
throw err;
|
|
133
|
+
finally {
|
|
134
|
+
clearInterval(timer);
|
|
83
135
|
}
|
|
84
136
|
const step = recordStepSuccess(runId, stepName, result);
|
|
85
137
|
return { step, result, attempt };
|
|
86
138
|
}
|
|
87
139
|
/**
|
|
88
|
-
* Помечает
|
|
140
|
+
* Помечает осиротевшие `running`-шаги как failed, сохраняя `attempt`.
|
|
141
|
+
*
|
|
142
|
+
* B12: шаг финализируется только при отсутствии lease (legacy-строки) или
|
|
143
|
+
* истёкшем `lease_until`. Шаг с живым lease принадлежит работающему процессу
|
|
144
|
+
* и не трогается. Возвращает обновлённые записи.
|
|
89
145
|
*
|
|
90
|
-
*
|
|
91
|
-
*
|
|
92
|
-
* падение процесса и восстановление.
|
|
146
|
+
* `attempt` не сбрасывается — следующая попытка получит `attempt + 1` через
|
|
147
|
+
* `retryStep`, поэтому номер попытки переживает падение процесса и восстановление.
|
|
93
148
|
*/
|
|
94
|
-
export function recoverInterruptedSteps(runId) {
|
|
149
|
+
export function recoverInterruptedSteps(runId, options = {}) {
|
|
95
150
|
const running = listRunningSteps(runId);
|
|
96
151
|
if (running.length === 0)
|
|
97
152
|
return [];
|
|
153
|
+
const nowMs = options.now ? new Date(options.now).getTime() : Date.now();
|
|
154
|
+
const expired = running.filter((step) => {
|
|
155
|
+
if (!step.leaseUntil)
|
|
156
|
+
return true;
|
|
157
|
+
const until = Date.parse(step.leaseUntil);
|
|
158
|
+
return Number.isNaN(until) || until <= nowMs;
|
|
159
|
+
});
|
|
160
|
+
if (expired.length === 0)
|
|
161
|
+
return [];
|
|
98
162
|
return withTransaction(() => {
|
|
99
163
|
const timestamp = nowIso();
|
|
100
164
|
const update = getDb().prepare(`UPDATE run_steps SET status = 'failed', error = ?, finished_at = ?,
|
|
101
165
|
updated_at = ? WHERE id = ? AND status = 'running'`);
|
|
102
|
-
for (const step of
|
|
166
|
+
for (const step of expired) {
|
|
103
167
|
update.run(STEP_INTERRUPTED_ERROR, timestamp, timestamp, step.id);
|
|
104
168
|
}
|
|
105
|
-
return
|
|
169
|
+
return expired.map((step) => requireStep(step.runId, step.stepName));
|
|
106
170
|
});
|
|
107
171
|
}
|
|
108
172
|
/** Список шагов в статусе running (для диагностики и восстановления). */
|
package/dist/db/run-resume.d.ts
CHANGED
|
@@ -16,6 +16,11 @@ export interface ResumeOptions {
|
|
|
16
16
|
handlers: Record<string, StepHandler>;
|
|
17
17
|
/** Восстанавливать зависшие `running`-шаги перед продолжением (по умолчанию true). */
|
|
18
18
|
recover?: boolean;
|
|
19
|
+
/**
|
|
20
|
+
* B12: момент для проверки lease при восстановлении. По умолчанию now.
|
|
21
|
+
* Передавайте будущее время, чтобы считать lease зависшего шага истёкшим.
|
|
22
|
+
*/
|
|
23
|
+
recoverNow?: string | Date;
|
|
19
24
|
/** Останавливаться на первой ошибке (по умолчанию true). */
|
|
20
25
|
stopOnError?: boolean;
|
|
21
26
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run-resume.d.ts","sourceRoot":"","sources":["../../src/db/run-resume.ts"],"names":[],"mappings":"AAAA,OAAO,EAML,KAAK,SAAS,EACd,KAAK,aAAa,EACnB,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"run-resume.d.ts","sourceRoot":"","sources":["../../src/db/run-resume.ts"],"names":[],"mappings":"AAAA,OAAO,EAML,KAAK,SAAS,EACd,KAAK,aAAa,EACnB,MAAM,gBAAgB,CAAC;AAQxB,OAAO,EAIL,KAAK,WAAW,EACjB,MAAM,kBAAkB,CAAC;AAE1B;;;;;;;GAOG;AAEH,8EAA8E;AAC9E,MAAM,MAAM,WAAW,GAAG,CAAC,IAAI,EAAE,aAAa,EAAE,OAAO,EAAE,WAAW,KAAK,OAAO,CAAC;AAEjF,2BAA2B;AAC3B,MAAM,WAAW,aAAa;IAC5B,+EAA+E;IAC/E,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;IACtC,sFAAsF;IACtF,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB;;;OAGG;IACH,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,4DAA4D;IAC5D,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB;AAED,uCAAuC;AACvC,MAAM,WAAW,YAAY;IAC3B,6CAA6C;IAC7C,GAAG,EAAE,SAAS,CAAC;IACf,iEAAiE;IACjE,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,qEAAqE;IACrE,kBAAkB,EAAE,MAAM,GAAG,IAAI,CAAC;IAClC,oCAAoC;IACpC,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,6CAA6C;IAC7C,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,qEAAqE;IACrE,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,qDAAqD;IACrD,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,kCAAkC;IAClC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;CACtB;AAOD,gFAAgF;AAChF,wBAAgB,cAAc,CAAC,KAAK,EAAE,MAAM,GAAG,aAAa,GAAG,IAAI,CAGlE;AA4CD;;;;GAIG;AACH,wBAAgB,aAAa,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,aAAa,GAAG,YAAY,CA4CjF;AAED,2DAA2D;AAC3D,wBAAsB,SAAS,CAC7B,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,aAAa,GACrB,OAAO,CAAC,YAAY,CAAC,CA4CvB"}
|
package/dist/db/run-resume.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { finishRun, listRunSteps, reopenRun, startRun, } from "./runs-repo.js";
|
|
2
|
-
import { recoverInterruptedSteps, requireRun, runStepStatefully, runStepStatefullyAsync, } from "./run-journal.js";
|
|
2
|
+
import { listRunningSteps, recoverInterruptedSteps, requireRun, runStepStatefully, runStepStatefullyAsync, } from "./run-journal.js";
|
|
3
3
|
import { consumeInjections, consumeOrphanInjections, pendingInjectionsForStep, } from "./run-context.js";
|
|
4
4
|
/** Завершён ли шаг успешно (повторять не нужно). */
|
|
5
5
|
function isStepDone(status) {
|
|
@@ -16,7 +16,14 @@ function prepareResume(runId, options) {
|
|
|
16
16
|
throw new Error(`Запуск отменён, возобновление невозможно: ${runId}`);
|
|
17
17
|
}
|
|
18
18
|
if (options.recover !== false)
|
|
19
|
-
recoverInterruptedSteps(runId);
|
|
19
|
+
recoverInterruptedSteps(runId, { now: options.recoverNow });
|
|
20
|
+
// B12: шаг с живым lease принадлежит работающему процессу. Возобновлять его
|
|
21
|
+
// здесь нельзя — иначе два исполнителя возьмут один шаг.
|
|
22
|
+
const active = listRunningSteps(runId);
|
|
23
|
+
if (active.length > 0) {
|
|
24
|
+
const step = active[0];
|
|
25
|
+
throw new Error(`Шаг ${step.stepName} выполняется другим процессом (lease до ${step.leaseUntil ?? "неизвестно"}); возобновление отложено.`);
|
|
26
|
+
}
|
|
20
27
|
const steps = listRunSteps(runId);
|
|
21
28
|
const startIndex = steps.findIndex((step) => !isStepDone(step.status));
|
|
22
29
|
if (startIndex >= 0) {
|
package/dist/db/runs-repo.d.ts
CHANGED
|
@@ -39,7 +39,12 @@ export interface RunStepRecord {
|
|
|
39
39
|
position: number;
|
|
40
40
|
status: StepStatus;
|
|
41
41
|
attempt: number;
|
|
42
|
+
/** Ключ идемпотентности (36.3); уникален в пределах запуска. */
|
|
42
43
|
idempotencyKey: string | null;
|
|
44
|
+
/** B12: идентификатор процесса-владельца шага (`host:pid:startedAt`). */
|
|
45
|
+
ownerId: string | null;
|
|
46
|
+
/** B12: момент, до которого владелец обязан продлить lease (ISO). */
|
|
47
|
+
leaseUntil: string | null;
|
|
43
48
|
startedAt: string | null;
|
|
44
49
|
finishedAt: string | null;
|
|
45
50
|
error: string | null;
|
|
@@ -71,6 +76,11 @@ export interface FinishOptions {
|
|
|
71
76
|
error?: string | null;
|
|
72
77
|
output?: unknown;
|
|
73
78
|
}
|
|
79
|
+
/** B12: владелец шага и срок его lease. */
|
|
80
|
+
export interface StepLease {
|
|
81
|
+
ownerId: string;
|
|
82
|
+
leaseUntil: string;
|
|
83
|
+
}
|
|
74
84
|
/** Создаёт запуск и (опционально) его шаги одной транзакцией. */
|
|
75
85
|
export declare function createRun(options: CreateRunOptions): RunRecord;
|
|
76
86
|
/** Добавляет шаг в существующий запуск. Имя шага уникально внутри запуска. */
|
|
@@ -107,7 +117,7 @@ export declare function listRunSteps(runId: string): RunStepRecord[];
|
|
|
107
117
|
/** Поиск шага по ключу идемпотентности (36.3) в пределах запуска. */
|
|
108
118
|
export declare function findStepByIdempotencyKey(runId: string, idempotencyKey: string): RunStepRecord | undefined;
|
|
109
119
|
/** pending → running. Возвращает false, если шаг не найден. */
|
|
110
|
-
export declare function startStep(id: string, startedAt?: string): boolean;
|
|
120
|
+
export declare function startStep(id: string, startedAt?: string, lease?: StepLease): boolean;
|
|
111
121
|
/** running → passed/failed; pending → skipped допустим. */
|
|
112
122
|
export declare function finishStep(id: string, status: Extract<StepStatus, "passed" | "failed" | "skipped">, options?: FinishOptions): boolean;
|
|
113
123
|
/**
|
|
@@ -116,7 +126,14 @@ export declare function finishStep(id: string, status: Extract<StepStatus, "pass
|
|
|
116
126
|
* Это единственный переход из финального статуса шага. Предыдущая попытка
|
|
117
127
|
* остаётся видимой в счётчике attempt; для 36.4 (DLQ) здесь появится лимит.
|
|
118
128
|
*/
|
|
119
|
-
export declare function retryStep(id: string, startedAt?: string): boolean;
|
|
129
|
+
export declare function retryStep(id: string, startedAt?: string, lease?: StepLease): boolean;
|
|
130
|
+
/**
|
|
131
|
+
* B12: продлевает lease выполняющегося шага.
|
|
132
|
+
*
|
|
133
|
+
* Возвращает false, если шаг уже не `running` (например, recovery успел
|
|
134
|
+
* финализировать его после истечения lease): продлевать нечего.
|
|
135
|
+
*/
|
|
136
|
+
export declare function renewStepLease(id: string, lease: StepLease): boolean;
|
|
120
137
|
/** Количество шагов запуска (для health/отчётов). */
|
|
121
138
|
export declare function countRunSteps(runId: string): number;
|
|
122
139
|
/** Удаляет запуск; шаги удаляются каскадом (ON DELETE CASCADE). */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runs-repo.d.ts","sourceRoot":"","sources":["../../src/db/runs-repo.ts"],"names":[],"mappings":"AAGA;;;;;;;;;GASG;AAEH,8FAA8F;AAC9F,MAAM,MAAM,SAAS,GAAG,SAAS,GAAG,SAAS,GAAG,QAAQ,GAAG,QAAQ,GAAG,QAAQ,GAAG,WAAW,CAAC;AAE7F,qFAAqF;AACrF,MAAM,MAAM,UAAU,GAAG,SAAS,GAAG,SAAS,GAAG,QAAQ,GAAG,QAAQ,GAAG,SAAS,CAAC;AA8BjF,qBAAa,sBAAuB,SAAQ,KAAK;IAE7C,QAAQ,CAAC,MAAM,EAAE,KAAK,GAAG,MAAM;IAC/B,QAAQ,CAAC,IAAI,EAAE,MAAM;IACrB,QAAQ,CAAC,EAAE,EAAE,MAAM;gBAFV,MAAM,EAAE,KAAK,GAAG,MAAM,EACtB,IAAI,EAAE,MAAM,EACZ,EAAE,EAAE,MAAM;CAKtB;AAED,MAAM,WAAW,SAAS;IACxB,EAAE,EAAE,MAAM,CAAC;IACX,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,SAAS,CAAC;IAClB,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,QAAQ,EAAE,OAAO,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,aAAa;IAC5B,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,oDAAoD;IACpD,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,UAAU,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC;IAChB,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,MAAM,EAAE,OAAO,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,gBAAgB;IAC/B,oEAAoE;IACpE,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,8CAA8C;IAC9C,MAAM,CAAC,EAAE,OAAO,CAAC,SAAS,EAAE,SAAS,GAAG,SAAS,CAAC,CAAC;IACnD,4DAA4D;IAC5D,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,wDAAwD;IACxD,KAAK,CAAC,EAAE,iBAAiB,EAAE,CAAC;CAC7B;AAED,MAAM,WAAW,iBAAiB;IAChC,QAAQ,EAAE,MAAM,CAAC;IACjB,cAAc,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,MAAM,CAAC,EAAE,UAAU,CAAC;IACpB,8CAA8C;IAC9C,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB;AAED,MAAM,WAAW,aAAa;IAC5B,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB;
|
|
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
|
@@ -34,17 +34,49 @@ export class InvalidTransitionError extends Error {
|
|
|
34
34
|
this.name = "InvalidTransitionError";
|
|
35
35
|
}
|
|
36
36
|
}
|
|
37
|
+
function isRecord(value) {
|
|
38
|
+
return typeof value === "object" && value !== null && !Array.isArray(value);
|
|
39
|
+
}
|
|
40
|
+
function isSqliteRow(value) {
|
|
41
|
+
if (!isRecord(value))
|
|
42
|
+
return false;
|
|
43
|
+
return Object.values(value).every((cell) => cell === null ||
|
|
44
|
+
typeof cell === "string" ||
|
|
45
|
+
typeof cell === "number" ||
|
|
46
|
+
typeof cell === "bigint");
|
|
47
|
+
}
|
|
48
|
+
/** Строковое представление ячейки — то же, что давал `String(row.col)` раньше. */
|
|
49
|
+
function asText(cell) {
|
|
50
|
+
if (cell === null)
|
|
51
|
+
return "null";
|
|
52
|
+
return typeof cell === "string" ? cell : String(cell);
|
|
53
|
+
}
|
|
54
|
+
/** Nullable TEXT-колонка: SQL NULL → null, иначе строковое представление. */
|
|
55
|
+
function nullableText(cell) {
|
|
56
|
+
return cell === null ? null : asText(cell);
|
|
57
|
+
}
|
|
58
|
+
/** Одна строка результата или undefined (SELECT ... WHERE id = ?). */
|
|
59
|
+
function queryRow(sql, ...params) {
|
|
60
|
+
const raw = getDb().prepare(sql).get(...params);
|
|
61
|
+
return isSqliteRow(raw) ? raw : undefined;
|
|
62
|
+
}
|
|
63
|
+
/** Все строки результата (SELECT ... с several строками). */
|
|
64
|
+
function queryRows(sql, ...params) {
|
|
65
|
+
const raw = getDb().prepare(sql).all(...params);
|
|
66
|
+
return Array.isArray(raw) ? raw.filter(isSqliteRow) : [];
|
|
67
|
+
}
|
|
37
68
|
function nowIso() {
|
|
38
69
|
return new Date().toISOString();
|
|
39
70
|
}
|
|
71
|
+
/** JSON-колонка хранит текст (результат serializeJson) или SQL NULL. */
|
|
40
72
|
function parseJson(value) {
|
|
41
73
|
if (value == null)
|
|
42
74
|
return null;
|
|
43
75
|
try {
|
|
44
|
-
return JSON.parse(
|
|
76
|
+
return JSON.parse(value);
|
|
45
77
|
}
|
|
46
78
|
catch {
|
|
47
|
-
return
|
|
79
|
+
return value;
|
|
48
80
|
}
|
|
49
81
|
}
|
|
50
82
|
function serializeJson(value) {
|
|
@@ -59,34 +91,38 @@ function serializeJson(value) {
|
|
|
59
91
|
}
|
|
60
92
|
function runRowToRecord(row) {
|
|
61
93
|
return {
|
|
62
|
-
id:
|
|
63
|
-
taskName:
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
94
|
+
id: asText(row.id),
|
|
95
|
+
taskName: asText(row.task_name),
|
|
96
|
+
// Доменное приведение: значения приходят из CHECK-ограниченых наших же записей.
|
|
97
|
+
status: asText(row.status),
|
|
98
|
+
parentRunId: nullableText(row.parent_run_id),
|
|
99
|
+
workspaceId: nullableText(row.workspace_id),
|
|
100
|
+
startedAt: nullableText(row.started_at),
|
|
101
|
+
finishedAt: nullableText(row.finished_at),
|
|
102
|
+
error: nullableText(row.error),
|
|
103
|
+
metadata: parseJson(nullableText(row.metadata_json)),
|
|
104
|
+
createdAt: asText(row.created_at),
|
|
105
|
+
updatedAt: asText(row.updated_at),
|
|
73
106
|
};
|
|
74
107
|
}
|
|
75
108
|
function stepRowToRecord(row) {
|
|
76
109
|
return {
|
|
77
|
-
id:
|
|
78
|
-
runId:
|
|
79
|
-
stepName:
|
|
110
|
+
id: asText(row.id),
|
|
111
|
+
runId: asText(row.run_id),
|
|
112
|
+
stepName: asText(row.step_name),
|
|
80
113
|
position: Number(row.position) || 0,
|
|
81
|
-
|
|
114
|
+
// Доменное приведение: см. комментарий в runRowToRecord.
|
|
115
|
+
status: asText(row.status),
|
|
82
116
|
attempt: Number(row.attempt) || 1,
|
|
83
|
-
idempotencyKey:
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
117
|
+
idempotencyKey: nullableText(row.idempotency_key),
|
|
118
|
+
ownerId: nullableText(row.owner_id),
|
|
119
|
+
leaseUntil: nullableText(row.lease_until),
|
|
120
|
+
startedAt: nullableText(row.started_at),
|
|
121
|
+
finishedAt: nullableText(row.finished_at),
|
|
122
|
+
error: nullableText(row.error),
|
|
123
|
+
output: parseJson(nullableText(row.output_json)),
|
|
124
|
+
createdAt: asText(row.created_at),
|
|
125
|
+
updatedAt: asText(row.updated_at),
|
|
90
126
|
};
|
|
91
127
|
}
|
|
92
128
|
function assertTransition(entity, from, to, allowed) {
|
|
@@ -133,9 +169,7 @@ function insertStepUnsafe(runId, options, timestamp, position) {
|
|
|
133
169
|
}
|
|
134
170
|
/** Следующая позиция шага в цепочке запуска. */
|
|
135
171
|
function nextStepPosition(runId) {
|
|
136
|
-
const row =
|
|
137
|
-
.prepare("SELECT COALESCE(MAX(position), -1) + 1 AS next FROM run_steps WHERE run_id = ?")
|
|
138
|
-
.get(runId);
|
|
172
|
+
const row = queryRow("SELECT COALESCE(MAX(position), -1) + 1 AS next FROM run_steps WHERE run_id = ?", runId);
|
|
139
173
|
return Number(row?.next) || 0;
|
|
140
174
|
}
|
|
141
175
|
/** Добавляет шаг в существующий запуск. Имя шага уникально внутри запуска. */
|
|
@@ -159,23 +193,17 @@ export function createSteps(runId, steps) {
|
|
|
159
193
|
return listRunSteps(runId);
|
|
160
194
|
}
|
|
161
195
|
export function getRun(id) {
|
|
162
|
-
const row =
|
|
196
|
+
const row = queryRow("SELECT * FROM runs WHERE id = ?", id);
|
|
163
197
|
return row ? runRowToRecord(row) : undefined;
|
|
164
198
|
}
|
|
165
199
|
/** Список запусков (новые сверху). Без taskName — по всем задачам. */
|
|
166
200
|
export function listRuns(taskName, limit = 100) {
|
|
167
201
|
const safeLimit = Math.max(1, Math.min(10000, Math.floor(limit) || 1));
|
|
168
202
|
if (taskName) {
|
|
169
|
-
return
|
|
170
|
-
|
|
171
|
-
ORDER BY created_at DESC, id DESC LIMIT ?`)
|
|
172
|
-
.all(taskName, safeLimit)
|
|
173
|
-
.map(runRowToRecord);
|
|
203
|
+
return queryRows(`SELECT * FROM runs WHERE lower(task_name) = lower(?)
|
|
204
|
+
ORDER BY created_at DESC, id DESC LIMIT ?`, taskName, safeLimit).map(runRowToRecord);
|
|
174
205
|
}
|
|
175
|
-
return
|
|
176
|
-
.prepare("SELECT * FROM runs ORDER BY created_at DESC, id DESC LIMIT ?")
|
|
177
|
-
.all(safeLimit)
|
|
178
|
-
.map(runRowToRecord);
|
|
206
|
+
return queryRows("SELECT * FROM runs ORDER BY created_at DESC, id DESC LIMIT ?", safeLimit).map(runRowToRecord);
|
|
179
207
|
}
|
|
180
208
|
/** pending → running. Возвращает false, если запуск не найден. */
|
|
181
209
|
export function startRun(id, startedAt = nowIso()) {
|
|
@@ -243,32 +271,25 @@ export function reopenRun(id, startedAt = nowIso()) {
|
|
|
243
271
|
});
|
|
244
272
|
}
|
|
245
273
|
export function getStepById(id) {
|
|
246
|
-
const row =
|
|
274
|
+
const row = queryRow("SELECT * FROM run_steps WHERE id = ?", id);
|
|
247
275
|
return row ? stepRowToRecord(row) : undefined;
|
|
248
276
|
}
|
|
249
277
|
/** Шаг по имени внутри запуска (имя уникально). */
|
|
250
278
|
export function getStep(runId, stepName) {
|
|
251
|
-
const row =
|
|
252
|
-
.prepare("SELECT * FROM run_steps WHERE run_id = ? AND step_name = ?")
|
|
253
|
-
.get(runId, stepName);
|
|
279
|
+
const row = queryRow("SELECT * FROM run_steps WHERE run_id = ? AND step_name = ?", runId, stepName);
|
|
254
280
|
return row ? stepRowToRecord(row) : undefined;
|
|
255
281
|
}
|
|
256
282
|
/** Все шаги запуска в порядке создания. */
|
|
257
283
|
export function listRunSteps(runId) {
|
|
258
|
-
return
|
|
259
|
-
.prepare("SELECT * FROM run_steps WHERE run_id = ? ORDER BY position ASC, rowid ASC")
|
|
260
|
-
.all(runId)
|
|
261
|
-
.map(stepRowToRecord);
|
|
284
|
+
return queryRows("SELECT * FROM run_steps WHERE run_id = ? ORDER BY position ASC, rowid ASC", runId).map(stepRowToRecord);
|
|
262
285
|
}
|
|
263
286
|
/** Поиск шага по ключу идемпотентности (36.3) в пределах запуска. */
|
|
264
287
|
export function findStepByIdempotencyKey(runId, idempotencyKey) {
|
|
265
|
-
const row =
|
|
266
|
-
.prepare("SELECT * FROM run_steps WHERE run_id = ? AND idempotency_key = ? LIMIT 1")
|
|
267
|
-
.get(runId, idempotencyKey);
|
|
288
|
+
const row = queryRow("SELECT * FROM run_steps WHERE run_id = ? AND idempotency_key = ? LIMIT 1", runId, idempotencyKey);
|
|
268
289
|
return row ? stepRowToRecord(row) : undefined;
|
|
269
290
|
}
|
|
270
291
|
/** pending → running. Возвращает false, если шаг не найден. */
|
|
271
|
-
export function startStep(id, startedAt = nowIso()) {
|
|
292
|
+
export function startStep(id, startedAt = nowIso(), lease) {
|
|
272
293
|
return withTransaction(() => {
|
|
273
294
|
const step = getStepById(id);
|
|
274
295
|
if (!step)
|
|
@@ -276,8 +297,8 @@ export function startStep(id, startedAt = nowIso()) {
|
|
|
276
297
|
assertTransition("step", step.status, "running", STEP_TRANSITIONS[step.status]);
|
|
277
298
|
getDb()
|
|
278
299
|
.prepare(`UPDATE run_steps SET status = 'running', started_at = ?, finished_at = NULL,
|
|
279
|
-
error = NULL, updated_at = ? WHERE id = ?`)
|
|
280
|
-
.run(startedAt, nowIso(), id);
|
|
300
|
+
error = NULL, owner_id = ?, lease_until = ?, updated_at = ? WHERE id = ?`)
|
|
301
|
+
.run(startedAt, lease?.ownerId ?? null, lease?.leaseUntil ?? null, nowIso(), id);
|
|
281
302
|
return true;
|
|
282
303
|
});
|
|
283
304
|
}
|
|
@@ -302,7 +323,7 @@ export function finishStep(id, status, options = {}) {
|
|
|
302
323
|
* Это единственный переход из финального статуса шага. Предыдущая попытка
|
|
303
324
|
* остаётся видимой в счётчике attempt; для 36.4 (DLQ) здесь появится лимит.
|
|
304
325
|
*/
|
|
305
|
-
export function retryStep(id, startedAt = nowIso()) {
|
|
326
|
+
export function retryStep(id, startedAt = nowIso(), lease) {
|
|
306
327
|
return withTransaction(() => {
|
|
307
328
|
const step = getStepById(id);
|
|
308
329
|
if (!step)
|
|
@@ -312,16 +333,28 @@ export function retryStep(id, startedAt = nowIso()) {
|
|
|
312
333
|
}
|
|
313
334
|
getDb()
|
|
314
335
|
.prepare(`UPDATE run_steps SET status = 'running', attempt = attempt + 1,
|
|
315
|
-
started_at = ?, finished_at = NULL, error = NULL,
|
|
316
|
-
|
|
336
|
+
started_at = ?, finished_at = NULL, error = NULL,
|
|
337
|
+
owner_id = ?, lease_until = ?, updated_at = ? WHERE id = ?`)
|
|
338
|
+
.run(startedAt, lease?.ownerId ?? null, lease?.leaseUntil ?? null, nowIso(), id);
|
|
317
339
|
return true;
|
|
318
340
|
});
|
|
319
341
|
}
|
|
342
|
+
/**
|
|
343
|
+
* B12: продлевает lease выполняющегося шага.
|
|
344
|
+
*
|
|
345
|
+
* Возвращает false, если шаг уже не `running` (например, recovery успел
|
|
346
|
+
* финализировать его после истечения lease): продлевать нечего.
|
|
347
|
+
*/
|
|
348
|
+
export function renewStepLease(id, lease) {
|
|
349
|
+
const result = getDb()
|
|
350
|
+
.prepare(`UPDATE run_steps SET owner_id = ?, lease_until = ?, updated_at = ?
|
|
351
|
+
WHERE id = ? AND status = 'running'`)
|
|
352
|
+
.run(lease.ownerId, lease.leaseUntil, nowIso(), id);
|
|
353
|
+
return Number(result.changes) > 0;
|
|
354
|
+
}
|
|
320
355
|
/** Количество шагов запуска (для health/отчётов). */
|
|
321
356
|
export function countRunSteps(runId) {
|
|
322
|
-
const row =
|
|
323
|
-
.prepare("SELECT COUNT(*) AS count FROM run_steps WHERE run_id = ?")
|
|
324
|
-
.get(runId);
|
|
357
|
+
const row = queryRow("SELECT COUNT(*) AS count FROM run_steps WHERE run_id = ?", runId);
|
|
325
358
|
return Number(row?.count) || 0;
|
|
326
359
|
}
|
|
327
360
|
/** Удаляет запуск; шаги удаляются каскадом (ON DELETE CASCADE). */
|
|
@@ -331,9 +364,7 @@ export function deleteRun(id) {
|
|
|
331
364
|
}
|
|
332
365
|
/** Готова ли схема к работе с durable DAG (runs + run_steps). */
|
|
333
366
|
export function isRunStateReady() {
|
|
334
|
-
const rows =
|
|
335
|
-
.prepare("SELECT name FROM sqlite_master WHERE type = 'table' AND name IN ('runs', 'run_steps')")
|
|
336
|
-
.all();
|
|
367
|
+
const rows = queryRows("SELECT name FROM sqlite_master WHERE type = 'table' AND name IN ('runs', 'run_steps')");
|
|
337
368
|
return rows.length === 2;
|
|
338
369
|
}
|
|
339
370
|
/** Терминальный ли статус шага (для resume/cleanup в следующих подзадачах). */
|