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
package/dist/core/ps-wrapper.js
CHANGED
|
@@ -79,6 +79,8 @@ export const WRAPPER_SCRIPT = `param(
|
|
|
79
79
|
[string]$QualityGate,
|
|
80
80
|
# G-1.2: snapshot входов гейта, снятый при создании обёртки.
|
|
81
81
|
[string]$GateSnapshotFile = "",
|
|
82
|
+
# PL-47: пути, которые задача вправе изменить (из -Files afterScript).
|
|
83
|
+
[string]$GateAllowPaths = "",
|
|
82
84
|
[string]$BeforeScript,
|
|
83
85
|
[string]$AfterScript,
|
|
84
86
|
[string]$EnvFile,
|
|
@@ -172,6 +174,15 @@ $script:timedOut = $false
|
|
|
172
174
|
$script:attemptExitCode = 0
|
|
173
175
|
$startedAtIso = $startTime.ToUniversalTime().ToString("o")
|
|
174
176
|
$script:runId = ""
|
|
177
|
+
# PL-7.2: разделённые потоки последнего хука для структурированного журнала.
|
|
178
|
+
$script:lastHookStdout = ""
|
|
179
|
+
$script:lastHookStderr = ""
|
|
180
|
+
# PL-25: помощник целостности гейта и файл snapshot'а рабочего дерева.
|
|
181
|
+
$gateIntegrityFile = ""
|
|
182
|
+
if ($RecorderFile) {
|
|
183
|
+
$gateIntegrityFile = Join-Path (Split-Path $RecorderFile -Parent) "gate-integrity.js"
|
|
184
|
+
}
|
|
185
|
+
$worktreeSnapshotFile = ""
|
|
175
186
|
|
|
176
187
|
# Hotfix 1.5.3.1: блокировка ДО записи в историю. Раньше lock существовал только
|
|
177
188
|
# в in-process пути (LockManager/withLock), а schtasks-запуск обёртки его не
|
|
@@ -270,6 +281,9 @@ function Invoke-HookScript {
|
|
|
270
281
|
if (-not $timeout -or $timeout -le 0) {
|
|
271
282
|
$output = & cmd.exe /c $Command 2>&1
|
|
272
283
|
$code = $LASTEXITCODE
|
|
284
|
+
# Без таймаута потоки.cmd объединены — сохраняем как stdout, stderr пуст.
|
|
285
|
+
$script:lastHookStdout = (@($output) -join "\`n")
|
|
286
|
+
$script:lastHookStderr = ""
|
|
273
287
|
foreach ($line in @($output)) {
|
|
274
288
|
Write-Log "[hook] $line"
|
|
275
289
|
}
|
|
@@ -315,6 +329,8 @@ function Invoke-HookScript {
|
|
|
315
329
|
$errText = ""
|
|
316
330
|
if ($outTask.Wait(5000)) { try { $outText = $outTask.Result } catch {} }
|
|
317
331
|
if ($errTask.Wait(5000)) { try { $errText = $errTask.Result } catch {} }
|
|
332
|
+
$script:lastHookStdout = $outText
|
|
333
|
+
$script:lastHookStderr = $errText
|
|
318
334
|
foreach ($text in @($outText, $errText)) {
|
|
319
335
|
foreach ($line in @($text -split "\r?\n")) {
|
|
320
336
|
if ($line -ne "") {
|
|
@@ -331,6 +347,26 @@ function Invoke-HookScript {
|
|
|
331
347
|
}
|
|
332
348
|
}
|
|
333
349
|
|
|
350
|
+
# PL-7.2: пишет отдельное событие hook.output с реальным exit code и
|
|
351
|
+
# разделёнными stdout/stderr. Наблюдаемость не должна ломать задачу.
|
|
352
|
+
function Write-HookStructuredOutput {
|
|
353
|
+
param([string]$Phase, [int]$ExitCode)
|
|
354
|
+
if (-not $RecorderFile) { return }
|
|
355
|
+
$helper = Join-Path (Split-Path $RecorderFile -Parent) "hook-output.js"
|
|
356
|
+
if (-not (Test-Path -LiteralPath $helper)) { return }
|
|
357
|
+
$outFile = Join-Path ([System.IO.Path]::GetTempPath()) ("sched-hook-out-" + [guid]::NewGuid().ToString("N") + ".txt")
|
|
358
|
+
$errFile = Join-Path ([System.IO.Path]::GetTempPath()) ("sched-hook-err-" + [guid]::NewGuid().ToString("N") + ".txt")
|
|
359
|
+
try {
|
|
360
|
+
Set-Content -LiteralPath $outFile -Value ([string]$script:lastHookStdout) -Encoding UTF8
|
|
361
|
+
Set-Content -LiteralPath $errFile -Value ([string]$script:lastHookStderr) -Encoding UTF8
|
|
362
|
+
& node "$helper" $Phase $TaskName $ExitCode $outFile $errFile "$script:runId" 2>$null | Out-Null
|
|
363
|
+
} catch {
|
|
364
|
+
} finally {
|
|
365
|
+
Remove-Item -LiteralPath $outFile -Force -ErrorAction SilentlyContinue
|
|
366
|
+
Remove-Item -LiteralPath $errFile -Force -ErrorAction SilentlyContinue
|
|
367
|
+
}
|
|
368
|
+
}
|
|
369
|
+
|
|
334
370
|
# Hotfix 1.5.3.1: запуск opencode с реальным таймаутом.
|
|
335
371
|
# Раньше TimeoutSeconds принимался, но нигде не использовался — задача работала
|
|
336
372
|
# до конца, а статус 'timeout' не выставлялся никогда. Теперь параллельно
|
|
@@ -345,6 +381,10 @@ function Invoke-OpenCodeOnce {
|
|
|
345
381
|
|
|
346
382
|
$watch = $null
|
|
347
383
|
$timeoutMarker = ""
|
|
384
|
+
# PL-51: состояние health-check лога (отдельный сторожевой job).
|
|
385
|
+
$healthWatch = $null
|
|
386
|
+
$healthMarker = ""
|
|
387
|
+
$healthFailure = ""
|
|
348
388
|
if ($TimeoutSeconds -gt 0) {
|
|
349
389
|
$timeoutMarker = Join-Path ([System.IO.Path]::GetTempPath()) ("sched-timeout-" + [guid]::NewGuid().ToString("N") + ".flag")
|
|
350
390
|
$watch = Start-Job -ScriptBlock {
|
|
@@ -404,6 +444,51 @@ function Invoke-OpenCodeOnce {
|
|
|
404
444
|
} -ArgumentList $PID, $TimeoutSeconds, $timeoutMarker
|
|
405
445
|
}
|
|
406
446
|
|
|
447
|
+
# PL-51: health-check лога. Некоторые модели уходят в бесконечный retry
|
|
448
|
+
# (ECONNRESET / Free usage limit reached / Insufficient Balance) и висят
|
|
449
|
+
# до самого TimeoutSeconds, не делая полезной работы. Сторожевой job читает
|
|
450
|
+
# хвост лога и при повторяющейся ошибке пишет причину в лог, маркер и
|
|
451
|
+
# завершает дерево процесса задачи — как сторож таймаута.
|
|
452
|
+
# Пороги настраиваются env, по умолчанию: 15 с, 3 повтора, 40 строк.
|
|
453
|
+
if ($env:AGENT_STEWARD_HEALTH_CHECK -ne "0" -and $LogFile) {
|
|
454
|
+
$healthInterval = 15
|
|
455
|
+
$healthThreshold = 3
|
|
456
|
+
$healthTail = 40
|
|
457
|
+
try {
|
|
458
|
+
if ($env:AGENT_STEWARD_HEALTH_INTERVAL_SEC -match '^\\d+$') { $healthInterval = [Math]::Max(2, [int]$env:AGENT_STEWARD_HEALTH_INTERVAL_SEC) }
|
|
459
|
+
if ($env:AGENT_STEWARD_HEALTH_REPEAT_THRESHOLD -match '^\\d+$') { $healthThreshold = [Math]::Max(1, [int]$env:AGENT_STEWARD_HEALTH_REPEAT_THRESHOLD) }
|
|
460
|
+
if ($env:AGENT_STEWARD_HEALTH_TAIL_LINES -match '^\\d+$') { $healthTail = [Math]::Max(5, [int]$env:AGENT_STEWARD_HEALTH_TAIL_LINES) }
|
|
461
|
+
} catch {}
|
|
462
|
+
$healthMarker = Join-Path ([System.IO.Path]::GetTempPath()) ("sched-health-" + [guid]::NewGuid().ToString("N") + ".flag")
|
|
463
|
+
$healthWatch = Start-Job -ScriptBlock {
|
|
464
|
+
param([int]$RootId, [string]$Marker, [string]$LogPath, [int]$IntervalSec, [int]$Threshold, [int]$TailLines)
|
|
465
|
+
$pattern = 'ECONNRESET|Free usage limit reached|Insufficient Balance|ECONNREFUSED|ETIMEDOUT'
|
|
466
|
+
# Базовая линия: старые ошибки из предыдущих попыток не должны
|
|
467
|
+
# убивать здоровый запуск — реагируем только на рост числа ошибок.
|
|
468
|
+
$baseline = -1
|
|
469
|
+
while ($true) {
|
|
470
|
+
Start-Sleep -Seconds $IntervalSec
|
|
471
|
+
if (-not $LogPath -or -not (Test-Path -LiteralPath $LogPath)) { continue }
|
|
472
|
+
try { $tail = @(Get-Content -LiteralPath $LogPath -Tail $TailLines -ErrorAction Stop) } catch { continue }
|
|
473
|
+
$bad = @($tail | Where-Object { $_ -match $pattern })
|
|
474
|
+
if ($baseline -lt 0 -or $bad.Count -lt $baseline) { $baseline = $bad.Count; continue }
|
|
475
|
+
if ($bad.Count -ge $baseline + $Threshold) {
|
|
476
|
+
$reason = "PL-51: модель повторяет ошибку ($($bad.Count) за последние $TailLines строк): $($bad[-1])"
|
|
477
|
+
try { Add-Content -LiteralPath $LogPath -Value "[agent-steward] $reason" -Encoding UTF8 } catch {}
|
|
478
|
+
try { Set-Content -LiteralPath $Marker -Value $reason -Encoding UTF8 } catch {}
|
|
479
|
+
try { & taskkill.exe /F /T /PID $RootId 2>$null | Out-Null } catch {}
|
|
480
|
+
break
|
|
481
|
+
}
|
|
482
|
+
}
|
|
483
|
+
} -ArgumentList $PID, $healthMarker, $LogFile, $healthInterval, $healthThreshold, $healthTail
|
|
484
|
+
}
|
|
485
|
+
|
|
486
|
+
# QV-8: дочерний opencode run не должен загружать инструменты планировщика
|
|
487
|
+
# (иначе ребёнок видит все 30 инструментов и может рекурсивно создавать задачи).
|
|
488
|
+
# Маркер живёт только время запуска ИИ и восстанавливается в finally.
|
|
489
|
+
$previousChildRun = $env:AGENT_STEWARD_CHILD_RUN
|
|
490
|
+
$env:AGENT_STEWARD_CHILD_RUN = "1"
|
|
491
|
+
|
|
407
492
|
$script:timedOut = $false
|
|
408
493
|
$script:attemptExitCode = 0
|
|
409
494
|
# Состояние фильтра лога сбрасываем на каждой попытке: иначе незакрытый
|
|
@@ -435,16 +520,31 @@ function Invoke-OpenCodeOnce {
|
|
|
435
520
|
}
|
|
436
521
|
}
|
|
437
522
|
} finally {
|
|
523
|
+
if ($null -eq $previousChildRun) {
|
|
524
|
+
Remove-Item Env:\AGENT_STEWARD_CHILD_RUN -ErrorAction SilentlyContinue
|
|
525
|
+
} else {
|
|
526
|
+
$env:AGENT_STEWARD_CHILD_RUN = $previousChildRun
|
|
527
|
+
}
|
|
438
528
|
if ($timeoutMarker -and (Test-Path -LiteralPath $timeoutMarker)) {
|
|
439
529
|
$script:timedOut = $true
|
|
440
530
|
}
|
|
531
|
+
if ($healthMarker -and (Test-Path -LiteralPath $healthMarker)) {
|
|
532
|
+
try { $healthFailure = (Get-Content -LiteralPath $healthMarker -Raw -ErrorAction Stop).Trim() } catch { $healthFailure = "модель повторяет ошибку подряд" }
|
|
533
|
+
}
|
|
441
534
|
if ($watch) {
|
|
442
535
|
Stop-Job -Job $watch -ErrorAction SilentlyContinue
|
|
443
536
|
Remove-Job -Job $watch -Force -ErrorAction SilentlyContinue
|
|
444
537
|
}
|
|
538
|
+
if ($healthWatch) {
|
|
539
|
+
Stop-Job -Job $healthWatch -ErrorAction SilentlyContinue
|
|
540
|
+
Remove-Job -Job $healthWatch -Force -ErrorAction SilentlyContinue
|
|
541
|
+
}
|
|
445
542
|
if ($timeoutMarker) {
|
|
446
543
|
Remove-Item -LiteralPath $timeoutMarker -Force -ErrorAction SilentlyContinue
|
|
447
544
|
}
|
|
545
|
+
if ($healthMarker) {
|
|
546
|
+
Remove-Item -LiteralPath $healthMarker -Force -ErrorAction SilentlyContinue
|
|
547
|
+
}
|
|
448
548
|
}
|
|
449
549
|
|
|
450
550
|
if ($script:timedOut) {
|
|
@@ -452,6 +552,11 @@ function Invoke-OpenCodeOnce {
|
|
|
452
552
|
$script:errorMessage = "Таймаут: превышено $TimeoutSeconds с"
|
|
453
553
|
return 124
|
|
454
554
|
}
|
|
555
|
+
if ($healthFailure) {
|
|
556
|
+
Write-Log "[agent-steward] PL-51: задача '$TaskName' остановлена health-check: $healthFailure"
|
|
557
|
+
$script:errorMessage = "Ошибка модели при запуске: $healthFailure"
|
|
558
|
+
return 125
|
|
559
|
+
}
|
|
455
560
|
return $script:attemptExitCode
|
|
456
561
|
}
|
|
457
562
|
|
|
@@ -546,7 +651,12 @@ function Get-UsageFromLog {
|
|
|
546
651
|
)
|
|
547
652
|
$costPatterns = @(
|
|
548
653
|
($prefix + '(?i)(?:cost|total\\s+cost)\\s*[:=]?\\s*\\$\\s*([0-9]+(?:[.,][0-9]+)?)'),
|
|
549
|
-
($prefix + '(?i)(?:cost|total\\s+cost)\\s*[:=]\\s*([0-9]+(?:[.,][0-9]+)?)\\s*(?:usd|\\$)')
|
|
654
|
+
($prefix + '(?i)(?:cost|total\\s+cost)\\s*[:=]\\s*([0-9]+(?:[.,][0-9]+)?)\\s*(?:usd|\\$)'),
|
|
655
|
+
# QA-F.1: OpenCode печатает costUsd=0.1 / cost_usd=0.75 / cost=0.25 без
|
|
656
|
+
# валютного знака. Без этих шаблонов PS-обёртка теряла стоимость, тогда
|
|
657
|
+
# как TS-парсер (src/core/record-history.ts) её уже распознавал.
|
|
658
|
+
($prefix + '(?i)(?:costUsd|cost_usd|cost(?:\\s*usd)?)\\s*[:=]\\s*\\$?\\s*([0-9]+(?:[.,][0-9]+)?)'),
|
|
659
|
+
($prefix + '(?i)(?:costUsd|cost_usd|cost(?:\\s*usd)?)\\s*[:=]\\s*([0-9]+(?:[.,][0-9]+)?)\\s*(?:usd|\\$)')
|
|
550
660
|
)
|
|
551
661
|
|
|
552
662
|
# Идём с конца: OpenCode печатает итог последним, а более ранние строки
|
|
@@ -595,6 +705,16 @@ try {
|
|
|
595
705
|
Set-Location $Workdir
|
|
596
706
|
}
|
|
597
707
|
|
|
708
|
+
# PL-25: фиксируем состояние рабочего дерева до запуска ИИ. Перед гейтом
|
|
709
|
+
# сверяем его, чтобы чужие незакоммиченные правки src/ не давали ложный зелёный.
|
|
710
|
+
if ($QualityGate -and $GateSnapshotFile -and $Workdir -and $gateIntegrityFile -and (Test-Path -LiteralPath $gateIntegrityFile)) {
|
|
711
|
+
$worktreeSnapshotFile = [System.IO.Path]::ChangeExtension($GateSnapshotFile, ".worktree.json")
|
|
712
|
+
$snapAllowArgs = @()
|
|
713
|
+
if ($GateAllowPaths) { $snapAllowArgs = @("--allow", $GateAllowPaths) }
|
|
714
|
+
$snapOut = & node $gateIntegrityFile worktree-snapshot --dir "$Workdir" --out "$worktreeSnapshotFile" @snapAllowArgs 2>&1
|
|
715
|
+
foreach ($line in $snapOut) { Write-Log "[agent-steward] $line" }
|
|
716
|
+
}
|
|
717
|
+
|
|
598
718
|
if ($WorkspaceName) {
|
|
599
719
|
$gitBranch = "-"
|
|
600
720
|
$gitRemote = "-"
|
|
@@ -692,8 +812,10 @@ try {
|
|
|
692
812
|
if ($BeforeScript) {
|
|
693
813
|
Write-Log "[agent-steward] Pre-flight: $BeforeScript"
|
|
694
814
|
$preCode = Invoke-HookScript -Command $BeforeScript
|
|
815
|
+
Write-HookStructuredOutput -Phase "preFlight" -ExitCode $preCode
|
|
695
816
|
if ($preCode -ne 0) {
|
|
696
|
-
|
|
817
|
+
# PL-6.1: SilentlyContinue не гарантирует код 0 — подсказываем явный exit 0.
|
|
818
|
+
Write-Log "[agent-steward] ОШИБКА: Pre-flight script failed (код $preCode). Завершите хук явным 'exit 0' (например: if (Test-Path -LiteralPath '<path>') { Remove-Item -LiteralPath '<path>' -Force }; exit 0)."
|
|
697
819
|
$script:preFlightStatus = "error"
|
|
698
820
|
$script:errorMessage = "Pre-flight script failed"
|
|
699
821
|
$script:exitCode = 1
|
|
@@ -705,6 +827,14 @@ try {
|
|
|
705
827
|
}
|
|
706
828
|
|
|
707
829
|
if (-not $script:skipMainTask) {
|
|
830
|
+
# QA-P0.2: граница реального прогона для extractLastRunLog(). Маркер пишется
|
|
831
|
+
# без префикса времени и только после guard/pre-flight — отменённый запуск
|
|
832
|
+
# не должен выглядеть как реальный. Лог дописывается, показываем последний сегмент.
|
|
833
|
+
if ($LogFile) {
|
|
834
|
+
try {
|
|
835
|
+
Add-Content -Path $LogFile -Value ("[agent-steward] === Run started " + $startedAtIso + " (" + $TaskName + ") ===") -Encoding utf8
|
|
836
|
+
} catch {}
|
|
837
|
+
}
|
|
708
838
|
$prompt = Get-Content -Path $PromptFile -Raw -Encoding UTF8
|
|
709
839
|
|
|
710
840
|
# W-1: запуск в одноразовом git worktree — сообщаем путь агенту.
|
|
@@ -797,7 +927,6 @@ try {
|
|
|
797
927
|
# снятым при создании задачи. При расхождении гейт НЕ выполняется.
|
|
798
928
|
$gateIntegrityOk = $false
|
|
799
929
|
if ($GateSnapshotFile -and (Test-Path -LiteralPath $GateSnapshotFile)) {
|
|
800
|
-
$gateIntegrityFile = Join-Path (Split-Path $RecorderFile -Parent) "gate-integrity.js"
|
|
801
930
|
if (Test-Path -LiteralPath $gateIntegrityFile) {
|
|
802
931
|
$verifyOutput = & node $gateIntegrityFile verify --snapshot "$GateSnapshotFile" --gate-file "$QualityGate" --prompt-file "$PromptFile" --timeout $GateTimeoutSeconds 2>&1
|
|
803
932
|
$verifyCode = $LASTEXITCODE
|
|
@@ -820,6 +949,20 @@ try {
|
|
|
820
949
|
$script:exitCode = 1
|
|
821
950
|
}
|
|
822
951
|
|
|
952
|
+
if ($gateIntegrityOk -and $worktreeSnapshotFile -and (Test-Path -LiteralPath $worktreeSnapshotFile)) {
|
|
953
|
+
$verifyAllowArgs = @()
|
|
954
|
+
if ($GateAllowPaths) { $verifyAllowArgs = @("--allow", $GateAllowPaths) }
|
|
955
|
+
$worktreeOut = & node $gateIntegrityFile worktree-verify --dir "$Workdir" --snapshot "$worktreeSnapshotFile" @verifyAllowArgs 2>&1
|
|
956
|
+
$worktreeCode = $LASTEXITCODE
|
|
957
|
+
foreach ($line in $worktreeOut) { Write-Log "[agent-steward] $line" }
|
|
958
|
+
if ($worktreeCode -ne 0) {
|
|
959
|
+
$gateIntegrityOk = $false
|
|
960
|
+
Write-Log "[agent-steward] ОШИБКА: рабочее дерево изменилось во время прогона — гейт не доверяем."
|
|
961
|
+
$script:errorMessage = "Quality Gate: рабочее дерево изменилось во время прогона"
|
|
962
|
+
$script:exitCode = 1
|
|
963
|
+
}
|
|
964
|
+
}
|
|
965
|
+
|
|
823
966
|
if ($gateIntegrityOk) {
|
|
824
967
|
Write-Log "[agent-steward] Запуск Quality Gate: $QualityGate"
|
|
825
968
|
# Тот же таймаут, что у хуков: зависший gate не должен держать lock.
|
|
@@ -840,7 +983,12 @@ try {
|
|
|
840
983
|
}
|
|
841
984
|
|
|
842
985
|
if ($script:exitCode -ne 0) {
|
|
843
|
-
|
|
986
|
+
# Раньше пустое errorMessage превращалось в "-" в истории: причина
|
|
987
|
+
# падения терялась (например, при отказе модели до вывода в лог).
|
|
988
|
+
if (-not $script:errorMessage) {
|
|
989
|
+
$script:errorMessage = "Код возврата $($script:exitCode)"
|
|
990
|
+
}
|
|
991
|
+
Write-Log "[agent-steward] ОШИБКА: задача '$TaskName' завершилась с кодом $($script:exitCode). $script:errorMessage"
|
|
844
992
|
} else {
|
|
845
993
|
Write-Log "[agent-steward] Задача '$TaskName' успешно завершена."
|
|
846
994
|
}
|
|
@@ -854,6 +1002,7 @@ try {
|
|
|
854
1002
|
if ($AfterScript) {
|
|
855
1003
|
Write-Log "[agent-steward] Post-flight: $AfterScript"
|
|
856
1004
|
$postCode = Invoke-HookScript -Command $AfterScript
|
|
1005
|
+
Write-HookStructuredOutput -Phase "postFlight" -ExitCode $postCode
|
|
857
1006
|
if ($postCode -ne 0) {
|
|
858
1007
|
Write-Log "[agent-steward] ОШИБКА: Post-flight script failed (код $postCode)."
|
|
859
1008
|
$script:postFlightStatus = "error"
|
|
@@ -951,6 +1100,23 @@ export async function writePromptFile(taskName, prompt) {
|
|
|
951
1100
|
export function lockFilePath(taskName) {
|
|
952
1101
|
return path.join(PLUGIN_DIR, "locks", `${sanitizeName(taskName)}.lock`);
|
|
953
1102
|
}
|
|
1103
|
+
/**
|
|
1104
|
+
* PL-47: извлекает список `-Files "a;b"` из PowerShell afterScript; возвращает
|
|
1105
|
+
* строку `a|b` для gate-integrity. Возвращает "", если afterScript не коммитит
|
|
1106
|
+
* через pl-commit.ps1 (тогда гейт работает по старой схеме).
|
|
1107
|
+
*/
|
|
1108
|
+
export function gateAllowPathsFromAfterScript(afterScript) {
|
|
1109
|
+
if (!afterScript)
|
|
1110
|
+
return "";
|
|
1111
|
+
const match = /-Files\s+"([^"]+)"/i.exec(afterScript);
|
|
1112
|
+
if (!match)
|
|
1113
|
+
return "";
|
|
1114
|
+
return match[1]
|
|
1115
|
+
.split(";")
|
|
1116
|
+
.map((item) => item.trim().replace(/\\/g, "/").replace(/^\.\//, ""))
|
|
1117
|
+
.filter(Boolean)
|
|
1118
|
+
.join("|");
|
|
1119
|
+
}
|
|
954
1120
|
/**
|
|
955
1121
|
* Генерирует per-task .cmd-обёртку, которую schtasks вызывает через /tr.
|
|
956
1122
|
* Внутри .cmd — жёстко заданный вызов run-task.ps1 с задачей, промптом,
|
|
@@ -1002,7 +1168,9 @@ worktreeHelperFile,
|
|
|
1002
1168
|
/** W-3: guard-условия перед запуском opencode. */
|
|
1003
1169
|
guards,
|
|
1004
1170
|
/** Путь к dist/core/guard-run.js (обязателен при guards). */
|
|
1005
|
-
guardHelperFile
|
|
1171
|
+
guardHelperFile,
|
|
1172
|
+
/** PL-47: RELATIVE-пути, которые задача вправе изменить (из -Files). */
|
|
1173
|
+
gateAllowPaths) {
|
|
1006
1174
|
await fs.mkdir(WRAPPER_DIR, { recursive: true });
|
|
1007
1175
|
const cmdPath = path.join(WRAPPER_DIR, `run-${sanitizedName}.cmd`);
|
|
1008
1176
|
const ps1Path = path.join(WRAPPER_DIR, WRAPPER_FILENAME);
|
|
@@ -1060,6 +1228,9 @@ guardHelperFile) {
|
|
|
1060
1228
|
gateTimeoutSeconds: safeGateTimeout,
|
|
1061
1229
|
});
|
|
1062
1230
|
psArgs.push(`-GateSnapshotFile "${snapshotFile}"`);
|
|
1231
|
+
const safeAllow = (gateAllowPaths ?? "").replace(/[\r\n"]+/g, "").trim();
|
|
1232
|
+
if (safeAllow)
|
|
1233
|
+
psArgs.push(`-GateAllowPaths "${safeAllow}"`);
|
|
1063
1234
|
}
|
|
1064
1235
|
if (model?.trim()) {
|
|
1065
1236
|
const safeModel = model.replace(/[\r\n"]+/g, "").trim();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"record-history.d.ts","sourceRoot":"","sources":["../../src/core/record-history.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"record-history.d.ts","sourceRoot":"","sources":["../../src/core/record-history.ts"],"names":[],"mappings":"AAkBA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAC1D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAiEnD,MAAM,WAAW,SAAS;IACxB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AA6BD;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,MAAM,GAAG,SAAS,CAmC5D;AA0ID;;;;;;;;;GASG;AACH,wBAAgB,yBAAyB,CACvC,aAAa,EAAE,MAAM,EACrB,WAAW,EAAE,cAAc,EAAE,EAC7B,OAAO,EAAE,aAAa,EAAE,GACvB,MAAM,EAAE,CA0EV;AA8QD,4DAA4D;AAC5D,MAAM,WAAW,kBAAkB;IACjC,QAAQ,CAAC,EAAE,MAAM,CAAC,QAAQ,CAAC;IAC3B,aAAa,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,cAAc,GAAG,SAAS,CAAC;IAC7D,UAAU,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CAC9C;AAED;;;;;;;GAOG;AACH,wBAAsB,yBAAyB,CAC7C,QAAQ,EAAE,MAAM,EAChB,IAAI,GAAE,kBAAuB,GAC5B,OAAO,CAAC,OAAO,CAAC,CAqBlB"}
|
|
@@ -5,12 +5,14 @@ import { pathToFileURL } from "node:url";
|
|
|
5
5
|
import { runTaskNow } from "./scheduler/run-now.js";
|
|
6
6
|
import { createSchedulerBackend } from "./scheduler/index.js";
|
|
7
7
|
import { notifyTaskCompletion } from "../notifications.js";
|
|
8
|
-
import { finishRun, getLatestHistoryByTask, recordRun, startRun } from "../db/history-repo.js";
|
|
8
|
+
import { finishRun, getLatestHistoryByTask, normalizeErrorText, recordRun, startRun, } from "../db/history-repo.js";
|
|
9
9
|
import { deleteSetting, decrementCounterSetting } from "../db/settings-repo.js";
|
|
10
10
|
import { getTask, listTasks } from "../db/tasks-repo.js";
|
|
11
|
+
import { extractLastRunLog } from "./mission.js";
|
|
11
12
|
import { rotateSessionIfNeeded } from "./session.js";
|
|
12
13
|
import { advanceMatrixAfterClone, finalizeMatrixIfComplete, } from "./matrix.js";
|
|
13
14
|
import { appendStructuredLog } from "./structured-log.js";
|
|
15
|
+
import { collectOpenCodeUsage } from "./opencode-usage.js";
|
|
14
16
|
/**
|
|
15
17
|
* Диагностика рекордера пишется в runs.jsonl: цепочки, DAG, повторы и
|
|
16
18
|
* one-shot-очистка иначе не видны в машиночитаемом логе. Human-readable
|
|
@@ -41,7 +43,9 @@ const LOG_TAIL_LINES = 500;
|
|
|
41
43
|
*/
|
|
42
44
|
function readLogTail(filePath, maxLines) {
|
|
43
45
|
try {
|
|
44
|
-
|
|
46
|
+
// Токены/стоимость относятся к завершаемому запуску; старые прогоны
|
|
47
|
+
// в том же файле лога не должны портить оценку (QA-F.1).
|
|
48
|
+
const content = extractLastRunLog(fs.readFileSync(filePath, "utf8"));
|
|
45
49
|
const lines = content.split(/\r?\n/);
|
|
46
50
|
if (lines.length > 0 && lines[lines.length - 1] === "")
|
|
47
51
|
lines.pop();
|
|
@@ -59,6 +63,11 @@ const TOKEN_PATTERNS = [
|
|
|
59
63
|
const COST_PATTERNS = [
|
|
60
64
|
new RegExp(USAGE_PREFIX + "(?:cost|total\\s+cost)\\s*[:=]?\\s*\\$\\s*([0-9]+(?:[.,][0-9]+)?)", "i"),
|
|
61
65
|
new RegExp(USAGE_PREFIX + "(?:cost|total\\s+cost)\\s*[:=]\\s*([0-9]+(?:[.,][0-9]+)?)\\s*(?:usd|\\$)", "i"),
|
|
66
|
+
// QA-F.1: OpenCode печатает costUsd=0.1 / cost=0.25 без валютного знака —
|
|
67
|
+
// старые шаблоны требовали `$` перед числом или `usd` после, поэтому
|
|
68
|
+
// стоимость терялась и в метриках/аналитике оставалась нулевой.
|
|
69
|
+
new RegExp(USAGE_PREFIX + "(?:costUsd|cost_usd|cost(?:\\s*usd)?)\\s*[:=]\\s*\\$?\\s*([0-9]+(?:[.,][0-9]+)?)", "i"),
|
|
70
|
+
new RegExp(USAGE_PREFIX + "(?:costUsd|cost_usd|cost(?:\\s*usd)?)\\s*[:=]\\s*([0-9]+(?:[.,][0-9]+)?)\\s*(?:usd|\\$)", "i"),
|
|
62
71
|
];
|
|
63
72
|
function parseUsageValue(raw, suffix) {
|
|
64
73
|
const value = parseFloat(raw.replace(",", "."));
|
|
@@ -117,6 +126,35 @@ export function parseUsageFromLog(logFile) {
|
|
|
117
126
|
}
|
|
118
127
|
return result;
|
|
119
128
|
}
|
|
129
|
+
/**
|
|
130
|
+
* PL-38: если обёртка не передала usage, а логи его не содержат, берём
|
|
131
|
+
* показания из собственной БД OpenCode за окно запуска задачи. Результат
|
|
132
|
+
* консервативный: уже найденные значения не перезаписываются, нули не подменяются.
|
|
133
|
+
*/
|
|
134
|
+
function resolveUsageFromOpenCodeDb(taskName, startedAtIso, durationMs, fallback) {
|
|
135
|
+
if (fallback.tokens !== undefined && fallback.costUsd !== undefined)
|
|
136
|
+
return fallback;
|
|
137
|
+
const definition = getTask(taskName);
|
|
138
|
+
const end = Date.now();
|
|
139
|
+
const parsedStart = Date.parse(startedAtIso);
|
|
140
|
+
const start = Number.isFinite(parsedStart) ? parsedStart : end - Math.max(0, durationMs);
|
|
141
|
+
// +-2 с покрывают рассинхрон часов обёртки и движка OpenCode.
|
|
142
|
+
const usage = collectOpenCodeUsage({
|
|
143
|
+
since: start - 2000,
|
|
144
|
+
until: end + 2000,
|
|
145
|
+
cwd: definition?.workingDirectory,
|
|
146
|
+
});
|
|
147
|
+
if (!usage || (usage.tokens <= 0 && usage.costUsd <= 0))
|
|
148
|
+
return fallback;
|
|
149
|
+
const resolved = {
|
|
150
|
+
tokens: fallback.tokens ?? (usage.tokens > 0 ? usage.tokens : undefined),
|
|
151
|
+
costUsd: fallback.costUsd ?? (usage.costUsd > 0 ? usage.costUsd : undefined),
|
|
152
|
+
};
|
|
153
|
+
logRecorderEvent("usage.from_opencode_db", taskName, {
|
|
154
|
+
reason: `tokens=${usage.tokens} cost=${usage.costUsd} messages=${usage.messages}`,
|
|
155
|
+
});
|
|
156
|
+
return resolved;
|
|
157
|
+
}
|
|
120
158
|
/**
|
|
121
159
|
* Ищет настройку повторов задачи в БД.
|
|
122
160
|
* Возвращает 0, если повторы не настроены.
|
|
@@ -376,7 +414,7 @@ async function main() {
|
|
|
376
414
|
process.exit(1);
|
|
377
415
|
}
|
|
378
416
|
const durationMs = Number(fifth) || 0;
|
|
379
|
-
const error = sixth
|
|
417
|
+
const error = normalizeErrorText(sixth);
|
|
380
418
|
// 12-й аргумент — путь к лог-файлу задачи (добавлен в T-08 / D-08).
|
|
381
419
|
const logFile = twelfth;
|
|
382
420
|
const tokens = parseOptionalNumber(seventh);
|
|
@@ -394,6 +432,13 @@ async function main() {
|
|
|
394
432
|
costResolved = usage.costUsd;
|
|
395
433
|
}
|
|
396
434
|
}
|
|
435
|
+
// --finish не получает startedAt: восстанавливаем окно из длительности.
|
|
436
|
+
if (tokensResolved === undefined || costResolved === undefined) {
|
|
437
|
+
const approximatedStart = new Date(Date.now() - Math.max(0, durationMs)).toISOString();
|
|
438
|
+
const dbUsage = resolveUsageFromOpenCodeDb(taskName, approximatedStart, durationMs, { tokens: tokensResolved, costUsd: costResolved });
|
|
439
|
+
tokensResolved = dbUsage.tokens;
|
|
440
|
+
costResolved = dbUsage.costUsd;
|
|
441
|
+
}
|
|
397
442
|
const model = ninth && ninth !== "-" ? ninth.trim() || undefined : undefined;
|
|
398
443
|
const preFlightStatus = parseHookStatus(tenth);
|
|
399
444
|
const postFlightStatus = parseHookStatus(eleventh);
|
|
@@ -423,7 +468,7 @@ async function main() {
|
|
|
423
468
|
}
|
|
424
469
|
const startedAt = third ?? new Date().toISOString();
|
|
425
470
|
const durationMs = Number(fourth) || 0;
|
|
426
|
-
const error = fifth
|
|
471
|
+
const error = normalizeErrorText(fifth);
|
|
427
472
|
// Токены и стоимость приходят из PowerShell-обёртки (ps-wrapper.ts).
|
|
428
473
|
// "-" означает «данных нет» (openCode не печатал usage в лог).
|
|
429
474
|
const tokens = parseOptionalNumber(sixth);
|
|
@@ -444,6 +489,14 @@ async function main() {
|
|
|
444
489
|
costResolved = usage.costUsd;
|
|
445
490
|
}
|
|
446
491
|
}
|
|
492
|
+
if (tokensResolved === undefined || costResolved === undefined) {
|
|
493
|
+
const dbUsage = resolveUsageFromOpenCodeDb(taskName, startedAt, durationMs, {
|
|
494
|
+
tokens: tokensResolved,
|
|
495
|
+
costUsd: costResolved,
|
|
496
|
+
});
|
|
497
|
+
tokensResolved = dbUsage.tokens;
|
|
498
|
+
costResolved = dbUsage.costUsd;
|
|
499
|
+
}
|
|
447
500
|
// Восьмой аргумент — модель; "-" означает, что модель не задана.
|
|
448
501
|
const model = eighth && eighth !== "-" ? eighth.trim() || undefined : undefined;
|
|
449
502
|
// Девятый и десятый — итоги pre/post-flight хуков.
|
|
@@ -519,9 +572,17 @@ async function handleCompletion(taskName, st, chainTarget, error, durationMs, to
|
|
|
519
572
|
});
|
|
520
573
|
}
|
|
521
574
|
if (st === "success") {
|
|
575
|
+
// PL-5.1: один и тот же следующий шаг может прийти и из chainTarget
|
|
576
|
+
// (nextTaskOnSuccess), и из DAG-зависимых (dependsOn). Запускаем каждое
|
|
577
|
+
// имя ровно один раз за завершение: Set по имени, без учёта регистра —
|
|
578
|
+
// именно так сравнивает имена selectDependentsToTrigger.
|
|
579
|
+
const triggered = new Set();
|
|
580
|
+
const nameKey = (name) => name.trim().toLowerCase();
|
|
522
581
|
// Успешный запуск сбрасывает счётчик повторов.
|
|
523
582
|
await deleteSetting(retryStateKey(taskName));
|
|
524
583
|
if (chainTarget) {
|
|
584
|
+
const key = nameKey(chainTarget);
|
|
585
|
+
triggered.add(key);
|
|
525
586
|
const started = await triggerTask(chainTarget);
|
|
526
587
|
if (started) {
|
|
527
588
|
logRecorderEvent("chain.triggered", taskName, { nextTask: chainTarget });
|
|
@@ -536,6 +597,17 @@ async function handleCompletion(taskName, st, chainTarget, error, durationMs, to
|
|
|
536
597
|
const definitions = listTasks();
|
|
537
598
|
const dependents = selectDependentsToTrigger(taskName, definitions, history);
|
|
538
599
|
for (const dependent of dependents) {
|
|
600
|
+
const key = nameKey(dependent);
|
|
601
|
+
if (triggered.has(key)) {
|
|
602
|
+
// Один шаг попал и в цепочку, и в DAG — второй triggerTask
|
|
603
|
+
// создал бы дублирующий запуск (наблюдалось 09:29:24Z).
|
|
604
|
+
logRecorderEvent("dag.dedup_skipped", taskName, {
|
|
605
|
+
reason: "already triggered via nextTaskOnSuccess",
|
|
606
|
+
nextTask: dependent,
|
|
607
|
+
});
|
|
608
|
+
continue;
|
|
609
|
+
}
|
|
610
|
+
triggered.add(key);
|
|
539
611
|
const started = await triggerTask(dependent);
|
|
540
612
|
if (started) {
|
|
541
613
|
logRecorderEvent("dag.triggered", taskName, { nextTask: dependent });
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* QV-8: маркер дочернего прогона `opencode run`.
|
|
3
|
+
*
|
|
4
|
+
* Обёртки задач выставляют `AGENT_STEWARD_CHILD_RUN=1` перед запуском ИИ.
|
|
5
|
+
* Плагин читает маркер при загрузке и НЕ регистрирует инструменты
|
|
6
|
+
* планировщика, RPC, скилл и дашборд: дочерний агент не должен рекурсивно
|
|
7
|
+
* создавать задачи и не должен конкурировать с родительским дашбордом за порт.
|
|
8
|
+
*/
|
|
9
|
+
export declare const CHILD_RUN_ENV = "AGENT_STEWARD_CHILD_RUN";
|
|
10
|
+
/** True, когда текущий процесс — дочерний `opencode run` задачи планировщика. */
|
|
11
|
+
export declare function isChildRunMode(env?: NodeJS.ProcessEnv): boolean;
|
|
12
|
+
//# sourceMappingURL=run-mode.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"run-mode.d.ts","sourceRoot":"","sources":["../../src/core/run-mode.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,eAAO,MAAM,aAAa,4BAA4B,CAAC;AAIvD,iFAAiF;AACjF,wBAAgB,cAAc,CAAC,GAAG,GAAE,MAAM,CAAC,UAAwB,GAAG,OAAO,CAI5E"}
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* QV-8: маркер дочернего прогона `opencode run`.
|
|
3
|
+
*
|
|
4
|
+
* Обёртки задач выставляют `AGENT_STEWARD_CHILD_RUN=1` перед запуском ИИ.
|
|
5
|
+
* Плагин читает маркер при загрузке и НЕ регистрирует инструменты
|
|
6
|
+
* планировщика, RPC, скилл и дашборд: дочерний агент не должен рекурсивно
|
|
7
|
+
* создавать задачи и не должен конкурировать с родительским дашбордом за порт.
|
|
8
|
+
*/
|
|
9
|
+
export const CHILD_RUN_ENV = "AGENT_STEWARD_CHILD_RUN";
|
|
10
|
+
const TRUTHY = new Set(["1", "true", "yes", "on"]);
|
|
11
|
+
/** True, когда текущий процесс — дочерний `opencode run` задачи планировщика. */
|
|
12
|
+
export function isChildRunMode(env = process.env) {
|
|
13
|
+
const raw = env[CHILD_RUN_ENV];
|
|
14
|
+
if (typeof raw !== "string")
|
|
15
|
+
return false;
|
|
16
|
+
return TRUTHY.has(raw.trim().toLowerCase());
|
|
17
|
+
}
|
|
@@ -1,3 +1,7 @@
|
|
|
1
|
+
/** Codes returned by Windows/PowerShell while a log file is still held by the writer. */
|
|
2
|
+
export declare function isRetriableLogReadError(code: unknown): boolean;
|
|
3
|
+
/** Retry fs.readFile while the writer still holds the log (emit_event / immediate get_task_logs race). */
|
|
4
|
+
export declare function readLogWithRetry(logPath: string, attempts?: number, delayMs?: number): Promise<string>;
|
|
1
5
|
/**
|
|
2
6
|
* Читает файл лога задачи и возвращает последние 50 строк.
|
|
3
7
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logs.d.ts","sourceRoot":"","sources":["../../../src/core/scheduler/logs.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"logs.d.ts","sourceRoot":"","sources":["../../../src/core/scheduler/logs.ts"],"names":[],"mappings":"AAKA,yFAAyF;AACzF,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,OAAO,GAAG,OAAO,CAE9D;AAED,0GAA0G;AAC1G,wBAAsB,gBAAgB,CACpC,OAAO,EAAE,MAAM,EACf,QAAQ,SAAI,EACZ,OAAO,SAAK,GACX,OAAO,CAAC,MAAM,CAAC,CAiBjB;AAED;;;;;GAKG;AACH,wBAAsB,WAAW,CAC/B,IAAI,EAAE,MAAM,EACZ,KAAK,SAAK,GACT,OAAO,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,CAwB3C"}
|
|
@@ -1,6 +1,29 @@
|
|
|
1
1
|
import fs from "node:fs/promises";
|
|
2
2
|
import path from "node:path";
|
|
3
3
|
import { LOG_DIR, sanitizeName } from "../../types.js";
|
|
4
|
+
import { extractLastRunLog } from "../mission.js";
|
|
5
|
+
/** Codes returned by Windows/PowerShell while a log file is still held by the writer. */
|
|
6
|
+
export function isRetriableLogReadError(code) {
|
|
7
|
+
return code === "EBUSY" || code === "EPERM" || code === "EACCES";
|
|
8
|
+
}
|
|
9
|
+
/** Retry fs.readFile while the writer still holds the log (emit_event / immediate get_task_logs race). */
|
|
10
|
+
export async function readLogWithRetry(logPath, attempts = 6, delayMs = 50) {
|
|
11
|
+
let lastErr;
|
|
12
|
+
for (let i = 0; i < attempts; i++) {
|
|
13
|
+
try {
|
|
14
|
+
return await fs.readFile(logPath, "utf8");
|
|
15
|
+
}
|
|
16
|
+
catch (err) {
|
|
17
|
+
lastErr = err;
|
|
18
|
+
if (!isRetriableLogReadError(err.code) ||
|
|
19
|
+
i === attempts - 1) {
|
|
20
|
+
throw err;
|
|
21
|
+
}
|
|
22
|
+
await new Promise((resolve) => setTimeout(resolve, delayMs * (i + 1)));
|
|
23
|
+
}
|
|
24
|
+
}
|
|
25
|
+
throw lastErr;
|
|
26
|
+
}
|
|
4
27
|
/**
|
|
5
28
|
* Читает файл лога задачи и возвращает последние 50 строк.
|
|
6
29
|
*
|
|
@@ -11,7 +34,8 @@ export async function getTaskLogs(name, limit = 50) {
|
|
|
11
34
|
const logPath = path.join(LOG_DIR, `${sanitizeName(name)}.log`);
|
|
12
35
|
try {
|
|
13
36
|
// PowerShell 5.1 пишет UTF-8 с BOM — убираем его, чтобы GUI не показывал мусор.
|
|
14
|
-
|
|
37
|
+
// Лог дописывается между запусками: показываем только последний прогон.
|
|
38
|
+
const content = extractLastRunLog(await readLogWithRetry(logPath));
|
|
15
39
|
const lines = content.split(/\r?\n/).filter((line) => line.trim());
|
|
16
40
|
if (lines.length === 0) {
|
|
17
41
|
return {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"secrets.d.ts","sourceRoot":"","sources":["../../src/core/secrets.ts"],"names":[],"mappings":"AAQA;;;;;;;;;;;;;GAaG;AAEH,eAAO,MAAM,YAAY,QAAwC,CAAC;AAClE,eAAO,MAAM,gBAAgB,QAAuC,CAAC;AACrE,eAAO,MAAM,aAAa,QAAyC,CAAC;
|
|
1
|
+
{"version":3,"file":"secrets.d.ts","sourceRoot":"","sources":["../../src/core/secrets.ts"],"names":[],"mappings":"AAQA;;;;;;;;;;;;;GAaG;AAEH,eAAO,MAAM,YAAY,QAAwC,CAAC;AAClE,eAAO,MAAM,gBAAgB,QAAuC,CAAC;AACrE,eAAO,MAAM,aAAa,QAAyC,CAAC;AAyGpE,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,qEAAqE;IACrE,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;CACnB;AAoBD,0DAA0D;AAC1D,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAQvD;AAED,wEAAwE;AACxE,wBAAgB,YAAY,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAIpD;AAoOD,qEAAqE;AACrE,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,cAAc,CAoBrE;AAED,yEAAyE;AACzE,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAW1D;AAED,uDAAuD;AACvD,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAE/C;AAED,0CAA0C;AAC1C,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CASlD;AASD,6EAA6E;AAC7E,wBAAgB,WAAW,IAAI,cAAc,EAAE,CAc9C;AAED,kMAAkM;AAClM,wBAAgB,gBAAgB,CAC9B,KAAK,EAAE,MAAM,EACb,kBAAkB,CAAC,EAAE,MAAM,EAAE,GAC5B;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,EAAE,CAAA;CAAE,CAkBtC;AAED;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAC/B,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAC3B,kBAAkB,CAAC,EAAE,MAAM,EAAE,GAC5B;IAAE,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAAC,OAAO,EAAE,MAAM,EAAE,CAAA;CAAE,CASpD;AA8BD;;;GAGG;AACH,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,OAAO,GAAG,MAAM,CA+BzD;AAED,qEAAqE;AACrE,wBAAgB,iBAAiB,IAAI,IAAI,CAIxC;AAED;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,GAAG,MAAM,EAAE,CAAC,MAAM,GAAG,SAAS,CAAC,EAAE,GAAG,MAAM,EAAE,CAW9E"}
|
package/dist/core/secrets.js
CHANGED
|
@@ -33,8 +33,9 @@ const KEY_BYTES = 32;
|
|
|
33
33
|
* используется из CLI/GUI/плагина, переписывать его на async нельзя.
|
|
34
34
|
*/
|
|
35
35
|
const SECRETS_LOCK_FILE = `${SECRETS_FILE}.lock`;
|
|
36
|
-
|
|
37
|
-
|
|
36
|
+
// icacls на Windows под параллельной нагрузкой CI может занять секунды;
|
|
37
|
+
// 5 с приводило к ложным «Не удалось получить блокировку» даже без краша.
|
|
38
|
+
const SECRETS_LOCK_TIMEOUT_MS = 30000;
|
|
38
39
|
let secretsLockDepth = 0;
|
|
39
40
|
function sleepSync(ms) {
|
|
40
41
|
Atomics.wait(new Int32Array(new SharedArrayBuffer(4)), 0, 0, ms);
|
|
@@ -69,13 +70,22 @@ function withSecretsLock(fn) {
|
|
|
69
70
|
throw err;
|
|
70
71
|
try {
|
|
71
72
|
const stat = fs.statSync(SECRETS_LOCK_FILE);
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
73
|
+
const rawOwner = fs.readFileSync(SECRETS_LOCK_FILE, "utf8").trim();
|
|
74
|
+
const owner = /^\d+$/.test(rawOwner) ? Number(rawOwner) : NaN;
|
|
75
|
+
// Мёртвый владелец — лок осиротел. PID проверяем независимо от времени
|
|
76
|
+
// жизни файла: свежий лок упавшего процесса раньше блокировал запись
|
|
77
|
+
// на 10 с (stale) + 5 с (timeout) и ложно падал на загруженном CI.
|
|
78
|
+
if (Number.isInteger(owner) && owner > 0 && !isProcessAlive(owner)) {
|
|
79
|
+
fs.rmSync(SECRETS_LOCK_FILE, { force: true });
|
|
80
|
+
continue;
|
|
78
81
|
}
|
|
82
|
+
// Пустой/битый лок с только что созданным mtime может ещё не содержать
|
|
83
|
+
// PID — даём процессу-создателю окно, прежде чем считать его осиротевшим.
|
|
84
|
+
if (Date.now() - stat.mtimeMs > 1000 && !Number.isInteger(owner)) {
|
|
85
|
+
fs.rmSync(SECRETS_LOCK_FILE, { force: true });
|
|
86
|
+
continue;
|
|
87
|
+
}
|
|
88
|
+
// Лок с живым владельцем не крадём, даже если он создан давно.
|
|
79
89
|
}
|
|
80
90
|
catch {
|
|
81
91
|
// Лок исчез между stat и read — повторяем попытку.
|