agent-steward 0.0.5 → 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 +176 -1
- package/README.md +9 -7
- package/ROADMAP-STRATEGY.md +5 -5
- package/ROADMAP.md +107 -17
- package/dist/cli.js +5 -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/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 +36 -0
- package/dist/core/gate-integrity.d.ts.map +1 -1
- package/dist/core/gate-integrity.js +144 -1
- package/dist/core/local-ai.d.ts.map +1 -1
- package/dist/core/local-ai.js +7 -3
- package/dist/core/matrix.d.ts +8 -0
- package/dist/core/matrix.d.ts.map +1 -1
- package/dist/core/matrix.js +57 -2
- package/dist/core/mission.d.ts +20 -0
- package/dist/core/mission.d.ts.map +1 -1
- package/dist/core/mission.js +45 -5
- 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-io.d.ts +1 -1
- package/dist/core/pipeline-io.d.ts.map +1 -1
- package/dist/core/pipeline-io.js +26 -12
- package/dist/core/pipeline-map.d.ts +6 -0
- package/dist/core/pipeline-map.d.ts.map +1 -1
- package/dist/core/pipeline-map.js +12 -0
- package/dist/core/ps-wrapper.d.ts +10 -2
- package/dist/core/ps-wrapper.d.ts.map +1 -1
- package/dist/core/ps-wrapper.js +176 -5
- package/dist/core/record-history.d.ts.map +1 -1
- package/dist/core/record-history.js +76 -4
- 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/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/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 +30 -0
- 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/wrappers/bash.d.ts +2 -0
- package/dist/core/wrappers/bash.d.ts.map +1 -1
- package/dist/core/wrappers/bash.js +58 -6
- package/dist/db/history-repo.d.ts +32 -0
- package/dist/db/history-repo.d.ts.map +1 -1
- package/dist/db/history-repo.js +85 -7
- 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 +33 -11
- 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 +9 -4
- package/dist/db/runs-repo.d.ts.map +1 -1
- package/dist/db/runs-repo.js +71 -56
- package/dist/db/schema.d.ts +2 -2
- package/dist/db/schema.d.ts.map +1 -1
- package/dist/db/schema.js +70 -1
- 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 +6 -1
- 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/index.d.ts +247 -53
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +999 -211
- package/dist/notifications.d.ts +31 -2
- package/dist/notifications.d.ts.map +1 -1
- package/dist/notifications.js +132 -13
- package/dist/profiles.d.ts.map +1 -1
- package/dist/profiles.js +66 -15
- package/dist/rpc.d.ts +108 -0
- package/dist/rpc.d.ts.map +1 -1
- package/dist/rpc.js +28 -0
- package/dist/server.d.ts +17 -2
- package/dist/server.d.ts.map +1 -1
- package/dist/server.js +77 -12
- package/dist/settings.d.ts +42 -0
- package/dist/settings.d.ts.map +1 -1
- package/dist/settings.js +82 -0
- package/dist/task-transfer.d.ts +5 -0
- package/dist/task-transfer.d.ts.map +1 -1
- package/dist/task-transfer.js +48 -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 +49 -12
- package/docs/COMPATIBILITY.md +2 -2
- package/docs/EXECUTION-LOOP.md +6 -3
- package/docs/FEATURES.md +65 -4
- package/docs/FEATURES.zh.md +45 -2
- package/docs/QA-A2-GUI-TUI.md +205 -0
- package/docs/README.ru.md +3 -3
- package/docs/README.zh.md +2 -2
- package/gui-experimental.cjs +9 -9
- package/locales/en.json +42 -3
- package/locales/ru.json +42 -3
- package/locales/zh.json +42 -3
- package/package.json +15 -2
- 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 +26 -2
- 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 +5 -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 +233 -10
- package/src/core/feedback.ts +582 -0
- package/src/core/gate-integrity.ts +171 -1
- package/src/core/local-ai.ts +7 -3
- package/src/core/matrix.ts +63 -2
- package/src/core/mission.ts +51 -5
- package/src/core/opencode-models.ts +30 -21
- package/src/core/opencode-usage.ts +182 -0
- package/src/core/pipeline-io.ts +28 -11
- package/src/core/pipeline-map.ts +19 -0
- package/src/core/ps-wrapper.ts +173 -4
- package/src/core/record-history.ts +94 -4
- package/src/core/run-mode.ts +19 -0
- package/src/core/scheduler/logs.ts +32 -1
- package/src/core/secrets.ts +18 -11
- package/src/core/self-analysis.ts +75 -29
- package/src/core/shutdown.ts +90 -4
- package/src/core/structured-log.ts +67 -0
- package/src/core/usage-surface.ts +70 -0
- package/src/core/wrappers/bash.ts +60 -5
- package/src/db/history-repo.ts +153 -19
- package/src/db/metrics-repo.ts +38 -11
- package/src/db/migrate.ts +57 -32
- package/src/db/recovery.ts +10 -4
- package/src/db/runs-repo.ts +113 -61
- package/src/db/schema.ts +70 -1
- package/src/db/templates-repo.ts +5 -3
- package/src/gui.tsx +261 -5
- package/src/history.ts +10 -3
- package/src/hook-output.ts +39 -0
- package/src/index.ts +1407 -345
- package/src/notifications.ts +189 -39
- package/src/profiles.ts +72 -16
- package/src/rpc.ts +30 -0
- package/src/server.ts +107 -23
- package/src/settings.ts +120 -0
- package/src/task-transfer.ts +59 -6
- package/src/templates.ts +3 -3
- package/src/types.ts +23 -2
- package/src/workspaces.ts +37 -14
|
@@ -39,7 +39,7 @@ export const BASH_LOCK_PID_FUNCTION = `parse_lock_pid() {
|
|
|
39
39
|
* Если задана модель, вызов превращается в `opencode run --model "<model>" <промпт>`.
|
|
40
40
|
*/
|
|
41
41
|
export function buildBashWrapperScript(options) {
|
|
42
|
-
const { sanitizedName, taskName, promptFile, timeoutSeconds, lockFile, workdir, workspaceName, logFile, recorderFile, qualityGate, model, beforeScript, afterScript, sessionMode, sessionId, sessionFile, oneShotCleanupCommand, allowedTools, deniedTools, policy, legacyShell, scheduleGate, envFile, gateTimeoutSeconds, worktree, worktreeHelper, guards, guardHelper, } = options;
|
|
42
|
+
const { sanitizedName, taskName, promptFile, timeoutSeconds, lockFile, workdir, workspaceName, logFile, recorderFile, qualityGate, model, beforeScript, afterScript, sessionMode, sessionId, sessionFile, oneShotCleanupCommand, allowedTools, deniedTools, policy, legacyShell, scheduleGate, envFile, gateTimeoutSeconds, worktree, worktreeHelper, guards, guardHelper, gateAllowPaths, } = options;
|
|
43
43
|
// G-1.2: фиксируем входы гейта при создании обёртки и передаём путь
|
|
44
44
|
// snapshot'а и помощника проверки в сгенерированный скрипт.
|
|
45
45
|
let gateSnapshot = "";
|
|
@@ -99,6 +99,7 @@ export function buildBashWrapperScript(options) {
|
|
|
99
99
|
// G-1.2: путь к snapshot'у и CLI проверки целостности входов гейта.
|
|
100
100
|
`GATE_SNAPSHOT=${shellQuote(gateSnapshot)}`,
|
|
101
101
|
`GATE_INTEGRITY=${shellQuote(gateIntegrity)}`,
|
|
102
|
+
`GATE_ALLOW_PATHS=${shellQuote(gateAllowPaths ?? "")}`,
|
|
102
103
|
`MODEL=${shellQuote(model ?? "")}`,
|
|
103
104
|
// Спринт 24: режим сессии — "new" (по умолчанию), "reuse" (--session <id>), "last" (--continue).
|
|
104
105
|
`SESSION_MODE=${shellQuote(sessionMode ?? "new")}`,
|
|
@@ -378,6 +379,14 @@ export function buildBashWrapperScript(options) {
|
|
|
378
379
|
"fi",
|
|
379
380
|
'START_EPOCH="$(date +%s)"',
|
|
380
381
|
'STARTED_AT="$(date -u \'+%Y-%m-%dT%H:%M:%SZ\')"',
|
|
382
|
+
// PL-25: снимаем состояние рабочего дерева до запуска ИИ; перед гейтом сверяем.
|
|
383
|
+
'WT_SNAPSHOT=""',
|
|
384
|
+
'if [ -n "$QUALITY_GATE" ] && [ -n "$GATE_SNAPSHOT" ] && [ -n "$GATE_INTEGRITY" ] && [ -n "$WORKDIR" ] && [ -f "$GATE_INTEGRITY" ]; then',
|
|
385
|
+
' WT_SNAPSHOT="${GATE_SNAPSHOT%.json}.worktree.json"',
|
|
386
|
+
' ALLOW_ARGS=""',
|
|
387
|
+
' if [ -n "$GATE_ALLOW_PATHS" ]; then ALLOW_ARGS="--allow $GATE_ALLOW_PATHS"; fi',
|
|
388
|
+
' node "$GATE_INTEGRITY" worktree-snapshot --dir "$WORKDIR" --out "$WT_SNAPSHOT" $ALLOW_ARGS >> "$LOG_FILE" 2>&1 || true',
|
|
389
|
+
"fi",
|
|
381
390
|
"EXIT_CODE=0",
|
|
382
391
|
'ERROR_MESSAGE=""',
|
|
383
392
|
'PRE_FLIGHT_STATUS="skipped"',
|
|
@@ -393,13 +402,37 @@ export function buildBashWrapperScript(options) {
|
|
|
393
402
|
' RUN_ID="$(node "$RECORDER_FILE" --start "$TASK_NAME" "$STARTED_AT" 2>> "$LOG_FILE" | tail -n 1)"',
|
|
394
403
|
"fi",
|
|
395
404
|
"",
|
|
405
|
+
// PL-7.2: отдельный вызов хука с разделением stdout/stderr и structured логом.
|
|
406
|
+
"hook_output() {",
|
|
407
|
+
' local phase="$1" code="$2" out="$3" err="$4" helper',
|
|
408
|
+
' if [ -z "$RECORDER_FILE" ] || ! command -v node >/dev/null 2>&1; then',
|
|
409
|
+
" return 0",
|
|
410
|
+
" fi",
|
|
411
|
+
' helper="$(dirname "$RECORDER_FILE")/hook-output.js"',
|
|
412
|
+
' [ -f "$helper" ] || return 0',
|
|
413
|
+
' node "$helper" "$phase" "$TASK_NAME" "$code" "$out" "$err" "${RUN_ID:-}" >> "$LOG_FILE" 2>&1 || true',
|
|
414
|
+
"}",
|
|
415
|
+
"run_hook_captured() {",
|
|
416
|
+
' local phase="$1" command="$2" out err code',
|
|
417
|
+
' out="$(mktemp)"',
|
|
418
|
+
' err="$(mktemp)"',
|
|
419
|
+
' run_with_timeout "$GATE_TIMEOUT_SECONDS" bash -c "$command" >"$out" 2>"$err"',
|
|
420
|
+
" code=$?",
|
|
421
|
+
' cat "$out" >> "$LOG_FILE"',
|
|
422
|
+
' cat "$err" >> "$LOG_FILE"',
|
|
423
|
+
' hook_output "$phase" "$code" "$out" "$err"',
|
|
424
|
+
' rm -f "$out" "$err"',
|
|
425
|
+
" return $code",
|
|
426
|
+
"}",
|
|
427
|
+
"",
|
|
396
428
|
"# Pre-flight: выполняется до основной задачи. Ненулевой код отменяет запуск.",
|
|
397
429
|
'if [ -n "$BEFORE_SCRIPT" ]; then',
|
|
398
430
|
' log "[scheduler] Pre-flight: $BEFORE_SCRIPT"',
|
|
399
|
-
'
|
|
431
|
+
' run_hook_captured "preFlight" "$BEFORE_SCRIPT"',
|
|
400
432
|
" PRE_CODE=$?",
|
|
401
433
|
' if [ "$PRE_CODE" -ne 0 ]; then',
|
|
402
|
-
|
|
434
|
+
" # PL-6.1: last command in a hook defines the exit code — add explicit exit 0.",
|
|
435
|
+
' log "[scheduler] ОШИБКА: Pre-flight script failed (код $PRE_CODE). Завершите хук явным exit 0 (например: rm -f \"$path\" || true; exit 0)."',
|
|
403
436
|
' PRE_FLIGHT_STATUS="error"',
|
|
404
437
|
' ERROR_MESSAGE="Pre-flight script failed"',
|
|
405
438
|
" EXIT_CODE=1",
|
|
@@ -412,12 +445,20 @@ export function buildBashWrapperScript(options) {
|
|
|
412
445
|
"",
|
|
413
446
|
'if [ "$SKIP_MAIN" -eq 0 ]; then',
|
|
414
447
|
"",
|
|
448
|
+
// QA-P0.2: маркер границы реального прогона. Пишется без префикса времени,
|
|
449
|
+
// чтобы extractLastRunLog() смог отсечь вывод предыдущих запусков и
|
|
450
|
+
// подготовительные записи. До этой точки запуск мог быть отменён guard-ом
|
|
451
|
+
// или pre-flight, поэтому маркер нельзя ставить раньше.
|
|
452
|
+
'printf \'[agent-steward] === Run started %s (%s) ===\\n\' "$(date -u \'+%Y-%m-%dT%H:%M:%SZ\')" "$TASK_NAME" >> "$LOG_FILE" 2>/dev/null || true',
|
|
453
|
+
"",
|
|
415
454
|
"# Модель указывается только если задана — иначе OpenCode берёт свою по умолчанию.",
|
|
416
455
|
"# exec важен: в фоновом режиме он заменяет подоболочку процессом opencode,",
|
|
417
456
|
"# поэтому $! — это PID самого opencode, и watchdog убивает именно его.",
|
|
418
457
|
"# Ветвление вместо массива: bash 3.2 (macOS) с set -u падает на пустом",
|
|
419
458
|
'# "${ARR[@]}".',
|
|
420
459
|
"run_opencode() {",
|
|
460
|
+
" # QV-8: дочерний opencode run не загружает инструменты планировщика.",
|
|
461
|
+
" export AGENT_STEWARD_CHILD_RUN=1",
|
|
421
462
|
' if [ "$SESSION_MODE" = "reuse" ]; then',
|
|
422
463
|
' if [ -n "$SESSION_FILE" ] && [ -f "$SESSION_FILE" ]; then',
|
|
423
464
|
' SESSION_ID="$(head -n 1 "$SESSION_FILE" 2>/dev/null | tr -d "\\r")"',
|
|
@@ -504,6 +545,7 @@ export function buildBashWrapperScript(options) {
|
|
|
504
545
|
'if [ -n "$QUALITY_GATE" ] && [ "$EXIT_CODE" -eq 0 ]; then',
|
|
505
546
|
// G-1.2: сверяем входы гейта со snapshot'ом, снятым при создании задачи.
|
|
506
547
|
" GATE_INTEGRITY_OK=1",
|
|
548
|
+
" WORKTREE_FAIL=0",
|
|
507
549
|
' if [ -n "$GATE_SNAPSHOT" ] && [ -n "$GATE_INTEGRITY" ] && [ -f "$GATE_SNAPSHOT" ] && [ -f "$GATE_INTEGRITY" ]; then',
|
|
508
550
|
' node "$GATE_INTEGRITY" verify --snapshot "$GATE_SNAPSHOT" --gate-command "$QUALITY_GATE" --prompt-file "$PROMPT_FILE" --timeout "$GATE_TIMEOUT_SECONDS" >> "$LOG_FILE" 2>&1',
|
|
509
551
|
" VERIFY_CODE=$?",
|
|
@@ -511,9 +553,19 @@ export function buildBashWrapperScript(options) {
|
|
|
511
553
|
" else",
|
|
512
554
|
" GATE_INTEGRITY_OK=0",
|
|
513
555
|
" fi",
|
|
556
|
+
' if [ "$GATE_INTEGRITY_OK" -eq 1 ] && [ -n "$WT_SNAPSHOT" ] && [ -f "$WT_SNAPSHOT" ] && [ -n "$WORKDIR" ]; then',
|
|
557
|
+
' node "$GATE_INTEGRITY" worktree-verify --dir "$WORKDIR" --snapshot "$WT_SNAPSHOT" $ALLOW_ARGS >> "$LOG_FILE" 2>&1',
|
|
558
|
+
" WT_CODE=$?",
|
|
559
|
+
' if [ "$WT_CODE" -ne 0 ]; then GATE_INTEGRITY_OK=0; WORKTREE_FAIL=1; fi',
|
|
560
|
+
" fi",
|
|
514
561
|
' if [ "$GATE_INTEGRITY_OK" -eq 0 ]; then',
|
|
515
|
-
'
|
|
516
|
-
'
|
|
562
|
+
' if [ "$WORKTREE_FAIL" -eq 1 ]; then',
|
|
563
|
+
' log "[scheduler] ОШИБКА: рабочее дерево изменилось во время прогона — гейт не доверяем."',
|
|
564
|
+
' ERROR_MESSAGE="Quality Gate: рабочее дерево изменилось во время прогона"',
|
|
565
|
+
" else",
|
|
566
|
+
' log "[scheduler] ОШИБКА: целостность входов Quality Gate нарушена (snapshot mismatch)."',
|
|
567
|
+
' ERROR_MESSAGE="Quality Gate: целостность входов нарушена (snapshot mismatch)"',
|
|
568
|
+
" fi",
|
|
517
569
|
" EXIT_CODE=1",
|
|
518
570
|
" else",
|
|
519
571
|
' log "[scheduler] Запуск Quality Gate: $QUALITY_GATE"',
|
|
@@ -534,7 +586,7 @@ export function buildBashWrapperScript(options) {
|
|
|
534
586
|
"# Post-flight: выполняется ВСЕГДА, даже если основная задача упала.",
|
|
535
587
|
'if [ -n "$AFTER_SCRIPT" ]; then',
|
|
536
588
|
' log "[scheduler] Post-flight: $AFTER_SCRIPT"',
|
|
537
|
-
'
|
|
589
|
+
' run_hook_captured "postFlight" "$AFTER_SCRIPT"',
|
|
538
590
|
" POST_CODE=$?",
|
|
539
591
|
' if [ "$POST_CODE" -ne 0 ]; then',
|
|
540
592
|
' log "[scheduler] ОШИБКА: Post-flight script failed (код $POST_CODE)."',
|
|
@@ -7,6 +7,13 @@ import type { TaskStatus } from "../history.js";
|
|
|
7
7
|
* в crash recovery.
|
|
8
8
|
*/
|
|
9
9
|
export type HistoryStatus = TaskStatus | "running";
|
|
10
|
+
/**
|
|
11
|
+
* QA-P1.5: прочерк и пустая строка — не текст ошибки, а маркер «нет данных».
|
|
12
|
+
* PowerShell-обёртка исторически передавала "-" для успешных запусков, и он
|
|
13
|
+
* попадал в history и структурированные логи как сообщение об ошибке.
|
|
14
|
+
* Нормализуем и при записи, и при чтении (легаси-записи уже есть в БД).
|
|
15
|
+
*/
|
|
16
|
+
export declare function normalizeErrorText(error: string | null | undefined): string | null;
|
|
10
17
|
export interface StoredHistoryRecord {
|
|
11
18
|
id?: number;
|
|
12
19
|
taskName: string;
|
|
@@ -64,6 +71,15 @@ export declare function finishRun(id: number, status: TaskStatus, durationMs: nu
|
|
|
64
71
|
export declare function recordRun(taskName: string, status: TaskStatus, startedAt: string, durationMs: number, error?: string | null, nextTask?: string | null, tokens?: number, costUsd?: number, model?: string, preFlightStatus?: "success" | "error" | "skipped", postFlightStatus?: "success" | "error" | "skipped", finishedAt?: string, workspaceId?: string | null, allowedTools?: string[] | null, deniedTools?: string[] | null): number;
|
|
65
72
|
/** История запусков (новые сверху). Без taskName — по всем задачам. */
|
|
66
73
|
export declare function getHistory(taskName?: string | null, limit?: number, status?: string | null): StoredHistoryRecord[];
|
|
74
|
+
/**
|
|
75
|
+
* История для проверки бюджетов: записи, учётный момент которых
|
|
76
|
+
* (`finished_at`, при отсутствии `started_at`) не раньше `periodStart`.
|
|
77
|
+
*
|
|
78
|
+
* В отличие от `getHistorySince()` учитывает запуски, начатые в предыдущем
|
|
79
|
+
* периоде, но завершённые в текущем — именно по ним считается расход в
|
|
80
|
+
* `src/core/budget.ts`. Лимит 100000 совпадает с максимумом `getHistory`.
|
|
81
|
+
*/
|
|
82
|
+
export declare function getHistoryForBudget(periodStart: string, limit?: number): StoredHistoryRecord[];
|
|
67
83
|
/**
|
|
68
84
|
* Последняя запись по каждой задаче (P2-29).
|
|
69
85
|
*
|
|
@@ -72,6 +88,14 @@ export declare function getHistory(taskName?: string | null, limit?: number, sta
|
|
|
72
88
|
* Здесь SQL сам выбирает по одной самой свежей записи на задачу.
|
|
73
89
|
*/
|
|
74
90
|
export declare function getLatestHistoryByTask(limit?: number): StoredHistoryRecord[];
|
|
91
|
+
/**
|
|
92
|
+
* История для аналитики за окно `days` дней: все запуски, которые могут
|
|
93
|
+
* попасть в период по времени начала. Окно на один день шире запрашиваемого,
|
|
94
|
+
* чтобы полностью покрыть самый ранний UTC-день (buildAnalytics всё равно
|
|
95
|
+
* отфильтрует лишнее по дате). Лимит 100000 снимает потолок в 20000 записей,
|
|
96
|
+
* из-за которого отчёты за 365 дней молча недосчитывали запуски и расход.
|
|
97
|
+
*/
|
|
98
|
+
export declare function getHistoryForAnalytics(days: number, now?: Date, includeInternal?: boolean): StoredHistoryRecord[];
|
|
75
99
|
/** История запусков, начатых не раньше timestamp (ISO-строка). */
|
|
76
100
|
export declare function getHistorySince(timestamp: string, limit?: number): StoredHistoryRecord[];
|
|
77
101
|
/**
|
|
@@ -97,6 +121,14 @@ export interface RecoverInterruptedOptions {
|
|
|
97
121
|
now?: Date;
|
|
98
122
|
/** Порог возраста для записей с непроверяемым владельцем. */
|
|
99
123
|
maxUnverifiableAgeMs?: number;
|
|
124
|
+
/**
|
|
125
|
+
* PL-46: порог, после которого запись живого владельца считается
|
|
126
|
+
* «зависшей» (например, процесс убит через schtasks /End) и финализируется
|
|
127
|
+
* как timeout. 0 отключает проверку. По умолчанию 0 — прямой вызов
|
|
128
|
+
* recoverInterrupted() сохраняет crash-recovery-поведение; порог задаёт
|
|
129
|
+
* recoverInterruptedRuns() (см. db/recovery.ts).
|
|
130
|
+
*/
|
|
131
|
+
staleAfterMs?: number;
|
|
100
132
|
/** Имя текущего хоста (для тестов). */
|
|
101
133
|
hostname?: string;
|
|
102
134
|
/** Проверка живости PID (для тестов). */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"history-repo.d.ts","sourceRoot":"","sources":["../../src/db/history-repo.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAEhD;;;;;;GAMG;AAEH,MAAM,MAAM,aAAa,GAAG,UAAU,GAAG,SAAS,CAAC;AAEnD,MAAM,WAAW,mBAAmB;IAClC,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,aAAa,CAAC;IACtB,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,eAAe,CAAC,EAAE,SAAS,GAAG,OAAO,GAAG,SAAS,CAAC;IAClD,gBAAgB,CAAC,EAAE,SAAS,GAAG,OAAO,GAAG,SAAS,CAAC;IACnD,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,YAAY,CAAC,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;IAC/B,WAAW,CAAC,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;IAC9B,kDAAkD;IAClD,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,cAAc,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CAChC;AAED,8DAA8D;AAC9D,MAAM,WAAW,SAAS;IACxB,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,UAAU,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,eAAe,CAAC,EAAE,SAAS,GAAG,OAAO,GAAG,SAAS,CAAC;IAClD,gBAAgB,CAAC,EAAE,SAAS,GAAG,OAAO,GAAG,SAAS,CAAC;IACnD,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;
|
|
1
|
+
{"version":3,"file":"history-repo.d.ts","sourceRoot":"","sources":["../../src/db/history-repo.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAEhD;;;;;;GAMG;AAEH,MAAM,MAAM,aAAa,GAAG,UAAU,GAAG,SAAS,CAAC;AAEnD;;;;;GAKG;AACH,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,GAAG,MAAM,GAAG,IAAI,CAIlF;AAED,MAAM,WAAW,mBAAmB;IAClC,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,aAAa,CAAC;IACtB,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,eAAe,CAAC,EAAE,SAAS,GAAG,OAAO,GAAG,SAAS,CAAC;IAClD,gBAAgB,CAAC,EAAE,SAAS,GAAG,OAAO,GAAG,SAAS,CAAC;IACnD,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,YAAY,CAAC,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;IAC/B,WAAW,CAAC,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;IAC9B,kDAAkD;IAClD,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,cAAc,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CAChC;AAED,8DAA8D;AAC9D,MAAM,WAAW,SAAS;IACxB,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,UAAU,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,eAAe,CAAC,EAAE,SAAS,GAAG,OAAO,GAAG,SAAS,CAAC;IAClD,gBAAgB,CAAC,EAAE,SAAS,GAAG,OAAO,GAAG,SAAS,CAAC;IACnD,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AA8ED,sFAAsF;AACtF,wBAAgB,aAAa,CAAC,MAAM,EAAE,mBAAmB,GAAG,MAAM,CAwBjE;AAED,6EAA6E;AAC7E,wBAAgB,QAAQ,CACtB,QAAQ,EAAE,MAAM,EAChB,SAAS,SAA2B,EACpC,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,EAC3B,YAAY,CAAC,EAAE,MAAM,EAAE,GAAG,IAAI,EAC9B,WAAW,CAAC,EAAE,MAAM,EAAE,GAAG,IAAI,EAC7B,KAAK,CAAC,EAAE;IAAE,GAAG,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,GAC/E,MAAM,CAuBR;AAED;;;GAGG;AACH,wBAAgB,SAAS,CACvB,EAAE,EAAE,MAAM,EACV,MAAM,EAAE,UAAU,EAClB,UAAU,EAAE,MAAM,EAClB,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,EACrB,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,EACxB,MAAM,CAAC,EAAE,MAAM,EACf,OAAO,CAAC,EAAE,MAAM,EAChB,KAAK,CAAC,EAAE,MAAM,EACd,eAAe,CAAC,EAAE,SAAS,GAAG,OAAO,GAAG,SAAS,EACjD,gBAAgB,CAAC,EAAE,SAAS,GAAG,OAAO,GAAG,SAAS,GACjD,OAAO,CAmET;AAED;;;GAGG;AACH,wBAAgB,SAAS,CACvB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,UAAU,EAClB,SAAS,EAAE,MAAM,EACjB,UAAU,EAAE,MAAM,EAClB,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,EACrB,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,EACxB,MAAM,CAAC,EAAE,MAAM,EACf,OAAO,CAAC,EAAE,MAAM,EAChB,KAAK,CAAC,EAAE,MAAM,EACd,eAAe,CAAC,EAAE,SAAS,GAAG,OAAO,GAAG,SAAS,EACjD,gBAAgB,CAAC,EAAE,SAAS,GAAG,OAAO,GAAG,SAAS,EAClD,UAAU,SAA2B,EACrC,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,EAC3B,YAAY,CAAC,EAAE,MAAM,EAAE,GAAG,IAAI,EAC9B,WAAW,CAAC,EAAE,MAAM,EAAE,GAAG,IAAI,GAC5B,MAAM,CAiDR;AAED,uEAAuE;AACvE,wBAAgB,UAAU,CACxB,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,EACxB,KAAK,SAAM,EACX,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,GACrB,mBAAmB,EAAE,CAkCvB;AAED;;;;;;;GAOG;AACH,wBAAgB,mBAAmB,CACjC,WAAW,EAAE,MAAM,EACnB,KAAK,SAAS,GACb,mBAAmB,EAAE,CAWvB;AAED;;;;;;GAMG;AACH,wBAAgB,sBAAsB,CAAC,KAAK,SAAO,GAAG,mBAAmB,EAAE,CAa1E;AAED;;;;;;GAMG;AACH,wBAAgB,sBAAsB,CACpC,IAAI,EAAE,MAAM,EACZ,GAAG,GAAE,IAAiB,EACtB,eAAe,UAAQ,GACtB,mBAAmB,EAAE,CAMvB;AAED,kEAAkE;AAClE,wBAAgB,eAAe,CAC7B,SAAS,EAAE,MAAM,EACjB,KAAK,SAAO,GACX,mBAAmB,EAAE,CAWvB;AAED;;;;;;;;;GASG;AAEH,uFAAuF;AACvF,eAAO,MAAM,6BAA6B,QAAsB,CAAC;AAEjE,MAAM,WAAW,wBAAwB;IACvC,gDAAgD;IAChD,SAAS,EAAE,MAAM,CAAC;IAClB,kDAAkD;IAClD,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,yBAAyB;IACxC,mCAAmC;IACnC,GAAG,CAAC,EAAE,IAAI,CAAC;IACX,6DAA6D;IAC7D,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B;;;;;;OAMG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,uCAAuC;IACvC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,yCAAyC;IACzC,OAAO,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC;CACpC;AAED,6EAA6E;AAC7E,wBAAgB,cAAc,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CASnD;AAED,wBAAgB,kBAAkB,CAChC,OAAO,GAAE,yBAA8B,GACtC,wBAAwB,CA6F1B;AAED,0DAA0D;AAC1D,wBAAgB,YAAY,IAAI,MAAM,CAMrC;AAED,gFAAgF;AAChF,wBAAgB,mBAAmB,IAAI,MAAM,CAK5C;AAED,kFAAkF;AAClF,MAAM,WAAW,oBAAoB;IACnC,EAAE,EAAE,MAAM,CAAC;IACX,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,2EAA2E;AAC3E,wBAAgB,kBAAkB,IAAI,oBAAoB,EAAE,CAc3D;AAED,wEAAwE;AACxE,MAAM,WAAW,mBAAmB;IAClC,gDAAgD;IAChD,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,6CAA6C;IAC7C,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,2CAA2C;IAC3C,GAAG,CAAC,EAAE,IAAI,CAAC;CACZ;AAED,MAAM,WAAW,kBAAkB;IACjC,YAAY,EAAE,MAAM,CAAC;IACrB,cAAc,EAAE,MAAM,CAAC;IACvB,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,wEAAwE;IACxE,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;CACvB;AAED;;;;;;GAMG;AACH,wBAAgB,YAAY,CAAC,OAAO,GAAE,mBAAwB,GAAG,kBAAkB,CA2ClF;AAED;;;;GAIG;AACH,wBAAgB,aAAa,IAAI,OAAO,CAOvC"}
|
package/dist/db/history-repo.js
CHANGED
|
@@ -2,6 +2,18 @@ import { getDb, withTransaction } from "./index.js";
|
|
|
2
2
|
import { incrementMetricsUnsafe } from "./metrics-repo.js";
|
|
3
3
|
import { appendStructuredLog } from "../core/structured-log.js";
|
|
4
4
|
import os from "node:os";
|
|
5
|
+
/**
|
|
6
|
+
* QA-P1.5: прочерк и пустая строка — не текст ошибки, а маркер «нет данных».
|
|
7
|
+
* PowerShell-обёртка исторически передавала "-" для успешных запусков, и он
|
|
8
|
+
* попадал в history и структурированные логи как сообщение об ошибке.
|
|
9
|
+
* Нормализуем и при записи, и при чтении (легаси-записи уже есть в БД).
|
|
10
|
+
*/
|
|
11
|
+
export function normalizeErrorText(error) {
|
|
12
|
+
if (error == null)
|
|
13
|
+
return null;
|
|
14
|
+
const trimmed = String(error).trim();
|
|
15
|
+
return !trimmed || trimmed === "-" ? null : trimmed;
|
|
16
|
+
}
|
|
5
17
|
function rowToRecord(row) {
|
|
6
18
|
const status = String(row.status);
|
|
7
19
|
return {
|
|
@@ -11,7 +23,7 @@ function rowToRecord(row) {
|
|
|
11
23
|
startedAt: String(row.started_at),
|
|
12
24
|
finishedAt: row.finished_at == null ? null : String(row.finished_at),
|
|
13
25
|
durationMs: row.duration_ms == null ? null : Number(row.duration_ms),
|
|
14
|
-
error: row.error == null ? null : String(row.error),
|
|
26
|
+
error: normalizeErrorText(row.error == null ? null : String(row.error)),
|
|
15
27
|
nextTask: row.next_task == null ? null : String(row.next_task),
|
|
16
28
|
tokens: row.tokens == null ? undefined : Number(row.tokens),
|
|
17
29
|
costUsd: row.cost_usd == null ? undefined : Number(row.cost_usd),
|
|
@@ -23,6 +35,7 @@ function rowToRecord(row) {
|
|
|
23
35
|
? undefined
|
|
24
36
|
: String(row.post_flight_status),
|
|
25
37
|
workspaceId: row.workspace_id == null ? null : String(row.workspace_id),
|
|
38
|
+
// QA-A2-T3: JSON.parse возвращает any — сужаем к доменному типу без as any.
|
|
26
39
|
allowedTools: row.allowed_tools == null ? null : JSON.parse(String(row.allowed_tools)),
|
|
27
40
|
deniedTools: row.denied_tools == null ? null : JSON.parse(String(row.denied_tools)),
|
|
28
41
|
ownerPid: row.owner_pid == null ? null : Number(row.owner_pid),
|
|
@@ -42,7 +55,7 @@ function lastId(result) {
|
|
|
42
55
|
export function insertHistory(record) {
|
|
43
56
|
const result = getDb()
|
|
44
57
|
.prepare(INSERT_SQL)
|
|
45
|
-
.run(record.taskName, record.status, record.startedAt, record.finishedAt ?? null, record.durationMs ?? null, record.error
|
|
58
|
+
.run(record.taskName, record.status, record.startedAt, record.finishedAt ?? null, record.durationMs ?? null, normalizeErrorText(record.error), record.tokens ?? null, record.costUsd ?? null, record.model ?? null, record.preFlightStatus ?? null, record.postFlightStatus ?? null, record.nextTask ?? null, record.workspaceId ?? null, record.allowedTools == null ? null : JSON.stringify(record.allowedTools), record.deniedTools == null ? null : JSON.stringify(record.deniedTools), record.ownerPid ?? null, record.ownerHost ?? null, record.ownerStartedAt ?? null);
|
|
46
59
|
return lastId(result);
|
|
47
60
|
}
|
|
48
61
|
/** Начало запуска: строка с finished_at = NULL (переживёт сбой процесса). */
|
|
@@ -77,9 +90,11 @@ export function startRun(taskName, startedAt = new Date().toISOString(), workspa
|
|
|
77
90
|
export function finishRun(id, status, durationMs, error, nextTask, tokens, costUsd, model, preFlightStatus, postFlightStatus) {
|
|
78
91
|
const safeDuration = Number.isFinite(durationMs) ? Math.max(0, Math.floor(durationMs)) : 0;
|
|
79
92
|
const finishedAt = new Date().toISOString();
|
|
93
|
+
const cleanError = normalizeErrorText(error);
|
|
80
94
|
let completed = null;
|
|
81
95
|
const ok = withTransaction(() => {
|
|
82
96
|
const instance = getDb();
|
|
97
|
+
// QA-A2-T3: граница node:sqlite — get() возвращает any, сужаем к доменному типу.
|
|
83
98
|
const row = instance
|
|
84
99
|
.prepare("SELECT finished_at FROM history WHERE id = ?")
|
|
85
100
|
.get(id);
|
|
@@ -91,7 +106,7 @@ export function finishRun(id, status, durationMs, error, nextTask, tokens, costU
|
|
|
91
106
|
tokens = ?, cost_usd = ?, model = ?,
|
|
92
107
|
pre_flight_status = ?, post_flight_status = ?
|
|
93
108
|
WHERE id = ?`)
|
|
94
|
-
.run(status, finishedAt, safeDuration,
|
|
109
|
+
.run(status, finishedAt, safeDuration, cleanError, nextTask ?? null, tokens ?? null, costUsd ?? null, model ?? null, preFlightStatus ?? null, postFlightStatus ?? null, id);
|
|
95
110
|
const taskRow = instance
|
|
96
111
|
.prepare("SELECT task_name, started_at FROM history WHERE id = ?")
|
|
97
112
|
.get(id);
|
|
@@ -112,7 +127,7 @@ export function finishRun(id, status, durationMs, error, nextTask, tokens, costU
|
|
|
112
127
|
startedAt: done.startedAt,
|
|
113
128
|
finishedAt,
|
|
114
129
|
durationMs: safeDuration,
|
|
115
|
-
error:
|
|
130
|
+
error: cleanError,
|
|
116
131
|
nextTask: nextTask ?? null,
|
|
117
132
|
tokens,
|
|
118
133
|
costUsd,
|
|
@@ -129,10 +144,11 @@ export function finishRun(id, status, durationMs, error, nextTask, tokens, costU
|
|
|
129
144
|
*/
|
|
130
145
|
export function recordRun(taskName, status, startedAt, durationMs, error, nextTask, tokens, costUsd, model, preFlightStatus, postFlightStatus, finishedAt = new Date().toISOString(), workspaceId, allowedTools, deniedTools) {
|
|
131
146
|
const safeDuration = Math.max(0, Math.floor(Number(durationMs) || 0));
|
|
147
|
+
const cleanError = normalizeErrorText(error);
|
|
132
148
|
const id = withTransaction(() => {
|
|
133
149
|
const result = getDb()
|
|
134
150
|
.prepare(INSERT_SQL)
|
|
135
|
-
.run(taskName, status, startedAt, finishedAt, safeDuration,
|
|
151
|
+
.run(taskName, status, startedAt, finishedAt, safeDuration, cleanError, tokens ?? null, costUsd ?? null, model ?? null, preFlightStatus ?? null, postFlightStatus ?? null, nextTask ?? null, workspaceId ?? null, allowedTools == null ? null : JSON.stringify(allowedTools), deniedTools == null ? null : JSON.stringify(deniedTools),
|
|
136
152
|
// owner-колонки относятся только к незавершённым запускам (startRun).
|
|
137
153
|
null, null, null);
|
|
138
154
|
incrementMetricsUnsafe(taskName, status, tokens, costUsd);
|
|
@@ -146,7 +162,7 @@ export function recordRun(taskName, status, startedAt, durationMs, error, nextTa
|
|
|
146
162
|
startedAt,
|
|
147
163
|
finishedAt,
|
|
148
164
|
durationMs: safeDuration,
|
|
149
|
-
error:
|
|
165
|
+
error: cleanError,
|
|
150
166
|
nextTask: nextTask ?? null,
|
|
151
167
|
tokens,
|
|
152
168
|
costUsd,
|
|
@@ -161,6 +177,7 @@ export function recordRun(taskName, status, startedAt, durationMs, error, nextTa
|
|
|
161
177
|
export function getHistory(taskName, limit = 200, status) {
|
|
162
178
|
const safeLimit = Math.max(1, Math.min(100000, Math.floor(limit) || 1));
|
|
163
179
|
const clauses = [];
|
|
180
|
+
// QA-A2-T3: параметры привязки — только string/number (domain type вместо any[]).
|
|
164
181
|
const params = [];
|
|
165
182
|
if (taskName) {
|
|
166
183
|
clauses.push("lower(task_name) = lower(?)");
|
|
@@ -187,9 +204,28 @@ export function getHistory(taskName, limit = 200, status) {
|
|
|
187
204
|
.prepare(`SELECT * FROM history${where}
|
|
188
205
|
ORDER BY started_at DESC, id DESC
|
|
189
206
|
LIMIT ?`)
|
|
207
|
+
// QA-A2-T3: граница node:sqlite — all() возвращает any[], сужаем к HistoryRow[].
|
|
190
208
|
.all(...params);
|
|
191
209
|
return rows.map(rowToRecord);
|
|
192
210
|
}
|
|
211
|
+
/**
|
|
212
|
+
* История для проверки бюджетов: записи, учётный момент которых
|
|
213
|
+
* (`finished_at`, при отсутствии `started_at`) не раньше `periodStart`.
|
|
214
|
+
*
|
|
215
|
+
* В отличие от `getHistorySince()` учитывает запуски, начатые в предыдущем
|
|
216
|
+
* периоде, но завершённые в текущем — именно по ним считается расход в
|
|
217
|
+
* `src/core/budget.ts`. Лимит 100000 совпадает с максимумом `getHistory`.
|
|
218
|
+
*/
|
|
219
|
+
export function getHistoryForBudget(periodStart, limit = 100000) {
|
|
220
|
+
const safeLimit = Math.max(1, Math.min(100000, Math.floor(limit) || 1));
|
|
221
|
+
const rows = getDb()
|
|
222
|
+
.prepare(`SELECT * FROM history
|
|
223
|
+
WHERE COALESCE(finished_at, started_at) >= ?
|
|
224
|
+
ORDER BY started_at DESC, id DESC
|
|
225
|
+
LIMIT ?`)
|
|
226
|
+
.all(periodStart, safeLimit);
|
|
227
|
+
return rows.map(rowToRecord);
|
|
228
|
+
}
|
|
193
229
|
/**
|
|
194
230
|
* Последняя запись по каждой задаче (P2-29).
|
|
195
231
|
*
|
|
@@ -209,6 +245,20 @@ export function getLatestHistoryByTask(limit = 5000) {
|
|
|
209
245
|
.all(safeLimit);
|
|
210
246
|
return rows.map(rowToRecord);
|
|
211
247
|
}
|
|
248
|
+
/**
|
|
249
|
+
* История для аналитики за окно `days` дней: все запуски, которые могут
|
|
250
|
+
* попасть в период по времени начала. Окно на один день шире запрашиваемого,
|
|
251
|
+
* чтобы полностью покрыть самый ранний UTC-день (buildAnalytics всё равно
|
|
252
|
+
* отфильтрует лишнее по дате). Лимит 100000 снимает потолок в 20000 записей,
|
|
253
|
+
* из-за которого отчёты за 365 дней молча недосчитывали запуски и расход.
|
|
254
|
+
*/
|
|
255
|
+
export function getHistoryForAnalytics(days, now = new Date(), includeInternal = false) {
|
|
256
|
+
const safeDays = Math.max(1, Math.min(365, Math.floor(days) || 1));
|
|
257
|
+
const since = new Date(now.getTime() - (safeDays + 1) * 24 * 60 * 60 * 1000);
|
|
258
|
+
const records = getHistorySince(since.toISOString(), 100000);
|
|
259
|
+
// PL-37: служебные задачи (__*) — артефакты тестов/проб, не пользовательская аналитика.
|
|
260
|
+
return includeInternal ? records : records.filter((record) => !record.taskName.startsWith("__"));
|
|
261
|
+
}
|
|
212
262
|
/** История запусков, начатых не раньше timestamp (ISO-строка). */
|
|
213
263
|
export function getHistorySince(timestamp, limit = 5000) {
|
|
214
264
|
const safeLimit = Math.max(1, Math.min(100000, Math.floor(limit) || 1));
|
|
@@ -271,6 +321,23 @@ export function recoverInterrupted(options = {}) {
|
|
|
271
321
|
CAST((julianday(?) - julianday(started_at)) * 86400000 AS INTEGER)
|
|
272
322
|
)
|
|
273
323
|
WHERE id = ? AND finished_at IS NULL`);
|
|
324
|
+
// PL-46: «живой» владелец может быть мёртвой записью после schtasks /End —
|
|
325
|
+
// такой прогон помечается timeout, а не error crash recovery.
|
|
326
|
+
const staleUpdate = db.prepare(`UPDATE history SET
|
|
327
|
+
status = 'timeout',
|
|
328
|
+
error = CASE
|
|
329
|
+
WHEN error IS NULL OR error = '' THEN 'Запуск прерван: владелец завершён (schtasks /End или аналог)'
|
|
330
|
+
ELSE error
|
|
331
|
+
END,
|
|
332
|
+
finished_at = COALESCE(finished_at, ?),
|
|
333
|
+
duration_ms = COALESCE(
|
|
334
|
+
duration_ms,
|
|
335
|
+
CAST((julianday(?) - julianday(started_at)) * 86400000 AS INTEGER)
|
|
336
|
+
)
|
|
337
|
+
WHERE id = ? AND finished_at IS NULL`);
|
|
338
|
+
const staleAfter = typeof options.staleAfterMs === "number" && Number.isFinite(options.staleAfterMs)
|
|
339
|
+
? Math.max(0, options.staleAfterMs)
|
|
340
|
+
: 0;
|
|
274
341
|
let recovered = 0;
|
|
275
342
|
let keptAlive = 0;
|
|
276
343
|
withTransaction(() => {
|
|
@@ -279,7 +346,16 @@ export function recoverInterrupted(options = {}) {
|
|
|
279
346
|
const ownerHost = row.owner_host == null ? null : String(row.owner_host);
|
|
280
347
|
const verifiable = ownerPid != null && ownerPid > 0 && ownerHost != null && ownerHost === hostname;
|
|
281
348
|
if (verifiable && ownerPid != null && isAlive(ownerPid)) {
|
|
282
|
-
|
|
349
|
+
const since = Date.parse(String(row.started_at ?? ""));
|
|
350
|
+
const age = Number.isFinite(since) ? now.getTime() - since : 0;
|
|
351
|
+
if (staleAfter > 0 && age >= staleAfter) {
|
|
352
|
+
const result = staleUpdate.run(nowIso, nowIso, row.id);
|
|
353
|
+
if (Number(result.changes) > 0)
|
|
354
|
+
recovered += 1;
|
|
355
|
+
}
|
|
356
|
+
else {
|
|
357
|
+
keptAlive += 1;
|
|
358
|
+
}
|
|
283
359
|
continue;
|
|
284
360
|
}
|
|
285
361
|
if (!verifiable) {
|
|
@@ -299,6 +375,7 @@ export function recoverInterrupted(options = {}) {
|
|
|
299
375
|
}
|
|
300
376
|
/** Количество записей истории (для миграции и тестов). */
|
|
301
377
|
export function countHistory() {
|
|
378
|
+
// QA-A2-T3: граница node:sqlite — get() возвращает any, сужаем к строке счётчика.
|
|
302
379
|
const row = getDb().prepare("SELECT COUNT(*) AS count FROM history").get();
|
|
303
380
|
return Number(row?.count) || 0;
|
|
304
381
|
}
|
|
@@ -315,6 +392,7 @@ export function listRunningRecords() {
|
|
|
315
392
|
.prepare(`SELECT id, task_name, started_at FROM history
|
|
316
393
|
WHERE finished_at IS NULL
|
|
317
394
|
ORDER BY started_at ASC, id ASC`)
|
|
395
|
+
// QA-A2-T3: граница node:sqlite — all() возвращает any[], сужаем к доменному типу.
|
|
318
396
|
.all();
|
|
319
397
|
return rows.map((row) => ({
|
|
320
398
|
id: Number(row.id) || 0,
|
|
@@ -21,12 +21,18 @@ export interface TaskMetricsRow {
|
|
|
21
21
|
export interface MetricsTotals {
|
|
22
22
|
total: number;
|
|
23
23
|
success: number;
|
|
24
|
+
/** Реальные отказы (error/timeout/неизвестный статус) без прерванных и пропусков. */
|
|
24
25
|
error: number;
|
|
26
|
+
/** Пропуски (status=skipped) — не падения. */
|
|
27
|
+
skipped: number;
|
|
28
|
+
/** Прерванные crash recovery (error с текстом «Прервано …»). */
|
|
29
|
+
interrupted: number;
|
|
25
30
|
partial: number;
|
|
26
31
|
tokens: number;
|
|
27
32
|
costUsd: number;
|
|
28
33
|
}
|
|
29
34
|
export declare const LEGACY_METRICS_TASK = "__legacy__";
|
|
35
|
+
export declare function isInternalTaskName(taskName: string): boolean;
|
|
30
36
|
/** Инкремент метрик без собственной транзакции (для использования внутри recordRun). */
|
|
31
37
|
export declare function incrementMetricsUnsafe(taskName: string, status: TaskStatus, tokens?: number, costUsd?: number): void;
|
|
32
38
|
/** Атомарно увеличивает счётчики задачи: +1 запуск, +1 success/error, токены, стоимость. */
|
|
@@ -35,8 +41,20 @@ export declare function incrementMetrics(taskName: string, status: TaskStatus, t
|
|
|
35
41
|
export declare function getMetrics(taskName: string): TaskMetricsRow;
|
|
36
42
|
/** Метрики всех реальных задач (служебные строки исключены). */
|
|
37
43
|
export declare function getAllMetrics(includeInternal?: boolean): TaskMetricsRow[];
|
|
38
|
-
/**
|
|
39
|
-
|
|
44
|
+
/**
|
|
45
|
+
* Суммарные метрики по единой выборке истории (QA-P1.1).
|
|
46
|
+
*
|
|
47
|
+
* Раньше итоги брались из таблицы metrics. Но crash recovery помечает
|
|
48
|
+
* незавершённые запуски прямо в history (UPDATE ... status='error') без
|
|
49
|
+
* инкремента metrics, поэтому get_metrics расходился с analytics и
|
|
50
|
+
* self_analysis на число прерванных запусков. Теперь все три источника
|
|
51
|
+
* считают по одной и той же истории: success/partial явные, всё остальное
|
|
52
|
+
* (error/timeout/skipped) — error, running не участвует.
|
|
53
|
+
*
|
|
54
|
+
* Примечание: поточечные метрики getMetrics()/getAllMetrics() остаются
|
|
55
|
+
* таблицей metrics — там хранится в том числе legacy-хвост без истории.
|
|
56
|
+
*/
|
|
57
|
+
export declare function getTotals(includeInternal?: boolean): MetricsTotals;
|
|
40
58
|
/** Старый appendMetric(status) без имени задачи. */
|
|
41
59
|
export declare function incrementGlobalMetrics(status: TaskStatus): void;
|
|
42
60
|
/** Прямая запись строки метрик — используется миграцией. */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"metrics-repo.d.ts","sourceRoot":"","sources":["../../src/db/metrics-repo.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAEhD;;;;;;;;GAQG;AAEH,MAAM,WAAW,cAAc;IAC7B,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,kFAAkF;IAClF,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,aAAa;IAC5B,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;CACjB;AAGD,eAAO,MAAM,mBAAmB,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"metrics-repo.d.ts","sourceRoot":"","sources":["../../src/db/metrics-repo.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAEhD;;;;;;;;GAQG;AAEH,MAAM,WAAW,cAAc;IAC7B,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,kFAAkF;IAClF,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,aAAa;IAC5B,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,qFAAqF;IACrF,KAAK,EAAE,MAAM,CAAC;IACd,8CAA8C;IAC9C,OAAO,EAAE,MAAM,CAAC;IAChB,gEAAgE;IAChE,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;CACjB;AAGD,eAAO,MAAM,mBAAmB,eAAe,CAAC;AAEhD,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAE5D;AAcD,wFAAwF;AACxF,wBAAgB,sBAAsB,CACpC,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,UAAU,EAClB,MAAM,SAAI,EACV,OAAO,SAAI,GACV,IAAI,CAsBN;AAED,4FAA4F;AAC5F,wBAAgB,gBAAgB,CAC9B,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,UAAU,EAClB,MAAM,CAAC,EAAE,MAAM,EACf,OAAO,CAAC,EAAE,MAAM,GACf,IAAI,CAEN;AAED,mEAAmE;AACnE,wBAAgB,UAAU,CAAC,QAAQ,EAAE,MAAM,GAAG,cAAc,CAQ3D;AAED,gEAAgE;AAChE,wBAAgB,aAAa,CAAC,eAAe,UAAQ,GAAG,cAAc,EAAE,CAKvE;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,SAAS,CAAC,eAAe,UAAQ,GAAG,aAAa,CA+BhE;AAED,oDAAoD;AACpD,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,UAAU,GAAG,IAAI,CAE/D;AAED,4DAA4D;AAC5D,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,cAAc,GAAG,IAAI,CAsB1D;AAED,+BAA+B;AAC/B,wBAAgB,YAAY,IAAI,MAAM,CAGrC"}
|
package/dist/db/metrics-repo.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { getDb } from "./index.js";
|
|
2
2
|
const GLOBAL_TASK = "__global__";
|
|
3
3
|
export const LEGACY_METRICS_TASK = "__legacy__";
|
|
4
|
-
function
|
|
4
|
+
export function isInternalTaskName(taskName) {
|
|
5
5
|
return taskName.startsWith("__");
|
|
6
6
|
}
|
|
7
7
|
function rowToMetrics(row) {
|
|
@@ -55,24 +55,46 @@ export function getAllMetrics(includeInternal = false) {
|
|
|
55
55
|
const rows = getDb()
|
|
56
56
|
.prepare("SELECT * FROM metrics ORDER BY task_name COLLATE NOCASE ASC")
|
|
57
57
|
.all();
|
|
58
|
-
return rows.map(rowToMetrics).filter((row) => includeInternal || !
|
|
58
|
+
return rows.map(rowToMetrics).filter((row) => includeInternal || !isInternalTaskName(row.taskName));
|
|
59
59
|
}
|
|
60
|
-
/**
|
|
61
|
-
|
|
60
|
+
/**
|
|
61
|
+
* Суммарные метрики по единой выборке истории (QA-P1.1).
|
|
62
|
+
*
|
|
63
|
+
* Раньше итоги брались из таблицы metrics. Но crash recovery помечает
|
|
64
|
+
* незавершённые запуски прямо в history (UPDATE ... status='error') без
|
|
65
|
+
* инкремента metrics, поэтому get_metrics расходился с analytics и
|
|
66
|
+
* self_analysis на число прерванных запусков. Теперь все три источника
|
|
67
|
+
* считают по одной и той же истории: success/partial явные, всё остальное
|
|
68
|
+
* (error/timeout/skipped) — error, running не участвует.
|
|
69
|
+
*
|
|
70
|
+
* Примечание: поточечные метрики getMetrics()/getAllMetrics() остаются
|
|
71
|
+
* таблицей metrics — там хранится в том числе legacy-хвост без истории.
|
|
72
|
+
*/
|
|
73
|
+
export function getTotals(includeInternal = false) {
|
|
74
|
+
// PL-37: служебные задачи (__*), используемые тестами/пробами, не должны
|
|
75
|
+
// попадать в агрегированные метрики — getAllMetrics их уже фильтрует.
|
|
76
|
+
const internalFilter = includeInternal ? "" : "AND task_name NOT LIKE '\\_\\_%' ESCAPE '\\'";
|
|
62
77
|
const row = getDb()
|
|
63
78
|
.prepare(`SELECT
|
|
64
|
-
|
|
65
|
-
COALESCE(SUM(success), 0) AS success,
|
|
66
|
-
COALESCE(SUM(
|
|
67
|
-
COALESCE(SUM(
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
79
|
+
COUNT(*) AS total,
|
|
80
|
+
COALESCE(SUM(CASE WHEN status = 'success' THEN 1 ELSE 0 END), 0) AS success,
|
|
81
|
+
COALESCE(SUM(CASE WHEN status = 'partial' THEN 1 ELSE 0 END), 0) AS partial,
|
|
82
|
+
COALESCE(SUM(CASE WHEN status = 'skipped' THEN 1 ELSE 0 END), 0) AS skipped,
|
|
83
|
+
COALESCE(SUM(CASE WHEN status NOT IN ('success', 'partial', 'running', 'skipped')
|
|
84
|
+
AND COALESCE(error, '') NOT LIKE '%Прервано%' THEN 1 ELSE 0 END), 0) AS error,
|
|
85
|
+
COALESCE(SUM(CASE WHEN status NOT IN ('success', 'partial', 'running', 'skipped')
|
|
86
|
+
AND COALESCE(error, '') LIKE '%Прервано%' THEN 1 ELSE 0 END), 0) AS interrupted,
|
|
87
|
+
COALESCE(SUM(CASE WHEN tokens > 0 THEN CAST(tokens AS INTEGER) ELSE 0 END), 0) AS tokens,
|
|
88
|
+
COALESCE(SUM(CASE WHEN cost_usd > 0 THEN cost_usd ELSE 0 END), 0) AS cost_usd
|
|
89
|
+
FROM history
|
|
90
|
+
WHERE status <> 'running' ${internalFilter}`)
|
|
71
91
|
.get();
|
|
72
92
|
return {
|
|
73
93
|
total: Number(row?.total) || 0,
|
|
74
94
|
success: Number(row?.success) || 0,
|
|
75
95
|
error: Number(row?.error) || 0,
|
|
96
|
+
skipped: Number(row?.skipped) || 0,
|
|
97
|
+
interrupted: Number(row?.interrupted) || 0,
|
|
76
98
|
partial: Number(row?.partial) || 0,
|
|
77
99
|
tokens: Number(row?.tokens) || 0,
|
|
78
100
|
costUsd: Number(row?.cost_usd) || 0,
|
package/dist/db/migrate.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"migrate.d.ts","sourceRoot":"","sources":["../../src/db/migrate.ts"],"names":[],"mappings":"AAWA;;;;;;;;;GASG;AAEH,MAAM,WAAW,eAAe;IAC9B,QAAQ,EAAE,OAAO,CAAC;IAClB,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,EAAE,CAAC;CACnB;
|
|
1
|
+
{"version":3,"file":"migrate.d.ts","sourceRoot":"","sources":["../../src/db/migrate.ts"],"names":[],"mappings":"AAWA;;;;;;;;;GASG;AAEH,MAAM,WAAW,eAAe;IAC9B,QAAQ,EAAE,OAAO,CAAC;IAClB,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,EAAE,CAAC;CACnB;AA6GD;;;GAGG;AACH,wBAAsB,eAAe,CACnC,SAAS,GAAE,MAAmB,GAC7B,OAAO,CAAC,eAAe,CAAC,CAkN1B"}
|