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
@@ -1,8 +1,11 @@
1
1
  import fs from "node:fs/promises";
2
+ import fsSync from "node:fs";
2
3
  import path from "node:path";
3
4
  import { WRAPPER_DIR } from "../../types.js";
4
5
  import { shellQuote } from "../scheduler/posix.js";
5
6
  import type { ScheduleGateSpec } from "../schedule-v2.js";
7
+ import type { TaskGuards } from "../guard.js";
8
+ import { createGateSnapshot } from "../gate-integrity.js";
6
9
  import {
7
10
  buildOpencodeConfig as buildPermissionsConfig,
8
11
  formatPolicyLog,
@@ -76,8 +79,36 @@ export interface BashWrapperOptions {
76
79
  * 0 — без таймаута. Зависший хук не должен держать lock.
77
80
  */
78
81
  gateTimeoutSeconds?: number;
82
+ /** W-1 (0.0.6): запустить задачу в одноразовом git worktree. */
83
+ worktree?: boolean;
84
+ /** Путь к dist/core/worktree-run.js (обязателен при worktree=true). */
85
+ worktreeHelper?: string;
86
+ /** W-3 (0.0.6): guard-условия перед запуском opencode. */
87
+ guards?: TaskGuards;
88
+ /** Путь к dist/core/guard-run.js (обязателен при guards). */
89
+ guardHelper?: string;
90
+ /** PL-47: пути, которые задача вправе изменить (из -Files afterScript). */
91
+ gateAllowPaths?: string;
79
92
  }
80
93
 
94
+ /**
95
+ * B6: разбор PID из lock-токена для bash-обёртки.
96
+ *
97
+ * Понимает единый `<pid>-<iso>` (Node и PS), legacy PS `<iso>|<pid>`
98
+ * и голый `<pid>` (pid-файл самой bash-обёртки). Legacy PS проверяется
99
+ * первым: иначе год из ISO был бы принят за PID.
100
+ */
101
+ export const BASH_LOCK_PID_FUNCTION = `parse_lock_pid() {
102
+ local text="$1"
103
+ case "$text" in
104
+ *"|"*) printf '%s' "\${text##*|}" ;;
105
+ [0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]T*) printf '' ;;
106
+ [0-9]*-*) printf '%s' "\${text%%-*}" ;;
107
+ [0-9]*) printf '%s' "$text" ;;
108
+ *) printf '' ;;
109
+ esac
110
+ }`;
111
+
81
112
  /**
82
113
  * Собирает текст bash-обёртки.
83
114
  *
@@ -96,6 +127,7 @@ export interface BashWrapperOptions {
96
127
  */
97
128
  export function buildBashWrapperScript(options: BashWrapperOptions): string {
98
129
  const {
130
+ sanitizedName,
99
131
  taskName,
100
132
  promptFile,
101
133
  timeoutSeconds,
@@ -119,8 +151,38 @@ export function buildBashWrapperScript(options: BashWrapperOptions): string {
119
151
  scheduleGate,
120
152
  envFile,
121
153
  gateTimeoutSeconds,
154
+ worktree,
155
+ worktreeHelper,
156
+ guards,
157
+ guardHelper,
158
+ gateAllowPaths,
122
159
  } = options;
123
160
 
161
+ // G-1.2: фиксируем входы гейта при создании обёртки и передаём путь
162
+ // snapshot'а и помощника проверки в сгенерированный скрипт.
163
+ let gateSnapshot = "";
164
+ let gateIntegrity = "";
165
+ if (qualityGate?.trim()) {
166
+ const safeGateTimeout =
167
+ typeof gateTimeoutSeconds === "number" && Number.isFinite(gateTimeoutSeconds)
168
+ ? Math.max(0, Math.floor(gateTimeoutSeconds))
169
+ : 300;
170
+ let prompt = "";
171
+ try {
172
+ prompt = fsSync.readFileSync(promptFile || "", "utf8");
173
+ } catch {
174
+ // Промпт мог быть удалён — snapshot всё равно уникален для задачи.
175
+ }
176
+ gateSnapshot = createGateSnapshot(sanitizedName || taskName, {
177
+ gate: qualityGate,
178
+ prompt,
179
+ gateTimeoutSeconds: safeGateTimeout,
180
+ });
181
+ gateIntegrity = recorderFile
182
+ ? path.join(path.dirname(recorderFile), "gate-integrity.js")
183
+ : "";
184
+ }
185
+
124
186
  const effectivePermissions = resolvePermissions({
125
187
  policy,
126
188
  legacyShell,
@@ -139,12 +201,24 @@ export function buildBashWrapperScript(options: BashWrapperOptions): string {
139
201
  `LOCK_FILE=${shellQuote(lockFile)}`,
140
202
  `WORKDIR=${shellQuote(workdir || process.cwd())}`,
141
203
  `WORKSPACE_NAME=${shellQuote(workspaceName ?? "")}`,
204
+ // W-1 (0.0.6): одноразовый git worktree на запуск.
205
+ `WORKTREE_MODE=${worktree ? 1 : 0}`,
206
+ `WORKTREE_HELPER=${shellQuote(worktreeHelper ?? "")}`,
207
+ // W-3 (0.0.6): guard-условия. Пустая строка = guard не настроен.
208
+ `GUARD_HELPER=${shellQuote(guardHelper ?? "")}`,
209
+ `GUARD_B64=${shellQuote(guards ? Buffer.from(JSON.stringify(guards), "utf8").toString("base64") : "")}`,
210
+ // W-4 (0.0.6): причина пропуска в history (fixed, без произвольного текста из лога).
211
+ `GUARD_SKIP_B64=${shellQuote(Buffer.from("guard conditions not met", "utf8").toString("base64"))}`,
142
212
  `TIMEOUT_SECONDS=${Number.isFinite(timeoutSeconds) ? Math.max(0, Math.floor(timeoutSeconds)) : 3600}`,
143
213
  // Маркер сработавшего watchdog: по нему обёртка отличает таймаут от
144
214
  // обычного ненулевого кода возврата (SIGTERM/SIGKILL неотличимы от падения).
145
215
  `TIMEOUT_MARKER=${shellQuote(`${lockFile}.timeout`)}`,
146
216
  `RECORDER_FILE=${shellQuote(recorderFile ?? "")}`,
147
217
  `QUALITY_GATE=${shellQuote(qualityGate ?? "")}`,
218
+ // G-1.2: путь к snapshot'у и CLI проверки целостности входов гейта.
219
+ `GATE_SNAPSHOT=${shellQuote(gateSnapshot)}`,
220
+ `GATE_INTEGRITY=${shellQuote(gateIntegrity)}`,
221
+ `GATE_ALLOW_PATHS=${shellQuote(gateAllowPaths ?? "")}`,
148
222
  `MODEL=${shellQuote(model ?? "")}`,
149
223
  // Спринт 24: режим сессии — "new" (по умолчанию), "reuse" (--session <id>), "last" (--continue).
150
224
  `SESSION_MODE=${shellQuote(sessionMode ?? "new")}`,
@@ -188,6 +262,8 @@ export function buildBashWrapperScript(options: BashWrapperOptions): string {
188
262
  ' printf \'[%s] %s\\n\' "$(date \'+%Y-%m-%d %H:%M:%S\')" "$*" >> "$LOG_FILE" 2>/dev/null || true',
189
263
  "}",
190
264
  "",
265
+ BASH_LOCK_PID_FUNCTION,
266
+ "",
191
267
  'log "[role-scoped] opencode config passed via OPENCODE_CONFIG_CONTENT"',
192
268
  `log ${shellQuote(`[policy] ${formatPolicyLog(effectivePermissions)}`)}`,
193
269
  ...effectivePermissions.deniedByPolicy.map(
@@ -254,8 +330,35 @@ export function buildBashWrapperScript(options: BashWrapperOptions): string {
254
330
  "fi",
255
331
  "",
256
332
  "# Атомарная блокировка: mkdir завершается ошибкой, если каталог уже есть.",
257
- "# В каталог пишем PID: после kill -9 осиротевший lock снимается, а не",
258
- "# блокирует задачу до истечения STALE_LOCK_MAX_AGE_MS.",
333
+ "# B6: перед своим каталогом проверяем файловый lock Node/PS (<lock>):",
334
+ "# они держат файл, а bash — каталог. Без этой проверки Node-процесс и",
335
+ "# bash-обёртка могли выполнять одну задачу одновременно.",
336
+ 'if [ -f "$LOCK_FILE" ]; then',
337
+ ' LOCK_OWNER_RAW="$(cat "$LOCK_FILE" 2>/dev/null || true)"',
338
+ ' LOCK_FILE_PID="$(parse_lock_pid "$LOCK_OWNER_RAW")"',
339
+ ' if [ -z "$LOCK_FILE_PID" ]; then',
340
+ ' log "[scheduler] Не удалось определить владельца lock — пропуск запуска."',
341
+ " exit 0",
342
+ " fi",
343
+ ' if kill -0 "$LOCK_FILE_PID" 2>/dev/null; then',
344
+ ' log "[scheduler] Задача \'$TASK_NAME\' уже выполняется (pid $LOCK_FILE_PID) — пропуск запуска."',
345
+ " exit 0",
346
+ " fi",
347
+ " # Владелец мёртв: атомарно уводим файл, чтобы не удалить lock, который",
348
+ " # другой воркер успел пересоздать.",
349
+ ' STALE_LOCK_FILE="$LOCK_FILE.stale-$$-$(date +%s)"',
350
+ ' if ! mv "$LOCK_FILE" "$STALE_LOCK_FILE" 2>/dev/null; then',
351
+ ' if [ -f "$LOCK_FILE" ]; then',
352
+ ' log "[scheduler] Не удалось вытеснить осиротевший lock \'$LOCK_FILE\' — пропуск запуска."',
353
+ " exit 0",
354
+ " fi",
355
+ " else",
356
+ ' rm -f "$STALE_LOCK_FILE" 2>/dev/null || true',
357
+ " fi",
358
+ "fi",
359
+ "",
360
+ "# B6: в pid-файл пишем `<pid>-<iso>`, а не голый PID — так его читают",
361
+ "# Node и PS общим парсером. После kill -9 lock снимается по мёртвому PID.",
259
362
  'if ! mkdir "$LOCK_FILE.d" 2>/dev/null; then',
260
363
  ' if [ ! -d "$LOCK_FILE.d" ]; then',
261
364
  ' log "[scheduler] Не удалось создать lock \'$LOCK_FILE.d\' — запуск отменён."',
@@ -263,7 +366,7 @@ export function buildBashWrapperScript(options: BashWrapperOptions): string {
263
366
  " fi",
264
367
  ' LOCK_PID=""',
265
368
  ' if [ -f "$LOCK_FILE.d/pid" ]; then',
266
- ' LOCK_PID="$(cat "$LOCK_FILE.d/pid" 2>/dev/null || true)"',
369
+ ' LOCK_PID="$(parse_lock_pid "$(cat "$LOCK_FILE.d/pid" 2>/dev/null || true)")"',
267
370
  " fi",
268
371
  " LOCK_ALIVE=1",
269
372
  ' if [ -n "$LOCK_PID" ]; then',
@@ -288,14 +391,61 @@ export function buildBashWrapperScript(options: BashWrapperOptions): string {
288
391
  " exit 0",
289
392
  " fi",
290
393
  "fi",
291
- 'printf \'%s\\n\' "$$" > "$LOCK_FILE.d/pid" 2>/dev/null || true',
292
- 'cleanup() { rmdir "$LOCK_FILE.d" 2>/dev/null || rm -rf "$LOCK_FILE.d" 2>/dev/null; }',
394
+ 'printf \'%s\\n\' "$$-$(date -u +%Y-%m-%dT%H:%M:%SZ)" > "$LOCK_FILE.d/pid" 2>/dev/null || true',
395
+ "cleanup_worktree() {",
396
+ " if [ -n \"${AGENT_STEWARD_WORKTREE:-}\" ] && [ -n \"$WORKTREE_HELPER\" ] && command -v node >/dev/null 2>&1; then",
397
+ " cd \"$WORKDIR\" 2>/dev/null || true",
398
+ " node \"$WORKTREE_HELPER\" cleanup --path \"$AGENT_STEWARD_WORKTREE\" --repo \"$WORKDIR\" >> \"$LOG_FILE\" 2>&1 || true",
399
+ ' AGENT_STEWARD_WORKTREE=""',
400
+ " fi",
401
+ "}",
402
+ 'cleanup() { cleanup_worktree; rmdir "$LOCK_FILE.d" 2>/dev/null || rm -rf "$LOCK_FILE.d" 2>/dev/null; }',
293
403
  "trap cleanup EXIT INT TERM",
294
404
  "",
295
405
  'if [ -n "$WORKDIR" ] && [ -d "$WORKDIR" ]; then',
296
406
  ' cd "$WORKDIR" || { log "[scheduler] Не удалось перейти в $WORKDIR"; exit 1; }',
297
407
  "fi",
298
408
  "",
409
+ "# W-1 (0.0.6): одноразовый git worktree. Ошибка создания — fail-closed:",
410
+ "# задача не должна молча работать в основном дереве репозитория.",
411
+ 'if [ "$WORKTREE_MODE" = "1" ]; then',
412
+ ' if [ -z "$WORKTREE_HELPER" ] || ! command -v node >/dev/null 2>&1; then',
413
+ ' log "[scheduler] ОШИБКА: помощник worktree недоступен (нет node или worktree-run.js). Запуск отменён."',
414
+ " exit 1",
415
+ " fi",
416
+ ' AGENT_STEWARD_WORKTREE="$(node "$WORKTREE_HELPER" --repo "$WORKDIR" --task "$TASK_NAME" 2>> "$LOG_FILE" | tail -n 1)"',
417
+ ' if [ -z "$AGENT_STEWARD_WORKTREE" ]; then',
418
+ ' log "[scheduler] ОШИБКА: не удалось создать git worktree для \'$TASK_NAME\' — запуск отменён."',
419
+ " exit 1",
420
+ " fi",
421
+ " export AGENT_STEWARD_WORKTREE",
422
+ ' export AGENT_STEWARD_WORKTREE_REPO="$WORKDIR"',
423
+ ' log "[scheduler] Git worktree: $AGENT_STEWARD_WORKTREE"',
424
+ ' cd "$AGENT_STEWARD_WORKTREE" || { log "[scheduler] Не удалось перейти в worktree $AGENT_STEWARD_WORKTREE"; exit 1; }',
425
+ "fi",
426
+ "",
427
+ ...(guards
428
+ ? [
429
+ "# W-3 (0.0.6): guard-условия до запуска opencode. Код 4 — штатный skip,",
430
+ "# ненулевой код — ошибка проверки. В обоих случаях opencode не запускается,",
431
+ "# а созданный worktree убирается через trap cleanup.",
432
+ 'if [ -n "$GUARD_HELPER" ] && [ -n "$GUARD_B64" ]; then',
433
+ ' node "$GUARD_HELPER" --cwd "$PWD" --guards-b64 "$GUARD_B64" >> "$LOG_FILE" 2>&1',
434
+ " GUARD_STATUS=$?",
435
+ ' if [ "$GUARD_STATUS" -eq 4 ]; then',
436
+ ' log "[scheduler] guard: run skipped (условия не выполнены)"',
437
+ ' if [ -n "$RECORDER_FILE" ] && command -v node >/dev/null 2>&1; then',
438
+ ' node "$RECORDER_FILE" --skip "$TASK_NAME" "$GUARD_SKIP_B64" >> "$LOG_FILE" 2>&1 || true',
439
+ " fi",
440
+ " exit 0",
441
+ ' elif [ "$GUARD_STATUS" -ne 0 ]; then',
442
+ ' log "[scheduler] ОШИБКА: guard helper завершился с кодом $GUARD_STATUS — запуск отменён."',
443
+ " exit 1",
444
+ " fi",
445
+ "fi",
446
+ "",
447
+ ]
448
+ : []),
299
449
  "# Спринт 21: env-переменные workspace. Файл пишет плагин, значения не логируются.",
300
450
  'if [ -n "$ENV_FILE" ] && [ -f "$ENV_FILE" ]; then',
301
451
  ' while IFS= read -r env_line || [ -n "$env_line" ]; do',
@@ -338,15 +488,29 @@ export function buildBashWrapperScript(options: BashWrapperOptions): string {
338
488
  "fi",
339
489
  "",
340
490
  'PROMPT="$(cat "$PROMPT_FILE" 2>/dev/null || true)"',
491
+ "# W-1: сообщаем агенту, что он работает в одноразовом git worktree.",
492
+ 'if [ -n "${AGENT_STEWARD_WORKTREE:-}" ]; then',
493
+ ' PROMPT="[agent-steward] Рабочая директория запуска - одноразовый git worktree: $AGENT_STEWARD_WORKTREE',
494
+ '$PROMPT"',
495
+ "fi",
341
496
  "# T-09: backstop размера промпта на POSIX (argv ограничен MAX_ARG_STRLEN",
342
- "# 128 КиБ на аргумент в Linux). Считаем байты, а не символы.",
497
+ "# 128 КиБ на аргумент в Linux). Считаем байты, а не символы. Лимит включает",
498
+ "# завершающий NUL, поэтому максимум полезных данных — 131071 байт (B11.2).",
343
499
  'PROMPT_BYTES="$(printf %s "$PROMPT" | wc -c | tr -d \' \')"',
344
- 'if [ "$PROMPT_BYTES" -gt 131072 ] 2>/dev/null; then',
345
- ' log "[scheduler] ОШИБКА: промпт слишком длинный для argv POSIX: ${PROMPT_BYTES} байт (максимум 131072)."',
500
+ 'if [ "$PROMPT_BYTES" -ge 131072 ] 2>/dev/null; then',
501
+ ' log "[scheduler] ОШИБКА: промпт слишком длинный для argv POSIX: ${PROMPT_BYTES} байт (максимум 131071)."',
346
502
  " exit 1",
347
503
  "fi",
348
504
  'START_EPOCH="$(date +%s)"',
349
505
  'STARTED_AT="$(date -u \'+%Y-%m-%dT%H:%M:%SZ\')"',
506
+ // PL-25: снимаем состояние рабочего дерева до запуска ИИ; перед гейтом сверяем.
507
+ 'WT_SNAPSHOT=""',
508
+ 'if [ -n "$QUALITY_GATE" ] && [ -n "$GATE_SNAPSHOT" ] && [ -n "$GATE_INTEGRITY" ] && [ -n "$WORKDIR" ] && [ -f "$GATE_INTEGRITY" ]; then',
509
+ ' WT_SNAPSHOT="${GATE_SNAPSHOT%.json}.worktree.json"',
510
+ ' ALLOW_ARGS=""',
511
+ ' if [ -n "$GATE_ALLOW_PATHS" ]; then ALLOW_ARGS="--allow $GATE_ALLOW_PATHS"; fi',
512
+ ' node "$GATE_INTEGRITY" worktree-snapshot --dir "$WORKDIR" --out "$WT_SNAPSHOT" $ALLOW_ARGS >> "$LOG_FILE" 2>&1 || true',
513
+ "fi",
350
514
  "EXIT_CODE=0",
351
515
  'ERROR_MESSAGE=""',
352
516
  'PRE_FLIGHT_STATUS="skipped"',
@@ -362,13 +526,37 @@ export function buildBashWrapperScript(options: BashWrapperOptions): string {
362
526
  ' RUN_ID="$(node "$RECORDER_FILE" --start "$TASK_NAME" "$STARTED_AT" 2>> "$LOG_FILE" | tail -n 1)"',
363
527
  "fi",
364
528
  "",
529
+ // PL-7.2: отдельный вызов хука с разделением stdout/stderr и structured логом.
530
+ "hook_output() {",
531
+ ' local phase="$1" code="$2" out="$3" err="$4" helper',
532
+ ' if [ -z "$RECORDER_FILE" ] || ! command -v node >/dev/null 2>&1; then',
533
+ " return 0",
534
+ " fi",
535
+ ' helper="$(dirname "$RECORDER_FILE")/hook-output.js"',
536
+ ' [ -f "$helper" ] || return 0',
537
+ ' node "$helper" "$phase" "$TASK_NAME" "$code" "$out" "$err" "${RUN_ID:-}" >> "$LOG_FILE" 2>&1 || true',
538
+ "}",
539
+ "run_hook_captured() {",
540
+ ' local phase="$1" command="$2" out err code',
541
+ ' out="$(mktemp)"',
542
+ ' err="$(mktemp)"',
543
+ ' run_with_timeout "$GATE_TIMEOUT_SECONDS" bash -c "$command" >"$out" 2>"$err"',
544
+ " code=$?",
545
+ ' cat "$out" >> "$LOG_FILE"',
546
+ ' cat "$err" >> "$LOG_FILE"',
547
+ ' hook_output "$phase" "$code" "$out" "$err"',
548
+ ' rm -f "$out" "$err"',
549
+ " return $code",
550
+ "}",
551
+ "",
365
552
  "# Pre-flight: выполняется до основной задачи. Ненулевой код отменяет запуск.",
366
553
  'if [ -n "$BEFORE_SCRIPT" ]; then',
367
554
  ' log "[scheduler] Pre-flight: $BEFORE_SCRIPT"',
368
- ' run_with_timeout "$GATE_TIMEOUT_SECONDS" bash -c "$BEFORE_SCRIPT" >> "$LOG_FILE" 2>&1',
555
+ ' run_hook_captured "preFlight" "$BEFORE_SCRIPT"',
369
556
  " PRE_CODE=$?",
370
557
  ' if [ "$PRE_CODE" -ne 0 ]; then',
371
- ' log "[scheduler] ОШИБКА: Pre-flight script failed (код $PRE_CODE)."',
558
+ " # PL-6.1: last command in a hook defines the exit code — add explicit exit 0.",
559
+ ' log "[scheduler] ОШИБКА: Pre-flight script failed (код $PRE_CODE). Завершите хук явным exit 0 (например: rm -f \"$path\" || true; exit 0)."',
372
560
  ' PRE_FLIGHT_STATUS="error"',
373
561
  ' ERROR_MESSAGE="Pre-flight script failed"',
374
562
  " EXIT_CODE=1",
@@ -381,40 +569,48 @@ export function buildBashWrapperScript(options: BashWrapperOptions): string {
381
569
  "",
382
570
  'if [ "$SKIP_MAIN" -eq 0 ]; then',
383
571
  "",
572
+ // QA-P0.2: маркер границы реального прогона. Пишется без префикса времени,
573
+ // чтобы extractLastRunLog() смог отсечь вывод предыдущих запусков и
574
+ // подготовительные записи. До этой точки запуск мог быть отменён guard-ом
575
+ // или pre-flight, поэтому маркер нельзя ставить раньше.
576
+ 'printf \'[agent-steward] === Run started %s (%s) ===\\n\' "$(date -u \'+%Y-%m-%dT%H:%M:%SZ\')" "$TASK_NAME" >> "$LOG_FILE" 2>/dev/null || true',
577
+ "",
384
578
  "# Модель указывается только если задана — иначе OpenCode берёт свою по умолчанию.",
385
579
  "# exec важен: в фоновом режиме он заменяет подоболочку процессом opencode,",
386
580
  "# поэтому $! — это PID самого opencode, и watchdog убивает именно его.",
387
581
  "# Ветвление вместо массива: bash 3.2 (macOS) с set -u падает на пустом",
388
582
  '# "${ARR[@]}".',
389
583
  "run_opencode() {",
584
+ " # QV-8: дочерний opencode run не загружает инструменты планировщика.",
585
+ " export AGENT_STEWARD_CHILD_RUN=1",
390
586
  ' if [ "$SESSION_MODE" = "reuse" ]; then',
391
587
  ' if [ -n "$SESSION_FILE" ] && [ -f "$SESSION_FILE" ]; then',
392
588
  ' SESSION_ID="$(head -n 1 "$SESSION_FILE" 2>/dev/null | tr -d "\\r")"',
393
589
  " fi",
394
590
  ' if [ -n "$SESSION_ID" ]; then',
395
591
  ' if [ -n "$MODEL" ]; then',
396
- ' exec opencode run --auto --session "$SESSION_ID" --model "$MODEL" "$PROMPT"',
592
+ ' exec opencode run --auto --session "$SESSION_ID" --model "$MODEL" -- "$PROMPT"',
397
593
  " else",
398
- ' exec opencode run --auto --session "$SESSION_ID" "$PROMPT"',
594
+ ' exec opencode run --auto --session "$SESSION_ID" -- "$PROMPT"',
399
595
  " fi",
400
596
  " else",
401
597
  ' if [ -n "$MODEL" ]; then',
402
- ' exec opencode run --auto --model "$MODEL" "$PROMPT"',
598
+ ' exec opencode run --auto --model "$MODEL" -- "$PROMPT"',
403
599
  " else",
404
- ' exec opencode run --auto "$PROMPT"',
600
+ ' exec opencode run --auto -- "$PROMPT"',
405
601
  " fi",
406
602
  " fi",
407
603
  ' elif [ "$SESSION_MODE" = "last" ]; then',
408
604
  ' if [ -n "$MODEL" ]; then',
409
- ' exec opencode run --auto --continue --model "$MODEL" "$PROMPT"',
605
+ ' exec opencode run --auto --continue --model "$MODEL" -- "$PROMPT"',
410
606
  " else",
411
- ' exec opencode run --auto --continue "$PROMPT"',
607
+ ' exec opencode run --auto --continue -- "$PROMPT"',
412
608
  " fi",
413
609
  " else",
414
610
  ' if [ -n "$MODEL" ]; then',
415
- ' exec opencode run --auto --model "$MODEL" "$PROMPT"',
611
+ ' exec opencode run --auto --model "$MODEL" -- "$PROMPT"',
416
612
  " else",
417
- ' exec opencode run --auto "$PROMPT"',
613
+ ' exec opencode run --auto -- "$PROMPT"',
418
614
  " fi",
419
615
  " fi",
420
616
  "}",
@@ -471,15 +667,41 @@ export function buildBashWrapperScript(options: BashWrapperOptions): string {
471
667
  "fi",
472
668
  "",
473
669
  'if [ -n "$QUALITY_GATE" ] && [ "$EXIT_CODE" -eq 0 ]; then',
474
- ' log "[scheduler] Запуск Quality Gate: $QUALITY_GATE"',
475
- ' run_with_timeout "$GATE_TIMEOUT_SECONDS" bash -c "$QUALITY_GATE" >> "$LOG_FILE" 2>&1',
476
- " GATE_CODE=$?",
477
- ' if [ "$GATE_CODE" -ne 0 ]; then',
478
- ' log "[scheduler] ОШИБКА: Quality Gate провален. Код возврата: $GATE_CODE"',
479
- ' ERROR_MESSAGE="Quality Gate провален. Код возврата: $GATE_CODE"',
670
+ // G-1.2: сверяем входы гейта со snapshot'ом, снятым при создании задачи.
671
+ " GATE_INTEGRITY_OK=1",
672
+ " WORKTREE_FAIL=0",
673
+ ' if [ -n "$GATE_SNAPSHOT" ] && [ -n "$GATE_INTEGRITY" ] && [ -f "$GATE_SNAPSHOT" ] && [ -f "$GATE_INTEGRITY" ]; then',
674
+ ' node "$GATE_INTEGRITY" verify --snapshot "$GATE_SNAPSHOT" --gate-command "$QUALITY_GATE" --prompt-file "$PROMPT_FILE" --timeout "$GATE_TIMEOUT_SECONDS" >> "$LOG_FILE" 2>&1',
675
+ " VERIFY_CODE=$?",
676
+ ' if [ "$VERIFY_CODE" -ne 0 ]; then GATE_INTEGRITY_OK=0; fi',
677
+ " else",
678
+ " GATE_INTEGRITY_OK=0",
679
+ " fi",
680
+ ' if [ "$GATE_INTEGRITY_OK" -eq 1 ] && [ -n "$WT_SNAPSHOT" ] && [ -f "$WT_SNAPSHOT" ] && [ -n "$WORKDIR" ]; then',
681
+ ' node "$GATE_INTEGRITY" worktree-verify --dir "$WORKDIR" --snapshot "$WT_SNAPSHOT" $ALLOW_ARGS >> "$LOG_FILE" 2>&1',
682
+ " WT_CODE=$?",
683
+ ' if [ "$WT_CODE" -ne 0 ]; then GATE_INTEGRITY_OK=0; WORKTREE_FAIL=1; fi',
684
+ " fi",
685
+ ' if [ "$GATE_INTEGRITY_OK" -eq 0 ]; then',
686
+ ' if [ "$WORKTREE_FAIL" -eq 1 ]; then',
687
+ ' log "[scheduler] ОШИБКА: рабочее дерево изменилось во время прогона — гейт не доверяем."',
688
+ ' ERROR_MESSAGE="Quality Gate: рабочее дерево изменилось во время прогона"',
689
+ " else",
690
+ ' log "[scheduler] ОШИБКА: целостность входов Quality Gate нарушена (snapshot mismatch)."',
691
+ ' ERROR_MESSAGE="Quality Gate: целостность входов нарушена (snapshot mismatch)"',
692
+ " fi",
480
693
  " EXIT_CODE=1",
481
694
  " else",
482
- ' log "[scheduler] Quality Gate пройден."',
695
+ ' log "[scheduler] Запуск Quality Gate: $QUALITY_GATE"',
696
+ ' run_with_timeout "$GATE_TIMEOUT_SECONDS" bash -c "$QUALITY_GATE" >> "$LOG_FILE" 2>&1',
697
+ " GATE_CODE=$?",
698
+ ' if [ "$GATE_CODE" -ne 0 ]; then',
699
+ ' log "[scheduler] ОШИБКА: Quality Gate провален. Код возврата: $GATE_CODE"',
700
+ ' ERROR_MESSAGE="Quality Gate провален. Код возврата: $GATE_CODE"',
701
+ " EXIT_CODE=1",
702
+ " else",
703
+ ' log "[scheduler] Quality Gate пройден."',
704
+ " fi",
483
705
  " fi",
484
706
  "fi",
485
707
  "",
@@ -488,7 +710,7 @@ export function buildBashWrapperScript(options: BashWrapperOptions): string {
488
710
  "# Post-flight: выполняется ВСЕГДА, даже если основная задача упала.",
489
711
  'if [ -n "$AFTER_SCRIPT" ]; then',
490
712
  ' log "[scheduler] Post-flight: $AFTER_SCRIPT"',
491
- ' run_with_timeout "$GATE_TIMEOUT_SECONDS" bash -c "$AFTER_SCRIPT" >> "$LOG_FILE" 2>&1',
713
+ ' run_hook_captured "postFlight" "$AFTER_SCRIPT"',
492
714
  " POST_CODE=$?",
493
715
  ' if [ "$POST_CODE" -ne 0 ]; then',
494
716
  ' log "[scheduler] ОШИБКА: Post-flight script failed (код $POST_CODE)."',