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/src/core/triage.ts
CHANGED
|
@@ -99,7 +99,7 @@ const SYSTEM_PROMPT = [
|
|
|
99
99
|
class ParseFailure extends Error {
|
|
100
100
|
constructor(
|
|
101
101
|
readonly failure: "invalid-json" | "invalid-schema" | "invalid-response",
|
|
102
|
-
message: string
|
|
102
|
+
message: string,
|
|
103
103
|
) {
|
|
104
104
|
super(message);
|
|
105
105
|
}
|
|
@@ -120,7 +120,7 @@ function resolveEndpoint(baseUrl: string): {
|
|
|
120
120
|
return { url: `${base}/api/chat`, protocol: "ollama" };
|
|
121
121
|
}
|
|
122
122
|
|
|
123
|
-
function buildMessages(input: TriageInput):
|
|
123
|
+
function buildMessages(input: TriageInput): { role: string; content: string }[] {
|
|
124
124
|
const payload = {
|
|
125
125
|
task: input.taskName,
|
|
126
126
|
status: input.status,
|
|
@@ -164,7 +164,7 @@ function parseVerdict(raw: string): TriageVerdict {
|
|
|
164
164
|
} catch (err: any) {
|
|
165
165
|
throw new ParseFailure(
|
|
166
166
|
"invalid-json",
|
|
167
|
-
`Ответ модели не парсится как JSON: ${err instanceof Error ? err.message : String(err)}
|
|
167
|
+
`Ответ модели не парсится как JSON: ${err instanceof Error ? err.message : String(err)}`,
|
|
168
168
|
);
|
|
169
169
|
}
|
|
170
170
|
|
|
@@ -232,11 +232,11 @@ const delay = (ms: number) => new Promise((resolve) => setTimeout(resolve, ms));
|
|
|
232
232
|
export async function classifyNotification(
|
|
233
233
|
input: TriageInput,
|
|
234
234
|
settings: TriageSettings | undefined,
|
|
235
|
-
options: TriageOptions = {}
|
|
235
|
+
options: TriageOptions = {},
|
|
236
236
|
): Promise<TriageResult> {
|
|
237
237
|
const startedAt = Date.now();
|
|
238
238
|
const model = settings?.model?.trim() ?? "";
|
|
239
|
-
if (!settings
|
|
239
|
+
if (!settings?.baseUrl?.trim() || !model) {
|
|
240
240
|
return {
|
|
241
241
|
ok: false,
|
|
242
242
|
failure: "disabled",
|
|
@@ -276,26 +276,26 @@ export async function classifyNotification(
|
|
|
276
276
|
const body: Record<string, unknown> =
|
|
277
277
|
protocol === "openai"
|
|
278
278
|
? {
|
|
279
|
-
|
|
280
|
-
|
|
281
|
-
|
|
282
|
-
|
|
283
|
-
|
|
284
|
-
|
|
285
|
-
|
|
286
|
-
|
|
287
|
-
|
|
288
|
-
|
|
289
|
-
},
|
|
279
|
+
model,
|
|
280
|
+
messages,
|
|
281
|
+
temperature: 0,
|
|
282
|
+
stream: false,
|
|
283
|
+
response_format: {
|
|
284
|
+
type: "json_schema",
|
|
285
|
+
json_schema: {
|
|
286
|
+
name: "notification_triage",
|
|
287
|
+
strict: true,
|
|
288
|
+
schema: TRIAGE_SCHEMA,
|
|
290
289
|
},
|
|
291
|
-
}
|
|
290
|
+
},
|
|
291
|
+
}
|
|
292
292
|
: {
|
|
293
|
-
|
|
294
|
-
|
|
295
|
-
|
|
296
|
-
|
|
297
|
-
|
|
298
|
-
|
|
293
|
+
model,
|
|
294
|
+
messages,
|
|
295
|
+
stream: false,
|
|
296
|
+
format: TRIAGE_SCHEMA,
|
|
297
|
+
options: { temperature: 0 },
|
|
298
|
+
};
|
|
299
299
|
|
|
300
300
|
const response = await fetch(url, {
|
|
301
301
|
method: "POST",
|
package/src/core/watch-paths.ts
CHANGED
|
@@ -42,7 +42,7 @@ export function normalizeWatchPath(watchPath: string, baseDir: string): string {
|
|
|
42
42
|
const rel = relative(baseDir, resolved);
|
|
43
43
|
if (rel === ".." || rel.startsWith(`..${process.platform === "win32" ? "\\" : "/"}`) || isAbsolute(rel)) {
|
|
44
44
|
throw new Error(
|
|
45
|
-
`Путь наблюдения выходит за пределы рабочей директории задачи: "${trimmed}"
|
|
45
|
+
`Путь наблюдения выходит за пределы рабочей директории задачи: "${trimmed}".`,
|
|
46
46
|
);
|
|
47
47
|
}
|
|
48
48
|
return resolved;
|
|
@@ -140,6 +140,9 @@ export function buildBashWrapperScript(options: BashWrapperOptions): string {
|
|
|
140
140
|
`WORKDIR=${shellQuote(workdir || process.cwd())}`,
|
|
141
141
|
`WORKSPACE_NAME=${shellQuote(workspaceName ?? "")}`,
|
|
142
142
|
`TIMEOUT_SECONDS=${Number.isFinite(timeoutSeconds) ? Math.max(0, Math.floor(timeoutSeconds)) : 3600}`,
|
|
143
|
+
// Маркер сработавшего watchdog: по нему обёртка отличает таймаут от
|
|
144
|
+
// обычного ненулевого кода возврата (SIGTERM/SIGKILL неотличимы от падения).
|
|
145
|
+
`TIMEOUT_MARKER=${shellQuote(`${lockFile}.timeout`)}`,
|
|
143
146
|
`RECORDER_FILE=${shellQuote(recorderFile ?? "")}`,
|
|
144
147
|
`QUALITY_GATE=${shellQuote(qualityGate ?? "")}`,
|
|
145
148
|
`MODEL=${shellQuote(model ?? "")}`,
|
|
@@ -169,9 +172,9 @@ export function buildBashWrapperScript(options: BashWrapperOptions): string {
|
|
|
169
172
|
deniedTools,
|
|
170
173
|
policy,
|
|
171
174
|
legacyShell,
|
|
172
|
-
})
|
|
175
|
+
}),
|
|
173
176
|
)}`,
|
|
174
|
-
|
|
177
|
+
"",
|
|
175
178
|
"# cron запускает задачи с минимальным PATH — добавляем типовые каталоги.",
|
|
176
179
|
'export PATH="/opt/homebrew/bin:/usr/local/bin:$HOME/.local/bin:$HOME/.bun/bin:$PATH"',
|
|
177
180
|
"",
|
|
@@ -189,28 +192,39 @@ export function buildBashWrapperScript(options: BashWrapperOptions): string {
|
|
|
189
192
|
`log ${shellQuote(`[policy] ${formatPolicyLog(effectivePermissions)}`)}`,
|
|
190
193
|
...effectivePermissions.deniedByPolicy.map(
|
|
191
194
|
(entry) =>
|
|
192
|
-
`log ${shellQuote(`[policy] deny ${entry.action}: ${entry.hint}`)}
|
|
195
|
+
`log ${shellQuote(`[policy] deny ${entry.action}: ${entry.hint}`)}`,
|
|
193
196
|
),
|
|
194
197
|
"",
|
|
195
198
|
"# Таймаут для gate/хуков: зависший скрипт не должен держать lock до истечения",
|
|
196
199
|
"# STALE_LOCK_MAX_AGE_MS. 0 — без таймаута (не рекомендуется).",
|
|
197
200
|
`GATE_TIMEOUT_SECONDS=${Math.max(0, Math.floor(gateTimeoutSeconds ?? 300))}`,
|
|
198
|
-
|
|
201
|
+
"run_with_timeout() {",
|
|
199
202
|
' GATE_LIMIT="$1"; shift',
|
|
200
203
|
' if [ "$GATE_LIMIT" -le 0 ] 2>/dev/null; then',
|
|
201
204
|
' "$@"',
|
|
202
|
-
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
|
|
205
|
+
" return $?",
|
|
206
|
+
" fi",
|
|
207
|
+
" # T-10: потомок получает собственную группу процессов (job control), чтобы",
|
|
208
|
+
" # watchdog убивал всё дерево (bash -c и его детей), а не только прямого ребёнка.",
|
|
209
|
+
" set -m 2>/dev/null || true",
|
|
207
210
|
' "$@" &',
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
|
|
211
|
+
" GATE_CHILD=$!",
|
|
212
|
+
" set +m 2>/dev/null || true",
|
|
213
|
+
" (",
|
|
214
|
+
" WD_SLEEP_PID=",
|
|
215
|
+
" trap 'if [ -n \"$WD_SLEEP_PID\" ]; then kill \"$WD_SLEEP_PID\" 2>/dev/null || true; fi; exit 0' TERM INT",
|
|
216
|
+
' sleep "$GATE_LIMIT" &',
|
|
217
|
+
" WD_SLEEP_PID=$!",
|
|
218
|
+
' wait "$WD_SLEEP_PID" 2>/dev/null || true',
|
|
219
|
+
' kill -TERM -- "-$GATE_CHILD" 2>/dev/null || kill -TERM "$GATE_CHILD" 2>/dev/null',
|
|
220
|
+
" sleep 5 &",
|
|
221
|
+
" WD_SLEEP_PID=$!",
|
|
222
|
+
' wait "$WD_SLEEP_PID" 2>/dev/null || true',
|
|
223
|
+
' kill -KILL -- "-$GATE_CHILD" 2>/dev/null || kill -KILL "$GATE_CHILD" 2>/dev/null',
|
|
224
|
+
" ) >/dev/null 2>&1 &",
|
|
225
|
+
" GATE_WATCHDOG=$!",
|
|
212
226
|
' wait "$GATE_CHILD"',
|
|
213
|
-
|
|
227
|
+
" GATE_CODE=$?",
|
|
214
228
|
' kill "$GATE_WATCHDOG" 2>/dev/null || true',
|
|
215
229
|
' wait "$GATE_WATCHDOG" 2>/dev/null || true',
|
|
216
230
|
' return "$GATE_CODE"',
|
|
@@ -218,7 +232,7 @@ export function buildBashWrapperScript(options: BashWrapperOptions): string {
|
|
|
218
232
|
"",
|
|
219
233
|
"# Спринт 19: гейт расписания — до lock, чтобы ожидание окна не держало блокировку.",
|
|
220
234
|
'if [ -n "$SCHEDULE_GATE_FILE" ]; then',
|
|
221
|
-
|
|
235
|
+
" SCHED_GATE_ARGS=()",
|
|
222
236
|
' [ -n "$SCHEDULE_CRON" ] && SCHED_GATE_ARGS+=(--cron "$SCHEDULE_CRON")',
|
|
223
237
|
' [ -n "$SCHEDULE_TZ" ] && SCHED_GATE_ARGS+=(--tz "$SCHEDULE_TZ")',
|
|
224
238
|
' [ -n "$SCHEDULE_NOT_BEFORE" ] && SCHED_GATE_ARGS+=(--not-before "$SCHEDULE_NOT_BEFORE")',
|
|
@@ -227,10 +241,10 @@ export function buildBashWrapperScript(options: BashWrapperOptions): string {
|
|
|
227
241
|
' [ -n "$SCHEDULE_WINDOW_POLICY" ] && SCHED_GATE_ARGS+=(--window-policy "$SCHEDULE_WINDOW_POLICY")',
|
|
228
242
|
' [ -n "$SCHEDULE_DEFER_FILE" ] && SCHED_GATE_ARGS+=(--defer-file "$SCHEDULE_DEFER_FILE")',
|
|
229
243
|
' [ -n "$SCHEDULE_FORCE_FILE" ] && SCHED_GATE_ARGS+=(--force-file "$SCHEDULE_FORCE_FILE")',
|
|
230
|
-
|
|
244
|
+
" if ! command -v node >/dev/null 2>&1; then",
|
|
231
245
|
' log "[scheduler] Гейт расписания пропущен: node не найден в PATH."',
|
|
232
246
|
" else",
|
|
233
|
-
'
|
|
247
|
+
' node "$SCHEDULE_GATE_FILE" ${SCHED_GATE_ARGS[@]+"${SCHED_GATE_ARGS[@]}"} >> "$LOG_FILE" 2>&1',
|
|
234
248
|
" SCHED_GATE_CODE=$?",
|
|
235
249
|
' if [ "$SCHED_GATE_CODE" -eq 3 ]; then',
|
|
236
250
|
' log "[scheduler] Гейт расписания: запуск не требуется (cron/окно). Перенос или пропуск тика."',
|
|
@@ -251,24 +265,24 @@ export function buildBashWrapperScript(options: BashWrapperOptions): string {
|
|
|
251
265
|
' if [ -f "$LOCK_FILE.d/pid" ]; then',
|
|
252
266
|
' LOCK_PID="$(cat "$LOCK_FILE.d/pid" 2>/dev/null || true)"',
|
|
253
267
|
" fi",
|
|
254
|
-
|
|
268
|
+
" LOCK_ALIVE=1",
|
|
255
269
|
' if [ -n "$LOCK_PID" ]; then',
|
|
256
270
|
' if kill -0 "$LOCK_PID" 2>/dev/null; then LOCK_ALIVE=1; else LOCK_ALIVE=0; fi',
|
|
257
|
-
|
|
271
|
+
" fi",
|
|
258
272
|
' if [ "$LOCK_ALIVE" -eq 1 ]; then',
|
|
259
273
|
' log "[scheduler] Задача \'$TASK_NAME\' уже выполняется (pid ${LOCK_PID:-неизвестен}) — пропуск запуска."',
|
|
260
274
|
" exit 0",
|
|
261
275
|
" fi",
|
|
262
276
|
' log "[scheduler] Вытесняю осиротевший lock \'$LOCK_FILE.d\' (pid ${LOCK_PID:-неизвестен})."',
|
|
263
|
-
|
|
264
|
-
|
|
277
|
+
" # T-03: атомарно уводим каталог в уникальное имя вместо rm -rf, чтобы не",
|
|
278
|
+
" # удалить свежий lock, созданный другим воркером после нашей проверки.",
|
|
265
279
|
' STALE_LOCK_DIR="$LOCK_FILE.d.stale-$$"',
|
|
266
280
|
' if mv "$LOCK_FILE.d" "$STALE_LOCK_DIR" 2>/dev/null; then',
|
|
267
281
|
' rm -rf "$STALE_LOCK_DIR" 2>/dev/null || true',
|
|
268
|
-
|
|
282
|
+
" else",
|
|
269
283
|
' log "[scheduler] Не удалось вытеснить осиротевший lock — пропуск запуска."',
|
|
270
|
-
|
|
271
|
-
|
|
284
|
+
" exit 0",
|
|
285
|
+
" fi",
|
|
272
286
|
' if ! mkdir "$LOCK_FILE.d" 2>/dev/null; then',
|
|
273
287
|
' log "[scheduler] Не удалось взять lock \'$LOCK_FILE.d\' — пропуск запуска."',
|
|
274
288
|
" exit 0",
|
|
@@ -291,6 +305,14 @@ export function buildBashWrapperScript(options: BashWrapperOptions): string {
|
|
|
291
305
|
' env_value="${env_line#*=}"',
|
|
292
306
|
' case "$env_key" in *[!A-Za-z0-9_]*) continue ;; esac',
|
|
293
307
|
' case "$env_key" in [A-Za-z_]*) ;; *) continue ;; esac',
|
|
308
|
+
// P2-21: неразрешённая ссылка означает, что секрет удалён/переименован.
|
|
309
|
+
// Запускать агента с литералом "${secret:NAME}" нельзя — fail closed.
|
|
310
|
+
' case "$env_value" in',
|
|
311
|
+
" *'${secret:'*)",
|
|
312
|
+
' log "[scheduler] ОШИБКА: переменная $env_key содержит неразрешённый секрет (\\${secret:...}). Запуск отменён."',
|
|
313
|
+
" exit 78",
|
|
314
|
+
" ;;",
|
|
315
|
+
" esac",
|
|
294
316
|
' export "$env_key=$env_value"',
|
|
295
317
|
' done < "$ENV_FILE"',
|
|
296
318
|
' log "[scheduler] Переменные окружения workspace загружены."',
|
|
@@ -310,7 +332,7 @@ export function buildBashWrapperScript(options: BashWrapperOptions): string {
|
|
|
310
332
|
' log "[role-scoped] allowed=[$ALLOWED_TOOLS], denied=[$DENIED_TOOLS]"',
|
|
311
333
|
"fi",
|
|
312
334
|
"",
|
|
313
|
-
|
|
335
|
+
"if ! command -v opencode >/dev/null 2>&1; then",
|
|
314
336
|
' log "[scheduler] ОШИБКА: opencode не найден в PATH ($PATH)."',
|
|
315
337
|
" exit 127",
|
|
316
338
|
"fi",
|
|
@@ -321,17 +343,17 @@ export function buildBashWrapperScript(options: BashWrapperOptions): string {
|
|
|
321
343
|
'PROMPT_BYTES="$(printf %s "$PROMPT" | wc -c | tr -d \' \')"',
|
|
322
344
|
'if [ "$PROMPT_BYTES" -gt 131072 ] 2>/dev/null; then',
|
|
323
345
|
' log "[scheduler] ОШИБКА: промпт слишком длинный для argv POSIX: ${PROMPT_BYTES} байт (максимум 131072)."',
|
|
324
|
-
|
|
325
|
-
|
|
346
|
+
" exit 1",
|
|
347
|
+
"fi",
|
|
326
348
|
'START_EPOCH="$(date +%s)"',
|
|
327
349
|
'STARTED_AT="$(date -u \'+%Y-%m-%dT%H:%M:%SZ\')"',
|
|
328
|
-
|
|
350
|
+
"EXIT_CODE=0",
|
|
329
351
|
'ERROR_MESSAGE=""',
|
|
330
352
|
'PRE_FLIGHT_STATUS="skipped"',
|
|
331
353
|
'POST_FLIGHT_STATUS="skipped"',
|
|
332
|
-
|
|
354
|
+
"SKIP_MAIN=0",
|
|
333
355
|
"",
|
|
334
|
-
|
|
356
|
+
"log \"[scheduler] Запуск задачи '$TASK_NAME'...\"",
|
|
335
357
|
"",
|
|
336
358
|
"# Crash recovery: фиксируем начало до pre-flight. Если процесс убьют,",
|
|
337
359
|
"# останется finished_at = NULL и recovery при следующем старте пометит error.",
|
|
@@ -402,12 +424,26 @@ export function buildBashWrapperScript(options: BashWrapperOptions): string {
|
|
|
402
424
|
"# T-10: как и в run_with_timeout, opencode запускается в собственной группе",
|
|
403
425
|
"# процессов (exec внутри run_opencode сохраняет лидера группы), поэтому",
|
|
404
426
|
"# watchdog убивает всё дерево, а внуки не переживают таймаут.",
|
|
405
|
-
|
|
427
|
+
// Маркер мог остаться от предыдущего запуска (краш до очистки).
|
|
428
|
+
'rm -f "$TIMEOUT_MARKER" 2>/dev/null || true',
|
|
429
|
+
"set -m 2>/dev/null || true",
|
|
406
430
|
'run_opencode >> "$LOG_FILE" 2>&1 &',
|
|
407
431
|
"CHILD=$!",
|
|
408
|
-
|
|
432
|
+
"set +m 2>/dev/null || true",
|
|
409
433
|
'if [ "$TIMEOUT_SECONDS" -gt 0 ] 2>/dev/null; then',
|
|
410
|
-
|
|
434
|
+
" (",
|
|
435
|
+
" WD_SLEEP_PID=",
|
|
436
|
+
" trap 'if [ -n \"$WD_SLEEP_PID\" ]; then kill \"$WD_SLEEP_PID\" 2>/dev/null || true; fi; exit 0' TERM INT",
|
|
437
|
+
' sleep "$TIMEOUT_SECONDS" &',
|
|
438
|
+
" WD_SLEEP_PID=$!",
|
|
439
|
+
' wait "$WD_SLEEP_PID" 2>/dev/null || true',
|
|
440
|
+
' : > "$TIMEOUT_MARKER" 2>/dev/null || true',
|
|
441
|
+
' kill -TERM -- "-$CHILD" 2>/dev/null || kill -TERM "$CHILD" 2>/dev/null',
|
|
442
|
+
" sleep 5 &",
|
|
443
|
+
" WD_SLEEP_PID=$!",
|
|
444
|
+
' wait "$WD_SLEEP_PID" 2>/dev/null || true',
|
|
445
|
+
' kill -KILL -- "-$CHILD" 2>/dev/null || kill -KILL "$CHILD" 2>/dev/null',
|
|
446
|
+
" ) &",
|
|
411
447
|
" WATCHDOG=$!",
|
|
412
448
|
"fi",
|
|
413
449
|
'wait "$CHILD"',
|
|
@@ -416,10 +452,18 @@ export function buildBashWrapperScript(options: BashWrapperOptions): string {
|
|
|
416
452
|
' kill "$WATCHDOG" 2>/dev/null || true',
|
|
417
453
|
' wait "$WATCHDOG" 2>/dev/null || true',
|
|
418
454
|
"fi",
|
|
419
|
-
|
|
420
|
-
|
|
421
|
-
|
|
422
|
-
|
|
455
|
+
"",
|
|
456
|
+
"# Конфиг прав живёт только в переменной окружения — файл не создаётся.",
|
|
457
|
+
"",
|
|
458
|
+
"TIMED_OUT=0",
|
|
459
|
+
'if [ -f "$TIMEOUT_MARKER" ]; then',
|
|
460
|
+
" TIMED_OUT=1",
|
|
461
|
+
" EXIT_CODE=124",
|
|
462
|
+
// 124 — общепринятый код coreutils timeout; маркер нужен, потому что
|
|
463
|
+
// SIGTERM/SIGKILL сами по себе неотличимы от обычного падения.
|
|
464
|
+
' ERROR_MESSAGE="Таймаут: превышено ${TIMEOUT_SECONDS} с"',
|
|
465
|
+
' log "[scheduler] Задача \'$TASK_NAME\' прервана по таймауту (${TIMEOUT_SECONDS} с)."',
|
|
466
|
+
'elif [ "$EXIT_CODE" -ne 0 ]; then',
|
|
423
467
|
' log "[scheduler] Задача \'$TASK_NAME\' завершилась с кодом $EXIT_CODE."',
|
|
424
468
|
' ERROR_MESSAGE="Код возврата $EXIT_CODE"',
|
|
425
469
|
"else",
|
|
@@ -460,9 +504,10 @@ export function buildBashWrapperScript(options: BashWrapperOptions): string {
|
|
|
460
504
|
"fi",
|
|
461
505
|
"",
|
|
462
506
|
'END_EPOCH="$(date +%s)"',
|
|
463
|
-
|
|
507
|
+
"DURATION_MS=$(( (END_EPOCH - START_EPOCH) * 1000 ))",
|
|
464
508
|
'STATUS="error"',
|
|
465
|
-
'if [ "$EXIT_CODE" -eq 0 ]; then STATUS="success"; fi',
|
|
509
|
+
'if [ "$TIMED_OUT" -eq 1 ]; then STATUS="timeout"; elif [ "$EXIT_CODE" -eq 0 ]; then STATUS="success"; fi',
|
|
510
|
+
'rm -f "$TIMEOUT_MARKER" 2>/dev/null || true',
|
|
466
511
|
"",
|
|
467
512
|
'if [ -n "$RECORDER_FILE" ] && command -v node >/dev/null 2>&1; then',
|
|
468
513
|
' if [ -n "$RUN_ID" ]; then',
|
|
@@ -476,9 +521,9 @@ export function buildBashWrapperScript(options: BashWrapperOptions): string {
|
|
|
476
521
|
// История уже записана, поэтому фоновая очистка не влияет на результат.
|
|
477
522
|
...(oneShotCleanupCommand
|
|
478
523
|
? [
|
|
479
|
-
|
|
480
|
-
|
|
481
|
-
|
|
524
|
+
`(sleep 2; ${oneShotCleanupCommand}) >/dev/null 2>&1 &`,
|
|
525
|
+
"",
|
|
526
|
+
]
|
|
482
527
|
: []),
|
|
483
528
|
'exit "$EXIT_CODE"',
|
|
484
529
|
"",
|
|
@@ -492,14 +537,14 @@ export function buildBashWrapperScript(options: BashWrapperOptions): string {
|
|
|
492
537
|
* Возвращает абсолютный путь к .sh-файлу.
|
|
493
538
|
*/
|
|
494
539
|
export async function writeBashWrapper(
|
|
495
|
-
options: BashWrapperOptions
|
|
540
|
+
options: BashWrapperOptions,
|
|
496
541
|
): Promise<string> {
|
|
497
542
|
await fs.mkdir(WRAPPER_DIR, { recursive: true });
|
|
498
543
|
// locks/ нужен до первого запуска: обёртка берёт lock через mkdir.
|
|
499
544
|
await fs.mkdir(path.dirname(options.lockFile), { recursive: true });
|
|
500
545
|
const scriptPath = path.join(
|
|
501
546
|
WRAPPER_DIR,
|
|
502
|
-
`run-${options.sanitizedName}.sh
|
|
547
|
+
`run-${options.sanitizedName}.sh`,
|
|
503
548
|
);
|
|
504
549
|
const script = buildBashWrapperScript(options);
|
|
505
550
|
await fs.writeFile(scriptPath, script, "utf8");
|
|
@@ -526,7 +571,7 @@ export function buildOpencodeConfig(
|
|
|
526
571
|
allowedTools?: string[],
|
|
527
572
|
deniedTools?: string[],
|
|
528
573
|
policy?: PermissionPolicy,
|
|
529
|
-
legacyShell?: boolean
|
|
574
|
+
legacyShell?: boolean,
|
|
530
575
|
): string {
|
|
531
576
|
return buildPermissionsConfig({ allowedTools, deniedTools, policy, legacyShell });
|
|
532
577
|
}
|
|
@@ -0,0 +1,285 @@
|
|
|
1
|
+
import { normalizeTaskType } from "../core/router/rules.js";
|
|
2
|
+
import { getDb, withTransaction } from "./index.js";
|
|
3
|
+
|
|
4
|
+
/**
|
|
5
|
+
* Capability Map — слой 2 роутера (Спринт 36.5.b).
|
|
6
|
+
*
|
|
7
|
+
* Таблица `capability_map` хранит, как исполнитель справлялся с типом задачи:
|
|
8
|
+
* сколько запусков было, сколько прошло гейт, среднюю стоимость и время, а
|
|
9
|
+
* также последние 10 исходов. Роутер читает карту и выбирает маршрут
|
|
10
|
+
* (local / cloud / review) по порогам — без вызова модели, то есть 0 токенов
|
|
11
|
+
* на само решение.
|
|
12
|
+
*
|
|
13
|
+
* Карта обучается на исходах гейта: каждый прогон шага вызывает
|
|
14
|
+
* {@link recordCapabilityOutcome}, статистика обновляется скользящим средним.
|
|
15
|
+
* Данных мало — карта честно говорит «не знаю» и отдаёт решение слою 3
|
|
16
|
+
* (Explore-режим).
|
|
17
|
+
*/
|
|
18
|
+
|
|
19
|
+
/** Куда исполнять шаг. `review` — данных достаточно, но успех нестабилен. */
|
|
20
|
+
export type CapabilityTarget = "local" | "cloud" | "review" | "explore";
|
|
21
|
+
|
|
22
|
+
/** Порог, выше которого шаг считается надёжным для локали. */
|
|
23
|
+
export const LOCAL_SUCCESS_THRESHOLD = 0.85;
|
|
24
|
+
|
|
25
|
+
/** Порог, ниже которого локальный исполнитель считается безнадёжным. */
|
|
26
|
+
export const CLOUD_FAILURE_THRESHOLD = 0.3;
|
|
27
|
+
|
|
28
|
+
/** Минимум исходов, чтобы карта вообще бралась судить. */
|
|
29
|
+
export const MIN_RUNS_FOR_DECISION = 3;
|
|
30
|
+
|
|
31
|
+
/** Сколько последних исходов хранить (1 — гейт пройден, 0 — провал). */
|
|
32
|
+
export const RECENT_RUNS_LIMIT = 10;
|
|
33
|
+
|
|
34
|
+
export interface CapabilityRecord {
|
|
35
|
+
taskType: string;
|
|
36
|
+
/** Исполнитель, который последним обрабатывал тип задачи. */
|
|
37
|
+
model: string;
|
|
38
|
+
runsTotal: number;
|
|
39
|
+
runsPassed: number;
|
|
40
|
+
successRate: number;
|
|
41
|
+
avgCostUsd: number;
|
|
42
|
+
avgTimeMs: number;
|
|
43
|
+
/** Последние исходы, старые слева, новые справа, максимум 10. */
|
|
44
|
+
last10Runs: number[];
|
|
45
|
+
createdAt: string;
|
|
46
|
+
updatedAt: string;
|
|
47
|
+
}
|
|
48
|
+
|
|
49
|
+
/** Один исход гейта: пройден/провален + необязательные стоимость и время. */
|
|
50
|
+
export interface CapabilityOutcome {
|
|
51
|
+
taskType: string;
|
|
52
|
+
model?: string;
|
|
53
|
+
passed: boolean;
|
|
54
|
+
costUsd?: number;
|
|
55
|
+
timeMs?: number;
|
|
56
|
+
}
|
|
57
|
+
|
|
58
|
+
export interface CapabilityThresholds {
|
|
59
|
+
localSuccess?: number;
|
|
60
|
+
cloudFailure?: number;
|
|
61
|
+
minRuns?: number;
|
|
62
|
+
}
|
|
63
|
+
|
|
64
|
+
export interface CapabilityDecision {
|
|
65
|
+
taskType: string;
|
|
66
|
+
target: CapabilityTarget;
|
|
67
|
+
/** Машиночитаемая причина: no-data | local-reliable | escalate | review. */
|
|
68
|
+
reason: "no-data" | "local-reliable" | "escalate" | "review";
|
|
69
|
+
successRate: number;
|
|
70
|
+
runsTotal: number;
|
|
71
|
+
capability: CapabilityRecord | null;
|
|
72
|
+
}
|
|
73
|
+
|
|
74
|
+
const DEFAULT_MODEL = "local";
|
|
75
|
+
|
|
76
|
+
function nowIso(): string {
|
|
77
|
+
return new Date().toISOString();
|
|
78
|
+
}
|
|
79
|
+
|
|
80
|
+
function requireTaskType(taskType: string): string {
|
|
81
|
+
if (typeof taskType !== "string" || taskType.trim() === "") {
|
|
82
|
+
throw new Error("Пустой тип задачи: Capability Map требует непустой taskType.");
|
|
83
|
+
}
|
|
84
|
+
return normalizeTaskType(taskType);
|
|
85
|
+
}
|
|
86
|
+
|
|
87
|
+
function requireNonNegative(value: number, field: string): number {
|
|
88
|
+
if (!Number.isFinite(value) || value < 0) {
|
|
89
|
+
throw new Error(`Некорректное значение ${field}: ожидалось неотрицательное число, получено ${value}.`);
|
|
90
|
+
}
|
|
91
|
+
return value;
|
|
92
|
+
}
|
|
93
|
+
|
|
94
|
+
function parseRecentRuns(raw: unknown): number[] {
|
|
95
|
+
if (typeof raw !== "string" || raw.trim() === "") {
|
|
96
|
+
return [];
|
|
97
|
+
}
|
|
98
|
+
try {
|
|
99
|
+
const parsed: unknown = JSON.parse(raw);
|
|
100
|
+
if (!Array.isArray(parsed)) {
|
|
101
|
+
return [];
|
|
102
|
+
}
|
|
103
|
+
return parsed
|
|
104
|
+
.map((value) => (typeof value === "number" ? value : Number(value)))
|
|
105
|
+
.filter((value) => value === 0 || value === 1)
|
|
106
|
+
.slice(-RECENT_RUNS_LIMIT);
|
|
107
|
+
} catch {
|
|
108
|
+
return [];
|
|
109
|
+
}
|
|
110
|
+
}
|
|
111
|
+
|
|
112
|
+
function rowToRecord(row: Record<string, unknown>): CapabilityRecord {
|
|
113
|
+
const runsTotal = Number(row.runs_total) || 0;
|
|
114
|
+
const runsPassed = Number(row.runs_passed) || 0;
|
|
115
|
+
return {
|
|
116
|
+
taskType: String(row.task_type),
|
|
117
|
+
model: String(row.model ?? DEFAULT_MODEL),
|
|
118
|
+
runsTotal,
|
|
119
|
+
runsPassed,
|
|
120
|
+
successRate: Number(row.success_rate) || (runsTotal > 0 ? runsPassed / runsTotal : 0),
|
|
121
|
+
avgCostUsd: Number(row.avg_cost_usd) || 0,
|
|
122
|
+
avgTimeMs: Number(row.avg_time_ms) || 0,
|
|
123
|
+
last10Runs: parseRecentRuns(row.last_10_runs),
|
|
124
|
+
createdAt: String(row.created_at),
|
|
125
|
+
updatedAt: String(row.updated_at),
|
|
126
|
+
};
|
|
127
|
+
}
|
|
128
|
+
|
|
129
|
+
/** Читает статистику по типу задачи или `null`, если данных ещё нет. */
|
|
130
|
+
export function getCapability(taskType: string): CapabilityRecord | null {
|
|
131
|
+
const key = requireTaskType(taskType);
|
|
132
|
+
const row = getDb()
|
|
133
|
+
.prepare("SELECT * FROM capability_map WHERE task_type = ?")
|
|
134
|
+
.get(key) as Record<string, unknown> | undefined;
|
|
135
|
+
return row ? rowToRecord(row) : null;
|
|
136
|
+
}
|
|
137
|
+
|
|
138
|
+
/** Все известные типы задач, сначала самые надёжные. */
|
|
139
|
+
export function listCapabilities(limit = 100): CapabilityRecord[] {
|
|
140
|
+
const capped = Math.max(1, Math.floor(limit));
|
|
141
|
+
const rows = getDb()
|
|
142
|
+
.prepare("SELECT * FROM capability_map ORDER BY success_rate DESC, runs_total DESC, task_type ASC LIMIT ?")
|
|
143
|
+
.all(capped) as Record<string, unknown>[];
|
|
144
|
+
return rows.map(rowToRecord);
|
|
145
|
+
}
|
|
146
|
+
|
|
147
|
+
/**
|
|
148
|
+
* Записывает исход гейта и обновляет статистику скользящим средним.
|
|
149
|
+
*
|
|
150
|
+
* Возвращает актуальную запись карты — её же удобно логировать вместе с
|
|
151
|
+
* решением роутера, чтобы видеть, на каких данных он остановился.
|
|
152
|
+
*/
|
|
153
|
+
export function recordCapabilityOutcome(outcome: CapabilityOutcome): CapabilityRecord {
|
|
154
|
+
const key = requireTaskType(outcome.taskType);
|
|
155
|
+
if (typeof outcome.passed !== "boolean") {
|
|
156
|
+
throw new Error("Исход гейта должен быть boolean (passed).");
|
|
157
|
+
}
|
|
158
|
+
const cost = outcome.costUsd === undefined ? 0 : requireNonNegative(outcome.costUsd, "costUsd");
|
|
159
|
+
const time = outcome.timeMs === undefined ? 0 : requireNonNegative(outcome.timeMs, "timeMs");
|
|
160
|
+
const model = (outcome.model ?? DEFAULT_MODEL).trim() || DEFAULT_MODEL;
|
|
161
|
+
const passed = outcome.passed ? 1 : 0;
|
|
162
|
+
|
|
163
|
+
return withTransaction(() => {
|
|
164
|
+
const db = getDb();
|
|
165
|
+
const timestamp = nowIso();
|
|
166
|
+
const existing = getCapability(key);
|
|
167
|
+
if (!existing) {
|
|
168
|
+
db.prepare(
|
|
169
|
+
`INSERT INTO capability_map (
|
|
170
|
+
task_type, model, runs_total, runs_passed, success_rate,
|
|
171
|
+
avg_cost_usd, avg_time_ms, last_10_runs, created_at, updated_at
|
|
172
|
+
) VALUES (?, ?, 1, ?, ?, ?, ?, ?, ?, ?)`,
|
|
173
|
+
).run(
|
|
174
|
+
key,
|
|
175
|
+
model,
|
|
176
|
+
passed,
|
|
177
|
+
passed,
|
|
178
|
+
cost,
|
|
179
|
+
time,
|
|
180
|
+
JSON.stringify([passed]),
|
|
181
|
+
timestamp,
|
|
182
|
+
timestamp,
|
|
183
|
+
);
|
|
184
|
+
} else {
|
|
185
|
+
const runsTotal = existing.runsTotal + 1;
|
|
186
|
+
const runsPassed = existing.runsPassed + passed;
|
|
187
|
+
const avgCost = (existing.avgCostUsd * existing.runsTotal + cost) / runsTotal;
|
|
188
|
+
const avgTime = (existing.avgTimeMs * existing.runsTotal + time) / runsTotal;
|
|
189
|
+
const recent = [...existing.last10Runs, passed].slice(-RECENT_RUNS_LIMIT);
|
|
190
|
+
db.prepare(
|
|
191
|
+
`UPDATE capability_map
|
|
192
|
+
SET model = ?, runs_total = ?, runs_passed = ?, success_rate = ?,
|
|
193
|
+
avg_cost_usd = ?, avg_time_ms = ?, last_10_runs = ?, updated_at = ?
|
|
194
|
+
WHERE task_type = ?`,
|
|
195
|
+
).run(
|
|
196
|
+
model,
|
|
197
|
+
runsTotal,
|
|
198
|
+
runsPassed,
|
|
199
|
+
runsPassed / runsTotal,
|
|
200
|
+
avgCost,
|
|
201
|
+
avgTime,
|
|
202
|
+
JSON.stringify(recent),
|
|
203
|
+
timestamp,
|
|
204
|
+
key,
|
|
205
|
+
);
|
|
206
|
+
}
|
|
207
|
+
const record = getCapability(key);
|
|
208
|
+
if (!record) {
|
|
209
|
+
throw new Error(`Capability Map: запись для ${key} не сохранилась.`);
|
|
210
|
+
}
|
|
211
|
+
return record;
|
|
212
|
+
});
|
|
213
|
+
}
|
|
214
|
+
|
|
215
|
+
/**
|
|
216
|
+
* Решение слоя 2 по порогам (0 токенов).
|
|
217
|
+
*
|
|
218
|
+
* - данных меньше `minRuns` → `explore` (решает слой 3);
|
|
219
|
+
* - `success_rate ≥ 0.85` → `local`;
|
|
220
|
+
* - `success_rate ≤ 0.30` → `cloud` (эскалация);
|
|
221
|
+
* - между порогами → `review` (нужен человек или облачный ревьюер).
|
|
222
|
+
*/
|
|
223
|
+
export function decideCapabilityRoute(
|
|
224
|
+
taskType: string,
|
|
225
|
+
thresholds: CapabilityThresholds = {},
|
|
226
|
+
): CapabilityDecision {
|
|
227
|
+
const key = requireTaskType(taskType);
|
|
228
|
+
const localSuccess = thresholds.localSuccess ?? LOCAL_SUCCESS_THRESHOLD;
|
|
229
|
+
const cloudFailure = thresholds.cloudFailure ?? CLOUD_FAILURE_THRESHOLD;
|
|
230
|
+
const minRuns = thresholds.minRuns ?? MIN_RUNS_FOR_DECISION;
|
|
231
|
+
if (localSuccess <= cloudFailure) {
|
|
232
|
+
throw new Error("Порог localSuccess должен быть больше cloudFailure.");
|
|
233
|
+
}
|
|
234
|
+
|
|
235
|
+
const capability = getCapability(key);
|
|
236
|
+
if (!capability || capability.runsTotal < minRuns) {
|
|
237
|
+
return {
|
|
238
|
+
taskType: key,
|
|
239
|
+
target: "explore",
|
|
240
|
+
reason: "no-data",
|
|
241
|
+
successRate: capability?.successRate ?? 0,
|
|
242
|
+
runsTotal: capability?.runsTotal ?? 0,
|
|
243
|
+
capability,
|
|
244
|
+
};
|
|
245
|
+
}
|
|
246
|
+
|
|
247
|
+
if (capability.successRate >= localSuccess) {
|
|
248
|
+
return {
|
|
249
|
+
taskType: key,
|
|
250
|
+
target: "local",
|
|
251
|
+
reason: "local-reliable",
|
|
252
|
+
successRate: capability.successRate,
|
|
253
|
+
runsTotal: capability.runsTotal,
|
|
254
|
+
capability,
|
|
255
|
+
};
|
|
256
|
+
}
|
|
257
|
+
|
|
258
|
+
if (capability.successRate <= cloudFailure) {
|
|
259
|
+
return {
|
|
260
|
+
taskType: key,
|
|
261
|
+
target: "cloud",
|
|
262
|
+
reason: "escalate",
|
|
263
|
+
successRate: capability.successRate,
|
|
264
|
+
runsTotal: capability.runsTotal,
|
|
265
|
+
capability,
|
|
266
|
+
};
|
|
267
|
+
}
|
|
268
|
+
|
|
269
|
+
return {
|
|
270
|
+
taskType: key,
|
|
271
|
+
target: "review",
|
|
272
|
+
reason: "review",
|
|
273
|
+
successRate: capability.successRate,
|
|
274
|
+
runsTotal: capability.runsTotal,
|
|
275
|
+
capability,
|
|
276
|
+
};
|
|
277
|
+
}
|
|
278
|
+
|
|
279
|
+
/** Готова ли таблица карты (для диагностики и тестов миграции). */
|
|
280
|
+
export function isCapabilityMapReady(): boolean {
|
|
281
|
+
const rows = getDb()
|
|
282
|
+
.prepare("SELECT name FROM sqlite_master WHERE type = 'table' AND name = 'capability_map'")
|
|
283
|
+
.all() as { name?: string }[];
|
|
284
|
+
return rows.length > 0;
|
|
285
|
+
}
|
package/src/db/git-state-repo.ts
CHANGED
|
@@ -40,7 +40,7 @@ export function setGitState(taskName: string, commitSha: string, branch?: string
|
|
|
40
40
|
ON CONFLICT(task_name) DO UPDATE SET
|
|
41
41
|
commit_sha = excluded.commit_sha,
|
|
42
42
|
branch = excluded.branch,
|
|
43
|
-
updated_at = excluded.updated_at
|
|
43
|
+
updated_at = excluded.updated_at`,
|
|
44
44
|
)
|
|
45
45
|
.run(taskName, commitSha, branch ?? null, new Date().toISOString());
|
|
46
46
|
}
|