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.
Files changed (279) hide show
  1. package/CHANGELOG.md +309 -2
  2. package/CROSS_PLATFORM.md +19 -0
  3. package/README.md +55 -8
  4. package/ROADMAP-STRATEGY.md +22 -19
  5. package/ROADMAP.md +230 -159
  6. package/dist/cli.d.ts +3 -0
  7. package/dist/cli.d.ts.map +1 -0
  8. package/dist/cli.js +356 -0
  9. package/dist/core/analytics.d.ts +6 -0
  10. package/dist/core/analytics.d.ts.map +1 -1
  11. package/dist/core/analytics.js +20 -3
  12. package/dist/core/audit.d.ts +6 -0
  13. package/dist/core/audit.d.ts.map +1 -1
  14. package/dist/core/audit.js +24 -0
  15. package/dist/core/budget.d.ts +118 -0
  16. package/dist/core/budget.d.ts.map +1 -0
  17. package/dist/core/budget.js +206 -0
  18. package/dist/core/cron-to-schtasks.d.ts.map +1 -1
  19. package/dist/core/cron-to-schtasks.js +38 -0
  20. package/dist/core/dry-run.d.ts +26 -1
  21. package/dist/core/dry-run.d.ts.map +1 -1
  22. package/dist/core/dry-run.js +199 -8
  23. package/dist/core/execution.d.ts +203 -0
  24. package/dist/core/execution.d.ts.map +1 -0
  25. package/dist/core/execution.js +309 -0
  26. package/dist/core/feedback.d.ts +192 -0
  27. package/dist/core/feedback.d.ts.map +1 -0
  28. package/dist/core/feedback.js +426 -0
  29. package/dist/core/gate-integrity.d.ts +71 -0
  30. package/dist/core/gate-integrity.d.ts.map +1 -0
  31. package/dist/core/gate-integrity.js +275 -0
  32. package/dist/core/git-trigger.d.ts.map +1 -1
  33. package/dist/core/git-trigger.js +14 -2
  34. package/dist/core/guard-run.d.ts +4 -0
  35. package/dist/core/guard-run.d.ts.map +1 -0
  36. package/dist/core/guard-run.js +101 -0
  37. package/dist/core/guard.d.ts +52 -0
  38. package/dist/core/guard.d.ts.map +1 -0
  39. package/dist/core/guard.js +362 -0
  40. package/dist/core/local-ai.d.ts.map +1 -1
  41. package/dist/core/local-ai.js +7 -3
  42. package/dist/core/lock.d.ts +41 -0
  43. package/dist/core/lock.d.ts.map +1 -1
  44. package/dist/core/lock.js +141 -29
  45. package/dist/core/matrix.d.ts +8 -0
  46. package/dist/core/matrix.d.ts.map +1 -1
  47. package/dist/core/matrix.js +132 -17
  48. package/dist/core/mission.d.ts +103 -0
  49. package/dist/core/mission.d.ts.map +1 -0
  50. package/dist/core/mission.js +374 -0
  51. package/dist/core/opencode-models.d.ts +2 -2
  52. package/dist/core/opencode-models.d.ts.map +1 -1
  53. package/dist/core/opencode-models.js +28 -21
  54. package/dist/core/opencode-usage.d.ts +35 -0
  55. package/dist/core/opencode-usage.d.ts.map +1 -0
  56. package/dist/core/opencode-usage.js +132 -0
  57. package/dist/core/pipeline-apply.d.ts +38 -0
  58. package/dist/core/pipeline-apply.d.ts.map +1 -0
  59. package/dist/core/pipeline-apply.js +117 -0
  60. package/dist/core/pipeline-io.d.ts +13 -0
  61. package/dist/core/pipeline-io.d.ts.map +1 -0
  62. package/dist/core/pipeline-io.js +78 -0
  63. package/dist/core/pipeline-map.d.ts +52 -0
  64. package/dist/core/pipeline-map.d.ts.map +1 -0
  65. package/dist/core/pipeline-map.js +208 -0
  66. package/dist/core/pipeline-spec.d.ts +109 -0
  67. package/dist/core/pipeline-spec.d.ts.map +1 -0
  68. package/dist/core/pipeline-spec.js +554 -0
  69. package/dist/core/ps-wrapper.d.ts +27 -2
  70. package/dist/core/ps-wrapper.d.ts.map +1 -1
  71. package/dist/core/ps-wrapper.js +424 -65
  72. package/dist/core/record-history.d.ts.map +1 -1
  73. package/dist/core/record-history.js +206 -33
  74. package/dist/core/router/rules.d.ts.map +1 -1
  75. package/dist/core/router/rules.js +6 -0
  76. package/dist/core/run-mode.d.ts +12 -0
  77. package/dist/core/run-mode.d.ts.map +1 -0
  78. package/dist/core/run-mode.js +17 -0
  79. package/dist/core/scheduler/linux.d.ts +8 -1
  80. package/dist/core/scheduler/linux.d.ts.map +1 -1
  81. package/dist/core/scheduler/linux.js +34 -9
  82. package/dist/core/scheduler/logs.d.ts +4 -0
  83. package/dist/core/scheduler/logs.d.ts.map +1 -1
  84. package/dist/core/scheduler/logs.js +25 -1
  85. package/dist/core/scheduler/mac.d.ts +44 -2
  86. package/dist/core/scheduler/mac.d.ts.map +1 -1
  87. package/dist/core/scheduler/mac.js +126 -15
  88. package/dist/core/scheduler/windows.d.ts.map +1 -1
  89. package/dist/core/scheduler/windows.js +15 -12
  90. package/dist/core/secrets.d.ts.map +1 -1
  91. package/dist/core/secrets.js +18 -8
  92. package/dist/core/self-analysis.d.ts +32 -2
  93. package/dist/core/self-analysis.d.ts.map +1 -1
  94. package/dist/core/self-analysis.js +38 -27
  95. package/dist/core/shutdown.d.ts +33 -2
  96. package/dist/core/shutdown.d.ts.map +1 -1
  97. package/dist/core/shutdown.js +58 -2
  98. package/dist/core/structured-log.d.ts +37 -1
  99. package/dist/core/structured-log.d.ts.map +1 -1
  100. package/dist/core/structured-log.js +37 -0
  101. package/dist/core/usage-surface.d.ts +25 -0
  102. package/dist/core/usage-surface.d.ts.map +1 -0
  103. package/dist/core/usage-surface.js +41 -0
  104. package/dist/core/worktree-run.d.ts +4 -0
  105. package/dist/core/worktree-run.d.ts.map +1 -0
  106. package/dist/core/worktree-run.js +164 -0
  107. package/dist/core/worktree.d.ts +115 -0
  108. package/dist/core/worktree.d.ts.map +1 -0
  109. package/dist/core/worktree.js +462 -0
  110. package/dist/core/wrappers/bash.d.ts +19 -0
  111. package/dist/core/wrappers/bash.d.ts.map +1 -1
  112. package/dist/core/wrappers/bash.js +230 -27
  113. package/dist/db/capability-repo.d.ts +43 -2
  114. package/dist/db/capability-repo.d.ts.map +1 -1
  115. package/dist/db/capability-repo.js +96 -11
  116. package/dist/db/history-repo.d.ts +70 -5
  117. package/dist/db/history-repo.d.ts.map +1 -1
  118. package/dist/db/history-repo.js +170 -29
  119. package/dist/db/metrics-repo.d.ts +20 -2
  120. package/dist/db/metrics-repo.d.ts.map +1 -1
  121. package/dist/db/metrics-repo.js +35 -13
  122. package/dist/db/migrate.d.ts.map +1 -1
  123. package/dist/db/migrate.js +37 -17
  124. package/dist/db/recovery.d.ts +3 -1
  125. package/dist/db/recovery.d.ts.map +1 -1
  126. package/dist/db/recovery.js +11 -5
  127. package/dist/db/run-journal.d.ts +33 -5
  128. package/dist/db/run-journal.d.ts.map +1 -1
  129. package/dist/db/run-journal.js +78 -14
  130. package/dist/db/run-resume.d.ts +5 -0
  131. package/dist/db/run-resume.d.ts.map +1 -1
  132. package/dist/db/run-resume.js +9 -2
  133. package/dist/db/runs-repo.d.ts +19 -2
  134. package/dist/db/runs-repo.d.ts.map +1 -1
  135. package/dist/db/runs-repo.js +91 -60
  136. package/dist/db/schema.d.ts +2 -2
  137. package/dist/db/schema.d.ts.map +1 -1
  138. package/dist/db/schema.js +132 -2
  139. package/dist/db/templates-repo.d.ts +2 -2
  140. package/dist/db/templates-repo.d.ts.map +1 -1
  141. package/dist/db/templates-repo.js +5 -3
  142. package/dist/history.d.ts +7 -2
  143. package/dist/history.d.ts.map +1 -1
  144. package/dist/history.js +4 -2
  145. package/dist/hook-output.d.ts +2 -0
  146. package/dist/hook-output.d.ts.map +1 -0
  147. package/dist/hook-output.js +31 -0
  148. package/dist/i18n.d.ts +5 -0
  149. package/dist/i18n.d.ts.map +1 -1
  150. package/dist/i18n.js +11 -4
  151. package/dist/index.d.ts +375 -47
  152. package/dist/index.d.ts.map +1 -1
  153. package/dist/index.js +1344 -192
  154. package/dist/notifications.d.ts +53 -2
  155. package/dist/notifications.d.ts.map +1 -1
  156. package/dist/notifications.js +168 -21
  157. package/dist/profiles.d.ts.map +1 -1
  158. package/dist/profiles.js +82 -10
  159. package/dist/rpc.d.ts +354 -0
  160. package/dist/rpc.d.ts.map +1 -1
  161. package/dist/rpc.js +145 -0
  162. package/dist/server.d.ts +32 -2
  163. package/dist/server.d.ts.map +1 -1
  164. package/dist/server.js +154 -30
  165. package/dist/settings.d.ts +44 -2
  166. package/dist/settings.d.ts.map +1 -1
  167. package/dist/settings.js +85 -3
  168. package/dist/shared/jobs-view.d.ts +1 -1
  169. package/dist/shared/jobs-view.d.ts.map +1 -1
  170. package/dist/shared/jobs-view.js +2 -0
  171. package/dist/task-transfer.d.ts +21 -0
  172. package/dist/task-transfer.d.ts.map +1 -1
  173. package/dist/task-transfer.js +64 -3
  174. package/dist/templates.d.ts +2 -2
  175. package/dist/templates.d.ts.map +1 -1
  176. package/dist/templates.js +3 -3
  177. package/dist/types.d.ts +22 -2
  178. package/dist/types.d.ts.map +1 -1
  179. package/dist/workspaces.d.ts.map +1 -1
  180. package/dist/workspaces.js +34 -11
  181. package/docs/ARCHITECTURE.md +319 -66
  182. package/docs/COMPATIBILITY.md +2 -2
  183. package/docs/CONCEPT.md +18 -4
  184. package/docs/CROSS_PLATFORM.ru.md +20 -0
  185. package/docs/CROSS_PLATFORM.zh.md +18 -0
  186. package/docs/EXECUTION-LOOP.md +28 -10
  187. package/docs/FEATURES.md +129 -7
  188. package/docs/FEATURES.zh.md +97 -6
  189. package/docs/MIGRATION.md +2 -2
  190. package/docs/PIPELINE.md +293 -0
  191. package/docs/QA-A2-GUI-TUI.md +205 -0
  192. package/docs/README.ru.md +43 -4
  193. package/docs/README.zh.md +44 -4
  194. package/docs/SAFETY.md +23 -3
  195. package/gui-experimental.cjs +9 -8
  196. package/locales/en.json +58 -3
  197. package/locales/ru.json +58 -3
  198. package/locales/zh.json +58 -3
  199. package/opencode.pipeline.yaml +35 -0
  200. package/package.json +36 -4
  201. package/scripts/check-eslint-baseline.mjs +139 -0
  202. package/scripts/gen-test-plan-counters.mjs +117 -0
  203. package/scripts/github-ci-fetch.ps1 +37 -0
  204. package/scripts/pl-commit.ps1 +112 -0
  205. package/scripts/qa-a2-commit.ps1 +104 -0
  206. package/scripts/test-home.mjs +107 -0
  207. package/skills/scheduled-job-best-practices/SKILL.md +95 -1
  208. package/skills/scheduled-job-best-practices/references/recipes.md +139 -0
  209. package/src/cli.ts +417 -0
  210. package/src/core/analytics.ts +27 -4
  211. package/src/core/audit.ts +25 -0
  212. package/src/core/budget.ts +340 -0
  213. package/src/core/cron-to-schtasks.ts +42 -0
  214. package/src/core/dry-run.ts +235 -12
  215. package/src/core/execution.ts +538 -0
  216. package/src/core/feedback.ts +582 -0
  217. package/src/core/file-watcher.ts +2 -2
  218. package/src/core/gate-integrity.ts +330 -0
  219. package/src/core/git-trigger.ts +18 -5
  220. package/src/core/guard-run.ts +119 -0
  221. package/src/core/guard.ts +431 -0
  222. package/src/core/local-ai.ts +7 -3
  223. package/src/core/lock.ts +178 -37
  224. package/src/core/matrix.ts +158 -52
  225. package/src/core/mission.ts +531 -0
  226. package/src/core/native-notify.ts +1 -1
  227. package/src/core/opencode-models.ts +30 -21
  228. package/src/core/opencode-usage.ts +182 -0
  229. package/src/core/pipeline-apply.ts +158 -0
  230. package/src/core/pipeline-io.ts +96 -0
  231. package/src/core/pipeline-map.ts +283 -0
  232. package/src/core/pipeline-spec.ts +775 -0
  233. package/src/core/ps-wrapper.ts +435 -66
  234. package/src/core/record-history.ts +258 -81
  235. package/src/core/router/rules.ts +6 -0
  236. package/src/core/run-mode.ts +19 -0
  237. package/src/core/schedule-gate.ts +1 -1
  238. package/src/core/scheduler/at-fallback.ts +1 -1
  239. package/src/core/scheduler/linux.ts +40 -11
  240. package/src/core/scheduler/logs.ts +34 -3
  241. package/src/core/scheduler/mac.ts +174 -14
  242. package/src/core/scheduler/registry.ts +2 -2
  243. package/src/core/scheduler/windows.ts +19 -15
  244. package/src/core/secrets.ts +26 -19
  245. package/src/core/self-analysis.ts +75 -29
  246. package/src/core/shutdown.ts +90 -4
  247. package/src/core/structured-log.ts +89 -5
  248. package/src/core/telegram.ts +2 -2
  249. package/src/core/triage-worker.ts +7 -7
  250. package/src/core/triage.ts +2 -2
  251. package/src/core/usage-surface.ts +70 -0
  252. package/src/core/worktree-run.ts +199 -0
  253. package/src/core/worktree.ts +600 -0
  254. package/src/core/wrappers/bash.ts +248 -26
  255. package/src/db/capability-repo.ts +127 -10
  256. package/src/db/history-repo.ts +281 -40
  257. package/src/db/metrics-repo.ts +40 -13
  258. package/src/db/migrate.ts +57 -32
  259. package/src/db/recovery.ts +12 -5
  260. package/src/db/run-journal.ts +100 -13
  261. package/src/db/run-resume.ts +17 -1
  262. package/src/db/runs-repo.ts +147 -65
  263. package/src/db/schema.ts +134 -2
  264. package/src/db/templates-repo.ts +5 -3
  265. package/src/gui.tsx +438 -18
  266. package/src/history.ts +11 -4
  267. package/src/hook-output.ts +39 -0
  268. package/src/i18n.ts +12 -4
  269. package/src/index.ts +1902 -320
  270. package/src/notifications.ts +227 -47
  271. package/src/profiles.ts +88 -10
  272. package/src/rpc.ts +158 -0
  273. package/src/server.ts +201 -41
  274. package/src/settings.ts +125 -5
  275. package/src/shared/jobs-view.ts +3 -1
  276. package/src/task-transfer.ts +90 -6
  277. package/src/templates.ts +3 -3
  278. package/src/types.ts +23 -2
  279. package/src/workspaces.ts +37 -14
package/dist/cli.js ADDED
@@ -0,0 +1,356 @@
1
+ #!/usr/bin/env node
2
+ /**
3
+ * CLI agent-steward (Спринт 32, Pipeline-as-code).
4
+ *
5
+ * Команды:
6
+ * agent-steward pipeline validate <file> [--json]
7
+ * agent-steward pipeline apply <file> [--dry-run] [--json]
8
+ * agent-steward pipeline export --pipeline <name> [--out <file>]
9
+ *
10
+ * Exit-коды: 0 — успех, 1 — ошибки валидации/применения, 2 — неверные аргументы.
11
+ */
12
+ import { writeFileSync } from "node:fs";
13
+ import { stringify } from "yaml";
14
+ import { closeDb, initDb } from "./db/index.js";
15
+ import { listTasks } from "./db/tasks-repo.js";
16
+ import { loadPipelineFile } from "./core/pipeline-io.js";
17
+ import { executePipelineApply, planPipelineApply } from "./core/pipeline-apply.js";
18
+ import { tasksToPipelineSpec } from "./core/pipeline-map.js";
19
+ import { saveTaskDefinition } from "./task-transfer.js";
20
+ import { listWorkspaces } from "./workspaces.js";
21
+ import { runMission } from "./core/mission.js";
22
+ const USAGE = `agent-steward — планировщик agent jobs
23
+
24
+ Использование:
25
+ agent-steward pipeline validate <file> [--json]
26
+ agent-steward pipeline apply <file> [--dry-run] [--json]
27
+ agent-steward pipeline export --pipeline <name> [--out <file>]
28
+
29
+ Команды:
30
+ validate проверить opencode.pipeline.yaml, не меняя задачи
31
+ apply создать/обновить задачи из файла (идемпотентно)
32
+ export выгрузить задачи pipeline из БД обратно в YAML
33
+
34
+ Опции:
35
+ --json машинный вывод
36
+ --dry-run показать план apply без изменений
37
+ --pipeline имя pipeline для export
38
+ --out файл для export (по умолчанию stdout)
39
+ `;
40
+ function printIssueList(label, issues) {
41
+ if (issues.length === 0)
42
+ return;
43
+ console.error(label);
44
+ for (const issue of issues) {
45
+ console.error(` - ${issue.path}: ${issue.message}`);
46
+ }
47
+ }
48
+ function requireFile(args) {
49
+ const file = args.find((arg) => !arg.startsWith("--"));
50
+ if (!file) {
51
+ console.error("Не указан файл pipeline.\n");
52
+ console.error(USAGE);
53
+ process.exit(2);
54
+ }
55
+ return file;
56
+ }
57
+ function flagValue(args, name) {
58
+ const index = args.indexOf(name);
59
+ if (index === -1)
60
+ return undefined;
61
+ const value = args[index + 1];
62
+ if (!value || value.startsWith("--")) {
63
+ console.error(`Опция ${name} требует значение.`);
64
+ process.exit(2);
65
+ }
66
+ return value;
67
+ }
68
+ function workspaceResolver() {
69
+ const workspaces = listWorkspaces();
70
+ const byId = new Map(workspaces.map((ws) => [ws.id.toLowerCase(), ws.id]));
71
+ const byName = new Map(workspaces.map((ws) => [ws.name.trim().toLowerCase(), ws.id]));
72
+ return (value) => {
73
+ const key = value.trim().toLowerCase();
74
+ return byId.get(key) ?? byName.get(key);
75
+ };
76
+ }
77
+ /** Создаёт задачу через общий путь schedulerCreateTask и сохраняет определение. */
78
+ async function persistDefinition(def) {
79
+ const { schedulerCreateTask } = await import("./index.js");
80
+ await schedulerCreateTask(def.name, def.schedule, def.prompt, def.timeoutSeconds, def.workingDirectory, def.retryCount, def.retryDelay, def.qualityGate, def.nextTaskOnSuccess, def.nextTaskOnError, def.triggerType, def.watchPath, def.dependsOn, def.model, def.priority, def.beforeScript, def.afterScript, def.mcpEvent, def.workspaceId, def.allowedTools, def.deniedTools, def.matrix, def.matrixParentId, "create", def.timezone, def.notBefore, def.notAfter, def.pausedUntil, def.runAt, def.session, def.sessionId, def.sessionMaxRuns, {
81
+ activeDays: def.activeDays,
82
+ windowPolicy: def.windowPolicy,
83
+ watchGlobs: def.watchGlobs,
84
+ watchIgnore: def.watchIgnore,
85
+ gitBranch: def.gitBranch,
86
+ gitPaths: def.gitPaths,
87
+ gitIgnore: def.gitIgnore,
88
+ gitPollSeconds: def.gitPollSeconds,
89
+ }, def.runWhenLoggedOff, def.paused, def.legacyShell);
90
+ await saveTaskDefinition(def);
91
+ }
92
+ async function runValidate(args) {
93
+ const file = requireFile(args);
94
+ const json = args.includes("--json");
95
+ const result = await loadPipelineFile(file);
96
+ if (json) {
97
+ console.log(JSON.stringify({
98
+ ok: result.ok,
99
+ errors: result.errors,
100
+ warnings: result.warnings,
101
+ steps: result.spec?.steps.length ?? 0,
102
+ }, null, 2));
103
+ }
104
+ else {
105
+ printIssueList("Ошибки:", result.errors);
106
+ printIssueList("Предупреждения:", result.warnings);
107
+ if (result.ok && result.spec) {
108
+ console.log(`OK: «${result.spec.name}», шагов: ${result.spec.steps.length}`);
109
+ }
110
+ }
111
+ return result.ok ? 0 : 1;
112
+ }
113
+ async function runExport(args) {
114
+ const pipelineName = flagValue(args, "--pipeline");
115
+ if (!pipelineName) {
116
+ console.error("Для export укажите --pipeline <name>.\n");
117
+ console.error(USAGE);
118
+ return 2;
119
+ }
120
+ const out = flagValue(args, "--out");
121
+ initDb();
122
+ try {
123
+ const exported = tasksToPipelineSpec(listTasks(), pipelineName);
124
+ if (exported.spec.steps.length === 0) {
125
+ console.error(`Pipeline «${pipelineName}» не найден в БД.`);
126
+ return 1;
127
+ }
128
+ for (const warning of exported.warnings)
129
+ console.error(`Предупреждение: ${warning}`);
130
+ const yaml = stringify(exported.spec, { lineWidth: 0 });
131
+ if (out) {
132
+ writeFileSync(out, yaml, "utf8");
133
+ console.log(`Записано: ${out} (шагов: ${exported.spec.steps.length})`);
134
+ }
135
+ else {
136
+ process.stdout.write(yaml);
137
+ }
138
+ return 0;
139
+ }
140
+ finally {
141
+ closeDb();
142
+ }
143
+ }
144
+ async function runApply(args) {
145
+ const file = requireFile(args);
146
+ const dryRun = args.includes("--dry-run");
147
+ const json = args.includes("--json");
148
+ const parsed = await loadPipelineFile(file);
149
+ if (!parsed.ok || !parsed.spec) {
150
+ printIssueList("Ошибки:", parsed.errors);
151
+ printIssueList("Предупреждения:", parsed.warnings);
152
+ return 1;
153
+ }
154
+ initDb();
155
+ try {
156
+ const plan = planPipelineApply(parsed.spec, listTasks(), {
157
+ resolveWorkspaceId: workspaceResolver(),
158
+ });
159
+ for (const warning of plan.warnings)
160
+ console.error(`Предупреждение: ${warning}`);
161
+ if (!dryRun) {
162
+ await executePipelineApply(plan, {
163
+ create: persistDefinition,
164
+ update: persistDefinition,
165
+ });
166
+ }
167
+ const summary = {
168
+ pipeline: parsed.spec.name,
169
+ dryRun,
170
+ creates: plan.creates.map((task) => task.name),
171
+ updates: plan.updates.map((entry) => entry.task.name),
172
+ unchanged: plan.unchanged.map((task) => task.name),
173
+ stale: plan.stale.map((task) => task.name),
174
+ };
175
+ if (json) {
176
+ console.log(JSON.stringify(summary, null, 2));
177
+ }
178
+ else {
179
+ const verb = dryRun ? "Будет создано" : "Создано";
180
+ console.log(`${verb}: ${summary.creates.length}`);
181
+ console.log(`Обновлено: ${summary.updates.length}`);
182
+ console.log(`Без изменений: ${summary.unchanged.length}`);
183
+ if (summary.stale.length > 0) {
184
+ console.log(`Устаревшие (не удалены): ${summary.stale.join(", ")}`);
185
+ }
186
+ for (const name of summary.creates)
187
+ console.log(` + ${name}`);
188
+ for (const name of summary.updates)
189
+ console.log(` ~ ${name}`);
190
+ }
191
+ return 0;
192
+ }
193
+ catch (err) {
194
+ console.error(`Ошибка apply: ${err instanceof Error ? err.message : String(err)}`);
195
+ return 1;
196
+ }
197
+ finally {
198
+ closeDb();
199
+ }
200
+ }
201
+ function listFlag(args, name) {
202
+ const value = flagValue(args, name);
203
+ if (value === undefined)
204
+ return undefined;
205
+ const list = value
206
+ .split(",")
207
+ .map((item) => item.trim())
208
+ .filter(Boolean);
209
+ return list.length > 0 ? list : undefined;
210
+ }
211
+ /**
212
+ * AB-8.2: `agent-steward run <prompt>` — ad-hoc миссия без регистрации в ОС.
213
+ * Проходит тот же runtime, что и задачи: план → маршрут → GATE → ledger.
214
+ */
215
+ async function runAdHoc(args) {
216
+ const valueFlags = new Set([
217
+ "--cwd",
218
+ "--gate",
219
+ "--task-type",
220
+ "--model",
221
+ "--timeout",
222
+ "--policy",
223
+ "--allow-tools",
224
+ "--deny-tools",
225
+ "--session",
226
+ "--session-id",
227
+ "--name",
228
+ ]);
229
+ let prompt;
230
+ for (let index = 0; index < args.length; index++) {
231
+ const arg = args[index];
232
+ if (arg.startsWith("--")) {
233
+ if (valueFlags.has(arg))
234
+ index++;
235
+ continue;
236
+ }
237
+ prompt = arg;
238
+ break;
239
+ }
240
+ if (!prompt?.trim()) {
241
+ console.error("agent-steward run <prompt> [--cwd <dir>] [--gate <cmd>] [--task-type <type>] " +
242
+ "[--model <model>] [--timeout <sec>] [--policy hybrid|secure|legacy] " +
243
+ "[--allow-tools a,b] [--deny-tools a,b] [--session new|reuse|last] " +
244
+ "[--session-id ses_...] [--name <name>] [--dry-run] [--json]");
245
+ return 2;
246
+ }
247
+ const json = args.includes("--json");
248
+ const timeoutRaw = flagValue(args, "--timeout");
249
+ const timeoutSeconds = timeoutRaw === undefined ? undefined : Number(timeoutRaw);
250
+ if (timeoutSeconds !== undefined && (!Number.isInteger(timeoutSeconds) || timeoutSeconds <= 0)) {
251
+ console.error("--timeout должен быть целым положительным числом секунд.");
252
+ return 2;
253
+ }
254
+ const policyRaw = flagValue(args, "--policy");
255
+ if (policyRaw && !["hybrid", "secure", "legacy"].includes(policyRaw)) {
256
+ console.error("--policy должен быть hybrid, secure или legacy.");
257
+ return 2;
258
+ }
259
+ const sessionRaw = flagValue(args, "--session");
260
+ if (sessionRaw && !["new", "reuse", "last"].includes(sessionRaw)) {
261
+ console.error("--session должен быть new, reuse или last.");
262
+ return 2;
263
+ }
264
+ const spec = {
265
+ prompt,
266
+ cwd: flagValue(args, "--cwd"),
267
+ taskName: flagValue(args, "--name"),
268
+ taskType: flagValue(args, "--task-type"),
269
+ model: flagValue(args, "--model"),
270
+ session: sessionRaw,
271
+ sessionId: flagValue(args, "--session-id"),
272
+ timeoutSeconds,
273
+ gate: flagValue(args, "--gate"),
274
+ gateTimeoutSeconds: undefined,
275
+ policy: policyRaw,
276
+ allowedTools: listFlag(args, "--allow-tools"),
277
+ deniedTools: listFlag(args, "--deny-tools"),
278
+ dryRun: args.includes("--dry-run"),
279
+ };
280
+ initDb();
281
+ try {
282
+ const result = await runMission(spec);
283
+ if (json) {
284
+ console.log(JSON.stringify({
285
+ success: result.success,
286
+ dryRun: result.dryRun,
287
+ runId: result.runId,
288
+ status: result.status,
289
+ description: result.description,
290
+ error: result.error,
291
+ logFile: result.logFile,
292
+ steps: result.steps,
293
+ }, null, 2));
294
+ }
295
+ else {
296
+ console.log(result.description);
297
+ for (const step of result.steps) {
298
+ console.log(` ${step.stepName}: ${step.status} (attempt ${step.attempt})`);
299
+ }
300
+ if (result.error)
301
+ console.error(`Ошибка: ${result.error}`);
302
+ if (result.logFile)
303
+ console.log(`Лог: ${result.logFile}`);
304
+ if (result.runId)
305
+ console.log(`Запуск: ${result.runId}`);
306
+ }
307
+ return result.success ? 0 : 1;
308
+ }
309
+ catch (err) {
310
+ console.error(`Ошибка миссии: ${err instanceof Error ? err.message : String(err)}`);
311
+ return 1;
312
+ }
313
+ finally {
314
+ closeDb();
315
+ }
316
+ }
317
+ async function main(argv) {
318
+ const [group, command, ...rest] = argv;
319
+ if (group === "--help" || group === "-h" || group === "help" || !group) {
320
+ console.log(USAGE);
321
+ return group ? 0 : 2;
322
+ }
323
+ if (group === "run") {
324
+ return runAdHoc([command, ...rest].filter((value) => Boolean(value)));
325
+ }
326
+ if (group !== "pipeline") {
327
+ console.error(`Неизвестная команда «${group}».\n`);
328
+ console.error(USAGE);
329
+ return 2;
330
+ }
331
+ switch (command) {
332
+ case "--help":
333
+ case "-h":
334
+ case "help":
335
+ console.log(USAGE);
336
+ return 0;
337
+ case "validate":
338
+ return runValidate(rest);
339
+ case "apply":
340
+ return runApply(rest);
341
+ case "export":
342
+ return runExport(rest);
343
+ default:
344
+ console.error(`Неизвестная команда pipeline «${command ?? ""}».\n`);
345
+ console.error(USAGE);
346
+ return 2;
347
+ }
348
+ }
349
+ main(process.argv.slice(2))
350
+ .then((code) => {
351
+ process.exitCode = code;
352
+ })
353
+ .catch((err) => {
354
+ console.error(`Ошибка: ${err instanceof Error ? err.message : String(err)}`);
355
+ process.exitCode = 1;
356
+ });
@@ -24,6 +24,8 @@ export interface AnalyticsRecord {
24
24
  export interface AnalyticsTaskRef {
25
25
  name: string;
26
26
  matrixParentId?: string | null;
27
+ /** Экономика v2 (E-2): лимит токенов на запуск (0/undefined — без лимита). */
28
+ tokenBudget?: number;
27
29
  }
28
30
  export interface DailyBucket {
29
31
  /** YYYY-MM-DD (UTC). */
@@ -49,6 +51,10 @@ export interface TaskAnalyticsRow {
49
51
  /** Задача — клон матрицы (matrixParentId задан). */
50
52
  isMatrixClone: boolean;
51
53
  matrixParentId: string | null;
54
+ /** Экономика v2 (E-2): лимит токенов на запуск (0 — без лимита). */
55
+ tokenBudget?: number;
56
+ /** Сумма токенов за период превысила лимит на задачу. */
57
+ tokenBudgetExceeded?: boolean;
52
58
  }
53
59
  export interface MatrixAnalyticsRow {
54
60
  parentId: string;
@@ -1 +1 @@
1
- {"version":3,"file":"analytics.d.ts","sourceRoot":"","sources":["../../src/core/analytics.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"analytics.d.ts","sourceRoot":"","sources":["../../src/core/analytics.ts"],"names":[],"mappings":"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"}
@@ -62,10 +62,15 @@ export function buildAnalytics(records, options = {}) {
62
62
  const byModel = new Map();
63
63
  const byError = new Map();
64
64
  const cloneParent = new Map();
65
+ const taskTokenBudget = new Map();
65
66
  for (const task of options.tasks ?? []) {
66
67
  const parentId = task.matrixParentId?.trim();
67
68
  if (parentId)
68
69
  cloneParent.set(task.name.toLowerCase(), parentId);
70
+ const budget = Number(task.tokenBudget);
71
+ if (Number.isFinite(budget) && budget > 0) {
72
+ taskTokenBudget.set(task.name.toLowerCase(), budget);
73
+ }
69
74
  }
70
75
  let totalsTotal = 0;
71
76
  let totalsSuccess = 0;
@@ -132,7 +137,11 @@ export function buildAnalytics(records, options = {}) {
132
137
  costUsd: 0,
133
138
  isMatrixClone: cloneParent.has(taskKey),
134
139
  matrixParentId: cloneParent.get(taskKey) ?? null,
140
+ tokenBudget: taskTokenBudget.get(taskKey),
141
+ tokenBudgetExceeded: false,
142
+ maxRunTokens: 0,
135
143
  };
144
+ existing.maxRunTokens = Math.max(existing.maxRunTokens, tokens);
136
145
  existing.total += 1;
137
146
  if (status === "success")
138
147
  existing.success += 1;
@@ -152,8 +161,11 @@ export function buildAnalytics(records, options = {}) {
152
161
  byModel.set(model, modelRow);
153
162
  // Топ ошибок: группируем по тексту, чтобы дайджест показывал частые причины.
154
163
  if (status !== "success" && status !== "partial") {
155
- const message = typeof record.error === "string" && record.error.trim()
156
- ? record.error.trim().slice(0, 160)
164
+ // QA-P1.5: легаси-записи успешных запусков содержат "-" вместо текста
165
+ // ошибки. Такой маркер не является сообщением и не должен попадать в топ.
166
+ const rawError = typeof record.error === "string" ? record.error.trim() : "";
167
+ const message = rawError && rawError !== "-"
168
+ ? rawError.slice(0, 160)
157
169
  : "(без текста)";
158
170
  const errorRow = byError.get(message) ?? {
159
171
  message,
@@ -169,11 +181,16 @@ export function buildAnalytics(records, options = {}) {
169
181
  }
170
182
  }
171
183
  const tasks = [...byTask.values()]
172
- .map((row) => ({
184
+ .map(({ maxRunTokens, ...row }) => ({
173
185
  ...row,
174
186
  successRate: percent(row.success, row.total),
175
187
  avgDurationMs: Math.round(row.avgDurationMs),
176
188
  costUsd: Math.round(row.costUsd * 1e6) / 1e6,
189
+ // E-2: бюджет задаётся на один запуск, поэтому флаг выставляем по
190
+ // максимальному расходу токенов за запуск, а не по сумме за период.
191
+ tokenBudgetExceeded: row.tokenBudget
192
+ ? maxRunTokens > row.tokenBudget
193
+ : false,
177
194
  }))
178
195
  .sort((a, b) => b.total - a.total || a.taskName.localeCompare(b.taskName));
179
196
  const matrices = new Map();
@@ -79,6 +79,12 @@ export declare function recordToolBlocked(input: ToolBlockedInput): number | nul
79
79
  * неограничен. Возвращает число записанных событий.
80
80
  */
81
81
  export declare function recordTaskToolBlocks(task: string, allowedTools: readonly string[] | null | undefined, deniedTools: readonly string[] | null | undefined, actor?: AuditActor, source?: string, policy?: PermissionPolicy, legacyShell?: boolean): number;
82
+ /**
83
+ * QA-P3.1: единообразная проверка ISO-дат для фильтров аудита.
84
+ * Возвращает текст ошибки или null — чтобы все вызывающие (MCP, RPC, HTTP)
85
+ * отвечали одинаково, а не молча отдавали пустую выборку.
86
+ */
87
+ export declare function auditDateFilterError(value: string | null | undefined, name: "since" | "until"): string | null;
82
88
  /** Читает журнал аудита (новые сверху). */
83
89
  export declare function readAuditLog(filter?: ReadAuditFilter): ReadAuditResult;
84
90
  /**
@@ -1 +1 @@
1
- {"version":3,"file":"audit.d.ts","sourceRoot":"","sources":["../../src/core/audit.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"audit.d.ts","sourceRoot":"","sources":["../../src/core/audit.ts"],"names":[],"mappings":"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"}
@@ -199,8 +199,32 @@ export function recordTaskToolBlocks(task, allowedTools, deniedTools, actor = "s
199
199
  }
200
200
  return written;
201
201
  }
202
+ /**
203
+ * QA-P3.1: единообразная проверка ISO-дат для фильтров аудита.
204
+ * Возвращает текст ошибки или null — чтобы все вызывающие (MCP, RPC, HTTP)
205
+ * отвечали одинаково, а не молча отдавали пустую выборку.
206
+ */
207
+ export function auditDateFilterError(value, name) {
208
+ if (value === null || value === undefined)
209
+ return null;
210
+ const trimmed = String(value).trim();
211
+ if (!trimmed)
212
+ return null;
213
+ if (Number.isNaN(Date.parse(trimmed))) {
214
+ return `Некорректный параметр ${name}: ожидается ISO-дата.`;
215
+ }
216
+ return null;
217
+ }
202
218
  /** Читает журнал аудита (новые сверху). */
203
219
  export function readAuditLog(filter = {}) {
220
+ for (const [name, value] of [
221
+ ["since", filter.since],
222
+ ["until", filter.until],
223
+ ]) {
224
+ const dateError = auditDateFilterError(value, name);
225
+ if (dateError)
226
+ throw new Error(dateError);
227
+ }
204
228
  const limit = Math.max(1, Math.min(5000, Math.floor(filter.limit ?? 200) || 200));
205
229
  const where = [];
206
230
  const params = [];
@@ -0,0 +1,118 @@
1
+ /**
2
+ * Бюджеты день/неделя (Экономика v2, E-1.1).
3
+ *
4
+ * Чистые функции без БД, HTTP и ОС: расход считается из уже загруженной
5
+ * истории запусков, лимиты задаются пользователем в settings.json.
6
+ * Fail-open по умолчанию: выключенная группа или нулевой лимит никогда
7
+ * не блокируют запуски — они только перестают проверяться.
8
+ */
9
+ import { type AnalyticsRecord } from "./analytics.js";
10
+ export type BudgetPeriod = "day" | "week";
11
+ /** Лимиты в USD. 0 означает «без лимита» (fail-open). */
12
+ export interface BudgetSettings {
13
+ /** Включён ли учёт/проверка бюджетов. */
14
+ enabled: boolean;
15
+ /** Лимит на один UTC-день, USD (0 — без лимита). */
16
+ dailyUsd: number;
17
+ /** Лимит на одну UTC-неделю (с понедельника), USD (0 — без лимита). */
18
+ weeklyUsd: number;
19
+ }
20
+ export declare const DEFAULT_BUDGET_SETTINGS: BudgetSettings;
21
+ export declare function defaultBudgetSettings(): BudgetSettings;
22
+ /** Учёт одного периода: потрачено, осталось, достигнут ли лимит. */
23
+ export interface BudgetUsage {
24
+ period: BudgetPeriod;
25
+ /** Начало периода в UTC, ISO-строка. */
26
+ periodStart: string;
27
+ /** Конечный лимит, USD (0 — лимит выключен). */
28
+ limitUsd: number;
29
+ /** Потрачено завершёнными запусками в периоде, USD. */
30
+ spentUsd: number;
31
+ /** Сколько запусков попало в период. */
32
+ runs: number;
33
+ /** Остаток; 0, если лимит выключен или уже исчерпан. */
34
+ remainingUsd: number;
35
+ /** Доля расхода от лимита (0, если лимит выключен). Может быть > 1. */
36
+ ratio: number;
37
+ /** Лимит включён и расход достиг/превысил его. */
38
+ exceeded: boolean;
39
+ /**
40
+ * Проверка не активна: группа выключена глобально или лимит равен нулю.
41
+ * По умолчанию true — fail-open.
42
+ */
43
+ disabled: boolean;
44
+ }
45
+ export interface BudgetReport {
46
+ generatedAt: string;
47
+ enabled: boolean;
48
+ day: BudgetUsage;
49
+ week: BudgetUsage;
50
+ /** Хотя бы один включённый лимит достигнут/превышен. */
51
+ exceeded: boolean;
52
+ }
53
+ /** Начало UTC-дня, в котором находится `now`. */
54
+ export declare function startOfUtcDay(now: Date): Date;
55
+ /** Начало UTC-недели (понедельник 00:00), в которой находится `now`. */
56
+ export declare function startOfUtcWeek(now: Date): Date;
57
+ /**
58
+ * Считает расход за текущий UTC-день и UTC-неделю (с понедельника).
59
+ * Запуск относится к периоду по времени завершения (`finishedAt`, при
60
+ * отсутствии — `startedAt`); даты вне периода и статус `running` игнорируются.
61
+ */
62
+ export declare function buildBudgetReport(records: AnalyticsRecord[], settings?: BudgetSettings, now?: Date): BudgetReport;
63
+ /** Причина решения гейта запуска. */
64
+ export type BudgetGateReason = "disabled" | "within_limit" | "day_exceeded" | "week_exceeded";
65
+ /** Решение: можно ли начинать новый запуск. */
66
+ export interface BudgetGateDecision {
67
+ allowed: boolean;
68
+ reason: BudgetGateReason;
69
+ /** Какой лимит сработал (только при exceeded). */
70
+ period?: BudgetPeriod;
71
+ report: BudgetReport;
72
+ }
73
+ /**
74
+ * E-1.2: авто-пауза при превышении лимита.
75
+ *
76
+ * Fail-open: если группа выключена или оба лимита нулевые, запуски не
77
+ * блокируются. Иначе новый запуск пропускается, как только расход за
78
+ * текущий день/неделю достиг лимита. Дневной лимит проверяется первым.
79
+ */
80
+ export declare function evaluateBudgetGate(records: AnalyticsRecord[], settings?: BudgetSettings, now?: Date): BudgetGateDecision;
81
+ /** Человекочитаемая причина пропуска; пустая строка, если запуск разрешён. */
82
+ export declare function formatBudgetSkipMessage(decision: BudgetGateDecision): string;
83
+ /**
84
+ * E-1.3: текст алерта о превышении бюджета. Пустая строка, если лимит не
85
+ * превышен. Отличается от сообщения о пропуске запуска (E-1.2) тем, что
86
+ * явно сообщает об остановке всех новых запусков.
87
+ */
88
+ export declare function formatBudgetAlertMessage(decision: BudgetGateDecision): string;
89
+ /**
90
+ * E-2.2: гейт токен-бюджета одной задачи (per-task token budget).
91
+ *
92
+ * Лимит задаётся в определении задачи (`tokenBudget`, токены на один запуск).
93
+ * Если какой-либо завершённый прогон задачи в текущем UTC-дне/неделе превысил
94
+ * лимит, новые запуски пропускаются до начала следующего периода — та же
95
+ * логика, что у глобального бюджетного гейта E-1.2, но в разрезе одной задачи.
96
+ * Fail-open: лимит 0/undefined отключает проверку, запуски не блокируются.
97
+ */
98
+ export type TaskTokenBudgetReason = "no_budget" | "within_limit" | "day_exceeded" | "week_exceeded";
99
+ export interface TaskTokenBudgetDecision {
100
+ allowed: boolean;
101
+ reason: TaskTokenBudgetReason;
102
+ taskName: string;
103
+ tokenBudget: number;
104
+ /** Максимум токенов за один прогон в сработавшем периоде. */
105
+ maxRunTokens: number;
106
+ period?: BudgetPeriod;
107
+ }
108
+ /**
109
+ * Решение гейта персонального токен-бюджета задачи.
110
+ *
111
+ * Источник данных — уже загруженная история (`getHistoryForBudget`). Как и в
112
+ * аналитике (QA-B.1), превышение считается по одному прогону, а не по сумме за
113
+ * период; дневное окно проверяется первым (как дневной лимит в E-1.2).
114
+ */
115
+ export declare function evaluateTaskTokenBudgetGate(records: AnalyticsRecord[], taskName: string, tokenBudget: number | undefined, now?: Date): TaskTokenBudgetDecision;
116
+ /** Человекочитаемая причина пропуска; пустая строка, если запуск разрешён. */
117
+ export declare function formatTaskTokenBudgetSkipMessage(decision: TaskTokenBudgetDecision): string;
118
+ //# sourceMappingURL=budget.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"budget.d.ts","sourceRoot":"","sources":["../../src/core/budget.ts"],"names":[],"mappings":"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"}