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,12 +1,20 @@
|
|
|
1
1
|
import { spawn } from "node:child_process";
|
|
2
2
|
import fs from "node:fs";
|
|
3
|
+
import os from "node:os";
|
|
3
4
|
import { pathToFileURL } from "node:url";
|
|
4
5
|
import { runTaskNow } from "./scheduler/run-now.js";
|
|
5
6
|
import { createSchedulerBackend } from "./scheduler/index.js";
|
|
6
7
|
import { notifyTaskCompletion } from "../notifications.js";
|
|
7
|
-
import {
|
|
8
|
+
import {
|
|
9
|
+
finishRun,
|
|
10
|
+
getLatestHistoryByTask,
|
|
11
|
+
normalizeErrorText,
|
|
12
|
+
recordRun,
|
|
13
|
+
startRun,
|
|
14
|
+
} from "../db/history-repo.js";
|
|
8
15
|
import { deleteSetting, decrementCounterSetting } from "../db/settings-repo.js";
|
|
9
16
|
import { getTask, listTasks } from "../db/tasks-repo.js";
|
|
17
|
+
import { extractLastRunLog } from "./mission.js";
|
|
10
18
|
import { rotateSessionIfNeeded } from "./session.js";
|
|
11
19
|
import type { TaskDefinition } from "../task-transfer.js";
|
|
12
20
|
import type { HistoryRecord } from "../history.js";
|
|
@@ -14,8 +22,38 @@ import {
|
|
|
14
22
|
advanceMatrixAfterClone,
|
|
15
23
|
finalizeMatrixIfComplete,
|
|
16
24
|
} from "./matrix.js";
|
|
25
|
+
import { appendStructuredLog } from "./structured-log.js";
|
|
26
|
+
import { collectOpenCodeUsage } from "./opencode-usage.js";
|
|
17
27
|
|
|
18
|
-
type Status = "success" | "error" | "timeout";
|
|
28
|
+
type Status = "success" | "error" | "timeout" | "skipped";
|
|
29
|
+
|
|
30
|
+
/**
|
|
31
|
+
* Диагностика рекордера пишется в runs.jsonl: цепочки, DAG, повторы и
|
|
32
|
+
* one-shot-очистка иначе не видны в машиночитаемом логе. Human-readable
|
|
33
|
+
* вывод остаётся только в логе задачи; stdout `--start` не трогаем — обёртка
|
|
34
|
+
* читает оттуда runId.
|
|
35
|
+
*/
|
|
36
|
+
function logRecorderEvent(
|
|
37
|
+
event: string,
|
|
38
|
+
task: string,
|
|
39
|
+
details: {
|
|
40
|
+
runId?: number;
|
|
41
|
+
status?: string;
|
|
42
|
+
error?: string;
|
|
43
|
+
reason?: string;
|
|
44
|
+
nextTask?: string;
|
|
45
|
+
} = {},
|
|
46
|
+
): void {
|
|
47
|
+
appendStructuredLog({
|
|
48
|
+
event,
|
|
49
|
+
task,
|
|
50
|
+
runId: details.runId,
|
|
51
|
+
status: details.status,
|
|
52
|
+
error: details.error,
|
|
53
|
+
reason: details.reason,
|
|
54
|
+
nextTask: details.nextTask,
|
|
55
|
+
});
|
|
56
|
+
}
|
|
19
57
|
|
|
20
58
|
/** Префикс ключа настроек со счётчиком повторов конкретной задачи. */
|
|
21
59
|
const RETRY_STATE_PREFIX = "retry_state:";
|
|
@@ -33,7 +71,9 @@ const LOG_TAIL_LINES = 500;
|
|
|
33
71
|
*/
|
|
34
72
|
function readLogTail(filePath: string, maxLines: number): string[] {
|
|
35
73
|
try {
|
|
36
|
-
|
|
74
|
+
// Токены/стоимость относятся к завершаемому запуску; старые прогоны
|
|
75
|
+
// в том же файле лога не должны портить оценку (QA-F.1).
|
|
76
|
+
const content = extractLastRunLog(fs.readFileSync(filePath, "utf8"));
|
|
37
77
|
const lines = content.split(/\r?\n/);
|
|
38
78
|
if (lines.length > 0 && lines[lines.length - 1] === "") lines.pop();
|
|
39
79
|
return lines.slice(-maxLines);
|
|
@@ -55,6 +95,11 @@ const TOKEN_PATTERNS: RegExp[] = [
|
|
|
55
95
|
const COST_PATTERNS: RegExp[] = [
|
|
56
96
|
new RegExp(USAGE_PREFIX + "(?:cost|total\\s+cost)\\s*[:=]?\\s*\\$\\s*([0-9]+(?:[.,][0-9]+)?)", "i"),
|
|
57
97
|
new RegExp(USAGE_PREFIX + "(?:cost|total\\s+cost)\\s*[:=]\\s*([0-9]+(?:[.,][0-9]+)?)\\s*(?:usd|\\$)", "i"),
|
|
98
|
+
// QA-F.1: OpenCode печатает costUsd=0.1 / cost=0.25 без валютного знака —
|
|
99
|
+
// старые шаблоны требовали `$` перед числом или `usd` после, поэтому
|
|
100
|
+
// стоимость терялась и в метриках/аналитике оставалась нулевой.
|
|
101
|
+
new RegExp(USAGE_PREFIX + "(?:costUsd|cost_usd|cost(?:\\s*usd)?)\\s*[:=]\\s*\\$?\\s*([0-9]+(?:[.,][0-9]+)?)", "i"),
|
|
102
|
+
new RegExp(USAGE_PREFIX + "(?:costUsd|cost_usd|cost(?:\\s*usd)?)\\s*[:=]\\s*([0-9]+(?:[.,][0-9]+)?)\\s*(?:usd|\\$)", "i"),
|
|
58
103
|
];
|
|
59
104
|
|
|
60
105
|
function parseUsageValue(raw: string, suffix?: string): number | undefined {
|
|
@@ -112,6 +157,41 @@ export function parseUsageFromLog(logFile: string): UsageInfo {
|
|
|
112
157
|
return result;
|
|
113
158
|
}
|
|
114
159
|
|
|
160
|
+
/**
|
|
161
|
+
* PL-38: если обёртка не передала usage, а логи его не содержат, берём
|
|
162
|
+
* показания из собственной БД OpenCode за окно запуска задачи. Результат
|
|
163
|
+
* консервативный: уже найденные значения не перезаписываются, нули не подменяются.
|
|
164
|
+
*/
|
|
165
|
+
function resolveUsageFromOpenCodeDb(
|
|
166
|
+
taskName: string,
|
|
167
|
+
startedAtIso: string,
|
|
168
|
+
durationMs: number,
|
|
169
|
+
fallback: UsageInfo,
|
|
170
|
+
): UsageInfo {
|
|
171
|
+
if (fallback.tokens !== undefined && fallback.costUsd !== undefined) return fallback;
|
|
172
|
+
|
|
173
|
+
const definition = getTask(taskName);
|
|
174
|
+
const end = Date.now();
|
|
175
|
+
const parsedStart = Date.parse(startedAtIso);
|
|
176
|
+
const start = Number.isFinite(parsedStart) ? parsedStart : end - Math.max(0, durationMs);
|
|
177
|
+
// +-2 с покрывают рассинхрон часов обёртки и движка OpenCode.
|
|
178
|
+
const usage = collectOpenCodeUsage({
|
|
179
|
+
since: start - 2000,
|
|
180
|
+
until: end + 2000,
|
|
181
|
+
cwd: definition?.workingDirectory,
|
|
182
|
+
});
|
|
183
|
+
if (!usage || (usage.tokens <= 0 && usage.costUsd <= 0)) return fallback;
|
|
184
|
+
|
|
185
|
+
const resolved: UsageInfo = {
|
|
186
|
+
tokens: fallback.tokens ?? (usage.tokens > 0 ? usage.tokens : undefined),
|
|
187
|
+
costUsd: fallback.costUsd ?? (usage.costUsd > 0 ? usage.costUsd : undefined),
|
|
188
|
+
};
|
|
189
|
+
logRecorderEvent("usage.from_opencode_db", taskName, {
|
|
190
|
+
reason: `tokens=${usage.tokens} cost=${usage.costUsd} messages=${usage.messages}`,
|
|
191
|
+
});
|
|
192
|
+
return resolved;
|
|
193
|
+
}
|
|
194
|
+
|
|
115
195
|
/**
|
|
116
196
|
* Ищет настройку повторов задачи в БД.
|
|
117
197
|
* Возвращает 0, если повторы не настроены.
|
|
@@ -132,12 +212,11 @@ async function triggerTask(taskName: string): Promise<boolean> {
|
|
|
132
212
|
try {
|
|
133
213
|
await runTaskNow(taskName);
|
|
134
214
|
return true;
|
|
135
|
-
} catch (err:
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
);
|
|
215
|
+
} catch (err: unknown) {
|
|
216
|
+
logRecorderEvent("chain.trigger_failed", taskName, {
|
|
217
|
+
nextTask: taskName,
|
|
218
|
+
error: err instanceof Error ? err.message : String(err),
|
|
219
|
+
});
|
|
141
220
|
return false;
|
|
142
221
|
}
|
|
143
222
|
}
|
|
@@ -167,7 +246,7 @@ async function scheduleRetry(taskName: string): Promise<boolean> {
|
|
|
167
246
|
|
|
168
247
|
if (remaining === null) {
|
|
169
248
|
deleteSetting(key);
|
|
170
|
-
|
|
249
|
+
logRecorderEvent("retry.exhausted", taskName, { reason: "retries exhausted" });
|
|
171
250
|
return false;
|
|
172
251
|
}
|
|
173
252
|
|
|
@@ -183,17 +262,14 @@ async function scheduleRetry(taskName: string): Promise<boolean> {
|
|
|
183
262
|
});
|
|
184
263
|
child.unref();
|
|
185
264
|
|
|
186
|
-
|
|
187
|
-
`
|
|
188
|
-
|
|
189
|
-
);
|
|
265
|
+
logRecorderEvent("retry.scheduled", taskName, {
|
|
266
|
+
reason: `delay=${delay}s, remaining=${remaining}`,
|
|
267
|
+
});
|
|
190
268
|
return true;
|
|
191
|
-
} catch (err:
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
}`,
|
|
196
|
-
);
|
|
269
|
+
} catch (err: unknown) {
|
|
270
|
+
logRecorderEvent("retry.schedule_failed", taskName, {
|
|
271
|
+
error: err instanceof Error ? err.message : String(err),
|
|
272
|
+
});
|
|
197
273
|
return false;
|
|
198
274
|
}
|
|
199
275
|
}
|
|
@@ -209,13 +285,11 @@ async function runRetry(taskName: string, delaySec: number): Promise<void> {
|
|
|
209
285
|
|
|
210
286
|
try {
|
|
211
287
|
await runTaskNow(taskName);
|
|
212
|
-
|
|
213
|
-
} catch (err:
|
|
214
|
-
|
|
215
|
-
|
|
216
|
-
|
|
217
|
-
}`,
|
|
218
|
-
);
|
|
288
|
+
logRecorderEvent("retry.started", taskName);
|
|
289
|
+
} catch (err: unknown) {
|
|
290
|
+
logRecorderEvent("retry.failed", taskName, {
|
|
291
|
+
error: err instanceof Error ? err.message : String(err),
|
|
292
|
+
});
|
|
219
293
|
}
|
|
220
294
|
}
|
|
221
295
|
|
|
@@ -333,6 +407,50 @@ async function main() {
|
|
|
333
407
|
return;
|
|
334
408
|
}
|
|
335
409
|
|
|
410
|
+
/**
|
|
411
|
+
* W-4: режим пропуска — node record-history.js --skip "<task>" "<reasonB64>" "<logFile>" [durationMs]
|
|
412
|
+
* Вызывается обёртками при срабатывании guard (код 4). Причина передаётся
|
|
413
|
+
* base64, чтобы не подставлять произвольный текст в командную строку. Пропуск
|
|
414
|
+
* попадает в историю и total-метрику, но не считается ошибкой, не шлёт
|
|
415
|
+
* уведомление, не запускает цепочки/повторы и не запускает DAG.
|
|
416
|
+
*/
|
|
417
|
+
if (first === "--skip") {
|
|
418
|
+
const taskName = second;
|
|
419
|
+
if (!taskName) process.exit(1);
|
|
420
|
+
let reason = "guard conditions not met";
|
|
421
|
+
if (third) {
|
|
422
|
+
try {
|
|
423
|
+
const decoded = Buffer.from(third, "base64").toString("utf8").trim();
|
|
424
|
+
if (decoded) reason = decoded;
|
|
425
|
+
} catch {
|
|
426
|
+
// Битая base64 — оставляем причину по умолчанию.
|
|
427
|
+
}
|
|
428
|
+
}
|
|
429
|
+
const durationMs = Math.max(0, Number(fifth) || 0);
|
|
430
|
+
const finishedAt = new Date().toISOString();
|
|
431
|
+
const startedAt = new Date(Date.now() - durationMs).toISOString();
|
|
432
|
+
const definition = getTask(taskName);
|
|
433
|
+
recordRun(
|
|
434
|
+
taskName,
|
|
435
|
+
"skipped",
|
|
436
|
+
startedAt,
|
|
437
|
+
durationMs,
|
|
438
|
+
reason,
|
|
439
|
+
null,
|
|
440
|
+
undefined,
|
|
441
|
+
undefined,
|
|
442
|
+
undefined,
|
|
443
|
+
undefined,
|
|
444
|
+
undefined,
|
|
445
|
+
finishedAt,
|
|
446
|
+
definition?.workspaceId ?? null,
|
|
447
|
+
definition?.allowedTools ?? null,
|
|
448
|
+
definition?.deniedTools ?? null,
|
|
449
|
+
);
|
|
450
|
+
await handleCompletion(taskName, "skipped", null, reason, durationMs);
|
|
451
|
+
return;
|
|
452
|
+
}
|
|
453
|
+
|
|
336
454
|
const parseOptionalNumber = (value?: string): number | undefined => {
|
|
337
455
|
if (!value || value === "-") return undefined;
|
|
338
456
|
const num = Number(value);
|
|
@@ -357,12 +475,20 @@ async function main() {
|
|
|
357
475
|
if (!taskName) process.exit(1);
|
|
358
476
|
const startedAt = third ?? new Date().toISOString();
|
|
359
477
|
const definition = getTask(taskName);
|
|
478
|
+
// Владелец — процесс-обёртка, запустивший recorder. Он живёт дольше
|
|
479
|
+
// короткоживущего recorder'а, поэтому именно его PID проверяет recovery.
|
|
480
|
+
const owner = {
|
|
481
|
+
pid: process.ppid && process.ppid > 0 ? process.ppid : null,
|
|
482
|
+
host: os.hostname(),
|
|
483
|
+
startedAt: new Date().toISOString(),
|
|
484
|
+
};
|
|
360
485
|
const runId = startRun(
|
|
361
486
|
taskName,
|
|
362
487
|
startedAt,
|
|
363
488
|
definition?.workspaceId ?? null,
|
|
364
489
|
definition?.allowedTools ?? null,
|
|
365
490
|
definition?.deniedTools ?? null,
|
|
491
|
+
owner,
|
|
366
492
|
);
|
|
367
493
|
console.log(String(runId));
|
|
368
494
|
return;
|
|
@@ -380,7 +506,7 @@ async function main() {
|
|
|
380
506
|
process.exit(1);
|
|
381
507
|
}
|
|
382
508
|
const durationMs = Number(fifth) || 0;
|
|
383
|
-
const error = sixth
|
|
509
|
+
const error = normalizeErrorText(sixth);
|
|
384
510
|
// 12-й аргумент — путь к лог-файлу задачи (добавлен в T-08 / D-08).
|
|
385
511
|
const logFile = twelfth;
|
|
386
512
|
const tokens = parseOptionalNumber(seventh);
|
|
@@ -398,17 +524,31 @@ async function main() {
|
|
|
398
524
|
costResolved = usage.costUsd;
|
|
399
525
|
}
|
|
400
526
|
}
|
|
527
|
+
// --finish не получает startedAt: восстанавливаем окно из длительности.
|
|
528
|
+
if (tokensResolved === undefined || costResolved === undefined) {
|
|
529
|
+
const approximatedStart = new Date(Date.now() - Math.max(0, durationMs)).toISOString();
|
|
530
|
+
const dbUsage = resolveUsageFromOpenCodeDb(
|
|
531
|
+
taskName,
|
|
532
|
+
approximatedStart,
|
|
533
|
+
durationMs,
|
|
534
|
+
{ tokens: tokensResolved, costUsd: costResolved },
|
|
535
|
+
);
|
|
536
|
+
tokensResolved = dbUsage.tokens;
|
|
537
|
+
costResolved = dbUsage.costUsd;
|
|
538
|
+
}
|
|
401
539
|
const model = ninth && ninth !== "-" ? ninth.trim() || undefined : undefined;
|
|
402
540
|
const preFlightStatus = parseHookStatus(tenth);
|
|
403
541
|
const postFlightStatus = parseHookStatus(eleventh);
|
|
404
542
|
const st: Status =
|
|
405
|
-
status === "success" ? "success" : status === "timeout" ? "timeout" : "error";
|
|
543
|
+
status === "success" ? "success" : status === "timeout" ? "timeout" : status === "skipped" ? "skipped" : "error";
|
|
406
544
|
|
|
407
545
|
const definition = getTask(taskName);
|
|
408
546
|
const chainTarget =
|
|
409
547
|
st === "success"
|
|
410
548
|
? definition?.nextTaskOnSuccess || null
|
|
411
|
-
:
|
|
549
|
+
: st === "skipped"
|
|
550
|
+
? null
|
|
551
|
+
: definition?.nextTaskOnError || null;
|
|
412
552
|
|
|
413
553
|
const completed = finishRun(
|
|
414
554
|
runId,
|
|
@@ -423,9 +563,10 @@ async function main() {
|
|
|
423
563
|
postFlightStatus,
|
|
424
564
|
);
|
|
425
565
|
if (!completed) {
|
|
426
|
-
|
|
427
|
-
|
|
428
|
-
|
|
566
|
+
logRecorderEvent("run.finish_skipped", taskName, {
|
|
567
|
+
runId,
|
|
568
|
+
reason: "already finished or not found",
|
|
569
|
+
});
|
|
429
570
|
return;
|
|
430
571
|
}
|
|
431
572
|
|
|
@@ -442,12 +583,36 @@ async function main() {
|
|
|
442
583
|
|
|
443
584
|
const startedAt = third ?? new Date().toISOString();
|
|
444
585
|
const durationMs = Number(fourth) || 0;
|
|
445
|
-
const error = fifth
|
|
586
|
+
const error = normalizeErrorText(fifth);
|
|
446
587
|
|
|
447
588
|
// Токены и стоимость приходят из PowerShell-обёртки (ps-wrapper.ts).
|
|
448
589
|
// "-" означает «данных нет» (openCode не печатал usage в лог).
|
|
449
590
|
const tokens = parseOptionalNumber(sixth);
|
|
450
591
|
const costUsd = parseOptionalNumber(seventh);
|
|
592
|
+
// B10: 11-й аргумент — лог-файл задачи. Раньше legacy-режим его не читал,
|
|
593
|
+
// поэтому при "-" в токенах/стоимости usage терялся. Парсим лог так же,
|
|
594
|
+
// как режим --finish; отсутствие файла — graceful fallback (parseUsageFromLog
|
|
595
|
+
// возвращает пустой объект и не бросает).
|
|
596
|
+
const logFile = eleventh && eleventh !== "-" ? eleventh : undefined;
|
|
597
|
+
let tokensResolved = tokens;
|
|
598
|
+
let costResolved = costUsd;
|
|
599
|
+
if ((tokensResolved === undefined || costResolved === undefined) && logFile) {
|
|
600
|
+
const usage = parseUsageFromLog(logFile);
|
|
601
|
+
if (tokensResolved === undefined && usage.tokens !== undefined) {
|
|
602
|
+
tokensResolved = usage.tokens;
|
|
603
|
+
}
|
|
604
|
+
if (costResolved === undefined && usage.costUsd !== undefined) {
|
|
605
|
+
costResolved = usage.costUsd;
|
|
606
|
+
}
|
|
607
|
+
}
|
|
608
|
+
if (tokensResolved === undefined || costResolved === undefined) {
|
|
609
|
+
const dbUsage = resolveUsageFromOpenCodeDb(taskName, startedAt, durationMs, {
|
|
610
|
+
tokens: tokensResolved,
|
|
611
|
+
costUsd: costResolved,
|
|
612
|
+
});
|
|
613
|
+
tokensResolved = dbUsage.tokens;
|
|
614
|
+
costResolved = dbUsage.costUsd;
|
|
615
|
+
}
|
|
451
616
|
// Восьмой аргумент — модель; "-" означает, что модель не задана.
|
|
452
617
|
const model = eighth && eighth !== "-" ? eighth.trim() || undefined : undefined;
|
|
453
618
|
// Девятый и десятый — итоги pre/post-flight хуков.
|
|
@@ -455,13 +620,15 @@ async function main() {
|
|
|
455
620
|
const postFlightStatus = parseHookStatus(tenth);
|
|
456
621
|
|
|
457
622
|
const st: Status =
|
|
458
|
-
status === "success" ? "success" : status === "timeout" ? "timeout" : "error";
|
|
623
|
+
status === "success" ? "success" : status === "timeout" ? "timeout" : status === "skipped" ? "skipped" : "error";
|
|
459
624
|
|
|
460
625
|
const definition = getTask(taskName);
|
|
461
626
|
const chainTarget =
|
|
462
627
|
st === "success"
|
|
463
628
|
? definition?.nextTaskOnSuccess || null
|
|
464
|
-
:
|
|
629
|
+
: st === "skipped"
|
|
630
|
+
? null
|
|
631
|
+
: definition?.nextTaskOnError || null;
|
|
465
632
|
|
|
466
633
|
recordRun(
|
|
467
634
|
taskName,
|
|
@@ -470,8 +637,8 @@ async function main() {
|
|
|
470
637
|
durationMs,
|
|
471
638
|
error,
|
|
472
639
|
chainTarget,
|
|
473
|
-
|
|
474
|
-
|
|
640
|
+
tokensResolved,
|
|
641
|
+
costResolved,
|
|
475
642
|
model,
|
|
476
643
|
preFlightStatus,
|
|
477
644
|
postFlightStatus,
|
|
@@ -481,7 +648,7 @@ async function main() {
|
|
|
481
648
|
definition?.deniedTools ?? null,
|
|
482
649
|
);
|
|
483
650
|
|
|
484
|
-
await handleCompletion(taskName, st, chainTarget, error, durationMs,
|
|
651
|
+
await handleCompletion(taskName, st, chainTarget, error, durationMs, tokensResolved, costResolved);
|
|
485
652
|
}
|
|
486
653
|
|
|
487
654
|
/** Зависимости для тестируемой очистки one-shot (P2-27). */
|
|
@@ -515,16 +682,12 @@ export async function cleanupWindowsOneShotTask(
|
|
|
515
682
|
((name: string) => createSchedulerBackend().deleteTask(name));
|
|
516
683
|
try {
|
|
517
684
|
await deleteTask(taskName);
|
|
518
|
-
|
|
519
|
-
`[agent-steward] One-shot "${taskName}": задача удалена из Планировщика Windows.`,
|
|
520
|
-
);
|
|
685
|
+
logRecorderEvent("oneshot.cleaned", taskName);
|
|
521
686
|
return true;
|
|
522
|
-
} catch (err:
|
|
523
|
-
|
|
524
|
-
|
|
525
|
-
|
|
526
|
-
}`,
|
|
527
|
-
);
|
|
687
|
+
} catch (err: unknown) {
|
|
688
|
+
logRecorderEvent("oneshot.cleanup_failed", taskName, {
|
|
689
|
+
error: err instanceof Error ? err.message : String(err),
|
|
690
|
+
});
|
|
528
691
|
return false;
|
|
529
692
|
}
|
|
530
693
|
}
|
|
@@ -543,10 +706,13 @@ async function handleCompletion(
|
|
|
543
706
|
costUsd?: number | null,
|
|
544
707
|
): Promise<void> {
|
|
545
708
|
// Уведомление о завершении (webhook). Ошибки отправки логируются внутри
|
|
546
|
-
// и не влияют на историю, цепочки и повторы.
|
|
547
|
-
|
|
548
|
-
|
|
549
|
-
|
|
709
|
+
// и не влияют на историю, цепочки и повторы. Пропуск guard не уведомляем:
|
|
710
|
+
// для него нет отдельного шаблона, а шум в уведомлениях не нужен.
|
|
711
|
+
if (st !== "skipped") {
|
|
712
|
+
await notifyTaskCompletion(taskName, st, durationMs, error, tokens, costUsd, {
|
|
713
|
+
asyncTriage: true,
|
|
714
|
+
});
|
|
715
|
+
}
|
|
550
716
|
|
|
551
717
|
// P2-27: Windows не удаляет ONCE-задачи сам, а флаг schtasks `/z` на
|
|
552
718
|
// практике ломает создание задачи («task XML ... EndBoundary»).
|
|
@@ -559,21 +725,28 @@ async function handleCompletion(
|
|
|
559
725
|
try {
|
|
560
726
|
await advanceMatrixAfterClone(taskName);
|
|
561
727
|
await finalizeMatrixIfComplete(taskName);
|
|
562
|
-
} catch (err:
|
|
563
|
-
|
|
564
|
-
|
|
565
|
-
|
|
566
|
-
}`,
|
|
567
|
-
);
|
|
728
|
+
} catch (err: unknown) {
|
|
729
|
+
logRecorderEvent("matrix.error", taskName, {
|
|
730
|
+
error: err instanceof Error ? err.message : String(err),
|
|
731
|
+
});
|
|
568
732
|
}
|
|
569
733
|
|
|
570
734
|
if (st === "success") {
|
|
735
|
+
// PL-5.1: один и тот же следующий шаг может прийти и из chainTarget
|
|
736
|
+
// (nextTaskOnSuccess), и из DAG-зависимых (dependsOn). Запускаем каждое
|
|
737
|
+
// имя ровно один раз за завершение: Set по имени, без учёта регистра —
|
|
738
|
+
// именно так сравнивает имена selectDependentsToTrigger.
|
|
739
|
+
const triggered = new Set<string>();
|
|
740
|
+
const nameKey = (name: string): string => name.trim().toLowerCase();
|
|
741
|
+
|
|
571
742
|
// Успешный запуск сбрасывает счётчик повторов.
|
|
572
743
|
await deleteSetting(retryStateKey(taskName));
|
|
573
744
|
if (chainTarget) {
|
|
745
|
+
const key = nameKey(chainTarget);
|
|
746
|
+
triggered.add(key);
|
|
574
747
|
const started = await triggerTask(chainTarget);
|
|
575
748
|
if (started) {
|
|
576
|
-
|
|
749
|
+
logRecorderEvent("chain.triggered", taskName, { nextTask: chainTarget });
|
|
577
750
|
}
|
|
578
751
|
}
|
|
579
752
|
|
|
@@ -586,28 +759,36 @@ async function handleCompletion(
|
|
|
586
759
|
const definitions = listTasks();
|
|
587
760
|
const dependents = selectDependentsToTrigger(taskName, definitions, history);
|
|
588
761
|
for (const dependent of dependents) {
|
|
762
|
+
const key = nameKey(dependent);
|
|
763
|
+
if (triggered.has(key)) {
|
|
764
|
+
// Один шаг попал и в цепочку, и в DAG — второй triggerTask
|
|
765
|
+
// создал бы дублирующий запуск (наблюдалось 09:29:24Z).
|
|
766
|
+
logRecorderEvent("dag.dedup_skipped", taskName, {
|
|
767
|
+
reason: "already triggered via nextTaskOnSuccess",
|
|
768
|
+
nextTask: dependent,
|
|
769
|
+
});
|
|
770
|
+
continue;
|
|
771
|
+
}
|
|
772
|
+
triggered.add(key);
|
|
589
773
|
const started = await triggerTask(dependent);
|
|
590
774
|
if (started) {
|
|
591
|
-
|
|
592
|
-
`[agent-steward] DAG: все зависимости выполнены, запущена задача "${dependent}".`,
|
|
593
|
-
);
|
|
775
|
+
logRecorderEvent("dag.triggered", taskName, { nextTask: dependent });
|
|
594
776
|
}
|
|
595
777
|
}
|
|
596
|
-
} catch (err:
|
|
597
|
-
|
|
598
|
-
|
|
599
|
-
|
|
600
|
-
}`,
|
|
601
|
-
);
|
|
778
|
+
} catch (err: unknown) {
|
|
779
|
+
logRecorderEvent("dag.trigger_failed", taskName, {
|
|
780
|
+
error: err instanceof Error ? err.message : String(err),
|
|
781
|
+
});
|
|
602
782
|
}
|
|
603
|
-
} else {
|
|
783
|
+
} else if (st !== "skipped") {
|
|
604
784
|
// Сначала пытаемся повторить саму задачу; компенсирующая задача запускается
|
|
605
785
|
// только когда повторы исчерпаны (или не настроены).
|
|
786
|
+
// Пропуск guard — не ошибка: повторы и компенсации не запускаются.
|
|
606
787
|
const retryScheduled = await scheduleRetry(taskName);
|
|
607
788
|
if (!retryScheduled && chainTarget) {
|
|
608
789
|
const started = await triggerTask(chainTarget);
|
|
609
790
|
if (started) {
|
|
610
|
-
|
|
791
|
+
logRecorderEvent("compensation.triggered", taskName, { nextTask: chainTarget });
|
|
611
792
|
}
|
|
612
793
|
}
|
|
613
794
|
}
|
|
@@ -616,12 +797,10 @@ async function handleCompletion(
|
|
|
616
797
|
// при достижении sessionMaxRuns. Не должна ломать завершение запуска.
|
|
617
798
|
try {
|
|
618
799
|
await rotateSessionIfNeeded(taskName);
|
|
619
|
-
} catch (err:
|
|
620
|
-
|
|
621
|
-
|
|
622
|
-
|
|
623
|
-
}`,
|
|
624
|
-
);
|
|
800
|
+
} catch (err: unknown) {
|
|
801
|
+
logRecorderEvent("session.rotate_failed", taskName, {
|
|
802
|
+
error: err instanceof Error ? err.message : String(err),
|
|
803
|
+
});
|
|
625
804
|
}
|
|
626
805
|
}
|
|
627
806
|
|
|
@@ -643,11 +822,9 @@ function isDirectInvocation(): boolean {
|
|
|
643
822
|
|
|
644
823
|
if (isDirectInvocation()) {
|
|
645
824
|
main().catch((err) => {
|
|
646
|
-
|
|
647
|
-
|
|
648
|
-
|
|
649
|
-
}`,
|
|
650
|
-
);
|
|
825
|
+
logRecorderEvent("record_history.fatal", "record-history", {
|
|
826
|
+
error: err instanceof Error ? err.message : String(err),
|
|
827
|
+
});
|
|
651
828
|
process.exit(1);
|
|
652
829
|
});
|
|
653
830
|
}
|
package/src/core/router/rules.ts
CHANGED
|
@@ -54,6 +54,12 @@ export const STATIC_ROUTE_RULES: readonly StaticRouteRule[] = Object.freeze([
|
|
|
54
54
|
executor: "local",
|
|
55
55
|
description: "Тесты запускаются локальным процессом.",
|
|
56
56
|
},
|
|
57
|
+
{
|
|
58
|
+
taskType: "mission",
|
|
59
|
+
transport: "direct",
|
|
60
|
+
executor: "local",
|
|
61
|
+
description: "Ad-hoc миссия исполняется локально через обёртку без регистрации в ОС.",
|
|
62
|
+
},
|
|
57
63
|
{
|
|
58
64
|
taskType: "apply_diff",
|
|
59
65
|
transport: "direct",
|
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* QV-8: маркер дочернего прогона `opencode run`.
|
|
3
|
+
*
|
|
4
|
+
* Обёртки задач выставляют `AGENT_STEWARD_CHILD_RUN=1` перед запуском ИИ.
|
|
5
|
+
* Плагин читает маркер при загрузке и НЕ регистрирует инструменты
|
|
6
|
+
* планировщика, RPC, скилл и дашборд: дочерний агент не должен рекурсивно
|
|
7
|
+
* создавать задачи и не должен конкурировать с родительским дашбордом за порт.
|
|
8
|
+
*/
|
|
9
|
+
|
|
10
|
+
export const CHILD_RUN_ENV = "AGENT_STEWARD_CHILD_RUN";
|
|
11
|
+
|
|
12
|
+
const TRUTHY = new Set(["1", "true", "yes", "on"]);
|
|
13
|
+
|
|
14
|
+
/** True, когда текущий процесс — дочерний `opencode run` задачи планировщика. */
|
|
15
|
+
export function isChildRunMode(env: NodeJS.ProcessEnv = process.env): boolean {
|
|
16
|
+
const raw = env[CHILD_RUN_ENV];
|
|
17
|
+
if (typeof raw !== "string") return false;
|
|
18
|
+
return TRUTHY.has(raw.trim().toLowerCase());
|
|
19
|
+
}
|
|
@@ -160,7 +160,7 @@ async function main(): Promise<number> {
|
|
|
160
160
|
if (cronExpr) {
|
|
161
161
|
try {
|
|
162
162
|
spec = parseCron(cronExpr);
|
|
163
|
-
} catch (err:
|
|
163
|
+
} catch (err: unknown) {
|
|
164
164
|
// Fail-closed: при повреждённом cron проверка расписания невозможна.
|
|
165
165
|
// Если пропустить её (fail-open), задача с окном/днями будет
|
|
166
166
|
// запускаться на каждом минутном тике — включая дорогие LLM-агенты.
|
|
@@ -276,7 +276,7 @@ export async function pruneStaleFallbackEntries(
|
|
|
276
276
|
try {
|
|
277
277
|
entry.atJobId = await schedule(entry, buildFallbackCommand(entry), nowMs);
|
|
278
278
|
report.rescheduled += 1;
|
|
279
|
-
} catch (err:
|
|
279
|
+
} catch (err: unknown) {
|
|
280
280
|
warn(
|
|
281
281
|
`[scheduler] Не удалось пересоздать fallback для "${entry.name}": ${
|
|
282
282
|
err instanceof Error ? err.message : String(err)
|