agent-steward 0.0.4 → 0.0.6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +309 -2
- package/CROSS_PLATFORM.md +19 -0
- package/README.md +55 -8
- package/ROADMAP-STRATEGY.md +22 -19
- package/ROADMAP.md +230 -159
- package/dist/cli.d.ts +3 -0
- package/dist/cli.d.ts.map +1 -0
- package/dist/cli.js +356 -0
- package/dist/core/analytics.d.ts +6 -0
- package/dist/core/analytics.d.ts.map +1 -1
- package/dist/core/analytics.js +20 -3
- package/dist/core/audit.d.ts +6 -0
- package/dist/core/audit.d.ts.map +1 -1
- package/dist/core/audit.js +24 -0
- package/dist/core/budget.d.ts +118 -0
- package/dist/core/budget.d.ts.map +1 -0
- package/dist/core/budget.js +206 -0
- package/dist/core/cron-to-schtasks.d.ts.map +1 -1
- package/dist/core/cron-to-schtasks.js +38 -0
- package/dist/core/dry-run.d.ts +26 -1
- package/dist/core/dry-run.d.ts.map +1 -1
- package/dist/core/dry-run.js +199 -8
- package/dist/core/execution.d.ts +203 -0
- package/dist/core/execution.d.ts.map +1 -0
- package/dist/core/execution.js +309 -0
- package/dist/core/feedback.d.ts +192 -0
- package/dist/core/feedback.d.ts.map +1 -0
- package/dist/core/feedback.js +426 -0
- package/dist/core/gate-integrity.d.ts +71 -0
- package/dist/core/gate-integrity.d.ts.map +1 -0
- package/dist/core/gate-integrity.js +275 -0
- package/dist/core/git-trigger.d.ts.map +1 -1
- package/dist/core/git-trigger.js +14 -2
- package/dist/core/guard-run.d.ts +4 -0
- package/dist/core/guard-run.d.ts.map +1 -0
- package/dist/core/guard-run.js +101 -0
- package/dist/core/guard.d.ts +52 -0
- package/dist/core/guard.d.ts.map +1 -0
- package/dist/core/guard.js +362 -0
- package/dist/core/local-ai.d.ts.map +1 -1
- package/dist/core/local-ai.js +7 -3
- package/dist/core/lock.d.ts +41 -0
- package/dist/core/lock.d.ts.map +1 -1
- package/dist/core/lock.js +141 -29
- package/dist/core/matrix.d.ts +8 -0
- package/dist/core/matrix.d.ts.map +1 -1
- package/dist/core/matrix.js +132 -17
- package/dist/core/mission.d.ts +103 -0
- package/dist/core/mission.d.ts.map +1 -0
- package/dist/core/mission.js +374 -0
- package/dist/core/opencode-models.d.ts +2 -2
- package/dist/core/opencode-models.d.ts.map +1 -1
- package/dist/core/opencode-models.js +28 -21
- package/dist/core/opencode-usage.d.ts +35 -0
- package/dist/core/opencode-usage.d.ts.map +1 -0
- package/dist/core/opencode-usage.js +132 -0
- package/dist/core/pipeline-apply.d.ts +38 -0
- package/dist/core/pipeline-apply.d.ts.map +1 -0
- package/dist/core/pipeline-apply.js +117 -0
- package/dist/core/pipeline-io.d.ts +13 -0
- package/dist/core/pipeline-io.d.ts.map +1 -0
- package/dist/core/pipeline-io.js +78 -0
- package/dist/core/pipeline-map.d.ts +52 -0
- package/dist/core/pipeline-map.d.ts.map +1 -0
- package/dist/core/pipeline-map.js +208 -0
- package/dist/core/pipeline-spec.d.ts +109 -0
- package/dist/core/pipeline-spec.d.ts.map +1 -0
- package/dist/core/pipeline-spec.js +554 -0
- package/dist/core/ps-wrapper.d.ts +27 -2
- package/dist/core/ps-wrapper.d.ts.map +1 -1
- package/dist/core/ps-wrapper.js +424 -65
- package/dist/core/record-history.d.ts.map +1 -1
- package/dist/core/record-history.js +206 -33
- package/dist/core/router/rules.d.ts.map +1 -1
- package/dist/core/router/rules.js +6 -0
- package/dist/core/run-mode.d.ts +12 -0
- package/dist/core/run-mode.d.ts.map +1 -0
- package/dist/core/run-mode.js +17 -0
- package/dist/core/scheduler/linux.d.ts +8 -1
- package/dist/core/scheduler/linux.d.ts.map +1 -1
- package/dist/core/scheduler/linux.js +34 -9
- package/dist/core/scheduler/logs.d.ts +4 -0
- package/dist/core/scheduler/logs.d.ts.map +1 -1
- package/dist/core/scheduler/logs.js +25 -1
- package/dist/core/scheduler/mac.d.ts +44 -2
- package/dist/core/scheduler/mac.d.ts.map +1 -1
- package/dist/core/scheduler/mac.js +126 -15
- package/dist/core/scheduler/windows.d.ts.map +1 -1
- package/dist/core/scheduler/windows.js +15 -12
- package/dist/core/secrets.d.ts.map +1 -1
- package/dist/core/secrets.js +18 -8
- package/dist/core/self-analysis.d.ts +32 -2
- package/dist/core/self-analysis.d.ts.map +1 -1
- package/dist/core/self-analysis.js +38 -27
- package/dist/core/shutdown.d.ts +33 -2
- package/dist/core/shutdown.d.ts.map +1 -1
- package/dist/core/shutdown.js +58 -2
- package/dist/core/structured-log.d.ts +37 -1
- package/dist/core/structured-log.d.ts.map +1 -1
- package/dist/core/structured-log.js +37 -0
- package/dist/core/usage-surface.d.ts +25 -0
- package/dist/core/usage-surface.d.ts.map +1 -0
- package/dist/core/usage-surface.js +41 -0
- package/dist/core/worktree-run.d.ts +4 -0
- package/dist/core/worktree-run.d.ts.map +1 -0
- package/dist/core/worktree-run.js +164 -0
- package/dist/core/worktree.d.ts +115 -0
- package/dist/core/worktree.d.ts.map +1 -0
- package/dist/core/worktree.js +462 -0
- package/dist/core/wrappers/bash.d.ts +19 -0
- package/dist/core/wrappers/bash.d.ts.map +1 -1
- package/dist/core/wrappers/bash.js +230 -27
- package/dist/db/capability-repo.d.ts +43 -2
- package/dist/db/capability-repo.d.ts.map +1 -1
- package/dist/db/capability-repo.js +96 -11
- package/dist/db/history-repo.d.ts +70 -5
- package/dist/db/history-repo.d.ts.map +1 -1
- package/dist/db/history-repo.js +170 -29
- package/dist/db/metrics-repo.d.ts +20 -2
- package/dist/db/metrics-repo.d.ts.map +1 -1
- package/dist/db/metrics-repo.js +35 -13
- package/dist/db/migrate.d.ts.map +1 -1
- package/dist/db/migrate.js +37 -17
- package/dist/db/recovery.d.ts +3 -1
- package/dist/db/recovery.d.ts.map +1 -1
- package/dist/db/recovery.js +11 -5
- package/dist/db/run-journal.d.ts +33 -5
- package/dist/db/run-journal.d.ts.map +1 -1
- package/dist/db/run-journal.js +78 -14
- package/dist/db/run-resume.d.ts +5 -0
- package/dist/db/run-resume.d.ts.map +1 -1
- package/dist/db/run-resume.js +9 -2
- package/dist/db/runs-repo.d.ts +19 -2
- package/dist/db/runs-repo.d.ts.map +1 -1
- package/dist/db/runs-repo.js +91 -60
- package/dist/db/schema.d.ts +2 -2
- package/dist/db/schema.d.ts.map +1 -1
- package/dist/db/schema.js +132 -2
- package/dist/db/templates-repo.d.ts +2 -2
- package/dist/db/templates-repo.d.ts.map +1 -1
- package/dist/db/templates-repo.js +5 -3
- package/dist/history.d.ts +7 -2
- package/dist/history.d.ts.map +1 -1
- package/dist/history.js +4 -2
- package/dist/hook-output.d.ts +2 -0
- package/dist/hook-output.d.ts.map +1 -0
- package/dist/hook-output.js +31 -0
- package/dist/i18n.d.ts +5 -0
- package/dist/i18n.d.ts.map +1 -1
- package/dist/i18n.js +11 -4
- package/dist/index.d.ts +375 -47
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +1344 -192
- package/dist/notifications.d.ts +53 -2
- package/dist/notifications.d.ts.map +1 -1
- package/dist/notifications.js +168 -21
- package/dist/profiles.d.ts.map +1 -1
- package/dist/profiles.js +82 -10
- package/dist/rpc.d.ts +354 -0
- package/dist/rpc.d.ts.map +1 -1
- package/dist/rpc.js +145 -0
- package/dist/server.d.ts +32 -2
- package/dist/server.d.ts.map +1 -1
- package/dist/server.js +154 -30
- package/dist/settings.d.ts +44 -2
- package/dist/settings.d.ts.map +1 -1
- package/dist/settings.js +85 -3
- package/dist/shared/jobs-view.d.ts +1 -1
- package/dist/shared/jobs-view.d.ts.map +1 -1
- package/dist/shared/jobs-view.js +2 -0
- package/dist/task-transfer.d.ts +21 -0
- package/dist/task-transfer.d.ts.map +1 -1
- package/dist/task-transfer.js +64 -3
- package/dist/templates.d.ts +2 -2
- package/dist/templates.d.ts.map +1 -1
- package/dist/templates.js +3 -3
- package/dist/types.d.ts +22 -2
- package/dist/types.d.ts.map +1 -1
- package/dist/workspaces.d.ts.map +1 -1
- package/dist/workspaces.js +34 -11
- package/docs/ARCHITECTURE.md +319 -66
- package/docs/COMPATIBILITY.md +2 -2
- package/docs/CONCEPT.md +18 -4
- package/docs/CROSS_PLATFORM.ru.md +20 -0
- package/docs/CROSS_PLATFORM.zh.md +18 -0
- package/docs/EXECUTION-LOOP.md +28 -10
- package/docs/FEATURES.md +129 -7
- package/docs/FEATURES.zh.md +97 -6
- package/docs/MIGRATION.md +2 -2
- package/docs/PIPELINE.md +293 -0
- package/docs/QA-A2-GUI-TUI.md +205 -0
- package/docs/README.ru.md +43 -4
- package/docs/README.zh.md +44 -4
- package/docs/SAFETY.md +23 -3
- package/gui-experimental.cjs +9 -8
- package/locales/en.json +58 -3
- package/locales/ru.json +58 -3
- package/locales/zh.json +58 -3
- package/opencode.pipeline.yaml +35 -0
- package/package.json +36 -4
- package/scripts/check-eslint-baseline.mjs +139 -0
- package/scripts/gen-test-plan-counters.mjs +117 -0
- package/scripts/github-ci-fetch.ps1 +37 -0
- package/scripts/pl-commit.ps1 +112 -0
- package/scripts/qa-a2-commit.ps1 +104 -0
- package/scripts/test-home.mjs +107 -0
- package/skills/scheduled-job-best-practices/SKILL.md +95 -1
- package/skills/scheduled-job-best-practices/references/recipes.md +139 -0
- package/src/cli.ts +417 -0
- package/src/core/analytics.ts +27 -4
- package/src/core/audit.ts +25 -0
- package/src/core/budget.ts +340 -0
- package/src/core/cron-to-schtasks.ts +42 -0
- package/src/core/dry-run.ts +235 -12
- package/src/core/execution.ts +538 -0
- package/src/core/feedback.ts +582 -0
- package/src/core/file-watcher.ts +2 -2
- package/src/core/gate-integrity.ts +330 -0
- package/src/core/git-trigger.ts +18 -5
- package/src/core/guard-run.ts +119 -0
- package/src/core/guard.ts +431 -0
- package/src/core/local-ai.ts +7 -3
- package/src/core/lock.ts +178 -37
- package/src/core/matrix.ts +158 -52
- package/src/core/mission.ts +531 -0
- package/src/core/native-notify.ts +1 -1
- package/src/core/opencode-models.ts +30 -21
- package/src/core/opencode-usage.ts +182 -0
- package/src/core/pipeline-apply.ts +158 -0
- package/src/core/pipeline-io.ts +96 -0
- package/src/core/pipeline-map.ts +283 -0
- package/src/core/pipeline-spec.ts +775 -0
- package/src/core/ps-wrapper.ts +435 -66
- package/src/core/record-history.ts +258 -81
- package/src/core/router/rules.ts +6 -0
- package/src/core/run-mode.ts +19 -0
- package/src/core/schedule-gate.ts +1 -1
- package/src/core/scheduler/at-fallback.ts +1 -1
- package/src/core/scheduler/linux.ts +40 -11
- package/src/core/scheduler/logs.ts +34 -3
- package/src/core/scheduler/mac.ts +174 -14
- package/src/core/scheduler/registry.ts +2 -2
- package/src/core/scheduler/windows.ts +19 -15
- package/src/core/secrets.ts +26 -19
- package/src/core/self-analysis.ts +75 -29
- package/src/core/shutdown.ts +90 -4
- package/src/core/structured-log.ts +89 -5
- package/src/core/telegram.ts +2 -2
- package/src/core/triage-worker.ts +7 -7
- package/src/core/triage.ts +2 -2
- package/src/core/usage-surface.ts +70 -0
- package/src/core/worktree-run.ts +199 -0
- package/src/core/worktree.ts +600 -0
- package/src/core/wrappers/bash.ts +248 -26
- package/src/db/capability-repo.ts +127 -10
- package/src/db/history-repo.ts +281 -40
- package/src/db/metrics-repo.ts +40 -13
- package/src/db/migrate.ts +57 -32
- package/src/db/recovery.ts +12 -5
- package/src/db/run-journal.ts +100 -13
- package/src/db/run-resume.ts +17 -1
- package/src/db/runs-repo.ts +147 -65
- package/src/db/schema.ts +134 -2
- package/src/db/templates-repo.ts +5 -3
- package/src/gui.tsx +438 -18
- package/src/history.ts +11 -4
- package/src/hook-output.ts +39 -0
- package/src/i18n.ts +12 -4
- package/src/index.ts +1902 -320
- package/src/notifications.ts +227 -47
- package/src/profiles.ts +88 -10
- package/src/rpc.ts +158 -0
- package/src/server.ts +201 -41
- package/src/settings.ts +125 -5
- package/src/shared/jobs-view.ts +3 -1
- package/src/task-transfer.ts +90 -6
- package/src/templates.ts +3 -3
- package/src/types.ts +23 -2
- package/src/workspaces.ts +37 -14
|
@@ -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, gateAllowPaths, } = 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,24 @@ 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)}`,
|
|
102
|
+
`GATE_ALLOW_PATHS=${shellQuote(gateAllowPaths ?? "")}`,
|
|
48
103
|
`MODEL=${shellQuote(model ?? "")}`,
|
|
49
104
|
// Спринт 24: режим сессии — "new" (по умолчанию), "reuse" (--session <id>), "last" (--continue).
|
|
50
105
|
`SESSION_MODE=${shellQuote(sessionMode ?? "new")}`,
|
|
@@ -86,6 +141,8 @@ export function buildBashWrapperScript(options) {
|
|
|
86
141
|
' printf \'[%s] %s\\n\' "$(date \'+%Y-%m-%d %H:%M:%S\')" "$*" >> "$LOG_FILE" 2>/dev/null || true',
|
|
87
142
|
"}",
|
|
88
143
|
"",
|
|
144
|
+
BASH_LOCK_PID_FUNCTION,
|
|
145
|
+
"",
|
|
89
146
|
'log "[role-scoped] opencode config passed via OPENCODE_CONFIG_CONTENT"',
|
|
90
147
|
`log ${shellQuote(`[policy] ${formatPolicyLog(effectivePermissions)}`)}`,
|
|
91
148
|
...effectivePermissions.deniedByPolicy.map((entry) => `log ${shellQuote(`[policy] deny ${entry.action}: ${entry.hint}`)}`),
|
|
@@ -149,8 +206,35 @@ export function buildBashWrapperScript(options) {
|
|
|
149
206
|
"fi",
|
|
150
207
|
"",
|
|
151
208
|
"# Атомарная блокировка: mkdir завершается ошибкой, если каталог уже есть.",
|
|
152
|
-
"#
|
|
153
|
-
"#
|
|
209
|
+
"# B6: перед своим каталогом проверяем файловый lock Node/PS (<lock>):",
|
|
210
|
+
"# они держат файл, а bash — каталог. Без этой проверки Node-процесс и",
|
|
211
|
+
"# bash-обёртка могли выполнять одну задачу одновременно.",
|
|
212
|
+
'if [ -f "$LOCK_FILE" ]; then',
|
|
213
|
+
' LOCK_OWNER_RAW="$(cat "$LOCK_FILE" 2>/dev/null || true)"',
|
|
214
|
+
' LOCK_FILE_PID="$(parse_lock_pid "$LOCK_OWNER_RAW")"',
|
|
215
|
+
' if [ -z "$LOCK_FILE_PID" ]; then',
|
|
216
|
+
' log "[scheduler] Не удалось определить владельца lock — пропуск запуска."',
|
|
217
|
+
" exit 0",
|
|
218
|
+
" fi",
|
|
219
|
+
' if kill -0 "$LOCK_FILE_PID" 2>/dev/null; then',
|
|
220
|
+
' log "[scheduler] Задача \'$TASK_NAME\' уже выполняется (pid $LOCK_FILE_PID) — пропуск запуска."',
|
|
221
|
+
" exit 0",
|
|
222
|
+
" fi",
|
|
223
|
+
" # Владелец мёртв: атомарно уводим файл, чтобы не удалить lock, который",
|
|
224
|
+
" # другой воркер успел пересоздать.",
|
|
225
|
+
' STALE_LOCK_FILE="$LOCK_FILE.stale-$$-$(date +%s)"',
|
|
226
|
+
' if ! mv "$LOCK_FILE" "$STALE_LOCK_FILE" 2>/dev/null; then',
|
|
227
|
+
' if [ -f "$LOCK_FILE" ]; then',
|
|
228
|
+
' log "[scheduler] Не удалось вытеснить осиротевший lock \'$LOCK_FILE\' — пропуск запуска."',
|
|
229
|
+
" exit 0",
|
|
230
|
+
" fi",
|
|
231
|
+
" else",
|
|
232
|
+
' rm -f "$STALE_LOCK_FILE" 2>/dev/null || true',
|
|
233
|
+
" fi",
|
|
234
|
+
"fi",
|
|
235
|
+
"",
|
|
236
|
+
"# B6: в pid-файл пишем `<pid>-<iso>`, а не голый PID — так его читают",
|
|
237
|
+
"# Node и PS общим парсером. После kill -9 lock снимается по мёртвому PID.",
|
|
154
238
|
'if ! mkdir "$LOCK_FILE.d" 2>/dev/null; then',
|
|
155
239
|
' if [ ! -d "$LOCK_FILE.d" ]; then',
|
|
156
240
|
' log "[scheduler] Не удалось создать lock \'$LOCK_FILE.d\' — запуск отменён."',
|
|
@@ -158,7 +242,7 @@ export function buildBashWrapperScript(options) {
|
|
|
158
242
|
" fi",
|
|
159
243
|
' LOCK_PID=""',
|
|
160
244
|
' if [ -f "$LOCK_FILE.d/pid" ]; then',
|
|
161
|
-
' LOCK_PID="$(cat "$LOCK_FILE.d/pid" 2>/dev/null || true)"',
|
|
245
|
+
' LOCK_PID="$(parse_lock_pid "$(cat "$LOCK_FILE.d/pid" 2>/dev/null || true)")"',
|
|
162
246
|
" fi",
|
|
163
247
|
" LOCK_ALIVE=1",
|
|
164
248
|
' if [ -n "$LOCK_PID" ]; then',
|
|
@@ -183,14 +267,61 @@ export function buildBashWrapperScript(options) {
|
|
|
183
267
|
" exit 0",
|
|
184
268
|
" fi",
|
|
185
269
|
"fi",
|
|
186
|
-
'printf \'%s\\n\' "
|
|
187
|
-
|
|
270
|
+
'printf \'%s\\n\' "$$-$(date -u +%Y-%m-%dT%H:%M:%SZ)" > "$LOCK_FILE.d/pid" 2>/dev/null || true',
|
|
271
|
+
"cleanup_worktree() {",
|
|
272
|
+
" if [ -n \"${AGENT_STEWARD_WORKTREE:-}\" ] && [ -n \"$WORKTREE_HELPER\" ] && command -v node >/dev/null 2>&1; then",
|
|
273
|
+
" cd \"$WORKDIR\" 2>/dev/null || true",
|
|
274
|
+
" node \"$WORKTREE_HELPER\" cleanup --path \"$AGENT_STEWARD_WORKTREE\" --repo \"$WORKDIR\" >> \"$LOG_FILE\" 2>&1 || true",
|
|
275
|
+
' AGENT_STEWARD_WORKTREE=""',
|
|
276
|
+
" fi",
|
|
277
|
+
"}",
|
|
278
|
+
'cleanup() { cleanup_worktree; rmdir "$LOCK_FILE.d" 2>/dev/null || rm -rf "$LOCK_FILE.d" 2>/dev/null; }',
|
|
188
279
|
"trap cleanup EXIT INT TERM",
|
|
189
280
|
"",
|
|
190
281
|
'if [ -n "$WORKDIR" ] && [ -d "$WORKDIR" ]; then',
|
|
191
282
|
' cd "$WORKDIR" || { log "[scheduler] Не удалось перейти в $WORKDIR"; exit 1; }',
|
|
192
283
|
"fi",
|
|
193
284
|
"",
|
|
285
|
+
"# W-1 (0.0.6): одноразовый git worktree. Ошибка создания — fail-closed:",
|
|
286
|
+
"# задача не должна молча работать в основном дереве репозитория.",
|
|
287
|
+
'if [ "$WORKTREE_MODE" = "1" ]; then',
|
|
288
|
+
' if [ -z "$WORKTREE_HELPER" ] || ! command -v node >/dev/null 2>&1; then',
|
|
289
|
+
' log "[scheduler] ОШИБКА: помощник worktree недоступен (нет node или worktree-run.js). Запуск отменён."',
|
|
290
|
+
" exit 1",
|
|
291
|
+
" fi",
|
|
292
|
+
' AGENT_STEWARD_WORKTREE="$(node "$WORKTREE_HELPER" --repo "$WORKDIR" --task "$TASK_NAME" 2>> "$LOG_FILE" | tail -n 1)"',
|
|
293
|
+
' if [ -z "$AGENT_STEWARD_WORKTREE" ]; then',
|
|
294
|
+
' log "[scheduler] ОШИБКА: не удалось создать git worktree для \'$TASK_NAME\' — запуск отменён."',
|
|
295
|
+
" exit 1",
|
|
296
|
+
" fi",
|
|
297
|
+
" export AGENT_STEWARD_WORKTREE",
|
|
298
|
+
' export AGENT_STEWARD_WORKTREE_REPO="$WORKDIR"',
|
|
299
|
+
' log "[scheduler] Git worktree: $AGENT_STEWARD_WORKTREE"',
|
|
300
|
+
' cd "$AGENT_STEWARD_WORKTREE" || { log "[scheduler] Не удалось перейти в worktree $AGENT_STEWARD_WORKTREE"; exit 1; }',
|
|
301
|
+
"fi",
|
|
302
|
+
"",
|
|
303
|
+
...(guards
|
|
304
|
+
? [
|
|
305
|
+
"# W-3 (0.0.6): guard-условия до запуска opencode. Код 4 — штатный skip,",
|
|
306
|
+
"# ненулевой код — ошибка проверки. В обоих случаях opencode не запускается,",
|
|
307
|
+
"# а созданный worktree убирается через trap cleanup.",
|
|
308
|
+
'if [ -n "$GUARD_HELPER" ] && [ -n "$GUARD_B64" ]; then',
|
|
309
|
+
' node "$GUARD_HELPER" --cwd "$PWD" --guards-b64 "$GUARD_B64" >> "$LOG_FILE" 2>&1',
|
|
310
|
+
" GUARD_STATUS=$?",
|
|
311
|
+
' if [ "$GUARD_STATUS" -eq 4 ]; then',
|
|
312
|
+
' log "[scheduler] guard: run skipped (условия не выполнены)"',
|
|
313
|
+
' if [ -n "$RECORDER_FILE" ] && command -v node >/dev/null 2>&1; then',
|
|
314
|
+
' node "$RECORDER_FILE" --skip "$TASK_NAME" "$GUARD_SKIP_B64" >> "$LOG_FILE" 2>&1 || true',
|
|
315
|
+
" fi",
|
|
316
|
+
" exit 0",
|
|
317
|
+
' elif [ "$GUARD_STATUS" -ne 0 ]; then',
|
|
318
|
+
' log "[scheduler] ОШИБКА: guard helper завершился с кодом $GUARD_STATUS — запуск отменён."',
|
|
319
|
+
" exit 1",
|
|
320
|
+
" fi",
|
|
321
|
+
"fi",
|
|
322
|
+
"",
|
|
323
|
+
]
|
|
324
|
+
: []),
|
|
194
325
|
"# Спринт 21: env-переменные workspace. Файл пишет плагин, значения не логируются.",
|
|
195
326
|
'if [ -n "$ENV_FILE" ] && [ -f "$ENV_FILE" ]; then',
|
|
196
327
|
' while IFS= read -r env_line || [ -n "$env_line" ]; do',
|
|
@@ -233,15 +364,29 @@ export function buildBashWrapperScript(options) {
|
|
|
233
364
|
"fi",
|
|
234
365
|
"",
|
|
235
366
|
'PROMPT="$(cat "$PROMPT_FILE" 2>/dev/null || true)"',
|
|
367
|
+
"# W-1: сообщаем агенту, что он работает в одноразовом git worktree.",
|
|
368
|
+
'if [ -n "${AGENT_STEWARD_WORKTREE:-}" ]; then',
|
|
369
|
+
' PROMPT="[agent-steward] Рабочая директория запуска - одноразовый git worktree: $AGENT_STEWARD_WORKTREE',
|
|
370
|
+
'$PROMPT"',
|
|
371
|
+
"fi",
|
|
236
372
|
"# T-09: backstop размера промпта на POSIX (argv ограничен MAX_ARG_STRLEN",
|
|
237
|
-
"# 128 КиБ на аргумент в Linux). Считаем байты, а не символы.",
|
|
373
|
+
"# 128 КиБ на аргумент в Linux). Считаем байты, а не символы. Лимит включает",
|
|
374
|
+
"# завершающий NUL, поэтому максимум полезных данных — 131071 байт (B11.2).",
|
|
238
375
|
'PROMPT_BYTES="$(printf %s "$PROMPT" | wc -c | tr -d \' \')"',
|
|
239
|
-
'if [ "$PROMPT_BYTES" -
|
|
240
|
-
' log "[scheduler] ОШИБКА: промпт слишком длинный для argv POSIX: ${PROMPT_BYTES} байт (максимум
|
|
376
|
+
'if [ "$PROMPT_BYTES" -ge 131072 ] 2>/dev/null; then',
|
|
377
|
+
' log "[scheduler] ОШИБКА: промпт слишком длинный для argv POSIX: ${PROMPT_BYTES} байт (максимум 131071)."',
|
|
241
378
|
" exit 1",
|
|
242
379
|
"fi",
|
|
243
380
|
'START_EPOCH="$(date +%s)"',
|
|
244
381
|
'STARTED_AT="$(date -u \'+%Y-%m-%dT%H:%M:%SZ\')"',
|
|
382
|
+
// PL-25: снимаем состояние рабочего дерева до запуска ИИ; перед гейтом сверяем.
|
|
383
|
+
'WT_SNAPSHOT=""',
|
|
384
|
+
'if [ -n "$QUALITY_GATE" ] && [ -n "$GATE_SNAPSHOT" ] && [ -n "$GATE_INTEGRITY" ] && [ -n "$WORKDIR" ] && [ -f "$GATE_INTEGRITY" ]; then',
|
|
385
|
+
' WT_SNAPSHOT="${GATE_SNAPSHOT%.json}.worktree.json"',
|
|
386
|
+
' ALLOW_ARGS=""',
|
|
387
|
+
' if [ -n "$GATE_ALLOW_PATHS" ]; then ALLOW_ARGS="--allow $GATE_ALLOW_PATHS"; fi',
|
|
388
|
+
' node "$GATE_INTEGRITY" worktree-snapshot --dir "$WORKDIR" --out "$WT_SNAPSHOT" $ALLOW_ARGS >> "$LOG_FILE" 2>&1 || true',
|
|
389
|
+
"fi",
|
|
245
390
|
"EXIT_CODE=0",
|
|
246
391
|
'ERROR_MESSAGE=""',
|
|
247
392
|
'PRE_FLIGHT_STATUS="skipped"',
|
|
@@ -257,13 +402,37 @@ export function buildBashWrapperScript(options) {
|
|
|
257
402
|
' RUN_ID="$(node "$RECORDER_FILE" --start "$TASK_NAME" "$STARTED_AT" 2>> "$LOG_FILE" | tail -n 1)"',
|
|
258
403
|
"fi",
|
|
259
404
|
"",
|
|
405
|
+
// PL-7.2: отдельный вызов хука с разделением stdout/stderr и structured логом.
|
|
406
|
+
"hook_output() {",
|
|
407
|
+
' local phase="$1" code="$2" out="$3" err="$4" helper',
|
|
408
|
+
' if [ -z "$RECORDER_FILE" ] || ! command -v node >/dev/null 2>&1; then',
|
|
409
|
+
" return 0",
|
|
410
|
+
" fi",
|
|
411
|
+
' helper="$(dirname "$RECORDER_FILE")/hook-output.js"',
|
|
412
|
+
' [ -f "$helper" ] || return 0',
|
|
413
|
+
' node "$helper" "$phase" "$TASK_NAME" "$code" "$out" "$err" "${RUN_ID:-}" >> "$LOG_FILE" 2>&1 || true',
|
|
414
|
+
"}",
|
|
415
|
+
"run_hook_captured() {",
|
|
416
|
+
' local phase="$1" command="$2" out err code',
|
|
417
|
+
' out="$(mktemp)"',
|
|
418
|
+
' err="$(mktemp)"',
|
|
419
|
+
' run_with_timeout "$GATE_TIMEOUT_SECONDS" bash -c "$command" >"$out" 2>"$err"',
|
|
420
|
+
" code=$?",
|
|
421
|
+
' cat "$out" >> "$LOG_FILE"',
|
|
422
|
+
' cat "$err" >> "$LOG_FILE"',
|
|
423
|
+
' hook_output "$phase" "$code" "$out" "$err"',
|
|
424
|
+
' rm -f "$out" "$err"',
|
|
425
|
+
" return $code",
|
|
426
|
+
"}",
|
|
427
|
+
"",
|
|
260
428
|
"# Pre-flight: выполняется до основной задачи. Ненулевой код отменяет запуск.",
|
|
261
429
|
'if [ -n "$BEFORE_SCRIPT" ]; then',
|
|
262
430
|
' log "[scheduler] Pre-flight: $BEFORE_SCRIPT"',
|
|
263
|
-
'
|
|
431
|
+
' run_hook_captured "preFlight" "$BEFORE_SCRIPT"',
|
|
264
432
|
" PRE_CODE=$?",
|
|
265
433
|
' if [ "$PRE_CODE" -ne 0 ]; then',
|
|
266
|
-
|
|
434
|
+
" # PL-6.1: last command in a hook defines the exit code — add explicit exit 0.",
|
|
435
|
+
' log "[scheduler] ОШИБКА: Pre-flight script failed (код $PRE_CODE). Завершите хук явным exit 0 (например: rm -f \"$path\" || true; exit 0)."',
|
|
267
436
|
' PRE_FLIGHT_STATUS="error"',
|
|
268
437
|
' ERROR_MESSAGE="Pre-flight script failed"',
|
|
269
438
|
" EXIT_CODE=1",
|
|
@@ -276,40 +445,48 @@ export function buildBashWrapperScript(options) {
|
|
|
276
445
|
"",
|
|
277
446
|
'if [ "$SKIP_MAIN" -eq 0 ]; then',
|
|
278
447
|
"",
|
|
448
|
+
// QA-P0.2: маркер границы реального прогона. Пишется без префикса времени,
|
|
449
|
+
// чтобы extractLastRunLog() смог отсечь вывод предыдущих запусков и
|
|
450
|
+
// подготовительные записи. До этой точки запуск мог быть отменён guard-ом
|
|
451
|
+
// или pre-flight, поэтому маркер нельзя ставить раньше.
|
|
452
|
+
'printf \'[agent-steward] === Run started %s (%s) ===\\n\' "$(date -u \'+%Y-%m-%dT%H:%M:%SZ\')" "$TASK_NAME" >> "$LOG_FILE" 2>/dev/null || true',
|
|
453
|
+
"",
|
|
279
454
|
"# Модель указывается только если задана — иначе OpenCode берёт свою по умолчанию.",
|
|
280
455
|
"# exec важен: в фоновом режиме он заменяет подоболочку процессом opencode,",
|
|
281
456
|
"# поэтому $! — это PID самого opencode, и watchdog убивает именно его.",
|
|
282
457
|
"# Ветвление вместо массива: bash 3.2 (macOS) с set -u падает на пустом",
|
|
283
458
|
'# "${ARR[@]}".',
|
|
284
459
|
"run_opencode() {",
|
|
460
|
+
" # QV-8: дочерний opencode run не загружает инструменты планировщика.",
|
|
461
|
+
" export AGENT_STEWARD_CHILD_RUN=1",
|
|
285
462
|
' if [ "$SESSION_MODE" = "reuse" ]; then',
|
|
286
463
|
' if [ -n "$SESSION_FILE" ] && [ -f "$SESSION_FILE" ]; then',
|
|
287
464
|
' SESSION_ID="$(head -n 1 "$SESSION_FILE" 2>/dev/null | tr -d "\\r")"',
|
|
288
465
|
" fi",
|
|
289
466
|
' if [ -n "$SESSION_ID" ]; then',
|
|
290
467
|
' if [ -n "$MODEL" ]; then',
|
|
291
|
-
' exec opencode run --auto --session "$SESSION_ID" --model "$MODEL" "$PROMPT"',
|
|
468
|
+
' exec opencode run --auto --session "$SESSION_ID" --model "$MODEL" -- "$PROMPT"',
|
|
292
469
|
" else",
|
|
293
|
-
' exec opencode run --auto --session "$SESSION_ID" "$PROMPT"',
|
|
470
|
+
' exec opencode run --auto --session "$SESSION_ID" -- "$PROMPT"',
|
|
294
471
|
" fi",
|
|
295
472
|
" else",
|
|
296
473
|
' if [ -n "$MODEL" ]; then',
|
|
297
|
-
' exec opencode run --auto --model "$MODEL" "$PROMPT"',
|
|
474
|
+
' exec opencode run --auto --model "$MODEL" -- "$PROMPT"',
|
|
298
475
|
" else",
|
|
299
|
-
' exec opencode run --auto "$PROMPT"',
|
|
476
|
+
' exec opencode run --auto -- "$PROMPT"',
|
|
300
477
|
" fi",
|
|
301
478
|
" fi",
|
|
302
479
|
' elif [ "$SESSION_MODE" = "last" ]; then',
|
|
303
480
|
' if [ -n "$MODEL" ]; then',
|
|
304
|
-
' exec opencode run --auto --continue --model "$MODEL" "$PROMPT"',
|
|
481
|
+
' exec opencode run --auto --continue --model "$MODEL" -- "$PROMPT"',
|
|
305
482
|
" else",
|
|
306
|
-
' exec opencode run --auto --continue "$PROMPT"',
|
|
483
|
+
' exec opencode run --auto --continue -- "$PROMPT"',
|
|
307
484
|
" fi",
|
|
308
485
|
" else",
|
|
309
486
|
' if [ -n "$MODEL" ]; then',
|
|
310
|
-
' exec opencode run --auto --model "$MODEL" "$PROMPT"',
|
|
487
|
+
' exec opencode run --auto --model "$MODEL" -- "$PROMPT"',
|
|
311
488
|
" else",
|
|
312
|
-
' exec opencode run --auto "$PROMPT"',
|
|
489
|
+
' exec opencode run --auto -- "$PROMPT"',
|
|
313
490
|
" fi",
|
|
314
491
|
" fi",
|
|
315
492
|
"}",
|
|
@@ -366,15 +543,41 @@ export function buildBashWrapperScript(options) {
|
|
|
366
543
|
"fi",
|
|
367
544
|
"",
|
|
368
545
|
'if [ -n "$QUALITY_GATE" ] && [ "$EXIT_CODE" -eq 0 ]; then',
|
|
369
|
-
|
|
370
|
-
|
|
371
|
-
"
|
|
372
|
-
' if [ "$
|
|
373
|
-
'
|
|
374
|
-
|
|
546
|
+
// G-1.2: сверяем входы гейта со snapshot'ом, снятым при создании задачи.
|
|
547
|
+
" GATE_INTEGRITY_OK=1",
|
|
548
|
+
" WORKTREE_FAIL=0",
|
|
549
|
+
' if [ -n "$GATE_SNAPSHOT" ] && [ -n "$GATE_INTEGRITY" ] && [ -f "$GATE_SNAPSHOT" ] && [ -f "$GATE_INTEGRITY" ]; then',
|
|
550
|
+
' node "$GATE_INTEGRITY" verify --snapshot "$GATE_SNAPSHOT" --gate-command "$QUALITY_GATE" --prompt-file "$PROMPT_FILE" --timeout "$GATE_TIMEOUT_SECONDS" >> "$LOG_FILE" 2>&1',
|
|
551
|
+
" VERIFY_CODE=$?",
|
|
552
|
+
' if [ "$VERIFY_CODE" -ne 0 ]; then GATE_INTEGRITY_OK=0; fi',
|
|
553
|
+
" else",
|
|
554
|
+
" GATE_INTEGRITY_OK=0",
|
|
555
|
+
" fi",
|
|
556
|
+
' if [ "$GATE_INTEGRITY_OK" -eq 1 ] && [ -n "$WT_SNAPSHOT" ] && [ -f "$WT_SNAPSHOT" ] && [ -n "$WORKDIR" ]; then',
|
|
557
|
+
' node "$GATE_INTEGRITY" worktree-verify --dir "$WORKDIR" --snapshot "$WT_SNAPSHOT" $ALLOW_ARGS >> "$LOG_FILE" 2>&1',
|
|
558
|
+
" WT_CODE=$?",
|
|
559
|
+
' if [ "$WT_CODE" -ne 0 ]; then GATE_INTEGRITY_OK=0; WORKTREE_FAIL=1; fi',
|
|
560
|
+
" fi",
|
|
561
|
+
' if [ "$GATE_INTEGRITY_OK" -eq 0 ]; then',
|
|
562
|
+
' if [ "$WORKTREE_FAIL" -eq 1 ]; then',
|
|
563
|
+
' log "[scheduler] ОШИБКА: рабочее дерево изменилось во время прогона — гейт не доверяем."',
|
|
564
|
+
' ERROR_MESSAGE="Quality Gate: рабочее дерево изменилось во время прогона"',
|
|
565
|
+
" else",
|
|
566
|
+
' log "[scheduler] ОШИБКА: целостность входов Quality Gate нарушена (snapshot mismatch)."',
|
|
567
|
+
' ERROR_MESSAGE="Quality Gate: целостность входов нарушена (snapshot mismatch)"',
|
|
568
|
+
" fi",
|
|
375
569
|
" EXIT_CODE=1",
|
|
376
570
|
" else",
|
|
377
|
-
' log "[scheduler] Quality Gate
|
|
571
|
+
' log "[scheduler] Запуск Quality Gate: $QUALITY_GATE"',
|
|
572
|
+
' run_with_timeout "$GATE_TIMEOUT_SECONDS" bash -c "$QUALITY_GATE" >> "$LOG_FILE" 2>&1',
|
|
573
|
+
" GATE_CODE=$?",
|
|
574
|
+
' if [ "$GATE_CODE" -ne 0 ]; then',
|
|
575
|
+
' log "[scheduler] ОШИБКА: Quality Gate провален. Код возврата: $GATE_CODE"',
|
|
576
|
+
' ERROR_MESSAGE="Quality Gate провален. Код возврата: $GATE_CODE"',
|
|
577
|
+
" EXIT_CODE=1",
|
|
578
|
+
" else",
|
|
579
|
+
' log "[scheduler] Quality Gate пройден."',
|
|
580
|
+
" fi",
|
|
378
581
|
" fi",
|
|
379
582
|
"fi",
|
|
380
583
|
"",
|
|
@@ -383,7 +586,7 @@ export function buildBashWrapperScript(options) {
|
|
|
383
586
|
"# Post-flight: выполняется ВСЕГДА, даже если основная задача упала.",
|
|
384
587
|
'if [ -n "$AFTER_SCRIPT" ]; then',
|
|
385
588
|
' log "[scheduler] Post-flight: $AFTER_SCRIPT"',
|
|
386
|
-
'
|
|
589
|
+
' run_hook_captured "postFlight" "$AFTER_SCRIPT"',
|
|
387
590
|
" POST_CODE=$?",
|
|
388
591
|
' if [ "$POST_CODE" -ne 0 ]; then',
|
|
389
592
|
' log "[scheduler] ОШИБКА: Post-flight script failed (код $POST_CODE)."',
|
|
@@ -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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"}
|