agent-steward 0.0.2 → 0.0.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +45 -2
- package/CROSS_PLATFORM.md +11 -9
- package/README.md +11 -10
- package/ROADMAP-STRATEGY.md +93 -44
- package/ROADMAP.md +148 -1017
- package/dist/core/cron-to-schtasks.d.ts +0 -8
- package/dist/core/cron-to-schtasks.d.ts.map +1 -1
- package/dist/core/cron-to-schtasks.js +11 -86
- package/dist/core/dlq-api.d.ts +44 -0
- package/dist/core/dlq-api.d.ts.map +1 -0
- package/dist/core/dlq-api.js +68 -0
- package/dist/core/dry-run.d.ts.map +1 -1
- package/dist/core/dry-run.js +19 -2
- package/dist/core/file-watcher.js +9 -9
- package/dist/core/git-trigger.js +4 -4
- package/dist/core/lock.d.ts +20 -4
- package/dist/core/lock.d.ts.map +1 -1
- package/dist/core/lock.js +99 -26
- package/dist/core/one-shot.d.ts +31 -5
- package/dist/core/one-shot.d.ts.map +1 -1
- package/dist/core/one-shot.js +78 -10
- package/dist/core/opencode-cli.d.ts +28 -0
- package/dist/core/opencode-cli.d.ts.map +1 -0
- package/dist/core/opencode-cli.js +74 -0
- package/dist/core/opencode-models.d.ts +62 -0
- package/dist/core/opencode-models.d.ts.map +1 -0
- package/dist/core/opencode-models.js +277 -0
- package/dist/core/otel.js +2 -2
- package/dist/core/ps-wrapper.d.ts +1 -1
- package/dist/core/ps-wrapper.d.ts.map +1 -1
- package/dist/core/ps-wrapper.js +66 -36
- package/dist/core/record-history.d.ts +15 -0
- package/dist/core/record-history.d.ts.map +1 -1
- package/dist/core/record-history.js +78 -54
- package/dist/core/router/dispatch.d.ts +36 -0
- package/dist/core/router/dispatch.d.ts.map +1 -0
- package/dist/core/router/dispatch.js +59 -0
- package/dist/core/router/escalation.d.ts +47 -0
- package/dist/core/router/escalation.d.ts.map +1 -0
- package/dist/core/router/escalation.js +87 -0
- package/dist/core/router/planner.d.ts +53 -0
- package/dist/core/router/planner.d.ts.map +1 -0
- package/dist/core/router/planner.js +113 -0
- package/dist/core/router/rules.d.ts +46 -0
- package/dist/core/router/rules.d.ts.map +1 -0
- package/dist/core/router/rules.js +85 -0
- package/dist/core/run-panel-api.d.ts +94 -0
- package/dist/core/run-panel-api.d.ts.map +1 -0
- package/dist/core/run-panel-api.js +169 -0
- package/dist/core/schedule-gate.js +5 -1
- package/dist/core/schedule-v2.d.ts +36 -2
- package/dist/core/schedule-v2.d.ts.map +1 -1
- package/dist/core/schedule-v2.js +98 -12
- package/dist/core/scheduler/at-fallback.d.ts +95 -0
- package/dist/core/scheduler/at-fallback.d.ts.map +1 -0
- package/dist/core/scheduler/at-fallback.js +200 -0
- package/dist/core/scheduler/linux.d.ts +13 -2
- package/dist/core/scheduler/linux.d.ts.map +1 -1
- package/dist/core/scheduler/linux.js +67 -13
- package/dist/core/scheduler/mac.d.ts +14 -8
- package/dist/core/scheduler/mac.d.ts.map +1 -1
- package/dist/core/scheduler/mac.js +71 -22
- package/dist/core/scheduler/posix.d.ts.map +1 -1
- package/dist/core/scheduler/posix.js +37 -2
- package/dist/core/scheduler/registry.d.ts +13 -0
- package/dist/core/scheduler/registry.d.ts.map +1 -1
- package/dist/core/scheduler/registry.js +83 -21
- package/dist/core/scheduler/run-now.d.ts +16 -0
- package/dist/core/scheduler/run-now.d.ts.map +1 -0
- package/dist/core/scheduler/run-now.js +28 -0
- package/dist/core/scheduler/windows.d.ts +16 -3
- package/dist/core/scheduler/windows.d.ts.map +1 -1
- package/dist/core/scheduler/windows.js +249 -96
- package/dist/core/secrets.d.ts.map +1 -1
- package/dist/core/secrets.js +127 -30
- package/dist/core/self-analysis.js +55 -55
- package/dist/core/session.d.ts.map +1 -1
- package/dist/core/session.js +18 -11
- package/dist/core/summary.js +1 -1
- package/dist/core/task-name.d.ts +24 -0
- package/dist/core/task-name.d.ts.map +1 -0
- package/dist/core/task-name.js +40 -0
- package/dist/core/triage-chain.js +1 -1
- package/dist/core/triage-worker.js +2 -2
- package/dist/core/triage.js +1 -1
- package/dist/core/wrappers/bash.d.ts.map +1 -1
- package/dist/core/wrappers/bash.js +82 -37
- package/dist/db/capability-repo.d.ts +83 -0
- package/dist/db/capability-repo.d.ts.map +1 -0
- package/dist/db/capability-repo.js +182 -0
- package/dist/db/history-repo.d.ts +8 -0
- package/dist/db/history-repo.d.ts.map +1 -1
- package/dist/db/history-repo.js +19 -0
- package/dist/db/index.d.ts +6 -0
- package/dist/db/index.d.ts.map +1 -1
- package/dist/db/index.js +48 -2
- package/dist/db/migrate.d.ts.map +1 -1
- package/dist/db/migrate.js +3 -1
- package/dist/db/run-context.d.ts +103 -0
- package/dist/db/run-context.d.ts.map +1 -0
- package/dist/db/run-context.js +224 -0
- package/dist/db/run-dlq.d.ts +100 -0
- package/dist/db/run-dlq.d.ts.map +1 -0
- package/dist/db/run-dlq.js +191 -0
- package/dist/db/run-journal.d.ts +60 -0
- package/dist/db/run-journal.d.ts.map +1 -0
- package/dist/db/run-journal.js +143 -0
- package/dist/db/run-resume.d.ts +51 -0
- package/dist/db/run-resume.d.ts.map +1 -0
- package/dist/db/run-resume.js +156 -0
- package/dist/db/runs-repo.d.ts +128 -0
- package/dist/db/runs-repo.d.ts.map +1 -0
- package/dist/db/runs-repo.js +342 -0
- package/dist/db/schema.d.ts +16 -2
- package/dist/db/schema.d.ts.map +1 -1
- package/dist/db/schema.js +342 -35
- package/dist/db/settings-repo.d.ts +11 -0
- package/dist/db/settings-repo.d.ts.map +1 -1
- package/dist/db/settings-repo.js +25 -0
- package/dist/db/step-idempotency.d.ts +51 -0
- package/dist/db/step-idempotency.d.ts.map +1 -0
- package/dist/db/step-idempotency.js +136 -0
- package/dist/index.d.ts +5 -5
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +168 -40
- package/dist/notifications.js +18 -18
- package/dist/profiles.d.ts +7 -3
- package/dist/profiles.d.ts.map +1 -1
- package/dist/profiles.js +85 -7
- package/dist/rpc.d.ts +787 -0
- package/dist/rpc.d.ts.map +1 -1
- package/dist/rpc.js +324 -0
- package/dist/server.d.ts +33 -2
- package/dist/server.d.ts.map +1 -1
- package/dist/server.js +115 -54
- package/dist/shared/jobs-view.d.ts.map +1 -1
- package/dist/skill.js +1 -1
- package/dist/task-transfer.d.ts +1 -1
- package/dist/task-transfer.d.ts.map +1 -1
- package/dist/task-transfer.js +14 -10
- package/dist/types.d.ts +20 -4
- package/dist/types.d.ts.map +1 -1
- package/dist/types.js +44 -9
- package/dist/workspaces.d.ts +25 -3
- package/dist/workspaces.d.ts.map +1 -1
- package/dist/workspaces.js +44 -9
- package/docs/ARCHITECTURE.md +335 -9
- package/docs/COMPATIBILITY.md +10 -6
- package/docs/CONCEPT.md +183 -91
- package/docs/CROSS_PLATFORM.ru.md +11 -9
- package/docs/CROSS_PLATFORM.zh.md +11 -9
- package/docs/EXECUTION-LOOP.md +196 -0
- package/docs/FAQ.md +2 -2
- package/docs/FAQ.ru.md +2 -2
- package/docs/FAQ.zh.md +2 -2
- package/docs/FEATURES.md +5 -4
- package/docs/FEATURES.zh.md +5 -4
- package/docs/MIGRATION.md +34 -26
- package/docs/README.ru.md +27 -8
- package/docs/README.zh.md +11 -10
- package/docs/SAFETY.md +122 -0
- package/docs/SAVINGS.md +29 -0
- package/docs/SAVINGS.ru.md +29 -0
- package/docs/SAVINGS.zh.md +18 -0
- package/docs/V1-V2-COMPATIBILITY-PLAN.md +6 -6
- package/gui-experimental.cjs +8 -8
- package/index.js +1 -0
- package/locales/en.json +68 -0
- package/locales/ru.json +68 -0
- package/locales/zh.json +68 -0
- package/package.json +57 -11
- package/scripts/audit-bundle.mjs +215 -0
- package/src/core/analytics.ts +2 -2
- package/src/core/audit.ts +17 -17
- package/src/core/cron-to-schtasks.ts +14 -93
- package/src/core/dlq-api.ts +98 -0
- package/src/core/dry-run.ts +51 -27
- package/src/core/file-watcher.ts +17 -17
- package/src/core/git-trigger.ts +9 -9
- package/src/core/glob.ts +1 -1
- package/src/core/local-ai.ts +2 -2
- package/src/core/lock.ts +104 -31
- package/src/core/matrix.ts +31 -31
- package/src/core/native-notify.ts +2 -2
- package/src/core/one-shot.ts +91 -13
- package/src/core/opencode-cli.ts +103 -0
- package/src/core/opencode-models.ts +315 -0
- package/src/core/otel.ts +4 -4
- package/src/core/permissions.ts +5 -5
- package/src/core/prometheus.ts +17 -17
- package/src/core/ps-wrapper.ts +68 -38
- package/src/core/record-history.ts +114 -76
- package/src/core/retention.ts +3 -3
- package/src/core/router/dispatch.ts +94 -0
- package/src/core/router/escalation.ts +129 -0
- package/src/core/router/planner.ts +166 -0
- package/src/core/router/rules.ts +109 -0
- package/src/core/run-panel-api.ts +262 -0
- package/src/core/savings.ts +1 -1
- package/src/core/schedule-gate.ts +17 -13
- package/src/core/schedule-v2.ts +138 -29
- package/src/core/scheduler/at-fallback.ts +298 -0
- package/src/core/scheduler/index.ts +3 -3
- package/src/core/scheduler/linux.ts +92 -19
- package/src/core/scheduler/logs.ts +1 -1
- package/src/core/scheduler/mac.ts +112 -60
- package/src/core/scheduler/posix.ts +35 -2
- package/src/core/scheduler/registry.ts +109 -26
- package/src/core/scheduler/run-now.ts +32 -0
- package/src/core/scheduler/windows.ts +295 -125
- package/src/core/secrets.ts +139 -39
- package/src/core/self-analysis.ts +61 -61
- package/src/core/session.ts +26 -13
- package/src/core/structured-log.ts +3 -3
- package/src/core/summary.ts +25 -25
- package/src/core/task-name.ts +67 -0
- package/src/core/telegram.ts +16 -16
- package/src/core/triage-chain.ts +4 -4
- package/src/core/triage-compare.ts +8 -8
- package/src/core/triage-rules.ts +4 -4
- package/src/core/triage-shadow.ts +7 -7
- package/src/core/triage-worker.ts +6 -6
- package/src/core/triage.ts +23 -23
- package/src/core/watch-paths.ts +1 -1
- package/src/core/wrappers/bash.ts +90 -45
- package/src/db/capability-repo.ts +285 -0
- package/src/db/git-state-repo.ts +1 -1
- package/src/db/history-repo.ts +44 -22
- package/src/db/index.ts +53 -7
- package/src/db/metrics-repo.ts +10 -10
- package/src/db/migrate.ts +13 -11
- package/src/db/recovery.ts +3 -3
- package/src/db/run-context.ts +370 -0
- package/src/db/run-dlq.ts +310 -0
- package/src/db/run-journal.ts +212 -0
- package/src/db/run-resume.ts +256 -0
- package/src/db/runs-repo.ts +504 -0
- package/src/db/schema.ts +357 -44
- package/src/db/settings-repo.ts +33 -2
- package/src/db/step-idempotency.ts +185 -0
- package/src/db/tasks-repo.ts +10 -10
- package/src/db/templates-repo.ts +7 -7
- package/src/gui.tsx +516 -1
- package/src/history.ts +4 -4
- package/src/i18n.ts +7 -7
- package/src/index.ts +465 -308
- package/src/integrations.ts +6 -6
- package/src/notifications.ts +76 -76
- package/src/profiles.ts +98 -7
- package/src/rpc.ts +347 -1
- package/src/schtasks.ts +2 -2
- package/src/server.ts +155 -78
- package/src/settings.ts +44 -44
- package/src/shared/jobs-view.ts +60 -60
- package/src/skill.ts +1 -1
- package/src/task-transfer.ts +58 -56
- package/src/templates.ts +1 -1
- package/src/types.ts +54 -10
- package/src/workspaces.ts +73 -24
- package/dist/core/self-analysis.test.d.ts +0 -2
- package/dist/core/self-analysis.test.d.ts.map +0 -1
- package/dist/core/self-analysis.test.js +0 -219
- package/dist/gui-experimental.cjs +0 -1
package/dist/core/ps-wrapper.js
CHANGED
|
@@ -52,7 +52,11 @@ export const WRAPPER_SCRIPT = `param(
|
|
|
52
52
|
[int]$GateTimeoutSeconds = 300,
|
|
53
53
|
[int]$StaleLockMaxAgeMs = 86400000,
|
|
54
54
|
[string]$PermissionsB64 = "",
|
|
55
|
-
[string]$PolicyB64 = ""
|
|
55
|
+
[string]$PolicyB64 = "",
|
|
56
|
+
[string]$ModelB64 = "",
|
|
57
|
+
[string]$WorkspaceNameB64 = "",
|
|
58
|
+
[string]$AllowedToolsB64 = "",
|
|
59
|
+
[string]$DeniedToolsB64 = ""
|
|
56
60
|
)
|
|
57
61
|
|
|
58
62
|
[Console]::OutputEncoding = [System.Text.Encoding]::UTF8
|
|
@@ -60,6 +64,23 @@ $OutputEncoding = [System.Text.Encoding]::UTF8
|
|
|
60
64
|
|
|
61
65
|
$ErrorActionPreference = "Continue"
|
|
62
66
|
|
|
67
|
+
# P2-11: свободный текст (модель, имя workspace, списки инструментов) приходит
|
|
68
|
+
# в base64, чтобы символы подстановки PowerShell/cmd не разворачивались.
|
|
69
|
+
function ConvertFrom-B64Text {
|
|
70
|
+
param([string]$Value)
|
|
71
|
+
if (-not $Value) { return "" }
|
|
72
|
+
try {
|
|
73
|
+
return [System.Text.Encoding]::UTF8.GetString([System.Convert]::FromBase64String($Value))
|
|
74
|
+
} catch {
|
|
75
|
+
return ""
|
|
76
|
+
}
|
|
77
|
+
}
|
|
78
|
+
|
|
79
|
+
if ($ModelB64) { $Model = ConvertFrom-B64Text $ModelB64 }
|
|
80
|
+
if ($WorkspaceNameB64) { $WorkspaceName = ConvertFrom-B64Text $WorkspaceNameB64 }
|
|
81
|
+
if ($AllowedToolsB64) { $AllowedTools = ConvertFrom-B64Text $AllowedToolsB64 }
|
|
82
|
+
if ($DeniedToolsB64) { $DeniedTools = ConvertFrom-B64Text $DeniedToolsB64 }
|
|
83
|
+
|
|
63
84
|
function Write-Log {
|
|
64
85
|
param([string]$Message)
|
|
65
86
|
$timestamp = Get-Date -Format "yyyy-MM-dd HH:mm:ss"
|
|
@@ -96,7 +117,7 @@ if ($LogFile) {
|
|
|
96
117
|
} catch {}
|
|
97
118
|
}
|
|
98
119
|
|
|
99
|
-
Write-Log "[
|
|
120
|
+
Write-Log "[agent-steward] Запуск задачи '$TaskName'..."
|
|
100
121
|
|
|
101
122
|
$startTime = Get-Date
|
|
102
123
|
$script:exitCode = 0
|
|
@@ -176,11 +197,11 @@ if ($LockFile) {
|
|
|
176
197
|
}
|
|
177
198
|
}
|
|
178
199
|
if (-not $script:lockAcquired) {
|
|
179
|
-
Write-Log "[
|
|
200
|
+
Write-Log "[agent-steward] Запуск задачи '$TaskName' пропущен: удерживается активная блокировка."
|
|
180
201
|
exit 0
|
|
181
202
|
}
|
|
182
203
|
} catch {
|
|
183
|
-
Write-Log "[
|
|
204
|
+
Write-Log "[agent-steward] Не удалось захватить блокировку задачи '$TaskName': $_"
|
|
184
205
|
exit 0
|
|
185
206
|
}
|
|
186
207
|
}
|
|
@@ -244,7 +265,7 @@ function Invoke-HookScript {
|
|
|
244
265
|
try { & taskkill.exe /F /T /PID $proc.Id 2>$null | Out-Null } catch {}
|
|
245
266
|
try { $proc.WaitForExit(5000) | Out-Null } catch {}
|
|
246
267
|
$code = 124
|
|
247
|
-
Write-Log "[
|
|
268
|
+
Write-Log "[agent-steward] Таймаут хука ($timeout с): $Command"
|
|
248
269
|
} else {
|
|
249
270
|
try { $proc.WaitForExit() } catch {}
|
|
250
271
|
$code = $proc.ExitCode
|
|
@@ -262,7 +283,7 @@ function Invoke-HookScript {
|
|
|
262
283
|
}
|
|
263
284
|
return $code
|
|
264
285
|
} catch {
|
|
265
|
-
Write-Log "[
|
|
286
|
+
Write-Log "[agent-steward] Не удалось выполнить хук: $_"
|
|
266
287
|
return 1
|
|
267
288
|
} finally {
|
|
268
289
|
Remove-Item -LiteralPath $hookFile -Force -ErrorAction SilentlyContinue
|
|
@@ -355,7 +376,7 @@ function Invoke-OpenCodeOnce {
|
|
|
355
376
|
}
|
|
356
377
|
|
|
357
378
|
if ($script:timedOut) {
|
|
358
|
-
Write-Log "[
|
|
379
|
+
Write-Log "[agent-steward] Таймаут: задача '$TaskName' превысила лимит $TimeoutSeconds с — процесс остановлен."
|
|
359
380
|
$script:errorMessage = "Таймаут: превышено $TimeoutSeconds с"
|
|
360
381
|
return 124
|
|
361
382
|
}
|
|
@@ -597,17 +618,17 @@ try {
|
|
|
597
618
|
|
|
598
619
|
# Pre-flight: выполняется ДО основной задачи. Ненулевой код отменяет запуск.
|
|
599
620
|
if ($BeforeScript) {
|
|
600
|
-
Write-Log "[
|
|
621
|
+
Write-Log "[agent-steward] Pre-flight: $BeforeScript"
|
|
601
622
|
$preCode = Invoke-HookScript -Command $BeforeScript
|
|
602
623
|
if ($preCode -ne 0) {
|
|
603
|
-
Write-Log "[
|
|
624
|
+
Write-Log "[agent-steward] ОШИБКА: Pre-flight script failed (код $preCode)."
|
|
604
625
|
$script:preFlightStatus = "error"
|
|
605
626
|
$script:errorMessage = "Pre-flight script failed"
|
|
606
627
|
$script:exitCode = 1
|
|
607
628
|
$script:skipMainTask = $true
|
|
608
629
|
} else {
|
|
609
630
|
$script:preFlightStatus = "success"
|
|
610
|
-
Write-Log "[
|
|
631
|
+
Write-Log "[agent-steward] Pre-flight успешно завершён."
|
|
611
632
|
}
|
|
612
633
|
}
|
|
613
634
|
|
|
@@ -627,12 +648,22 @@ try {
|
|
|
627
648
|
Get-Content -Path $EnvFile -Encoding UTF8 | ForEach-Object {
|
|
628
649
|
$line = $_.Trim()
|
|
629
650
|
if ($line -and -not $line.StartsWith("#") -and $line -match "^([A-Za-z_][A-Za-z0-9_]*)=(.*)$") {
|
|
630
|
-
|
|
651
|
+
$envKey = $matches[1]
|
|
652
|
+
$envValue = $matches[2]
|
|
653
|
+
# P2-21: секрет удалён/переименован — не подставляем литерал
|
|
654
|
+
# \${secret:...} агенту, а прерываем запуск с понятной ошибкой.
|
|
655
|
+
if ($envValue -match '\$\{secret:[^}]+\}') {
|
|
656
|
+
throw "Workspace '$WorkspaceName': переменная $envKey содержит неразрешённый секрет. Запуск отменён."
|
|
657
|
+
}
|
|
658
|
+
Set-Item -Path ("env:" + $envKey) -Value $envValue
|
|
631
659
|
}
|
|
632
660
|
}
|
|
633
|
-
Write-Log "[
|
|
661
|
+
Write-Log "[agent-steward] Переменные окружения workspace загружены."
|
|
634
662
|
} catch {
|
|
635
|
-
Write-Log "[
|
|
663
|
+
Write-Log "[agent-steward] Не удалось загрузить env-файл workspace: $($_.Exception.Message)"
|
|
664
|
+
# P2-21: ошибка конфигурации секретов должна валить задачу,
|
|
665
|
+
# а не оставлять её работать без переменной окружения.
|
|
666
|
+
throw
|
|
636
667
|
}
|
|
637
668
|
}
|
|
638
669
|
|
|
@@ -655,7 +686,7 @@ try {
|
|
|
655
686
|
$fromFile = (Get-Content -LiteralPath $SessionFile -Raw -ErrorAction Stop).Trim()
|
|
656
687
|
if ($fromFile) { $effectiveSessionId = $fromFile }
|
|
657
688
|
} catch {
|
|
658
|
-
Write-Log "[
|
|
689
|
+
Write-Log "[agent-steward] Не удалось прочитать файл сессии: $($_.Exception.Message)"
|
|
659
690
|
}
|
|
660
691
|
}
|
|
661
692
|
if ($effectiveSessionId) {
|
|
@@ -679,7 +710,7 @@ try {
|
|
|
679
710
|
$attempt++
|
|
680
711
|
if ($attempt -gt 1) {
|
|
681
712
|
$waitSeconds = [Math]::Max(0, $RetryDelaySeconds)
|
|
682
|
-
Write-Log "[
|
|
713
|
+
Write-Log "[agent-steward] Повтор $($attempt - 1) из $($maxAttempts - 1) через $waitSeconds с..."
|
|
683
714
|
if ($waitSeconds -gt 0) { Start-Sleep -Seconds $waitSeconds }
|
|
684
715
|
$script:errorMessage = ""
|
|
685
716
|
}
|
|
@@ -688,47 +719,47 @@ try {
|
|
|
688
719
|
# Таймаут повторять бессмысленно: каждая попытка снова съест весь лимит.
|
|
689
720
|
if ($script:timedOut) { break }
|
|
690
721
|
if ($attempt -lt $maxAttempts) {
|
|
691
|
-
Write-Log "[
|
|
722
|
+
Write-Log "[agent-steward] Попытка $attempt завершилась с кодом $($script:exitCode)."
|
|
692
723
|
}
|
|
693
724
|
}
|
|
694
725
|
|
|
695
726
|
# Quality Gate: проверочная команда выполняется ТОЛЬКО после успешного
|
|
696
727
|
# завершения opencode run. Если ИИ упал — шлюз не запускаем.
|
|
697
728
|
if ($QualityGate -and $script:exitCode -eq 0) {
|
|
698
|
-
Write-Log "[
|
|
729
|
+
Write-Log "[agent-steward] Запуск Quality Gate: $QualityGate"
|
|
699
730
|
# Тот же таймаут, что у хуков: зависший gate не должен держать lock.
|
|
700
731
|
$gateCode = Invoke-HookScript -Command $QualityGate
|
|
701
732
|
|
|
702
733
|
if ($gateCode -eq 124) {
|
|
703
|
-
Write-Log "[
|
|
734
|
+
Write-Log "[agent-steward] ОШИБКА: Quality Gate превысил таймаут $GateTimeoutSeconds с и был остановлен."
|
|
704
735
|
$script:errorMessage = "Quality Gate: превышен таймаут $GateTimeoutSeconds с"
|
|
705
736
|
$script:exitCode = 1
|
|
706
737
|
} elseif ($gateCode -ne 0) {
|
|
707
|
-
Write-Log "[
|
|
738
|
+
Write-Log "[agent-steward] ОШИБКА: Quality Gate провален. Код возврата: $gateCode"
|
|
708
739
|
$script:errorMessage = "Quality Gate провален. Код возврата: $gateCode"
|
|
709
740
|
$script:exitCode = 1
|
|
710
741
|
} else {
|
|
711
|
-
Write-Log "[
|
|
742
|
+
Write-Log "[agent-steward] Quality Gate пройден."
|
|
712
743
|
}
|
|
713
744
|
}
|
|
714
745
|
|
|
715
746
|
if ($script:exitCode -ne 0) {
|
|
716
|
-
Write-Log "[
|
|
747
|
+
Write-Log "[agent-steward] Задача '$TaskName' завершилась с кодом $script:exitCode."
|
|
717
748
|
} else {
|
|
718
|
-
Write-Log "[
|
|
749
|
+
Write-Log "[agent-steward] Задача '$TaskName' успешно завершена."
|
|
719
750
|
}
|
|
720
751
|
} # конец блока основной задачи
|
|
721
752
|
} catch {
|
|
722
|
-
Write-Log "[
|
|
753
|
+
Write-Log "[agent-steward] Ошибка выполнения задачи '$TaskName': $_"
|
|
723
754
|
$script:errorMessage = "Ошибка выполнения задачи: $_"
|
|
724
755
|
$script:exitCode = 1
|
|
725
756
|
} finally {
|
|
726
757
|
# Post-flight: выполняется ВСЕГДА, даже если основная задача упала.
|
|
727
758
|
if ($AfterScript) {
|
|
728
|
-
Write-Log "[
|
|
759
|
+
Write-Log "[agent-steward] Post-flight: $AfterScript"
|
|
729
760
|
$postCode = Invoke-HookScript -Command $AfterScript
|
|
730
761
|
if ($postCode -ne 0) {
|
|
731
|
-
Write-Log "[
|
|
762
|
+
Write-Log "[agent-steward] ОШИБКА: Post-flight script failed (код $postCode)."
|
|
732
763
|
$script:postFlightStatus = "error"
|
|
733
764
|
if ($script:exitCode -eq 0) {
|
|
734
765
|
$script:errorMessage = "Post-flight script failed"
|
|
@@ -736,7 +767,7 @@ try {
|
|
|
736
767
|
}
|
|
737
768
|
} else {
|
|
738
769
|
$script:postFlightStatus = "success"
|
|
739
|
-
Write-Log "[
|
|
770
|
+
Write-Log "[agent-steward] Post-flight успешно завершён."
|
|
740
771
|
}
|
|
741
772
|
}
|
|
742
773
|
|
|
@@ -910,27 +941,26 @@ export async function writeWrapperCmd(sanitizedName, taskName, promptFile, timeo
|
|
|
910
941
|
if (model?.trim()) {
|
|
911
942
|
const safeModel = model.replace(/[\r\n"]+/g, "").trim();
|
|
912
943
|
if (safeModel) {
|
|
913
|
-
|
|
944
|
+
const modelB64 = Buffer.from(safeModel, "utf8").toString("base64");
|
|
945
|
+
psArgs.push(`-ModelB64 "${modelB64}"`);
|
|
914
946
|
}
|
|
915
947
|
}
|
|
916
948
|
if (workspaceName?.trim()) {
|
|
917
|
-
const
|
|
918
|
-
|
|
919
|
-
psArgs.push(`-WorkspaceName "${safeWorkspace}"`);
|
|
920
|
-
}
|
|
949
|
+
const workspaceB64 = Buffer.from(workspaceName.trim(), "utf8").toString("base64");
|
|
950
|
+
psArgs.push(`-WorkspaceNameB64 "${workspaceB64}"`);
|
|
921
951
|
}
|
|
922
952
|
// Role-scoped tools (спринт 14): передаём списки одной строкой через запятую.
|
|
923
953
|
for (const [flag, list] of [
|
|
924
|
-
["-
|
|
925
|
-
["-
|
|
954
|
+
["-AllowedToolsB64", allowedTools],
|
|
955
|
+
["-DeniedToolsB64", deniedTools],
|
|
926
956
|
]) {
|
|
927
957
|
const joined = (Array.isArray(list) ? list : [])
|
|
928
958
|
.map((item) => String(item).trim())
|
|
929
959
|
.filter(Boolean)
|
|
930
960
|
.join(",");
|
|
931
961
|
if (joined) {
|
|
932
|
-
const
|
|
933
|
-
psArgs.push(`${flag} "${
|
|
962
|
+
const b64 = Buffer.from(joined, "utf8").toString("base64");
|
|
963
|
+
psArgs.push(`${flag} "${b64}"`);
|
|
934
964
|
}
|
|
935
965
|
}
|
|
936
966
|
// Спринт 32: готовый JSON политики и метаданные для лога — в base64.
|
|
@@ -1024,7 +1054,7 @@ export async function writeWrapperCmd(sanitizedName, taskName, promptFile, timeo
|
|
|
1024
1054
|
gateArgs.push(`>> "${logFile.trim()}" 2>&1`);
|
|
1025
1055
|
}
|
|
1026
1056
|
lines.push(gateArgs.join(" "));
|
|
1027
|
-
lines.push(
|
|
1057
|
+
lines.push("if \"%errorlevel%\"==\"3\" exit /b 0");
|
|
1028
1058
|
}
|
|
1029
1059
|
lines.push(psArgs.join(" "));
|
|
1030
1060
|
await fs.writeFile(cmdPath, lines.join("\r\n"), "utf8");
|
|
@@ -22,4 +22,19 @@ export declare function parseUsageFromLog(logFile: string): UsageInfo;
|
|
|
22
22
|
* (иначе граф зациклится и будет перезапускать её на каждом завершении).
|
|
23
23
|
*/
|
|
24
24
|
export declare function selectDependentsToTrigger(completedTask: string, definitions: TaskDefinition[], history: HistoryRecord[]): string[];
|
|
25
|
+
/** Зависимости для тестируемой очистки one-shot (P2-27). */
|
|
26
|
+
export interface OneShotCleanupDeps {
|
|
27
|
+
platform?: NodeJS.Platform;
|
|
28
|
+
getDefinition?: (name: string) => TaskDefinition | undefined;
|
|
29
|
+
deleteTask?: (name: string) => Promise<void>;
|
|
30
|
+
}
|
|
31
|
+
/**
|
|
32
|
+
* Удаляет отработавшую ONCE-задачу из Планировщика Windows.
|
|
33
|
+
*
|
|
34
|
+
* `schtasks /create ... /z` должен был делать это сам, но на Win10/11
|
|
35
|
+
* возвращает «The task XML is missing a required element ... EndBoundary»
|
|
36
|
+
* и задача вообще не создаётся. Поэтому чистим после запуска вручную.
|
|
37
|
+
* На Linux/macOS очистка не нужна: `at` и launchd убирают one-shot сами.
|
|
38
|
+
*/
|
|
39
|
+
export declare function cleanupWindowsOneShotTask(taskName: string, deps?: OneShotCleanupDeps): Promise<boolean>;
|
|
25
40
|
//# sourceMappingURL=record-history.d.ts.map
|
|
@@ -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":"AAUA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAC1D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAiCnD,MAAM,WAAW,SAAS;IACxB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAwBD;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,MAAM,GAAG,SAAS,CAmC5D;AA6GD;;;;;;;;;GASG;AACH,wBAAgB,yBAAyB,CACvC,aAAa,EAAE,MAAM,EACrB,WAAW,EAAE,cAAc,EAAE,EAC7B,OAAO,EAAE,aAAa,EAAE,GACvB,MAAM,EAAE,CA0EV;AAiLD,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,CAyBlB"}
|
|
@@ -1,14 +1,19 @@
|
|
|
1
1
|
import { spawn } from "node:child_process";
|
|
2
2
|
import fs from "node:fs";
|
|
3
3
|
import { pathToFileURL } from "node:url";
|
|
4
|
+
import { runTaskNow } from "./scheduler/run-now.js";
|
|
4
5
|
import { createSchedulerBackend } from "./scheduler/index.js";
|
|
5
6
|
import { notifyTaskCompletion } from "../notifications.js";
|
|
6
|
-
import { finishRun,
|
|
7
|
-
import {
|
|
7
|
+
import { finishRun, getLatestHistoryByTask, recordRun, startRun } from "../db/history-repo.js";
|
|
8
|
+
import { deleteSetting, decrementCounterSetting } from "../db/settings-repo.js";
|
|
8
9
|
import { getTask, listTasks } from "../db/tasks-repo.js";
|
|
9
10
|
import { rotateSessionIfNeeded } from "./session.js";
|
|
10
11
|
import { advanceMatrixAfterClone, finalizeMatrixIfComplete, } from "./matrix.js";
|
|
11
|
-
|
|
12
|
+
/** Префикс ключа настроек со счётчиком повторов конкретной задачи. */
|
|
13
|
+
const RETRY_STATE_PREFIX = "retry_state:";
|
|
14
|
+
function retryStateKey(taskName) {
|
|
15
|
+
return `${RETRY_STATE_PREFIX}${taskName.toLowerCase()}`;
|
|
16
|
+
}
|
|
12
17
|
/** Сколько последних строк лога сканировать при поиске токенов/стоимости. */
|
|
13
18
|
const LOG_TAIL_LINES = 500;
|
|
14
19
|
/**
|
|
@@ -27,25 +32,25 @@ function readLogTail(filePath, maxLines) {
|
|
|
27
32
|
return [];
|
|
28
33
|
}
|
|
29
34
|
}
|
|
30
|
-
const USAGE_PREFIX =
|
|
35
|
+
const USAGE_PREFIX = "^\\s*(?:\\[.*?\\]\\s*)?";
|
|
31
36
|
const TOKEN_PATTERNS = [
|
|
32
|
-
new RegExp(USAGE_PREFIX +
|
|
33
|
-
new RegExp(USAGE_PREFIX +
|
|
37
|
+
new RegExp(USAGE_PREFIX + "(?:tokens?|token\\s+usage|usage)\\s*[:=]\\s*([0-9][0-9.,]*)\\s*([kKmM])?\\b", "i"),
|
|
38
|
+
new RegExp(USAGE_PREFIX + "(?:input|output|total)\\s+tokens?\\s*[:=]?\\s*([0-9][0-9.,]*)\\s*([kKmM])?\\b", "i"),
|
|
34
39
|
];
|
|
35
40
|
const COST_PATTERNS = [
|
|
36
|
-
new RegExp(USAGE_PREFIX +
|
|
37
|
-
new RegExp(USAGE_PREFIX +
|
|
41
|
+
new RegExp(USAGE_PREFIX + "(?:cost|total\\s+cost)\\s*[:=]?\\s*\\$\\s*([0-9]+(?:[.,][0-9]+)?)", "i"),
|
|
42
|
+
new RegExp(USAGE_PREFIX + "(?:cost|total\\s+cost)\\s*[:=]\\s*([0-9]+(?:[.,][0-9]+)?)\\s*(?:usd|\\$)", "i"),
|
|
38
43
|
];
|
|
39
44
|
function parseUsageValue(raw, suffix) {
|
|
40
|
-
const value = parseFloat(raw.replace(
|
|
45
|
+
const value = parseFloat(raw.replace(",", "."));
|
|
41
46
|
if (!Number.isFinite(value))
|
|
42
47
|
return undefined;
|
|
43
48
|
let mult = 1;
|
|
44
49
|
if (suffix) {
|
|
45
50
|
const s = suffix.toLowerCase();
|
|
46
|
-
if (s ===
|
|
51
|
+
if (s === "k")
|
|
47
52
|
mult = 1000;
|
|
48
|
-
else if (s ===
|
|
53
|
+
else if (s === "m")
|
|
49
54
|
mult = 1000000;
|
|
50
55
|
}
|
|
51
56
|
return Math.round(value * mult);
|
|
@@ -83,7 +88,7 @@ export function parseUsageFromLog(logFile) {
|
|
|
83
88
|
for (const pattern of COST_PATTERNS) {
|
|
84
89
|
const m = text.match(pattern);
|
|
85
90
|
if (m) {
|
|
86
|
-
result.costUsd = parseFloat(m[1].replace(
|
|
91
|
+
result.costUsd = parseFloat(m[1].replace(",", "."));
|
|
87
92
|
break;
|
|
88
93
|
}
|
|
89
94
|
}
|
|
@@ -110,29 +115,20 @@ async function loadRetryConfig(taskName) {
|
|
|
110
115
|
*/
|
|
111
116
|
async function triggerTask(taskName) {
|
|
112
117
|
try {
|
|
113
|
-
await
|
|
118
|
+
await runTaskNow(taskName);
|
|
114
119
|
return true;
|
|
115
120
|
}
|
|
116
121
|
catch (err) {
|
|
117
|
-
console.error(`[
|
|
122
|
+
console.error(`[agent-steward] Не удалось запустить задачу цепочки "${taskName}": ${err instanceof Error ? err.message : String(err)}`);
|
|
118
123
|
return false;
|
|
119
124
|
}
|
|
120
125
|
}
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
}
|
|
128
|
-
async function clearRetryState(taskName) {
|
|
129
|
-
const state = await loadRetryState();
|
|
130
|
-
const key = Object.keys(state).find((k) => k.toLowerCase() === taskName.toLowerCase());
|
|
131
|
-
if (!key)
|
|
132
|
-
return;
|
|
133
|
-
delete state[key];
|
|
134
|
-
await writeRetryState(state);
|
|
135
|
-
}
|
|
126
|
+
/*
|
|
127
|
+
* P2-30: раньше счётчики повторов лежали одним JSON-объектом в настройках.
|
|
128
|
+
* Каждое завершение задачи — отдельный процесс record-history, поэтому
|
|
129
|
+
* параллельные завершения перезаписывали map и теряли декременты. Теперь
|
|
130
|
+
* на задачу отдельный ключ и атомарный UPDATE ... RETURNING.
|
|
131
|
+
*/
|
|
136
132
|
/**
|
|
137
133
|
* Планирует повторный запуск упавшей задачи.
|
|
138
134
|
*
|
|
@@ -146,18 +142,13 @@ async function scheduleRetry(taskName) {
|
|
|
146
142
|
const { count, delay } = await loadRetryConfig(taskName);
|
|
147
143
|
if (count <= 0)
|
|
148
144
|
return false;
|
|
149
|
-
const
|
|
150
|
-
const
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
if (remaining <= 0) {
|
|
155
|
-
await clearRetryState(taskName);
|
|
156
|
-
console.log(`[windows-scheduler] Повторы для "${taskName}" исчерпаны.`);
|
|
145
|
+
const key = retryStateKey(taskName);
|
|
146
|
+
const remaining = decrementCounterSetting(key, count);
|
|
147
|
+
if (remaining === null) {
|
|
148
|
+
deleteSetting(key);
|
|
149
|
+
console.log(`[agent-steward] Повторы для "${taskName}" исчерпаны.`);
|
|
157
150
|
return false;
|
|
158
151
|
}
|
|
159
|
-
state[key] = remaining - 1;
|
|
160
|
-
await writeRetryState(state);
|
|
161
152
|
const script = process.argv[1];
|
|
162
153
|
if (!script)
|
|
163
154
|
return false;
|
|
@@ -169,12 +160,12 @@ async function scheduleRetry(taskName) {
|
|
|
169
160
|
windowsHide: true,
|
|
170
161
|
});
|
|
171
162
|
child.unref();
|
|
172
|
-
console.log(`[
|
|
173
|
-
`(осталось повторов: ${remaining
|
|
163
|
+
console.log(`[agent-steward] Задача "${taskName}" будет повторена через ${delay} с ` +
|
|
164
|
+
`(осталось повторов: ${remaining}).`);
|
|
174
165
|
return true;
|
|
175
166
|
}
|
|
176
167
|
catch (err) {
|
|
177
|
-
console.error(`[
|
|
168
|
+
console.error(`[agent-steward] Не удалось запланировать повтор "${taskName}": ${err instanceof Error ? err.message : String(err)}`);
|
|
178
169
|
return false;
|
|
179
170
|
}
|
|
180
171
|
}
|
|
@@ -188,11 +179,11 @@ async function runRetry(taskName, delaySec) {
|
|
|
188
179
|
const delay = Math.max(1, Math.floor(Number(delaySec) || 60));
|
|
189
180
|
await new Promise((resolve) => setTimeout(resolve, delay * 1000));
|
|
190
181
|
try {
|
|
191
|
-
await
|
|
192
|
-
console.log(`[
|
|
182
|
+
await runTaskNow(taskName);
|
|
183
|
+
console.log(`[agent-steward] Повторный запуск задачи "${taskName}".`);
|
|
193
184
|
}
|
|
194
185
|
catch (err) {
|
|
195
|
-
console.error(`[
|
|
186
|
+
console.error(`[agent-steward] Повторный запуск "${taskName}" не удался: ${err instanceof Error ? err.message : String(err)}`);
|
|
196
187
|
}
|
|
197
188
|
}
|
|
198
189
|
/**
|
|
@@ -349,7 +340,7 @@ async function main() {
|
|
|
349
340
|
: definition?.nextTaskOnError || null;
|
|
350
341
|
const completed = finishRun(runId, st, durationMs, error, chainTarget, tokensResolved, costResolved, model, preFlightStatus, postFlightStatus);
|
|
351
342
|
if (!completed) {
|
|
352
|
-
console.error(`[
|
|
343
|
+
console.error(`[agent-steward] record-history: запись #${runId} уже завершена или не найдена.`);
|
|
353
344
|
return;
|
|
354
345
|
}
|
|
355
346
|
await handleCompletion(taskName, st, chainTarget, error, durationMs, tokensResolved, costResolved);
|
|
@@ -381,6 +372,34 @@ async function main() {
|
|
|
381
372
|
recordRun(taskName, st, startedAt, durationMs, error, chainTarget, tokens, costUsd, model, preFlightStatus, postFlightStatus, new Date().toISOString(), definition?.workspaceId ?? null, definition?.allowedTools ?? null, definition?.deniedTools ?? null);
|
|
382
373
|
await handleCompletion(taskName, st, chainTarget, error, durationMs, tokens, costUsd);
|
|
383
374
|
}
|
|
375
|
+
/**
|
|
376
|
+
* Удаляет отработавшую ONCE-задачу из Планировщика Windows.
|
|
377
|
+
*
|
|
378
|
+
* `schtasks /create ... /z` должен был делать это сам, но на Win10/11
|
|
379
|
+
* возвращает «The task XML is missing a required element ... EndBoundary»
|
|
380
|
+
* и задача вообще не создаётся. Поэтому чистим после запуска вручную.
|
|
381
|
+
* На Linux/macOS очистка не нужна: `at` и launchd убирают one-shot сами.
|
|
382
|
+
*/
|
|
383
|
+
export async function cleanupWindowsOneShotTask(taskName, deps = {}) {
|
|
384
|
+
const platform = deps.platform ?? process.platform;
|
|
385
|
+
if (platform !== "win32")
|
|
386
|
+
return false;
|
|
387
|
+
const getDefinition = deps.getDefinition ?? getTask;
|
|
388
|
+
const definition = getDefinition(taskName);
|
|
389
|
+
if (!definition || definition.triggerType !== "once")
|
|
390
|
+
return false;
|
|
391
|
+
const deleteTask = deps.deleteTask ??
|
|
392
|
+
((name) => createSchedulerBackend().deleteTask(name));
|
|
393
|
+
try {
|
|
394
|
+
await deleteTask(taskName);
|
|
395
|
+
console.log(`[agent-steward] One-shot "${taskName}": задача удалена из Планировщика Windows.`);
|
|
396
|
+
return true;
|
|
397
|
+
}
|
|
398
|
+
catch (err) {
|
|
399
|
+
console.warn(`[agent-steward] One-shot "${taskName}": не удалось удалить задачу из Планировщика Windows: ${err instanceof Error ? err.message : String(err)}`);
|
|
400
|
+
return false;
|
|
401
|
+
}
|
|
402
|
+
}
|
|
384
403
|
/**
|
|
385
404
|
* Общая пост-обработка завершённого запуска: уведомление, цепочки задач,
|
|
386
405
|
* DAG-зависимости и повторы. Используется и legacy-режимом, и --finish.
|
|
@@ -391,6 +410,10 @@ async function handleCompletion(taskName, st, chainTarget, error, durationMs, to
|
|
|
391
410
|
await notifyTaskCompletion(taskName, st, durationMs, error, tokens, costUsd, {
|
|
392
411
|
asyncTriage: true,
|
|
393
412
|
});
|
|
413
|
+
// P2-27: Windows не удаляет ONCE-задачи сам, а флаг schtasks `/z` на
|
|
414
|
+
// практике ломает создание задачи («task XML ... EndBoundary»).
|
|
415
|
+
// Поэтому снимаем отработавшую one-shot задачу из Планировщика здесь.
|
|
416
|
+
await cleanupWindowsOneShotTask(taskName);
|
|
394
417
|
// Matrix (Спринт 15): клон завершился — двигаем sequential-цепочку или
|
|
395
418
|
// очередь concurrency-лимита (Спринт 17), а когда все клоны готовы —
|
|
396
419
|
// фиксируем агрегат и запускаем matrix-complete.
|
|
@@ -403,29 +426,30 @@ async function handleCompletion(taskName, st, chainTarget, error, durationMs, to
|
|
|
403
426
|
}
|
|
404
427
|
if (st === "success") {
|
|
405
428
|
// Успешный запуск сбрасывает счётчик повторов.
|
|
406
|
-
await
|
|
429
|
+
await deleteSetting(retryStateKey(taskName));
|
|
407
430
|
if (chainTarget) {
|
|
408
431
|
const started = await triggerTask(chainTarget);
|
|
409
432
|
if (started) {
|
|
410
|
-
console.log(`[
|
|
433
|
+
console.log(`[agent-steward] Запущена следующая задача в цепочке: ${chainTarget}`);
|
|
411
434
|
}
|
|
412
435
|
}
|
|
413
436
|
// DAG: после успеха проверяем задачи, у которых эта задача — одна из
|
|
414
437
|
// зависимостей. Запускаем только если ВСЕ зависимости уже успешны и
|
|
415
438
|
// зависимая задача ещё не запускалась после их завершения.
|
|
416
439
|
try {
|
|
417
|
-
|
|
440
|
+
// P2-29: по одной последней записи на задачу, а не «последние 200 строк».
|
|
441
|
+
const history = getLatestHistoryByTask();
|
|
418
442
|
const definitions = listTasks();
|
|
419
443
|
const dependents = selectDependentsToTrigger(taskName, definitions, history);
|
|
420
444
|
for (const dependent of dependents) {
|
|
421
445
|
const started = await triggerTask(dependent);
|
|
422
446
|
if (started) {
|
|
423
|
-
console.log(`[
|
|
447
|
+
console.log(`[agent-steward] DAG: все зависимости выполнены, запущена задача "${dependent}".`);
|
|
424
448
|
}
|
|
425
449
|
}
|
|
426
450
|
}
|
|
427
451
|
catch (err) {
|
|
428
|
-
console.error(`[
|
|
452
|
+
console.error(`[agent-steward] DAG: не удалось запустить зависимые задачи: ${err instanceof Error ? err.message : String(err)}`);
|
|
429
453
|
}
|
|
430
454
|
}
|
|
431
455
|
else {
|
|
@@ -435,7 +459,7 @@ async function handleCompletion(taskName, st, chainTarget, error, durationMs, to
|
|
|
435
459
|
if (!retryScheduled && chainTarget) {
|
|
436
460
|
const started = await triggerTask(chainTarget);
|
|
437
461
|
if (started) {
|
|
438
|
-
console.log(`[
|
|
462
|
+
console.log(`[agent-steward] Запущена компенсирующая задача: ${chainTarget}`);
|
|
439
463
|
}
|
|
440
464
|
}
|
|
441
465
|
}
|
|
@@ -445,7 +469,7 @@ async function handleCompletion(taskName, st, chainTarget, error, durationMs, to
|
|
|
445
469
|
await rotateSessionIfNeeded(taskName);
|
|
446
470
|
}
|
|
447
471
|
catch (err) {
|
|
448
|
-
console.warn(`[
|
|
472
|
+
console.warn(`[agent-steward] Не удалось обновить состояние сессии "${taskName}": ${err instanceof Error ? err.message : String(err)}`);
|
|
449
473
|
}
|
|
450
474
|
}
|
|
451
475
|
/**
|
|
@@ -465,7 +489,7 @@ function isDirectInvocation() {
|
|
|
465
489
|
}
|
|
466
490
|
if (isDirectInvocation()) {
|
|
467
491
|
main().catch((err) => {
|
|
468
|
-
console.error(`[
|
|
492
|
+
console.error(`[agent-steward] record-history: не удалось записать результат запуска: ${err instanceof Error ? err.message : String(err)}`);
|
|
469
493
|
process.exit(1);
|
|
470
494
|
});
|
|
471
495
|
}
|
|
@@ -0,0 +1,36 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Сборка маршрута шага из слоёв 1–2 (Спринт 36.5.d).
|
|
3
|
+
*
|
|
4
|
+
* Слой 1 отвечает мгновенно по таблице правил, слой 2 — по Capability Map.
|
|
5
|
+
* Модель здесь не участвует: `routeStep` не импортирует planner и ничего не
|
|
6
|
+
* декомпозирует, поэтому известный тип задачи обходится в 0 токенов.
|
|
7
|
+
*/
|
|
8
|
+
import type { CapabilityDecision, CapabilityThresholds } from "../../db/capability-repo.js";
|
|
9
|
+
import type { RouterExecutor, RouterTransport } from "./rules.js";
|
|
10
|
+
/** Откуда взято решение о маршруте. */
|
|
11
|
+
export type RouteSource = "static" | "capability";
|
|
12
|
+
/** Куда направляется шаг: исполнение или ручной разбор. */
|
|
13
|
+
export type RouteTarget = "local" | "cloud" | "review" | "explore";
|
|
14
|
+
/** Готовый маршрут шага. */
|
|
15
|
+
export interface StepRoute {
|
|
16
|
+
/** Нормализованный тип задачи. */
|
|
17
|
+
taskType: string;
|
|
18
|
+
/** Кто исполняет шаг либо почему шаг уходит человеку. */
|
|
19
|
+
target: RouteTarget;
|
|
20
|
+
/** Транспорт; `null` для `review`/`explore`, где исполнения пока нет. */
|
|
21
|
+
transport: RouterTransport | null;
|
|
22
|
+
/** Исполнитель; `null` для `review`/`explore`. */
|
|
23
|
+
executor: RouterExecutor | null;
|
|
24
|
+
/** Слой, принявший решение. */
|
|
25
|
+
source: RouteSource;
|
|
26
|
+
/** Стабильный код причины: `static-rule` либо решение Capability Map. */
|
|
27
|
+
reason: string;
|
|
28
|
+
/** Решение слоя 2, если он участвовал. */
|
|
29
|
+
decision?: CapabilityDecision;
|
|
30
|
+
}
|
|
31
|
+
/**
|
|
32
|
+
* Строит маршрут для типа задачи: статическое правило, затем Capability Map.
|
|
33
|
+
* Пустой тип — ошибка, а не молчаливый `explore`: маршрутизировать нечего.
|
|
34
|
+
*/
|
|
35
|
+
export declare function routeStep(taskType: string, thresholds?: CapabilityThresholds): StepRoute;
|
|
36
|
+
//# sourceMappingURL=dispatch.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"dispatch.d.ts","sourceRoot":"","sources":["../../../src/core/router/dispatch.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAGH,OAAO,KAAK,EAAE,kBAAkB,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AAE5F,OAAO,KAAK,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAElE,uCAAuC;AACvC,MAAM,MAAM,WAAW,GAAG,QAAQ,GAAG,YAAY,CAAC;AAElD,2DAA2D;AAC3D,MAAM,MAAM,WAAW,GAAG,OAAO,GAAG,OAAO,GAAG,QAAQ,GAAG,SAAS,CAAC;AAEnE,4BAA4B;AAC5B,MAAM,WAAW,SAAS;IACxB,kCAAkC;IAClC,QAAQ,EAAE,MAAM,CAAC;IACjB,yDAAyD;IACzD,MAAM,EAAE,WAAW,CAAC;IACpB,yEAAyE;IACzE,SAAS,EAAE,eAAe,GAAG,IAAI,CAAC;IAClC,kDAAkD;IAClD,QAAQ,EAAE,cAAc,GAAG,IAAI,CAAC;IAChC,+BAA+B;IAC/B,MAAM,EAAE,WAAW,CAAC;IACpB,yEAAyE;IACzE,MAAM,EAAE,MAAM,CAAC;IACf,0CAA0C;IAC1C,QAAQ,CAAC,EAAE,kBAAkB,CAAC;CAC/B;AAED;;;GAGG;AACH,wBAAgB,SAAS,CACvB,QAAQ,EAAE,MAAM,EAChB,UAAU,GAAE,oBAAyB,GACpC,SAAS,CA6BX"}
|