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 +1 @@
|
|
|
1
|
-
{"version":3,"file":"record-history.d.ts","sourceRoot":"","sources":["../../src/core/record-history.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"record-history.d.ts","sourceRoot":"","sources":["../../src/core/record-history.ts"],"names":[],"mappings":"AAkBA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAC1D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAiEnD,MAAM,WAAW,SAAS;IACxB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AA6BD;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,MAAM,GAAG,SAAS,CAmC5D;AA0ID;;;;;;;;;GASG;AACH,wBAAgB,yBAAyB,CACvC,aAAa,EAAE,MAAM,EACrB,WAAW,EAAE,cAAc,EAAE,EAC7B,OAAO,EAAE,aAAa,EAAE,GACvB,MAAM,EAAE,CA0EV;AA8QD,4DAA4D;AAC5D,MAAM,WAAW,kBAAkB;IACjC,QAAQ,CAAC,EAAE,MAAM,CAAC,QAAQ,CAAC;IAC3B,aAAa,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,cAAc,GAAG,SAAS,CAAC;IAC7D,UAAU,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CAC9C;AAED;;;;;;;GAOG;AACH,wBAAsB,yBAAyB,CAC7C,QAAQ,EAAE,MAAM,EAChB,IAAI,GAAE,kBAAuB,GAC5B,OAAO,CAAC,OAAO,CAAC,CAqBlB"}
|
|
@@ -1,14 +1,35 @@
|
|
|
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 { finishRun, getLatestHistoryByTask, recordRun, startRun } from "../db/history-repo.js";
|
|
8
|
+
import { finishRun, getLatestHistoryByTask, normalizeErrorText, recordRun, startRun, } from "../db/history-repo.js";
|
|
8
9
|
import { deleteSetting, decrementCounterSetting } from "../db/settings-repo.js";
|
|
9
10
|
import { getTask, listTasks } from "../db/tasks-repo.js";
|
|
11
|
+
import { extractLastRunLog } from "./mission.js";
|
|
10
12
|
import { rotateSessionIfNeeded } from "./session.js";
|
|
11
13
|
import { advanceMatrixAfterClone, finalizeMatrixIfComplete, } from "./matrix.js";
|
|
14
|
+
import { appendStructuredLog } from "./structured-log.js";
|
|
15
|
+
import { collectOpenCodeUsage } from "./opencode-usage.js";
|
|
16
|
+
/**
|
|
17
|
+
* Диагностика рекордера пишется в runs.jsonl: цепочки, DAG, повторы и
|
|
18
|
+
* one-shot-очистка иначе не видны в машиночитаемом логе. Human-readable
|
|
19
|
+
* вывод остаётся только в логе задачи; stdout `--start` не трогаем — обёртка
|
|
20
|
+
* читает оттуда runId.
|
|
21
|
+
*/
|
|
22
|
+
function logRecorderEvent(event, task, details = {}) {
|
|
23
|
+
appendStructuredLog({
|
|
24
|
+
event,
|
|
25
|
+
task,
|
|
26
|
+
runId: details.runId,
|
|
27
|
+
status: details.status,
|
|
28
|
+
error: details.error,
|
|
29
|
+
reason: details.reason,
|
|
30
|
+
nextTask: details.nextTask,
|
|
31
|
+
});
|
|
32
|
+
}
|
|
12
33
|
/** Префикс ключа настроек со счётчиком повторов конкретной задачи. */
|
|
13
34
|
const RETRY_STATE_PREFIX = "retry_state:";
|
|
14
35
|
function retryStateKey(taskName) {
|
|
@@ -22,7 +43,9 @@ const LOG_TAIL_LINES = 500;
|
|
|
22
43
|
*/
|
|
23
44
|
function readLogTail(filePath, maxLines) {
|
|
24
45
|
try {
|
|
25
|
-
|
|
46
|
+
// Токены/стоимость относятся к завершаемому запуску; старые прогоны
|
|
47
|
+
// в том же файле лога не должны портить оценку (QA-F.1).
|
|
48
|
+
const content = extractLastRunLog(fs.readFileSync(filePath, "utf8"));
|
|
26
49
|
const lines = content.split(/\r?\n/);
|
|
27
50
|
if (lines.length > 0 && lines[lines.length - 1] === "")
|
|
28
51
|
lines.pop();
|
|
@@ -40,6 +63,11 @@ const TOKEN_PATTERNS = [
|
|
|
40
63
|
const COST_PATTERNS = [
|
|
41
64
|
new RegExp(USAGE_PREFIX + "(?:cost|total\\s+cost)\\s*[:=]?\\s*\\$\\s*([0-9]+(?:[.,][0-9]+)?)", "i"),
|
|
42
65
|
new RegExp(USAGE_PREFIX + "(?:cost|total\\s+cost)\\s*[:=]\\s*([0-9]+(?:[.,][0-9]+)?)\\s*(?:usd|\\$)", "i"),
|
|
66
|
+
// QA-F.1: OpenCode печатает costUsd=0.1 / cost=0.25 без валютного знака —
|
|
67
|
+
// старые шаблоны требовали `$` перед числом или `usd` после, поэтому
|
|
68
|
+
// стоимость терялась и в метриках/аналитике оставалась нулевой.
|
|
69
|
+
new RegExp(USAGE_PREFIX + "(?:costUsd|cost_usd|cost(?:\\s*usd)?)\\s*[:=]\\s*\\$?\\s*([0-9]+(?:[.,][0-9]+)?)", "i"),
|
|
70
|
+
new RegExp(USAGE_PREFIX + "(?:costUsd|cost_usd|cost(?:\\s*usd)?)\\s*[:=]\\s*([0-9]+(?:[.,][0-9]+)?)\\s*(?:usd|\\$)", "i"),
|
|
43
71
|
];
|
|
44
72
|
function parseUsageValue(raw, suffix) {
|
|
45
73
|
const value = parseFloat(raw.replace(",", "."));
|
|
@@ -98,6 +126,35 @@ export function parseUsageFromLog(logFile) {
|
|
|
98
126
|
}
|
|
99
127
|
return result;
|
|
100
128
|
}
|
|
129
|
+
/**
|
|
130
|
+
* PL-38: если обёртка не передала usage, а логи его не содержат, берём
|
|
131
|
+
* показания из собственной БД OpenCode за окно запуска задачи. Результат
|
|
132
|
+
* консервативный: уже найденные значения не перезаписываются, нули не подменяются.
|
|
133
|
+
*/
|
|
134
|
+
function resolveUsageFromOpenCodeDb(taskName, startedAtIso, durationMs, fallback) {
|
|
135
|
+
if (fallback.tokens !== undefined && fallback.costUsd !== undefined)
|
|
136
|
+
return fallback;
|
|
137
|
+
const definition = getTask(taskName);
|
|
138
|
+
const end = Date.now();
|
|
139
|
+
const parsedStart = Date.parse(startedAtIso);
|
|
140
|
+
const start = Number.isFinite(parsedStart) ? parsedStart : end - Math.max(0, durationMs);
|
|
141
|
+
// +-2 с покрывают рассинхрон часов обёртки и движка OpenCode.
|
|
142
|
+
const usage = collectOpenCodeUsage({
|
|
143
|
+
since: start - 2000,
|
|
144
|
+
until: end + 2000,
|
|
145
|
+
cwd: definition?.workingDirectory,
|
|
146
|
+
});
|
|
147
|
+
if (!usage || (usage.tokens <= 0 && usage.costUsd <= 0))
|
|
148
|
+
return fallback;
|
|
149
|
+
const resolved = {
|
|
150
|
+
tokens: fallback.tokens ?? (usage.tokens > 0 ? usage.tokens : undefined),
|
|
151
|
+
costUsd: fallback.costUsd ?? (usage.costUsd > 0 ? usage.costUsd : undefined),
|
|
152
|
+
};
|
|
153
|
+
logRecorderEvent("usage.from_opencode_db", taskName, {
|
|
154
|
+
reason: `tokens=${usage.tokens} cost=${usage.costUsd} messages=${usage.messages}`,
|
|
155
|
+
});
|
|
156
|
+
return resolved;
|
|
157
|
+
}
|
|
101
158
|
/**
|
|
102
159
|
* Ищет настройку повторов задачи в БД.
|
|
103
160
|
* Возвращает 0, если повторы не настроены.
|
|
@@ -119,7 +176,10 @@ async function triggerTask(taskName) {
|
|
|
119
176
|
return true;
|
|
120
177
|
}
|
|
121
178
|
catch (err) {
|
|
122
|
-
|
|
179
|
+
logRecorderEvent("chain.trigger_failed", taskName, {
|
|
180
|
+
nextTask: taskName,
|
|
181
|
+
error: err instanceof Error ? err.message : String(err),
|
|
182
|
+
});
|
|
123
183
|
return false;
|
|
124
184
|
}
|
|
125
185
|
}
|
|
@@ -146,7 +206,7 @@ async function scheduleRetry(taskName) {
|
|
|
146
206
|
const remaining = decrementCounterSetting(key, count);
|
|
147
207
|
if (remaining === null) {
|
|
148
208
|
deleteSetting(key);
|
|
149
|
-
|
|
209
|
+
logRecorderEvent("retry.exhausted", taskName, { reason: "retries exhausted" });
|
|
150
210
|
return false;
|
|
151
211
|
}
|
|
152
212
|
const script = process.argv[1];
|
|
@@ -160,12 +220,15 @@ async function scheduleRetry(taskName) {
|
|
|
160
220
|
windowsHide: true,
|
|
161
221
|
});
|
|
162
222
|
child.unref();
|
|
163
|
-
|
|
164
|
-
`
|
|
223
|
+
logRecorderEvent("retry.scheduled", taskName, {
|
|
224
|
+
reason: `delay=${delay}s, remaining=${remaining}`,
|
|
225
|
+
});
|
|
165
226
|
return true;
|
|
166
227
|
}
|
|
167
228
|
catch (err) {
|
|
168
|
-
|
|
229
|
+
logRecorderEvent("retry.schedule_failed", taskName, {
|
|
230
|
+
error: err instanceof Error ? err.message : String(err),
|
|
231
|
+
});
|
|
169
232
|
return false;
|
|
170
233
|
}
|
|
171
234
|
}
|
|
@@ -180,10 +243,12 @@ async function runRetry(taskName, delaySec) {
|
|
|
180
243
|
await new Promise((resolve) => setTimeout(resolve, delay * 1000));
|
|
181
244
|
try {
|
|
182
245
|
await runTaskNow(taskName);
|
|
183
|
-
|
|
246
|
+
logRecorderEvent("retry.started", taskName);
|
|
184
247
|
}
|
|
185
248
|
catch (err) {
|
|
186
|
-
|
|
249
|
+
logRecorderEvent("retry.failed", taskName, {
|
|
250
|
+
error: err instanceof Error ? err.message : String(err),
|
|
251
|
+
});
|
|
187
252
|
}
|
|
188
253
|
}
|
|
189
254
|
/**
|
|
@@ -271,6 +336,36 @@ async function main() {
|
|
|
271
336
|
await runRetry(second, Number(third));
|
|
272
337
|
return;
|
|
273
338
|
}
|
|
339
|
+
/**
|
|
340
|
+
* W-4: режим пропуска — node record-history.js --skip "<task>" "<reasonB64>" "<logFile>" [durationMs]
|
|
341
|
+
* Вызывается обёртками при срабатывании guard (код 4). Причина передаётся
|
|
342
|
+
* base64, чтобы не подставлять произвольный текст в командную строку. Пропуск
|
|
343
|
+
* попадает в историю и total-метрику, но не считается ошибкой, не шлёт
|
|
344
|
+
* уведомление, не запускает цепочки/повторы и не запускает DAG.
|
|
345
|
+
*/
|
|
346
|
+
if (first === "--skip") {
|
|
347
|
+
const taskName = second;
|
|
348
|
+
if (!taskName)
|
|
349
|
+
process.exit(1);
|
|
350
|
+
let reason = "guard conditions not met";
|
|
351
|
+
if (third) {
|
|
352
|
+
try {
|
|
353
|
+
const decoded = Buffer.from(third, "base64").toString("utf8").trim();
|
|
354
|
+
if (decoded)
|
|
355
|
+
reason = decoded;
|
|
356
|
+
}
|
|
357
|
+
catch {
|
|
358
|
+
// Битая base64 — оставляем причину по умолчанию.
|
|
359
|
+
}
|
|
360
|
+
}
|
|
361
|
+
const durationMs = Math.max(0, Number(fifth) || 0);
|
|
362
|
+
const finishedAt = new Date().toISOString();
|
|
363
|
+
const startedAt = new Date(Date.now() - durationMs).toISOString();
|
|
364
|
+
const definition = getTask(taskName);
|
|
365
|
+
recordRun(taskName, "skipped", startedAt, durationMs, reason, null, undefined, undefined, undefined, undefined, undefined, finishedAt, definition?.workspaceId ?? null, definition?.allowedTools ?? null, definition?.deniedTools ?? null);
|
|
366
|
+
await handleCompletion(taskName, "skipped", null, reason, durationMs);
|
|
367
|
+
return;
|
|
368
|
+
}
|
|
274
369
|
const parseOptionalNumber = (value) => {
|
|
275
370
|
if (!value || value === "-")
|
|
276
371
|
return undefined;
|
|
@@ -296,7 +391,14 @@ async function main() {
|
|
|
296
391
|
process.exit(1);
|
|
297
392
|
const startedAt = third ?? new Date().toISOString();
|
|
298
393
|
const definition = getTask(taskName);
|
|
299
|
-
|
|
394
|
+
// Владелец — процесс-обёртка, запустивший recorder. Он живёт дольше
|
|
395
|
+
// короткоживущего recorder'а, поэтому именно его PID проверяет recovery.
|
|
396
|
+
const owner = {
|
|
397
|
+
pid: process.ppid && process.ppid > 0 ? process.ppid : null,
|
|
398
|
+
host: os.hostname(),
|
|
399
|
+
startedAt: new Date().toISOString(),
|
|
400
|
+
};
|
|
401
|
+
const runId = startRun(taskName, startedAt, definition?.workspaceId ?? null, definition?.allowedTools ?? null, definition?.deniedTools ?? null, owner);
|
|
300
402
|
console.log(String(runId));
|
|
301
403
|
return;
|
|
302
404
|
}
|
|
@@ -312,7 +414,7 @@ async function main() {
|
|
|
312
414
|
process.exit(1);
|
|
313
415
|
}
|
|
314
416
|
const durationMs = Number(fifth) || 0;
|
|
315
|
-
const error = sixth
|
|
417
|
+
const error = normalizeErrorText(sixth);
|
|
316
418
|
// 12-й аргумент — путь к лог-файлу задачи (добавлен в T-08 / D-08).
|
|
317
419
|
const logFile = twelfth;
|
|
318
420
|
const tokens = parseOptionalNumber(seventh);
|
|
@@ -330,17 +432,29 @@ async function main() {
|
|
|
330
432
|
costResolved = usage.costUsd;
|
|
331
433
|
}
|
|
332
434
|
}
|
|
435
|
+
// --finish не получает startedAt: восстанавливаем окно из длительности.
|
|
436
|
+
if (tokensResolved === undefined || costResolved === undefined) {
|
|
437
|
+
const approximatedStart = new Date(Date.now() - Math.max(0, durationMs)).toISOString();
|
|
438
|
+
const dbUsage = resolveUsageFromOpenCodeDb(taskName, approximatedStart, durationMs, { tokens: tokensResolved, costUsd: costResolved });
|
|
439
|
+
tokensResolved = dbUsage.tokens;
|
|
440
|
+
costResolved = dbUsage.costUsd;
|
|
441
|
+
}
|
|
333
442
|
const model = ninth && ninth !== "-" ? ninth.trim() || undefined : undefined;
|
|
334
443
|
const preFlightStatus = parseHookStatus(tenth);
|
|
335
444
|
const postFlightStatus = parseHookStatus(eleventh);
|
|
336
|
-
const st = status === "success" ? "success" : status === "timeout" ? "timeout" : "error";
|
|
445
|
+
const st = status === "success" ? "success" : status === "timeout" ? "timeout" : status === "skipped" ? "skipped" : "error";
|
|
337
446
|
const definition = getTask(taskName);
|
|
338
447
|
const chainTarget = st === "success"
|
|
339
448
|
? definition?.nextTaskOnSuccess || null
|
|
340
|
-
:
|
|
449
|
+
: st === "skipped"
|
|
450
|
+
? null
|
|
451
|
+
: definition?.nextTaskOnError || null;
|
|
341
452
|
const completed = finishRun(runId, st, durationMs, error, chainTarget, tokensResolved, costResolved, model, preFlightStatus, postFlightStatus);
|
|
342
453
|
if (!completed) {
|
|
343
|
-
|
|
454
|
+
logRecorderEvent("run.finish_skipped", taskName, {
|
|
455
|
+
runId,
|
|
456
|
+
reason: "already finished or not found",
|
|
457
|
+
});
|
|
344
458
|
return;
|
|
345
459
|
}
|
|
346
460
|
await handleCompletion(taskName, st, chainTarget, error, durationMs, tokensResolved, costResolved);
|
|
@@ -354,23 +468,49 @@ async function main() {
|
|
|
354
468
|
}
|
|
355
469
|
const startedAt = third ?? new Date().toISOString();
|
|
356
470
|
const durationMs = Number(fourth) || 0;
|
|
357
|
-
const error = fifth
|
|
471
|
+
const error = normalizeErrorText(fifth);
|
|
358
472
|
// Токены и стоимость приходят из PowerShell-обёртки (ps-wrapper.ts).
|
|
359
473
|
// "-" означает «данных нет» (openCode не печатал usage в лог).
|
|
360
474
|
const tokens = parseOptionalNumber(sixth);
|
|
361
475
|
const costUsd = parseOptionalNumber(seventh);
|
|
476
|
+
// B10: 11-й аргумент — лог-файл задачи. Раньше legacy-режим его не читал,
|
|
477
|
+
// поэтому при "-" в токенах/стоимости usage терялся. Парсим лог так же,
|
|
478
|
+
// как режим --finish; отсутствие файла — graceful fallback (parseUsageFromLog
|
|
479
|
+
// возвращает пустой объект и не бросает).
|
|
480
|
+
const logFile = eleventh && eleventh !== "-" ? eleventh : undefined;
|
|
481
|
+
let tokensResolved = tokens;
|
|
482
|
+
let costResolved = costUsd;
|
|
483
|
+
if ((tokensResolved === undefined || costResolved === undefined) && logFile) {
|
|
484
|
+
const usage = parseUsageFromLog(logFile);
|
|
485
|
+
if (tokensResolved === undefined && usage.tokens !== undefined) {
|
|
486
|
+
tokensResolved = usage.tokens;
|
|
487
|
+
}
|
|
488
|
+
if (costResolved === undefined && usage.costUsd !== undefined) {
|
|
489
|
+
costResolved = usage.costUsd;
|
|
490
|
+
}
|
|
491
|
+
}
|
|
492
|
+
if (tokensResolved === undefined || costResolved === undefined) {
|
|
493
|
+
const dbUsage = resolveUsageFromOpenCodeDb(taskName, startedAt, durationMs, {
|
|
494
|
+
tokens: tokensResolved,
|
|
495
|
+
costUsd: costResolved,
|
|
496
|
+
});
|
|
497
|
+
tokensResolved = dbUsage.tokens;
|
|
498
|
+
costResolved = dbUsage.costUsd;
|
|
499
|
+
}
|
|
362
500
|
// Восьмой аргумент — модель; "-" означает, что модель не задана.
|
|
363
501
|
const model = eighth && eighth !== "-" ? eighth.trim() || undefined : undefined;
|
|
364
502
|
// Девятый и десятый — итоги pre/post-flight хуков.
|
|
365
503
|
const preFlightStatus = parseHookStatus(ninth);
|
|
366
504
|
const postFlightStatus = parseHookStatus(tenth);
|
|
367
|
-
const st = status === "success" ? "success" : status === "timeout" ? "timeout" : "error";
|
|
505
|
+
const st = status === "success" ? "success" : status === "timeout" ? "timeout" : status === "skipped" ? "skipped" : "error";
|
|
368
506
|
const definition = getTask(taskName);
|
|
369
507
|
const chainTarget = st === "success"
|
|
370
508
|
? definition?.nextTaskOnSuccess || null
|
|
371
|
-
:
|
|
372
|
-
|
|
373
|
-
|
|
509
|
+
: st === "skipped"
|
|
510
|
+
? null
|
|
511
|
+
: definition?.nextTaskOnError || null;
|
|
512
|
+
recordRun(taskName, st, startedAt, durationMs, error, chainTarget, tokensResolved, costResolved, model, preFlightStatus, postFlightStatus, new Date().toISOString(), definition?.workspaceId ?? null, definition?.allowedTools ?? null, definition?.deniedTools ?? null);
|
|
513
|
+
await handleCompletion(taskName, st, chainTarget, error, durationMs, tokensResolved, costResolved);
|
|
374
514
|
}
|
|
375
515
|
/**
|
|
376
516
|
* Удаляет отработавшую ONCE-задачу из Планировщика Windows.
|
|
@@ -392,11 +532,13 @@ export async function cleanupWindowsOneShotTask(taskName, deps = {}) {
|
|
|
392
532
|
((name) => createSchedulerBackend().deleteTask(name));
|
|
393
533
|
try {
|
|
394
534
|
await deleteTask(taskName);
|
|
395
|
-
|
|
535
|
+
logRecorderEvent("oneshot.cleaned", taskName);
|
|
396
536
|
return true;
|
|
397
537
|
}
|
|
398
538
|
catch (err) {
|
|
399
|
-
|
|
539
|
+
logRecorderEvent("oneshot.cleanup_failed", taskName, {
|
|
540
|
+
error: err instanceof Error ? err.message : String(err),
|
|
541
|
+
});
|
|
400
542
|
return false;
|
|
401
543
|
}
|
|
402
544
|
}
|
|
@@ -406,10 +548,13 @@ export async function cleanupWindowsOneShotTask(taskName, deps = {}) {
|
|
|
406
548
|
*/
|
|
407
549
|
async function handleCompletion(taskName, st, chainTarget, error, durationMs, tokens, costUsd) {
|
|
408
550
|
// Уведомление о завершении (webhook). Ошибки отправки логируются внутри
|
|
409
|
-
// и не влияют на историю, цепочки и повторы.
|
|
410
|
-
|
|
411
|
-
|
|
412
|
-
|
|
551
|
+
// и не влияют на историю, цепочки и повторы. Пропуск guard не уведомляем:
|
|
552
|
+
// для него нет отдельного шаблона, а шум в уведомлениях не нужен.
|
|
553
|
+
if (st !== "skipped") {
|
|
554
|
+
await notifyTaskCompletion(taskName, st, durationMs, error, tokens, costUsd, {
|
|
555
|
+
asyncTriage: true,
|
|
556
|
+
});
|
|
557
|
+
}
|
|
413
558
|
// P2-27: Windows не удаляет ONCE-задачи сам, а флаг schtasks `/z` на
|
|
414
559
|
// практике ломает создание задачи («task XML ... EndBoundary»).
|
|
415
560
|
// Поэтому снимаем отработавшую one-shot задачу из Планировщика здесь.
|
|
@@ -422,15 +567,25 @@ async function handleCompletion(taskName, st, chainTarget, error, durationMs, to
|
|
|
422
567
|
await finalizeMatrixIfComplete(taskName);
|
|
423
568
|
}
|
|
424
569
|
catch (err) {
|
|
425
|
-
|
|
570
|
+
logRecorderEvent("matrix.error", taskName, {
|
|
571
|
+
error: err instanceof Error ? err.message : String(err),
|
|
572
|
+
});
|
|
426
573
|
}
|
|
427
574
|
if (st === "success") {
|
|
575
|
+
// PL-5.1: один и тот же следующий шаг может прийти и из chainTarget
|
|
576
|
+
// (nextTaskOnSuccess), и из DAG-зависимых (dependsOn). Запускаем каждое
|
|
577
|
+
// имя ровно один раз за завершение: Set по имени, без учёта регистра —
|
|
578
|
+
// именно так сравнивает имена selectDependentsToTrigger.
|
|
579
|
+
const triggered = new Set();
|
|
580
|
+
const nameKey = (name) => name.trim().toLowerCase();
|
|
428
581
|
// Успешный запуск сбрасывает счётчик повторов.
|
|
429
582
|
await deleteSetting(retryStateKey(taskName));
|
|
430
583
|
if (chainTarget) {
|
|
584
|
+
const key = nameKey(chainTarget);
|
|
585
|
+
triggered.add(key);
|
|
431
586
|
const started = await triggerTask(chainTarget);
|
|
432
587
|
if (started) {
|
|
433
|
-
|
|
588
|
+
logRecorderEvent("chain.triggered", taskName, { nextTask: chainTarget });
|
|
434
589
|
}
|
|
435
590
|
}
|
|
436
591
|
// DAG: после успеха проверяем задачи, у которых эта задача — одна из
|
|
@@ -442,24 +597,38 @@ async function handleCompletion(taskName, st, chainTarget, error, durationMs, to
|
|
|
442
597
|
const definitions = listTasks();
|
|
443
598
|
const dependents = selectDependentsToTrigger(taskName, definitions, history);
|
|
444
599
|
for (const dependent of dependents) {
|
|
600
|
+
const key = nameKey(dependent);
|
|
601
|
+
if (triggered.has(key)) {
|
|
602
|
+
// Один шаг попал и в цепочку, и в DAG — второй triggerTask
|
|
603
|
+
// создал бы дублирующий запуск (наблюдалось 09:29:24Z).
|
|
604
|
+
logRecorderEvent("dag.dedup_skipped", taskName, {
|
|
605
|
+
reason: "already triggered via nextTaskOnSuccess",
|
|
606
|
+
nextTask: dependent,
|
|
607
|
+
});
|
|
608
|
+
continue;
|
|
609
|
+
}
|
|
610
|
+
triggered.add(key);
|
|
445
611
|
const started = await triggerTask(dependent);
|
|
446
612
|
if (started) {
|
|
447
|
-
|
|
613
|
+
logRecorderEvent("dag.triggered", taskName, { nextTask: dependent });
|
|
448
614
|
}
|
|
449
615
|
}
|
|
450
616
|
}
|
|
451
617
|
catch (err) {
|
|
452
|
-
|
|
618
|
+
logRecorderEvent("dag.trigger_failed", taskName, {
|
|
619
|
+
error: err instanceof Error ? err.message : String(err),
|
|
620
|
+
});
|
|
453
621
|
}
|
|
454
622
|
}
|
|
455
|
-
else {
|
|
623
|
+
else if (st !== "skipped") {
|
|
456
624
|
// Сначала пытаемся повторить саму задачу; компенсирующая задача запускается
|
|
457
625
|
// только когда повторы исчерпаны (или не настроены).
|
|
626
|
+
// Пропуск guard — не ошибка: повторы и компенсации не запускаются.
|
|
458
627
|
const retryScheduled = await scheduleRetry(taskName);
|
|
459
628
|
if (!retryScheduled && chainTarget) {
|
|
460
629
|
const started = await triggerTask(chainTarget);
|
|
461
630
|
if (started) {
|
|
462
|
-
|
|
631
|
+
logRecorderEvent("compensation.triggered", taskName, { nextTask: chainTarget });
|
|
463
632
|
}
|
|
464
633
|
}
|
|
465
634
|
}
|
|
@@ -469,7 +638,9 @@ async function handleCompletion(taskName, st, chainTarget, error, durationMs, to
|
|
|
469
638
|
await rotateSessionIfNeeded(taskName);
|
|
470
639
|
}
|
|
471
640
|
catch (err) {
|
|
472
|
-
|
|
641
|
+
logRecorderEvent("session.rotate_failed", taskName, {
|
|
642
|
+
error: err instanceof Error ? err.message : String(err),
|
|
643
|
+
});
|
|
473
644
|
}
|
|
474
645
|
}
|
|
475
646
|
/**
|
|
@@ -489,7 +660,9 @@ function isDirectInvocation() {
|
|
|
489
660
|
}
|
|
490
661
|
if (isDirectInvocation()) {
|
|
491
662
|
main().catch((err) => {
|
|
492
|
-
|
|
663
|
+
logRecorderEvent("record_history.fatal", "record-history", {
|
|
664
|
+
error: err instanceof Error ? err.message : String(err),
|
|
665
|
+
});
|
|
493
666
|
process.exit(1);
|
|
494
667
|
});
|
|
495
668
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rules.d.ts","sourceRoot":"","sources":["../../../src/core/router/rules.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAEH,+BAA+B;AAC/B,MAAM,MAAM,eAAe,GAAG,QAAQ,GAAG,KAAK,GAAG,OAAO,CAAC;AAEzD,+DAA+D;AAC/D,MAAM,MAAM,cAAc,GAAG,OAAO,GAAG,OAAO,CAAC;AAE/C,gEAAgE;AAChE,MAAM,WAAW,eAAe;IAC9B,uEAAuE;IACvE,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,eAAe,CAAC;IAC3B,QAAQ,EAAE,cAAc,CAAC;IACzB,gEAAgE;IAChE,WAAW,EAAE,MAAM,CAAC;CACrB;AAED;;;;;;GAMG;AACH,eAAO,MAAM,kBAAkB,EAAE,SAAS,eAAe,
|
|
1
|
+
{"version":3,"file":"rules.d.ts","sourceRoot":"","sources":["../../../src/core/router/rules.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAEH,+BAA+B;AAC/B,MAAM,MAAM,eAAe,GAAG,QAAQ,GAAG,KAAK,GAAG,OAAO,CAAC;AAEzD,+DAA+D;AAC/D,MAAM,MAAM,cAAc,GAAG,OAAO,GAAG,OAAO,CAAC;AAE/C,gEAAgE;AAChE,MAAM,WAAW,eAAe;IAC9B,uEAAuE;IACvE,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,eAAe,CAAC;IAC3B,QAAQ,EAAE,cAAc,CAAC;IACzB,gEAAgE;IAChE,WAAW,EAAE,MAAM,CAAC;CACrB;AAED;;;;;;GAMG;AACH,eAAO,MAAM,kBAAkB,EAAE,SAAS,eAAe,EA2CvD,CAAC;AAMH;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAMvD;AAED,sFAAsF;AACtF,wBAAgB,eAAe,CAAC,QAAQ,EAAE,MAAM,GAAG,eAAe,GAAG,SAAS,CAK7E;AAED,uEAAuE;AACvE,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAE1D;AAED,yDAAyD;AACzD,wBAAgB,oBAAoB,IAAI,SAAS,eAAe,EAAE,CAEjE"}
|
|
@@ -37,6 +37,12 @@ export const STATIC_ROUTE_RULES = Object.freeze([
|
|
|
37
37
|
executor: "local",
|
|
38
38
|
description: "Тесты запускаются локальным процессом.",
|
|
39
39
|
},
|
|
40
|
+
{
|
|
41
|
+
taskType: "mission",
|
|
42
|
+
transport: "direct",
|
|
43
|
+
executor: "local",
|
|
44
|
+
description: "Ad-hoc миссия исполняется локально через обёртку без регистрации в ОС.",
|
|
45
|
+
},
|
|
40
46
|
{
|
|
41
47
|
taskType: "apply_diff",
|
|
42
48
|
transport: "direct",
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* QV-8: маркер дочернего прогона `opencode run`.
|
|
3
|
+
*
|
|
4
|
+
* Обёртки задач выставляют `AGENT_STEWARD_CHILD_RUN=1` перед запуском ИИ.
|
|
5
|
+
* Плагин читает маркер при загрузке и НЕ регистрирует инструменты
|
|
6
|
+
* планировщика, RPC, скилл и дашборд: дочерний агент не должен рекурсивно
|
|
7
|
+
* создавать задачи и не должен конкурировать с родительским дашбордом за порт.
|
|
8
|
+
*/
|
|
9
|
+
export declare const CHILD_RUN_ENV = "AGENT_STEWARD_CHILD_RUN";
|
|
10
|
+
/** True, когда текущий процесс — дочерний `opencode run` задачи планировщика. */
|
|
11
|
+
export declare function isChildRunMode(env?: NodeJS.ProcessEnv): boolean;
|
|
12
|
+
//# sourceMappingURL=run-mode.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"run-mode.d.ts","sourceRoot":"","sources":["../../src/core/run-mode.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,eAAO,MAAM,aAAa,4BAA4B,CAAC;AAIvD,iFAAiF;AACjF,wBAAgB,cAAc,CAAC,GAAG,GAAE,MAAM,CAAC,UAAwB,GAAG,OAAO,CAI5E"}
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* QV-8: маркер дочернего прогона `opencode run`.
|
|
3
|
+
*
|
|
4
|
+
* Обёртки задач выставляют `AGENT_STEWARD_CHILD_RUN=1` перед запуском ИИ.
|
|
5
|
+
* Плагин читает маркер при загрузке и НЕ регистрирует инструменты
|
|
6
|
+
* планировщика, RPC, скилл и дашборд: дочерний агент не должен рекурсивно
|
|
7
|
+
* создавать задачи и не должен конкурировать с родительским дашбордом за порт.
|
|
8
|
+
*/
|
|
9
|
+
export const CHILD_RUN_ENV = "AGENT_STEWARD_CHILD_RUN";
|
|
10
|
+
const TRUTHY = new Set(["1", "true", "yes", "on"]);
|
|
11
|
+
/** True, когда текущий процесс — дочерний `opencode run` задачи планировщика. */
|
|
12
|
+
export function isChildRunMode(env = process.env) {
|
|
13
|
+
const raw = env[CHILD_RUN_ENV];
|
|
14
|
+
if (typeof raw !== "string")
|
|
15
|
+
return false;
|
|
16
|
+
return TRUTHY.has(raw.trim().toLowerCase());
|
|
17
|
+
}
|
|
@@ -25,7 +25,14 @@ export declare class LinuxScheduler extends PosixSchedulerBase {
|
|
|
25
25
|
private renderBlock;
|
|
26
26
|
/** Читает текущий crontab (пустая строка, если crontab ещё не создан). */
|
|
27
27
|
private readCrontab;
|
|
28
|
-
/**
|
|
28
|
+
/**
|
|
29
|
+
* Убирает управляемый блок плагина из текста crontab.
|
|
30
|
+
*
|
|
31
|
+
* B9: удаляются только строки между парными маркерами. Незакрытый блок
|
|
32
|
+
* (маркер начала без конца) — fail-closed: бросаем ошибку, чтобы вызывающий
|
|
33
|
+
* не записал crontab и пользовательские задания после маркера не пропали.
|
|
34
|
+
* Строки вне маркеров сохраняются байт-в-байт, включая пустые.
|
|
35
|
+
*/
|
|
29
36
|
private stripBlock;
|
|
30
37
|
/** Записывает crontab через stdin: `crontab -`. */
|
|
31
38
|
private writeCrontab;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"linux.d.ts","sourceRoot":"","sources":["../../../src/core/scheduler/linux.ts"],"names":[],"mappings":"AAIA,OAAO,EAML,KAAK,qBAAqB,EAC3B,MAAM,kBAAkB,CAAC;AAK1B,OAAO,EAAE,kBAAkB,EAAc,MAAM,YAAY,CAAC;AAC5D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAInD;;;;;;;;;;GAUG;AACH,qBAAa,cAAe,SAAQ,kBAAkB;IACpD,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC,QAAQ,CAAW;IAC7C,QAAQ,CAAC,KAAK,8BAA8B;IAE5C,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAS;IACpC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAS;IAClC,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAS;IAC1C,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAS;IACxC,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAU;gBAE9B,OAAO,GAAE,MAAyB;IAY9C,OAAO,CAAC,QAAQ;IAkBhB,OAAO,CAAC,WAAW;IAYnB,0EAA0E;YAC5D,WAAW;
|
|
1
|
+
{"version":3,"file":"linux.d.ts","sourceRoot":"","sources":["../../../src/core/scheduler/linux.ts"],"names":[],"mappings":"AAIA,OAAO,EAML,KAAK,qBAAqB,EAC3B,MAAM,kBAAkB,CAAC;AAK1B,OAAO,EAAE,kBAAkB,EAAc,MAAM,YAAY,CAAC;AAC5D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAInD;;;;;;;;;;GAUG;AACH,qBAAa,cAAe,SAAQ,kBAAkB;IACpD,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC,QAAQ,CAAW;IAC7C,QAAQ,CAAC,KAAK,8BAA8B;IAE5C,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAS;IACpC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAS;IAClC,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAS;IAC1C,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAS;IACxC,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAU;gBAE9B,OAAO,GAAE,MAAyB;IAY9C,OAAO,CAAC,QAAQ;IAkBhB,OAAO,CAAC,WAAW;IAYnB,0EAA0E;YAC5D,WAAW;IAmBzB;;;;;;;OAOG;IACH,OAAO,CAAC,UAAU;IAiDlB,mDAAmD;YACrC,YAAY;IAgB1B,8CAA8C;YAChC,cAAc;IA+B5B;;;mDAG+C;IAC/C,OAAO,CAAC,SAAS;IAKjB;;;OAGG;YACW,UAAU;IAuExB,oDAAoD;YACtC,QAAQ;IAiBtB;;;OAGG;IACG,mBAAmB,IAAI,OAAO,CAAC,qBAAqB,CAAC;cAI3C,YAAY,CAAC,KAAK,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;cAUjD,cAAc,CAAC,KAAK,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;cAQnD,UAAU,CAAC,KAAK,EAAE,aAAa,EAAE,MAAM,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;CAoBjF"}
|
|
@@ -72,17 +72,25 @@ export class LinuxScheduler extends PosixSchedulerBase {
|
|
|
72
72
|
return stdout;
|
|
73
73
|
}
|
|
74
74
|
catch (err) {
|
|
75
|
-
const
|
|
75
|
+
const stderrRaw = err?.stderr;
|
|
76
|
+
const stderr = typeof stderrRaw === "string" ? stderrRaw : String(stderrRaw ?? "");
|
|
76
77
|
// "no crontab for user" — это нормальное состояние. Любую другую ошибку
|
|
77
78
|
// (нет доступа, сбой crontab) нельзя превращать в пустой crontab: иначе
|
|
78
79
|
// последующая запись затрёт пользовательские задания.
|
|
79
80
|
if (/no crontab/i.test(stderr) || /no crontab/i.test(String(err?.message ?? ""))) {
|
|
80
81
|
return "";
|
|
81
82
|
}
|
|
82
|
-
throw new Error(`Не удалось прочитать crontab: ${stderr.trim() || err?.message || err}`);
|
|
83
|
+
throw new Error(`Не удалось прочитать crontab: ${stderr.trim() || err?.message || String(err)}`);
|
|
83
84
|
}
|
|
84
85
|
}
|
|
85
|
-
/**
|
|
86
|
+
/**
|
|
87
|
+
* Убирает управляемый блок плагина из текста crontab.
|
|
88
|
+
*
|
|
89
|
+
* B9: удаляются только строки между парными маркерами. Незакрытый блок
|
|
90
|
+
* (маркер начала без конца) — fail-closed: бросаем ошибку, чтобы вызывающий
|
|
91
|
+
* не записал crontab и пользовательские задания после маркера не пропали.
|
|
92
|
+
* Строки вне маркеров сохраняются байт-в-байт, включая пустые.
|
|
93
|
+
*/
|
|
86
94
|
stripBlock(content) {
|
|
87
95
|
// Совместимость: до появления профилей блок назывался без суффикса.
|
|
88
96
|
// Он принадлежит профилю default; другие профили его не трогают.
|
|
@@ -98,19 +106,33 @@ export class LinuxScheduler extends PosixSchedulerBase {
|
|
|
98
106
|
const lines = content.split(/\r?\n/);
|
|
99
107
|
const result = [];
|
|
100
108
|
let inside = false;
|
|
101
|
-
|
|
102
|
-
|
|
109
|
+
let openAt = 0;
|
|
110
|
+
for (let index = 0; index < lines.length; index += 1) {
|
|
111
|
+
const line = lines[index];
|
|
112
|
+
const trimmed = line.trim();
|
|
113
|
+
if (isBegin(trimmed)) {
|
|
114
|
+
if (inside) {
|
|
115
|
+
throw new Error(`crontab: вложенный маркер начала блока на строке ${index + 1} ` +
|
|
116
|
+
`(предыдущий блок открыт на строке ${openAt}). Файл не изменён.`);
|
|
117
|
+
}
|
|
103
118
|
inside = true;
|
|
119
|
+
openAt = index + 1;
|
|
104
120
|
continue;
|
|
105
121
|
}
|
|
106
|
-
if (isEnd(
|
|
122
|
+
if (inside && isEnd(trimmed)) {
|
|
107
123
|
inside = false;
|
|
108
124
|
continue;
|
|
109
125
|
}
|
|
126
|
+
// Строки внутри блока удаляются; всё остальное (включая «сиротский»
|
|
127
|
+
// маркер конца) остаётся без изменений.
|
|
110
128
|
if (!inside)
|
|
111
129
|
result.push(line);
|
|
112
130
|
}
|
|
113
|
-
|
|
131
|
+
if (inside) {
|
|
132
|
+
throw new Error(`crontab: незакрытый блок плагина с строки ${openAt} — ` +
|
|
133
|
+
"маркер конца не найден. Файл не изменён.");
|
|
134
|
+
}
|
|
135
|
+
return result.join("\n");
|
|
114
136
|
}
|
|
115
137
|
/** Записывает crontab через stdin: `crontab -`. */
|
|
116
138
|
async writeCrontab(content) {
|
|
@@ -140,14 +162,17 @@ export class LinuxScheduler extends PosixSchedulerBase {
|
|
|
140
162
|
await withLockWait(crontabLock, "crontab", async () => {
|
|
141
163
|
const entries = await this.registry.load();
|
|
142
164
|
const current = await this.readCrontab();
|
|
143
|
-
|
|
165
|
+
// B9: stripBlock сохраняет содержимое вне маркеров. Отрезаем только
|
|
166
|
+
// хвостовые переводы строк, чтобы повторные rebuild не копили пустые
|
|
167
|
+
// строки; одна финальная добавляется ниже.
|
|
168
|
+
const base = this.stripBlock(current).replace(/\n+$/, "");
|
|
144
169
|
const block = this.renderBlock(entries);
|
|
145
170
|
// Пустой блок (нет задач) не пишем, чтобы не оставлять мусор в crontab.
|
|
146
171
|
const hasTasks = block
|
|
147
172
|
.split("\n")
|
|
148
173
|
.some((line) => line.trim().startsWith("# task:"));
|
|
149
174
|
const next = [base, hasTasks ? block : ""].filter(Boolean).join("\n");
|
|
150
|
-
await this.writeCrontab(next);
|
|
175
|
+
await this.writeCrontab(next ? `${next}\n` : "");
|
|
151
176
|
}, { timeoutMs: 15000, staleMs: 60000 });
|
|
152
177
|
}
|
|
153
178
|
/** Строка команды one-shot для stdin `at`.
|
|
@@ -1,3 +1,7 @@
|
|
|
1
|
+
/** Codes returned by Windows/PowerShell while a log file is still held by the writer. */
|
|
2
|
+
export declare function isRetriableLogReadError(code: unknown): boolean;
|
|
3
|
+
/** Retry fs.readFile while the writer still holds the log (emit_event / immediate get_task_logs race). */
|
|
4
|
+
export declare function readLogWithRetry(logPath: string, attempts?: number, delayMs?: number): Promise<string>;
|
|
1
5
|
/**
|
|
2
6
|
* Читает файл лога задачи и возвращает последние 50 строк.
|
|
3
7
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logs.d.ts","sourceRoot":"","sources":["../../../src/core/scheduler/logs.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"logs.d.ts","sourceRoot":"","sources":["../../../src/core/scheduler/logs.ts"],"names":[],"mappings":"AAKA,yFAAyF;AACzF,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,OAAO,GAAG,OAAO,CAE9D;AAED,0GAA0G;AAC1G,wBAAsB,gBAAgB,CACpC,OAAO,EAAE,MAAM,EACf,QAAQ,SAAI,EACZ,OAAO,SAAK,GACX,OAAO,CAAC,MAAM,CAAC,CAiBjB;AAED;;;;;GAKG;AACH,wBAAsB,WAAW,CAC/B,IAAI,EAAE,MAAM,EACZ,KAAK,SAAK,GACT,OAAO,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,CAwB3C"}
|