agent-steward 0.0.4 → 0.0.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +134 -2
- package/CROSS_PLATFORM.md +19 -0
- package/README.md +52 -7
- package/ROADMAP-STRATEGY.md +21 -18
- package/ROADMAP.md +140 -159
- package/dist/cli.d.ts +3 -0
- package/dist/cli.d.ts.map +1 -0
- package/dist/cli.js +351 -0
- package/dist/core/execution.d.ts +203 -0
- package/dist/core/execution.d.ts.map +1 -0
- package/dist/core/execution.js +309 -0
- package/dist/core/gate-integrity.d.ts +35 -0
- package/dist/core/gate-integrity.d.ts.map +1 -0
- package/dist/core/gate-integrity.js +132 -0
- package/dist/core/git-trigger.d.ts.map +1 -1
- package/dist/core/git-trigger.js +14 -2
- package/dist/core/guard-run.d.ts +4 -0
- package/dist/core/guard-run.d.ts.map +1 -0
- package/dist/core/guard-run.js +101 -0
- package/dist/core/guard.d.ts +52 -0
- package/dist/core/guard.d.ts.map +1 -0
- package/dist/core/guard.js +362 -0
- package/dist/core/lock.d.ts +41 -0
- package/dist/core/lock.d.ts.map +1 -1
- package/dist/core/lock.js +141 -29
- package/dist/core/matrix.d.ts.map +1 -1
- package/dist/core/matrix.js +75 -15
- package/dist/core/mission.d.ts +83 -0
- package/dist/core/mission.d.ts.map +1 -0
- package/dist/core/mission.js +334 -0
- package/dist/core/pipeline-apply.d.ts +38 -0
- package/dist/core/pipeline-apply.d.ts.map +1 -0
- package/dist/core/pipeline-apply.js +117 -0
- package/dist/core/pipeline-io.d.ts +13 -0
- package/dist/core/pipeline-io.d.ts.map +1 -0
- package/dist/core/pipeline-io.js +64 -0
- package/dist/core/pipeline-map.d.ts +46 -0
- package/dist/core/pipeline-map.d.ts.map +1 -0
- package/dist/core/pipeline-map.js +196 -0
- package/dist/core/pipeline-spec.d.ts +109 -0
- package/dist/core/pipeline-spec.d.ts.map +1 -0
- package/dist/core/pipeline-spec.js +554 -0
- package/dist/core/ps-wrapper.d.ts +19 -2
- package/dist/core/ps-wrapper.d.ts.map +1 -1
- package/dist/core/ps-wrapper.js +250 -62
- package/dist/core/record-history.d.ts.map +1 -1
- package/dist/core/record-history.js +130 -29
- package/dist/core/router/rules.d.ts.map +1 -1
- package/dist/core/router/rules.js +6 -0
- package/dist/core/scheduler/linux.d.ts +8 -1
- package/dist/core/scheduler/linux.d.ts.map +1 -1
- package/dist/core/scheduler/linux.js +34 -9
- package/dist/core/scheduler/mac.d.ts +44 -2
- package/dist/core/scheduler/mac.d.ts.map +1 -1
- package/dist/core/scheduler/mac.js +126 -15
- package/dist/core/scheduler/windows.d.ts.map +1 -1
- package/dist/core/scheduler/windows.js +15 -12
- package/dist/core/structured-log.d.ts +7 -1
- package/dist/core/structured-log.d.ts.map +1 -1
- package/dist/core/worktree-run.d.ts +4 -0
- package/dist/core/worktree-run.d.ts.map +1 -0
- package/dist/core/worktree-run.js +164 -0
- package/dist/core/worktree.d.ts +115 -0
- package/dist/core/worktree.d.ts.map +1 -0
- package/dist/core/worktree.js +462 -0
- package/dist/core/wrappers/bash.d.ts +17 -0
- package/dist/core/wrappers/bash.d.ts.map +1 -1
- package/dist/core/wrappers/bash.js +175 -24
- package/dist/db/capability-repo.d.ts +43 -2
- package/dist/db/capability-repo.d.ts.map +1 -1
- package/dist/db/capability-repo.js +96 -11
- package/dist/db/history-repo.d.ts +38 -5
- package/dist/db/history-repo.d.ts.map +1 -1
- package/dist/db/history-repo.js +88 -25
- package/dist/db/metrics-repo.js +2 -2
- package/dist/db/recovery.d.ts.map +1 -1
- package/dist/db/recovery.js +5 -4
- package/dist/db/run-journal.d.ts +33 -5
- package/dist/db/run-journal.d.ts.map +1 -1
- package/dist/db/run-journal.js +78 -14
- package/dist/db/run-resume.d.ts +5 -0
- package/dist/db/run-resume.d.ts.map +1 -1
- package/dist/db/run-resume.js +9 -2
- package/dist/db/runs-repo.d.ts +19 -2
- package/dist/db/runs-repo.d.ts.map +1 -1
- package/dist/db/runs-repo.js +22 -6
- package/dist/db/schema.d.ts +2 -2
- package/dist/db/schema.d.ts.map +1 -1
- package/dist/db/schema.js +63 -2
- package/dist/history.d.ts +1 -1
- package/dist/history.d.ts.map +1 -1
- package/dist/i18n.d.ts +5 -0
- package/dist/i18n.d.ts.map +1 -1
- package/dist/i18n.js +11 -4
- package/dist/index.d.ts +136 -2
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +378 -14
- package/dist/notifications.d.ts +22 -0
- package/dist/notifications.d.ts.map +1 -1
- package/dist/notifications.js +36 -8
- package/dist/profiles.d.ts.map +1 -1
- package/dist/profiles.js +25 -4
- package/dist/rpc.d.ts +246 -0
- package/dist/rpc.d.ts.map +1 -1
- package/dist/rpc.js +117 -0
- package/dist/server.d.ts +15 -0
- package/dist/server.d.ts.map +1 -1
- package/dist/server.js +77 -18
- package/dist/settings.d.ts +2 -2
- package/dist/settings.d.ts.map +1 -1
- package/dist/settings.js +3 -3
- package/dist/shared/jobs-view.d.ts +1 -1
- package/dist/shared/jobs-view.d.ts.map +1 -1
- package/dist/shared/jobs-view.js +2 -0
- package/dist/task-transfer.d.ts +16 -0
- package/dist/task-transfer.d.ts.map +1 -1
- package/dist/task-transfer.js +16 -0
- package/docs/ARCHITECTURE.md +281 -65
- package/docs/COMPATIBILITY.md +2 -2
- package/docs/CONCEPT.md +18 -4
- package/docs/CROSS_PLATFORM.ru.md +20 -0
- package/docs/CROSS_PLATFORM.zh.md +18 -0
- package/docs/EXECUTION-LOOP.md +22 -7
- package/docs/FEATURES.md +65 -4
- package/docs/FEATURES.zh.md +52 -4
- package/docs/MIGRATION.md +2 -2
- package/docs/PIPELINE.md +293 -0
- package/docs/README.ru.md +42 -3
- package/docs/README.zh.md +43 -3
- package/docs/SAFETY.md +23 -3
- package/gui-experimental.cjs +9 -8
- package/locales/en.json +17 -1
- package/locales/ru.json +17 -1
- package/locales/zh.json +17 -1
- package/opencode.pipeline.yaml +35 -0
- package/package.json +23 -4
- package/scripts/test-home.mjs +83 -0
- package/src/cli.ts +412 -0
- package/src/core/dry-run.ts +2 -2
- package/src/core/execution.ts +538 -0
- package/src/core/file-watcher.ts +2 -2
- package/src/core/gate-integrity.ts +160 -0
- package/src/core/git-trigger.ts +18 -5
- package/src/core/guard-run.ts +119 -0
- package/src/core/guard.ts +431 -0
- package/src/core/lock.ts +178 -37
- package/src/core/matrix.ts +95 -50
- package/src/core/mission.ts +485 -0
- package/src/core/native-notify.ts +1 -1
- package/src/core/pipeline-apply.ts +158 -0
- package/src/core/pipeline-io.ts +79 -0
- package/src/core/pipeline-map.ts +264 -0
- package/src/core/pipeline-spec.ts +775 -0
- package/src/core/ps-wrapper.ts +263 -63
- package/src/core/record-history.ts +164 -77
- package/src/core/router/rules.ts +6 -0
- package/src/core/schedule-gate.ts +1 -1
- package/src/core/scheduler/at-fallback.ts +1 -1
- package/src/core/scheduler/linux.ts +40 -11
- package/src/core/scheduler/logs.ts +2 -2
- package/src/core/scheduler/mac.ts +174 -14
- package/src/core/scheduler/registry.ts +2 -2
- package/src/core/scheduler/windows.ts +19 -15
- package/src/core/secrets.ts +8 -8
- package/src/core/structured-log.ts +22 -5
- package/src/core/telegram.ts +2 -2
- package/src/core/triage-worker.ts +7 -7
- package/src/core/triage.ts +2 -2
- package/src/core/worktree-run.ts +199 -0
- package/src/core/worktree.ts +600 -0
- package/src/core/wrappers/bash.ts +190 -23
- package/src/db/capability-repo.ts +127 -10
- package/src/db/history-repo.ts +129 -22
- package/src/db/metrics-repo.ts +2 -2
- package/src/db/recovery.ts +5 -4
- package/src/db/run-journal.ts +100 -13
- package/src/db/run-resume.ts +17 -1
- package/src/db/runs-repo.ts +36 -6
- package/src/db/schema.ts +65 -2
- package/src/gui.tsx +177 -13
- package/src/history.ts +1 -1
- package/src/i18n.ts +12 -4
- package/src/index.ts +524 -4
- package/src/notifications.ts +38 -8
- package/src/profiles.ts +26 -4
- package/src/rpc.ts +128 -0
- package/src/server.ts +94 -18
- package/src/settings.ts +5 -5
- package/src/shared/jobs-view.ts +3 -1
- package/src/task-transfer.ts +31 -0
|
@@ -1,8 +1,27 @@
|
|
|
1
1
|
import fs from "node:fs/promises";
|
|
2
|
+
import fsSync from "node:fs";
|
|
2
3
|
import path from "node:path";
|
|
3
4
|
import { WRAPPER_DIR } from "../../types.js";
|
|
4
5
|
import { shellQuote } from "../scheduler/posix.js";
|
|
6
|
+
import { createGateSnapshot } from "../gate-integrity.js";
|
|
5
7
|
import { buildOpencodeConfig as buildPermissionsConfig, formatPolicyLog, resolvePermissions, } from "../permissions.js";
|
|
8
|
+
/**
|
|
9
|
+
* B6: разбор PID из lock-токена для bash-обёртки.
|
|
10
|
+
*
|
|
11
|
+
* Понимает единый `<pid>-<iso>` (Node и PS), legacy PS `<iso>|<pid>`
|
|
12
|
+
* и голый `<pid>` (pid-файл самой bash-обёртки). Legacy PS проверяется
|
|
13
|
+
* первым: иначе год из ISO был бы принят за PID.
|
|
14
|
+
*/
|
|
15
|
+
export const BASH_LOCK_PID_FUNCTION = `parse_lock_pid() {
|
|
16
|
+
local text="$1"
|
|
17
|
+
case "$text" in
|
|
18
|
+
*"|"*) printf '%s' "\${text##*|}" ;;
|
|
19
|
+
[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]T*) printf '' ;;
|
|
20
|
+
[0-9]*-*) printf '%s' "\${text%%-*}" ;;
|
|
21
|
+
[0-9]*) printf '%s' "$text" ;;
|
|
22
|
+
*) printf '' ;;
|
|
23
|
+
esac
|
|
24
|
+
}`;
|
|
6
25
|
/**
|
|
7
26
|
* Собирает текст bash-обёртки.
|
|
8
27
|
*
|
|
@@ -20,7 +39,31 @@ import { buildOpencodeConfig as buildPermissionsConfig, formatPolicyLog, resolve
|
|
|
20
39
|
* Если задана модель, вызов превращается в `opencode run --model "<model>" <промпт>`.
|
|
21
40
|
*/
|
|
22
41
|
export function buildBashWrapperScript(options) {
|
|
23
|
-
const { taskName, promptFile, timeoutSeconds, lockFile, workdir, workspaceName, logFile, recorderFile, qualityGate, model, beforeScript, afterScript, sessionMode, sessionId, sessionFile, oneShotCleanupCommand, allowedTools, deniedTools, policy, legacyShell, scheduleGate, envFile, gateTimeoutSeconds, } = 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;
|
|
43
|
+
// G-1.2: фиксируем входы гейта при создании обёртки и передаём путь
|
|
44
|
+
// snapshot'а и помощника проверки в сгенерированный скрипт.
|
|
45
|
+
let gateSnapshot = "";
|
|
46
|
+
let gateIntegrity = "";
|
|
47
|
+
if (qualityGate?.trim()) {
|
|
48
|
+
const safeGateTimeout = typeof gateTimeoutSeconds === "number" && Number.isFinite(gateTimeoutSeconds)
|
|
49
|
+
? Math.max(0, Math.floor(gateTimeoutSeconds))
|
|
50
|
+
: 300;
|
|
51
|
+
let prompt = "";
|
|
52
|
+
try {
|
|
53
|
+
prompt = fsSync.readFileSync(promptFile || "", "utf8");
|
|
54
|
+
}
|
|
55
|
+
catch {
|
|
56
|
+
// Промпт мог быть удалён — snapshot всё равно уникален для задачи.
|
|
57
|
+
}
|
|
58
|
+
gateSnapshot = createGateSnapshot(sanitizedName || taskName, {
|
|
59
|
+
gate: qualityGate,
|
|
60
|
+
prompt,
|
|
61
|
+
gateTimeoutSeconds: safeGateTimeout,
|
|
62
|
+
});
|
|
63
|
+
gateIntegrity = recorderFile
|
|
64
|
+
? path.join(path.dirname(recorderFile), "gate-integrity.js")
|
|
65
|
+
: "";
|
|
66
|
+
}
|
|
24
67
|
const effectivePermissions = resolvePermissions({
|
|
25
68
|
policy,
|
|
26
69
|
legacyShell,
|
|
@@ -39,12 +82,23 @@ export function buildBashWrapperScript(options) {
|
|
|
39
82
|
`LOCK_FILE=${shellQuote(lockFile)}`,
|
|
40
83
|
`WORKDIR=${shellQuote(workdir || process.cwd())}`,
|
|
41
84
|
`WORKSPACE_NAME=${shellQuote(workspaceName ?? "")}`,
|
|
85
|
+
// W-1 (0.0.6): одноразовый git worktree на запуск.
|
|
86
|
+
`WORKTREE_MODE=${worktree ? 1 : 0}`,
|
|
87
|
+
`WORKTREE_HELPER=${shellQuote(worktreeHelper ?? "")}`,
|
|
88
|
+
// W-3 (0.0.6): guard-условия. Пустая строка = guard не настроен.
|
|
89
|
+
`GUARD_HELPER=${shellQuote(guardHelper ?? "")}`,
|
|
90
|
+
`GUARD_B64=${shellQuote(guards ? Buffer.from(JSON.stringify(guards), "utf8").toString("base64") : "")}`,
|
|
91
|
+
// W-4 (0.0.6): причина пропуска в history (fixed, без произвольного текста из лога).
|
|
92
|
+
`GUARD_SKIP_B64=${shellQuote(Buffer.from("guard conditions not met", "utf8").toString("base64"))}`,
|
|
42
93
|
`TIMEOUT_SECONDS=${Number.isFinite(timeoutSeconds) ? Math.max(0, Math.floor(timeoutSeconds)) : 3600}`,
|
|
43
94
|
// Маркер сработавшего watchdog: по нему обёртка отличает таймаут от
|
|
44
95
|
// обычного ненулевого кода возврата (SIGTERM/SIGKILL неотличимы от падения).
|
|
45
96
|
`TIMEOUT_MARKER=${shellQuote(`${lockFile}.timeout`)}`,
|
|
46
97
|
`RECORDER_FILE=${shellQuote(recorderFile ?? "")}`,
|
|
47
98
|
`QUALITY_GATE=${shellQuote(qualityGate ?? "")}`,
|
|
99
|
+
// G-1.2: путь к snapshot'у и CLI проверки целостности входов гейта.
|
|
100
|
+
`GATE_SNAPSHOT=${shellQuote(gateSnapshot)}`,
|
|
101
|
+
`GATE_INTEGRITY=${shellQuote(gateIntegrity)}`,
|
|
48
102
|
`MODEL=${shellQuote(model ?? "")}`,
|
|
49
103
|
// Спринт 24: режим сессии — "new" (по умолчанию), "reuse" (--session <id>), "last" (--continue).
|
|
50
104
|
`SESSION_MODE=${shellQuote(sessionMode ?? "new")}`,
|
|
@@ -86,6 +140,8 @@ export function buildBashWrapperScript(options) {
|
|
|
86
140
|
' printf \'[%s] %s\\n\' "$(date \'+%Y-%m-%d %H:%M:%S\')" "$*" >> "$LOG_FILE" 2>/dev/null || true',
|
|
87
141
|
"}",
|
|
88
142
|
"",
|
|
143
|
+
BASH_LOCK_PID_FUNCTION,
|
|
144
|
+
"",
|
|
89
145
|
'log "[role-scoped] opencode config passed via OPENCODE_CONFIG_CONTENT"',
|
|
90
146
|
`log ${shellQuote(`[policy] ${formatPolicyLog(effectivePermissions)}`)}`,
|
|
91
147
|
...effectivePermissions.deniedByPolicy.map((entry) => `log ${shellQuote(`[policy] deny ${entry.action}: ${entry.hint}`)}`),
|
|
@@ -149,8 +205,35 @@ export function buildBashWrapperScript(options) {
|
|
|
149
205
|
"fi",
|
|
150
206
|
"",
|
|
151
207
|
"# Атомарная блокировка: mkdir завершается ошибкой, если каталог уже есть.",
|
|
152
|
-
"#
|
|
153
|
-
"#
|
|
208
|
+
"# B6: перед своим каталогом проверяем файловый lock Node/PS (<lock>):",
|
|
209
|
+
"# они держат файл, а bash — каталог. Без этой проверки Node-процесс и",
|
|
210
|
+
"# bash-обёртка могли выполнять одну задачу одновременно.",
|
|
211
|
+
'if [ -f "$LOCK_FILE" ]; then',
|
|
212
|
+
' LOCK_OWNER_RAW="$(cat "$LOCK_FILE" 2>/dev/null || true)"',
|
|
213
|
+
' LOCK_FILE_PID="$(parse_lock_pid "$LOCK_OWNER_RAW")"',
|
|
214
|
+
' if [ -z "$LOCK_FILE_PID" ]; then',
|
|
215
|
+
' log "[scheduler] Не удалось определить владельца lock — пропуск запуска."',
|
|
216
|
+
" exit 0",
|
|
217
|
+
" fi",
|
|
218
|
+
' if kill -0 "$LOCK_FILE_PID" 2>/dev/null; then',
|
|
219
|
+
' log "[scheduler] Задача \'$TASK_NAME\' уже выполняется (pid $LOCK_FILE_PID) — пропуск запуска."',
|
|
220
|
+
" exit 0",
|
|
221
|
+
" fi",
|
|
222
|
+
" # Владелец мёртв: атомарно уводим файл, чтобы не удалить lock, который",
|
|
223
|
+
" # другой воркер успел пересоздать.",
|
|
224
|
+
' STALE_LOCK_FILE="$LOCK_FILE.stale-$$-$(date +%s)"',
|
|
225
|
+
' if ! mv "$LOCK_FILE" "$STALE_LOCK_FILE" 2>/dev/null; then',
|
|
226
|
+
' if [ -f "$LOCK_FILE" ]; then',
|
|
227
|
+
' log "[scheduler] Не удалось вытеснить осиротевший lock \'$LOCK_FILE\' — пропуск запуска."',
|
|
228
|
+
" exit 0",
|
|
229
|
+
" fi",
|
|
230
|
+
" else",
|
|
231
|
+
' rm -f "$STALE_LOCK_FILE" 2>/dev/null || true',
|
|
232
|
+
" fi",
|
|
233
|
+
"fi",
|
|
234
|
+
"",
|
|
235
|
+
"# B6: в pid-файл пишем `<pid>-<iso>`, а не голый PID — так его читают",
|
|
236
|
+
"# Node и PS общим парсером. После kill -9 lock снимается по мёртвому PID.",
|
|
154
237
|
'if ! mkdir "$LOCK_FILE.d" 2>/dev/null; then',
|
|
155
238
|
' if [ ! -d "$LOCK_FILE.d" ]; then',
|
|
156
239
|
' log "[scheduler] Не удалось создать lock \'$LOCK_FILE.d\' — запуск отменён."',
|
|
@@ -158,7 +241,7 @@ export function buildBashWrapperScript(options) {
|
|
|
158
241
|
" fi",
|
|
159
242
|
' LOCK_PID=""',
|
|
160
243
|
' if [ -f "$LOCK_FILE.d/pid" ]; then',
|
|
161
|
-
' LOCK_PID="$(cat "$LOCK_FILE.d/pid" 2>/dev/null || true)"',
|
|
244
|
+
' LOCK_PID="$(parse_lock_pid "$(cat "$LOCK_FILE.d/pid" 2>/dev/null || true)")"',
|
|
162
245
|
" fi",
|
|
163
246
|
" LOCK_ALIVE=1",
|
|
164
247
|
' if [ -n "$LOCK_PID" ]; then',
|
|
@@ -183,14 +266,61 @@ export function buildBashWrapperScript(options) {
|
|
|
183
266
|
" exit 0",
|
|
184
267
|
" fi",
|
|
185
268
|
"fi",
|
|
186
|
-
'printf \'%s\\n\' "
|
|
187
|
-
|
|
269
|
+
'printf \'%s\\n\' "$$-$(date -u +%Y-%m-%dT%H:%M:%SZ)" > "$LOCK_FILE.d/pid" 2>/dev/null || true',
|
|
270
|
+
"cleanup_worktree() {",
|
|
271
|
+
" if [ -n \"${AGENT_STEWARD_WORKTREE:-}\" ] && [ -n \"$WORKTREE_HELPER\" ] && command -v node >/dev/null 2>&1; then",
|
|
272
|
+
" cd \"$WORKDIR\" 2>/dev/null || true",
|
|
273
|
+
" node \"$WORKTREE_HELPER\" cleanup --path \"$AGENT_STEWARD_WORKTREE\" --repo \"$WORKDIR\" >> \"$LOG_FILE\" 2>&1 || true",
|
|
274
|
+
' AGENT_STEWARD_WORKTREE=""',
|
|
275
|
+
" fi",
|
|
276
|
+
"}",
|
|
277
|
+
'cleanup() { cleanup_worktree; rmdir "$LOCK_FILE.d" 2>/dev/null || rm -rf "$LOCK_FILE.d" 2>/dev/null; }',
|
|
188
278
|
"trap cleanup EXIT INT TERM",
|
|
189
279
|
"",
|
|
190
280
|
'if [ -n "$WORKDIR" ] && [ -d "$WORKDIR" ]; then',
|
|
191
281
|
' cd "$WORKDIR" || { log "[scheduler] Не удалось перейти в $WORKDIR"; exit 1; }',
|
|
192
282
|
"fi",
|
|
193
283
|
"",
|
|
284
|
+
"# W-1 (0.0.6): одноразовый git worktree. Ошибка создания — fail-closed:",
|
|
285
|
+
"# задача не должна молча работать в основном дереве репозитория.",
|
|
286
|
+
'if [ "$WORKTREE_MODE" = "1" ]; then',
|
|
287
|
+
' if [ -z "$WORKTREE_HELPER" ] || ! command -v node >/dev/null 2>&1; then',
|
|
288
|
+
' log "[scheduler] ОШИБКА: помощник worktree недоступен (нет node или worktree-run.js). Запуск отменён."',
|
|
289
|
+
" exit 1",
|
|
290
|
+
" fi",
|
|
291
|
+
' AGENT_STEWARD_WORKTREE="$(node "$WORKTREE_HELPER" --repo "$WORKDIR" --task "$TASK_NAME" 2>> "$LOG_FILE" | tail -n 1)"',
|
|
292
|
+
' if [ -z "$AGENT_STEWARD_WORKTREE" ]; then',
|
|
293
|
+
' log "[scheduler] ОШИБКА: не удалось создать git worktree для \'$TASK_NAME\' — запуск отменён."',
|
|
294
|
+
" exit 1",
|
|
295
|
+
" fi",
|
|
296
|
+
" export AGENT_STEWARD_WORKTREE",
|
|
297
|
+
' export AGENT_STEWARD_WORKTREE_REPO="$WORKDIR"',
|
|
298
|
+
' log "[scheduler] Git worktree: $AGENT_STEWARD_WORKTREE"',
|
|
299
|
+
' cd "$AGENT_STEWARD_WORKTREE" || { log "[scheduler] Не удалось перейти в worktree $AGENT_STEWARD_WORKTREE"; exit 1; }',
|
|
300
|
+
"fi",
|
|
301
|
+
"",
|
|
302
|
+
...(guards
|
|
303
|
+
? [
|
|
304
|
+
"# W-3 (0.0.6): guard-условия до запуска opencode. Код 4 — штатный skip,",
|
|
305
|
+
"# ненулевой код — ошибка проверки. В обоих случаях opencode не запускается,",
|
|
306
|
+
"# а созданный worktree убирается через trap cleanup.",
|
|
307
|
+
'if [ -n "$GUARD_HELPER" ] && [ -n "$GUARD_B64" ]; then',
|
|
308
|
+
' node "$GUARD_HELPER" --cwd "$PWD" --guards-b64 "$GUARD_B64" >> "$LOG_FILE" 2>&1',
|
|
309
|
+
" GUARD_STATUS=$?",
|
|
310
|
+
' if [ "$GUARD_STATUS" -eq 4 ]; then',
|
|
311
|
+
' log "[scheduler] guard: run skipped (условия не выполнены)"',
|
|
312
|
+
' if [ -n "$RECORDER_FILE" ] && command -v node >/dev/null 2>&1; then',
|
|
313
|
+
' node "$RECORDER_FILE" --skip "$TASK_NAME" "$GUARD_SKIP_B64" >> "$LOG_FILE" 2>&1 || true',
|
|
314
|
+
" fi",
|
|
315
|
+
" exit 0",
|
|
316
|
+
' elif [ "$GUARD_STATUS" -ne 0 ]; then',
|
|
317
|
+
' log "[scheduler] ОШИБКА: guard helper завершился с кодом $GUARD_STATUS — запуск отменён."',
|
|
318
|
+
" exit 1",
|
|
319
|
+
" fi",
|
|
320
|
+
"fi",
|
|
321
|
+
"",
|
|
322
|
+
]
|
|
323
|
+
: []),
|
|
194
324
|
"# Спринт 21: env-переменные workspace. Файл пишет плагин, значения не логируются.",
|
|
195
325
|
'if [ -n "$ENV_FILE" ] && [ -f "$ENV_FILE" ]; then',
|
|
196
326
|
' while IFS= read -r env_line || [ -n "$env_line" ]; do',
|
|
@@ -233,11 +363,17 @@ export function buildBashWrapperScript(options) {
|
|
|
233
363
|
"fi",
|
|
234
364
|
"",
|
|
235
365
|
'PROMPT="$(cat "$PROMPT_FILE" 2>/dev/null || true)"',
|
|
366
|
+
"# W-1: сообщаем агенту, что он работает в одноразовом git worktree.",
|
|
367
|
+
'if [ -n "${AGENT_STEWARD_WORKTREE:-}" ]; then',
|
|
368
|
+
' PROMPT="[agent-steward] Рабочая директория запуска - одноразовый git worktree: $AGENT_STEWARD_WORKTREE',
|
|
369
|
+
'$PROMPT"',
|
|
370
|
+
"fi",
|
|
236
371
|
"# T-09: backstop размера промпта на POSIX (argv ограничен MAX_ARG_STRLEN",
|
|
237
|
-
"# 128 КиБ на аргумент в Linux). Считаем байты, а не символы.",
|
|
372
|
+
"# 128 КиБ на аргумент в Linux). Считаем байты, а не символы. Лимит включает",
|
|
373
|
+
"# завершающий NUL, поэтому максимум полезных данных — 131071 байт (B11.2).",
|
|
238
374
|
'PROMPT_BYTES="$(printf %s "$PROMPT" | wc -c | tr -d \' \')"',
|
|
239
|
-
'if [ "$PROMPT_BYTES" -
|
|
240
|
-
' log "[scheduler] ОШИБКА: промпт слишком длинный для argv POSIX: ${PROMPT_BYTES} байт (максимум
|
|
375
|
+
'if [ "$PROMPT_BYTES" -ge 131072 ] 2>/dev/null; then',
|
|
376
|
+
' log "[scheduler] ОШИБКА: промпт слишком длинный для argv POSIX: ${PROMPT_BYTES} байт (максимум 131071)."',
|
|
241
377
|
" exit 1",
|
|
242
378
|
"fi",
|
|
243
379
|
'START_EPOCH="$(date +%s)"',
|
|
@@ -288,28 +424,28 @@ export function buildBashWrapperScript(options) {
|
|
|
288
424
|
" fi",
|
|
289
425
|
' if [ -n "$SESSION_ID" ]; then',
|
|
290
426
|
' if [ -n "$MODEL" ]; then',
|
|
291
|
-
' exec opencode run --auto --session "$SESSION_ID" --model "$MODEL" "$PROMPT"',
|
|
427
|
+
' exec opencode run --auto --session "$SESSION_ID" --model "$MODEL" -- "$PROMPT"',
|
|
292
428
|
" else",
|
|
293
|
-
' exec opencode run --auto --session "$SESSION_ID" "$PROMPT"',
|
|
429
|
+
' exec opencode run --auto --session "$SESSION_ID" -- "$PROMPT"',
|
|
294
430
|
" fi",
|
|
295
431
|
" else",
|
|
296
432
|
' if [ -n "$MODEL" ]; then',
|
|
297
|
-
' exec opencode run --auto --model "$MODEL" "$PROMPT"',
|
|
433
|
+
' exec opencode run --auto --model "$MODEL" -- "$PROMPT"',
|
|
298
434
|
" else",
|
|
299
|
-
' exec opencode run --auto "$PROMPT"',
|
|
435
|
+
' exec opencode run --auto -- "$PROMPT"',
|
|
300
436
|
" fi",
|
|
301
437
|
" fi",
|
|
302
438
|
' elif [ "$SESSION_MODE" = "last" ]; then',
|
|
303
439
|
' if [ -n "$MODEL" ]; then',
|
|
304
|
-
' exec opencode run --auto --continue --model "$MODEL" "$PROMPT"',
|
|
440
|
+
' exec opencode run --auto --continue --model "$MODEL" -- "$PROMPT"',
|
|
305
441
|
" else",
|
|
306
|
-
' exec opencode run --auto --continue "$PROMPT"',
|
|
442
|
+
' exec opencode run --auto --continue -- "$PROMPT"',
|
|
307
443
|
" fi",
|
|
308
444
|
" else",
|
|
309
445
|
' if [ -n "$MODEL" ]; then',
|
|
310
|
-
' exec opencode run --auto --model "$MODEL" "$PROMPT"',
|
|
446
|
+
' exec opencode run --auto --model "$MODEL" -- "$PROMPT"',
|
|
311
447
|
" else",
|
|
312
|
-
' exec opencode run --auto "$PROMPT"',
|
|
448
|
+
' exec opencode run --auto -- "$PROMPT"',
|
|
313
449
|
" fi",
|
|
314
450
|
" fi",
|
|
315
451
|
"}",
|
|
@@ -366,15 +502,30 @@ export function buildBashWrapperScript(options) {
|
|
|
366
502
|
"fi",
|
|
367
503
|
"",
|
|
368
504
|
'if [ -n "$QUALITY_GATE" ] && [ "$EXIT_CODE" -eq 0 ]; then',
|
|
369
|
-
|
|
370
|
-
|
|
371
|
-
|
|
372
|
-
'
|
|
373
|
-
|
|
374
|
-
'
|
|
505
|
+
// G-1.2: сверяем входы гейта со snapshot'ом, снятым при создании задачи.
|
|
506
|
+
" GATE_INTEGRITY_OK=1",
|
|
507
|
+
' if [ -n "$GATE_SNAPSHOT" ] && [ -n "$GATE_INTEGRITY" ] && [ -f "$GATE_SNAPSHOT" ] && [ -f "$GATE_INTEGRITY" ]; then',
|
|
508
|
+
' node "$GATE_INTEGRITY" verify --snapshot "$GATE_SNAPSHOT" --gate-command "$QUALITY_GATE" --prompt-file "$PROMPT_FILE" --timeout "$GATE_TIMEOUT_SECONDS" >> "$LOG_FILE" 2>&1',
|
|
509
|
+
" VERIFY_CODE=$?",
|
|
510
|
+
' if [ "$VERIFY_CODE" -ne 0 ]; then GATE_INTEGRITY_OK=0; fi',
|
|
511
|
+
" else",
|
|
512
|
+
" GATE_INTEGRITY_OK=0",
|
|
513
|
+
" fi",
|
|
514
|
+
' if [ "$GATE_INTEGRITY_OK" -eq 0 ]; then',
|
|
515
|
+
' log "[scheduler] ОШИБКА: целостность входов Quality Gate нарушена (snapshot mismatch)."',
|
|
516
|
+
' ERROR_MESSAGE="Quality Gate: целостность входов нарушена (snapshot mismatch)"',
|
|
375
517
|
" EXIT_CODE=1",
|
|
376
518
|
" else",
|
|
377
|
-
' log "[scheduler] Quality Gate
|
|
519
|
+
' log "[scheduler] Запуск Quality Gate: $QUALITY_GATE"',
|
|
520
|
+
' run_with_timeout "$GATE_TIMEOUT_SECONDS" bash -c "$QUALITY_GATE" >> "$LOG_FILE" 2>&1',
|
|
521
|
+
" GATE_CODE=$?",
|
|
522
|
+
' if [ "$GATE_CODE" -ne 0 ]; then',
|
|
523
|
+
' log "[scheduler] ОШИБКА: Quality Gate провален. Код возврата: $GATE_CODE"',
|
|
524
|
+
' ERROR_MESSAGE="Quality Gate провален. Код возврата: $GATE_CODE"',
|
|
525
|
+
" EXIT_CODE=1",
|
|
526
|
+
" else",
|
|
527
|
+
' log "[scheduler] Quality Gate пройден."',
|
|
528
|
+
" fi",
|
|
378
529
|
" fi",
|
|
379
530
|
"fi",
|
|
380
531
|
"",
|
|
@@ -22,13 +22,30 @@ export declare const CLOUD_FAILURE_THRESHOLD = 0.3;
|
|
|
22
22
|
export declare const MIN_RUNS_FOR_DECISION = 3;
|
|
23
23
|
/** Сколько последних исходов хранить (1 — гейт пройден, 0 — провал). */
|
|
24
24
|
export declare const RECENT_RUNS_LIMIT = 10;
|
|
25
|
+
/**
|
|
26
|
+
* B13: полураспад веса исхода в последних прогонах. Исход давностью
|
|
27
|
+
* `SUCCESS_HALF_LIFE_RUNS` прогонов весит вдвое меньше свежего.
|
|
28
|
+
*/
|
|
29
|
+
export declare const SUCCESS_HALF_LIFE_RUNS = 8;
|
|
30
|
+
/** B13: доля затухающего success rate в итоговой надёжности. */
|
|
31
|
+
export declare const DECAY_WEIGHT = 0.7;
|
|
32
|
+
/** B13: доля first-pass rate в итоговой надёжности. */
|
|
33
|
+
export declare const FIRST_PASS_WEIGHT = 0.3;
|
|
25
34
|
export interface CapabilityRecord {
|
|
26
35
|
taskType: string;
|
|
27
36
|
/** Исполнитель, который последним обрабатывал тип задачи. */
|
|
28
37
|
model: string;
|
|
29
38
|
runsTotal: number;
|
|
30
39
|
runsPassed: number;
|
|
40
|
+
/** B13: сколько успехов получено с первой попытки. */
|
|
41
|
+
firstPassCount: number;
|
|
42
|
+
/** B13: first_pass_count / runs_total. */
|
|
43
|
+
firstPassRate: number;
|
|
31
44
|
successRate: number;
|
|
45
|
+
/** B13: success rate последних прогонов с экспоненциальным затуханием. */
|
|
46
|
+
decayedSuccessRate: number;
|
|
47
|
+
/** B13: 0.7 * decayedSuccessRate + 0.3 * firstPassRate — вход маршрутизации. */
|
|
48
|
+
effectiveSuccessRate: number;
|
|
32
49
|
avgCostUsd: number;
|
|
33
50
|
avgTimeMs: number;
|
|
34
51
|
/** Последние исходы, старые слева, новые справа, максимум 10. */
|
|
@@ -43,6 +60,10 @@ export interface CapabilityOutcome {
|
|
|
43
60
|
passed: boolean;
|
|
44
61
|
costUsd?: number;
|
|
45
62
|
timeMs?: number;
|
|
63
|
+
/** B13: число попыток до исхода (1 — с первой). */
|
|
64
|
+
attempts?: number;
|
|
65
|
+
/** B13: явный признак first-pass; по умолчанию passed && attempts <= 1. */
|
|
66
|
+
firstPass?: boolean;
|
|
46
67
|
}
|
|
47
68
|
export interface CapabilityThresholds {
|
|
48
69
|
localSuccess?: number;
|
|
@@ -55,9 +76,25 @@ export interface CapabilityDecision {
|
|
|
55
76
|
/** Машиночитаемая причина: no-data | local-reliable | escalate | review. */
|
|
56
77
|
reason: "no-data" | "local-reliable" | "escalate" | "review";
|
|
57
78
|
successRate: number;
|
|
79
|
+
/** B13: надёжность с учётом затухания и first-pass, по ней принимается решение. */
|
|
80
|
+
effectiveSuccessRate: number;
|
|
81
|
+
/** B13: затухающий success rate последних прогонов. */
|
|
82
|
+
decayedSuccessRate: number;
|
|
83
|
+
/** B13: доля успехов с первой попытки. */
|
|
84
|
+
firstPassRate: number;
|
|
58
85
|
runsTotal: number;
|
|
59
86
|
capability: CapabilityRecord | null;
|
|
60
87
|
}
|
|
88
|
+
/**
|
|
89
|
+
* B13: экспоненциально взвешенный success rate последних исходов.
|
|
90
|
+
*
|
|
91
|
+
* Свежий исход весит 1, исход давностью `halfLife` прогонов — 0.5.
|
|
92
|
+
* Так старые успехи не перевешивают свежие провалы, а `last_10_runs`
|
|
93
|
+
* участвует в решении, а не только хранится для отчёта.
|
|
94
|
+
*/
|
|
95
|
+
export declare function decayedSuccessRate(runs: number[], halfLife?: number): number;
|
|
96
|
+
/** B13: надёжность для маршрутизации — затухание плюс успех с первой попытки. */
|
|
97
|
+
export declare function effectiveReliability(decayedRate: number, firstPassRate: number): number;
|
|
61
98
|
/** Читает статистику по типу задачи или `null`, если данных ещё нет. */
|
|
62
99
|
export declare function getCapability(taskType: string): CapabilityRecord | null;
|
|
63
100
|
/** Все известные типы задач, сначала самые надёжные. */
|
|
@@ -72,9 +109,13 @@ export declare function recordCapabilityOutcome(outcome: CapabilityOutcome): Cap
|
|
|
72
109
|
/**
|
|
73
110
|
* Решение слоя 2 по порогам (0 токенов).
|
|
74
111
|
*
|
|
112
|
+
* Пороги применяются к `effectiveSuccessRate` — 0.7 затухающего success rate
|
|
113
|
+
* последних прогонов плюс 0.3 first-pass rate (B13), а не к кумулятивному
|
|
114
|
+
* success rate. Поэтому старые успехи не перевешивают свежие провалы.
|
|
115
|
+
*
|
|
75
116
|
* - данных меньше `minRuns` → `explore` (решает слой 3);
|
|
76
|
-
* - `
|
|
77
|
-
* - `
|
|
117
|
+
* - `effectiveSuccessRate ≥ 0.85` → `local`;
|
|
118
|
+
* - `effectiveSuccessRate ≤ 0.30` → `cloud` (эскалация);
|
|
78
119
|
* - между порогами → `review` (нужен человек или облачный ревьюер).
|
|
79
120
|
*/
|
|
80
121
|
export declare function decideCapabilityRoute(taskType: string, thresholds?: CapabilityThresholds): CapabilityDecision;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"capability-repo.d.ts","sourceRoot":"","sources":["../../src/db/capability-repo.ts"],"names":[],"mappings":"AAGA;;;;;;;;;;;;;GAaG;AAEH,6EAA6E;AAC7E,MAAM,MAAM,gBAAgB,GAAG,OAAO,GAAG,OAAO,GAAG,QAAQ,GAAG,SAAS,CAAC;AAExE,8DAA8D;AAC9D,eAAO,MAAM,uBAAuB,OAAO,CAAC;AAE5C,wEAAwE;AACxE,eAAO,MAAM,uBAAuB,MAAM,CAAC;AAE3C,0DAA0D;AAC1D,eAAO,MAAM,qBAAqB,IAAI,CAAC;AAEvC,wEAAwE;AACxE,eAAO,MAAM,iBAAiB,KAAK,CAAC;AAEpC,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,EAAE,MAAM,CAAC;IACjB,6DAA6D;IAC7D,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,iEAAiE;IACjE,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,6EAA6E;AAC7E,MAAM,WAAW,iBAAiB;IAChC,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,OAAO,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"capability-repo.d.ts","sourceRoot":"","sources":["../../src/db/capability-repo.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,6 +8,15 @@ export const CLOUD_FAILURE_THRESHOLD = 0.3;
|
|
|
8
8
|
export const MIN_RUNS_FOR_DECISION = 3;
|
|
9
9
|
/** Сколько последних исходов хранить (1 — гейт пройден, 0 — провал). */
|
|
10
10
|
export const RECENT_RUNS_LIMIT = 10;
|
|
11
|
+
/**
|
|
12
|
+
* B13: полураспад веса исхода в последних прогонах. Исход давностью
|
|
13
|
+
* `SUCCESS_HALF_LIFE_RUNS` прогонов весит вдвое меньше свежего.
|
|
14
|
+
*/
|
|
15
|
+
export const SUCCESS_HALF_LIFE_RUNS = 8;
|
|
16
|
+
/** B13: доля затухающего success rate в итоговой надёжности. */
|
|
17
|
+
export const DECAY_WEIGHT = 0.7;
|
|
18
|
+
/** B13: доля first-pass rate в итоговой надёжности. */
|
|
19
|
+
export const FIRST_PASS_WEIGHT = 0.3;
|
|
11
20
|
const DEFAULT_MODEL = "local";
|
|
12
21
|
function nowIso() {
|
|
13
22
|
return new Date().toISOString();
|
|
@@ -24,6 +33,13 @@ function requireNonNegative(value, field) {
|
|
|
24
33
|
}
|
|
25
34
|
return value;
|
|
26
35
|
}
|
|
36
|
+
/** B13: номер попытки — целое ≥ 1. */
|
|
37
|
+
function requireAttempts(value) {
|
|
38
|
+
if (!Number.isInteger(value) || value < 1) {
|
|
39
|
+
throw new Error(`Некорректное значение attempts: ожидалось целое ≥ 1, получено ${value}.`);
|
|
40
|
+
}
|
|
41
|
+
return value;
|
|
42
|
+
}
|
|
27
43
|
function parseRecentRuns(raw) {
|
|
28
44
|
if (typeof raw !== "string" || raw.trim() === "") {
|
|
29
45
|
return [];
|
|
@@ -42,18 +58,57 @@ function parseRecentRuns(raw) {
|
|
|
42
58
|
return [];
|
|
43
59
|
}
|
|
44
60
|
}
|
|
61
|
+
/**
|
|
62
|
+
* B13: экспоненциально взвешенный success rate последних исходов.
|
|
63
|
+
*
|
|
64
|
+
* Свежий исход весит 1, исход давностью `halfLife` прогонов — 0.5.
|
|
65
|
+
* Так старые успехи не перевешивают свежие провалы, а `last_10_runs`
|
|
66
|
+
* участвует в решении, а не только хранится для отчёта.
|
|
67
|
+
*/
|
|
68
|
+
export function decayedSuccessRate(runs, halfLife = SUCCESS_HALF_LIFE_RUNS) {
|
|
69
|
+
const recent = runs
|
|
70
|
+
.filter((value) => value === 0 || value === 1)
|
|
71
|
+
.slice(-RECENT_RUNS_LIMIT);
|
|
72
|
+
if (recent.length === 0)
|
|
73
|
+
return 0;
|
|
74
|
+
const hl = Number.isFinite(halfLife) && halfLife > 0 ? halfLife : SUCCESS_HALF_LIFE_RUNS;
|
|
75
|
+
let weighted = 0;
|
|
76
|
+
let weights = 0;
|
|
77
|
+
recent.forEach((value, index) => {
|
|
78
|
+
const age = recent.length - 1 - index;
|
|
79
|
+
const weight = Math.pow(0.5, age / hl);
|
|
80
|
+
weighted += weight * value;
|
|
81
|
+
weights += weight;
|
|
82
|
+
});
|
|
83
|
+
return weights > 0 ? weighted / weights : 0;
|
|
84
|
+
}
|
|
85
|
+
/** B13: надёжность для маршрутизации — затухание плюс успех с первой попытки. */
|
|
86
|
+
export function effectiveReliability(decayedRate, firstPassRate) {
|
|
87
|
+
const decayed = Math.min(1, Math.max(0, decayedRate));
|
|
88
|
+
const firstPass = Math.min(1, Math.max(0, firstPassRate));
|
|
89
|
+
return DECAY_WEIGHT * decayed + FIRST_PASS_WEIGHT * firstPass;
|
|
90
|
+
}
|
|
45
91
|
function rowToRecord(row) {
|
|
46
92
|
const runsTotal = Number(row.runs_total) || 0;
|
|
47
93
|
const runsPassed = Number(row.runs_passed) || 0;
|
|
94
|
+
const successRate = Number(row.success_rate) || (runsTotal > 0 ? runsPassed / runsTotal : 0);
|
|
95
|
+
const firstPassCount = Number(row.first_pass_count) || 0;
|
|
96
|
+
const firstPassRate = runsTotal > 0 ? Math.min(1, firstPassCount / runsTotal) : 0;
|
|
97
|
+
const last10Runs = parseRecentRuns(row.last_10_runs);
|
|
98
|
+
const decayed = last10Runs.length > 0 ? decayedSuccessRate(last10Runs) : successRate;
|
|
48
99
|
return {
|
|
49
100
|
taskType: String(row.task_type),
|
|
50
101
|
model: String(row.model ?? DEFAULT_MODEL),
|
|
51
102
|
runsTotal,
|
|
52
103
|
runsPassed,
|
|
53
|
-
|
|
104
|
+
firstPassCount,
|
|
105
|
+
firstPassRate,
|
|
106
|
+
successRate,
|
|
107
|
+
decayedSuccessRate: decayed,
|
|
108
|
+
effectiveSuccessRate: effectiveReliability(decayed, firstPassRate),
|
|
54
109
|
avgCostUsd: Number(row.avg_cost_usd) || 0,
|
|
55
110
|
avgTimeMs: Number(row.avg_time_ms) || 0,
|
|
56
|
-
last10Runs
|
|
111
|
+
last10Runs,
|
|
57
112
|
createdAt: String(row.created_at),
|
|
58
113
|
updatedAt: String(row.updated_at),
|
|
59
114
|
};
|
|
@@ -89,15 +144,24 @@ export function recordCapabilityOutcome(outcome) {
|
|
|
89
144
|
const time = outcome.timeMs === undefined ? 0 : requireNonNegative(outcome.timeMs, "timeMs");
|
|
90
145
|
const model = (outcome.model ?? DEFAULT_MODEL).trim() || DEFAULT_MODEL;
|
|
91
146
|
const passed = outcome.passed ? 1 : 0;
|
|
147
|
+
const attempts = outcome.attempts === undefined ? undefined : requireAttempts(outcome.attempts);
|
|
148
|
+
if (outcome.firstPass !== undefined && typeof outcome.firstPass !== "boolean") {
|
|
149
|
+
throw new Error("Признак firstPass должен быть boolean.");
|
|
150
|
+
}
|
|
151
|
+
// B13: без явного признака успех считается первым, если попытка одна
|
|
152
|
+
// (или число попыток не передано — обратная совместимость).
|
|
153
|
+
const firstPass = passed === 1 &&
|
|
154
|
+
(outcome.firstPass ?? (attempts === undefined || attempts === 1));
|
|
155
|
+
const firstPassIncrement = firstPass ? 1 : 0;
|
|
92
156
|
return withTransaction(() => {
|
|
93
157
|
const db = getDb();
|
|
94
158
|
const timestamp = nowIso();
|
|
95
159
|
const existing = getCapability(key);
|
|
96
160
|
if (!existing) {
|
|
97
161
|
db.prepare(`INSERT INTO capability_map (
|
|
98
|
-
task_type, model, runs_total, runs_passed, success_rate,
|
|
162
|
+
task_type, model, runs_total, runs_passed, first_pass_count, success_rate,
|
|
99
163
|
avg_cost_usd, avg_time_ms, last_10_runs, created_at, updated_at
|
|
100
|
-
) VALUES (?, ?, 1, ?, ?, ?, ?, ?, ?, ?)`).run(key, model, passed, passed, cost, time, JSON.stringify([passed]), timestamp, timestamp);
|
|
164
|
+
) VALUES (?, ?, 1, ?, ?, ?, ?, ?, ?, ?, ?)`).run(key, model, passed, firstPassIncrement, passed, cost, time, JSON.stringify([passed]), timestamp, timestamp);
|
|
101
165
|
}
|
|
102
166
|
else {
|
|
103
167
|
const runsTotal = existing.runsTotal + 1;
|
|
@@ -106,9 +170,11 @@ export function recordCapabilityOutcome(outcome) {
|
|
|
106
170
|
const avgTime = (existing.avgTimeMs * existing.runsTotal + time) / runsTotal;
|
|
107
171
|
const recent = [...existing.last10Runs, passed].slice(-RECENT_RUNS_LIMIT);
|
|
108
172
|
db.prepare(`UPDATE capability_map
|
|
109
|
-
SET model = ?, runs_total = ?, runs_passed = ?,
|
|
110
|
-
|
|
111
|
-
|
|
173
|
+
SET model = ?, runs_total = ?, runs_passed = ?,
|
|
174
|
+
first_pass_count = COALESCE(first_pass_count, 0) + ?,
|
|
175
|
+
success_rate = ?, avg_cost_usd = ?, avg_time_ms = ?,
|
|
176
|
+
last_10_runs = ?, updated_at = ?
|
|
177
|
+
WHERE task_type = ?`).run(model, runsTotal, runsPassed, firstPassIncrement, runsPassed / runsTotal, avgCost, avgTime, JSON.stringify(recent), timestamp, key);
|
|
112
178
|
}
|
|
113
179
|
const record = getCapability(key);
|
|
114
180
|
if (!record) {
|
|
@@ -120,9 +186,13 @@ export function recordCapabilityOutcome(outcome) {
|
|
|
120
186
|
/**
|
|
121
187
|
* Решение слоя 2 по порогам (0 токенов).
|
|
122
188
|
*
|
|
189
|
+
* Пороги применяются к `effectiveSuccessRate` — 0.7 затухающего success rate
|
|
190
|
+
* последних прогонов плюс 0.3 first-pass rate (B13), а не к кумулятивному
|
|
191
|
+
* success rate. Поэтому старые успехи не перевешивают свежие провалы.
|
|
192
|
+
*
|
|
123
193
|
* - данных меньше `minRuns` → `explore` (решает слой 3);
|
|
124
|
-
* - `
|
|
125
|
-
* - `
|
|
194
|
+
* - `effectiveSuccessRate ≥ 0.85` → `local`;
|
|
195
|
+
* - `effectiveSuccessRate ≤ 0.30` → `cloud` (эскалация);
|
|
126
196
|
* - между порогами → `review` (нужен человек или облачный ревьюер).
|
|
127
197
|
*/
|
|
128
198
|
export function decideCapabilityRoute(taskType, thresholds = {}) {
|
|
@@ -134,32 +204,44 @@ export function decideCapabilityRoute(taskType, thresholds = {}) {
|
|
|
134
204
|
throw new Error("Порог localSuccess должен быть больше cloudFailure.");
|
|
135
205
|
}
|
|
136
206
|
const capability = getCapability(key);
|
|
207
|
+
const effectiveSuccessRate = capability?.effectiveSuccessRate ?? 0;
|
|
208
|
+
const decayedSuccessRate = capability?.decayedSuccessRate ?? 0;
|
|
209
|
+
const firstPassRate = capability?.firstPassRate ?? 0;
|
|
137
210
|
if (!capability || capability.runsTotal < minRuns) {
|
|
138
211
|
return {
|
|
139
212
|
taskType: key,
|
|
140
213
|
target: "explore",
|
|
141
214
|
reason: "no-data",
|
|
142
215
|
successRate: capability?.successRate ?? 0,
|
|
216
|
+
effectiveSuccessRate,
|
|
217
|
+
decayedSuccessRate,
|
|
218
|
+
firstPassRate,
|
|
143
219
|
runsTotal: capability?.runsTotal ?? 0,
|
|
144
220
|
capability,
|
|
145
221
|
};
|
|
146
222
|
}
|
|
147
|
-
if (
|
|
223
|
+
if (effectiveSuccessRate >= localSuccess) {
|
|
148
224
|
return {
|
|
149
225
|
taskType: key,
|
|
150
226
|
target: "local",
|
|
151
227
|
reason: "local-reliable",
|
|
152
228
|
successRate: capability.successRate,
|
|
229
|
+
effectiveSuccessRate,
|
|
230
|
+
decayedSuccessRate,
|
|
231
|
+
firstPassRate,
|
|
153
232
|
runsTotal: capability.runsTotal,
|
|
154
233
|
capability,
|
|
155
234
|
};
|
|
156
235
|
}
|
|
157
|
-
if (
|
|
236
|
+
if (effectiveSuccessRate <= cloudFailure) {
|
|
158
237
|
return {
|
|
159
238
|
taskType: key,
|
|
160
239
|
target: "cloud",
|
|
161
240
|
reason: "escalate",
|
|
162
241
|
successRate: capability.successRate,
|
|
242
|
+
effectiveSuccessRate,
|
|
243
|
+
decayedSuccessRate,
|
|
244
|
+
firstPassRate,
|
|
163
245
|
runsTotal: capability.runsTotal,
|
|
164
246
|
capability,
|
|
165
247
|
};
|
|
@@ -169,6 +251,9 @@ export function decideCapabilityRoute(taskType, thresholds = {}) {
|
|
|
169
251
|
target: "review",
|
|
170
252
|
reason: "review",
|
|
171
253
|
successRate: capability.successRate,
|
|
254
|
+
effectiveSuccessRate,
|
|
255
|
+
decayedSuccessRate,
|
|
256
|
+
firstPassRate,
|
|
172
257
|
runsTotal: capability.runsTotal,
|
|
173
258
|
capability,
|
|
174
259
|
};
|