agent-steward 0.0.3 → 0.0.5

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 (287) hide show
  1. package/CHANGELOG.md +154 -2
  2. package/CROSS_PLATFORM.md +19 -0
  3. package/README.md +54 -9
  4. package/ROADMAP-STRATEGY.md +23 -20
  5. package/ROADMAP.md +140 -143
  6. package/dist/cli.d.ts +3 -0
  7. package/dist/cli.d.ts.map +1 -0
  8. package/dist/cli.js +351 -0
  9. package/dist/core/dlq-api.d.ts +44 -0
  10. package/dist/core/dlq-api.d.ts.map +1 -0
  11. package/dist/core/dlq-api.js +68 -0
  12. package/dist/core/dry-run.d.ts.map +1 -1
  13. package/dist/core/dry-run.js +18 -1
  14. package/dist/core/execution.d.ts +203 -0
  15. package/dist/core/execution.d.ts.map +1 -0
  16. package/dist/core/execution.js +309 -0
  17. package/dist/core/gate-integrity.d.ts +35 -0
  18. package/dist/core/gate-integrity.d.ts.map +1 -0
  19. package/dist/core/gate-integrity.js +132 -0
  20. package/dist/core/git-trigger.d.ts.map +1 -1
  21. package/dist/core/git-trigger.js +14 -2
  22. package/dist/core/guard-run.d.ts +4 -0
  23. package/dist/core/guard-run.d.ts.map +1 -0
  24. package/dist/core/guard-run.js +101 -0
  25. package/dist/core/guard.d.ts +52 -0
  26. package/dist/core/guard.d.ts.map +1 -0
  27. package/dist/core/guard.js +362 -0
  28. package/dist/core/lock.d.ts +61 -4
  29. package/dist/core/lock.d.ts.map +1 -1
  30. package/dist/core/lock.js +213 -26
  31. package/dist/core/matrix.d.ts.map +1 -1
  32. package/dist/core/matrix.js +75 -15
  33. package/dist/core/mission.d.ts +83 -0
  34. package/dist/core/mission.d.ts.map +1 -0
  35. package/dist/core/mission.js +334 -0
  36. package/dist/core/one-shot.d.ts +5 -1
  37. package/dist/core/one-shot.d.ts.map +1 -1
  38. package/dist/core/one-shot.js +33 -8
  39. package/dist/core/opencode-cli.d.ts +28 -0
  40. package/dist/core/opencode-cli.d.ts.map +1 -0
  41. package/dist/core/opencode-cli.js +74 -0
  42. package/dist/core/opencode-models.d.ts +62 -0
  43. package/dist/core/opencode-models.d.ts.map +1 -0
  44. package/dist/core/opencode-models.js +277 -0
  45. package/dist/core/pipeline-apply.d.ts +38 -0
  46. package/dist/core/pipeline-apply.d.ts.map +1 -0
  47. package/dist/core/pipeline-apply.js +117 -0
  48. package/dist/core/pipeline-io.d.ts +13 -0
  49. package/dist/core/pipeline-io.d.ts.map +1 -0
  50. package/dist/core/pipeline-io.js +64 -0
  51. package/dist/core/pipeline-map.d.ts +46 -0
  52. package/dist/core/pipeline-map.d.ts.map +1 -0
  53. package/dist/core/pipeline-map.js +196 -0
  54. package/dist/core/pipeline-spec.d.ts +109 -0
  55. package/dist/core/pipeline-spec.d.ts.map +1 -0
  56. package/dist/core/pipeline-spec.js +554 -0
  57. package/dist/core/ps-wrapper.d.ts +19 -2
  58. package/dist/core/ps-wrapper.d.ts.map +1 -1
  59. package/dist/core/ps-wrapper.js +261 -63
  60. package/dist/core/record-history.d.ts +15 -0
  61. package/dist/core/record-history.d.ts.map +1 -1
  62. package/dist/core/record-history.js +183 -58
  63. package/dist/core/router/dispatch.d.ts +36 -0
  64. package/dist/core/router/dispatch.d.ts.map +1 -0
  65. package/dist/core/router/dispatch.js +59 -0
  66. package/dist/core/router/escalation.d.ts +47 -0
  67. package/dist/core/router/escalation.d.ts.map +1 -0
  68. package/dist/core/router/escalation.js +87 -0
  69. package/dist/core/router/planner.d.ts +53 -0
  70. package/dist/core/router/planner.d.ts.map +1 -0
  71. package/dist/core/router/planner.js +113 -0
  72. package/dist/core/router/rules.d.ts +46 -0
  73. package/dist/core/router/rules.d.ts.map +1 -0
  74. package/dist/core/router/rules.js +91 -0
  75. package/dist/core/run-panel-api.d.ts +94 -0
  76. package/dist/core/run-panel-api.d.ts.map +1 -0
  77. package/dist/core/run-panel-api.js +169 -0
  78. package/dist/core/schedule-gate.js +5 -1
  79. package/dist/core/schedule-v2.d.ts +34 -0
  80. package/dist/core/schedule-v2.d.ts.map +1 -1
  81. package/dist/core/schedule-v2.js +91 -5
  82. package/dist/core/scheduler/at-fallback.d.ts +55 -2
  83. package/dist/core/scheduler/at-fallback.d.ts.map +1 -1
  84. package/dist/core/scheduler/at-fallback.js +135 -5
  85. package/dist/core/scheduler/linux.d.ts +18 -2
  86. package/dist/core/scheduler/linux.d.ts.map +1 -1
  87. package/dist/core/scheduler/linux.js +63 -20
  88. package/dist/core/scheduler/mac.d.ts +44 -2
  89. package/dist/core/scheduler/mac.d.ts.map +1 -1
  90. package/dist/core/scheduler/mac.js +126 -15
  91. package/dist/core/scheduler/posix.d.ts.map +1 -1
  92. package/dist/core/scheduler/posix.js +25 -1
  93. package/dist/core/scheduler/registry.d.ts +11 -0
  94. package/dist/core/scheduler/registry.d.ts.map +1 -1
  95. package/dist/core/scheduler/registry.js +83 -21
  96. package/dist/core/scheduler/run-now.d.ts +16 -0
  97. package/dist/core/scheduler/run-now.d.ts.map +1 -0
  98. package/dist/core/scheduler/run-now.js +28 -0
  99. package/dist/core/scheduler/windows.d.ts.map +1 -1
  100. package/dist/core/scheduler/windows.js +15 -12
  101. package/dist/core/secrets.d.ts.map +1 -1
  102. package/dist/core/secrets.js +125 -28
  103. package/dist/core/session.d.ts.map +1 -1
  104. package/dist/core/session.js +18 -11
  105. package/dist/core/structured-log.d.ts +7 -1
  106. package/dist/core/structured-log.d.ts.map +1 -1
  107. package/dist/core/task-name.d.ts +24 -0
  108. package/dist/core/task-name.d.ts.map +1 -0
  109. package/dist/core/task-name.js +40 -0
  110. package/dist/core/worktree-run.d.ts +4 -0
  111. package/dist/core/worktree-run.d.ts.map +1 -0
  112. package/dist/core/worktree-run.js +164 -0
  113. package/dist/core/worktree.d.ts +115 -0
  114. package/dist/core/worktree.d.ts.map +1 -0
  115. package/dist/core/worktree.js +462 -0
  116. package/dist/core/wrappers/bash.d.ts +17 -0
  117. package/dist/core/wrappers/bash.d.ts.map +1 -1
  118. package/dist/core/wrappers/bash.js +224 -28
  119. package/dist/db/capability-repo.d.ts +124 -0
  120. package/dist/db/capability-repo.d.ts.map +1 -0
  121. package/dist/db/capability-repo.js +267 -0
  122. package/dist/db/history-repo.d.ts +46 -5
  123. package/dist/db/history-repo.d.ts.map +1 -1
  124. package/dist/db/history-repo.js +107 -25
  125. package/dist/db/index.d.ts +4 -0
  126. package/dist/db/index.d.ts.map +1 -1
  127. package/dist/db/index.js +39 -1
  128. package/dist/db/metrics-repo.js +2 -2
  129. package/dist/db/migrate.d.ts.map +1 -1
  130. package/dist/db/migrate.js +3 -1
  131. package/dist/db/recovery.d.ts.map +1 -1
  132. package/dist/db/recovery.js +5 -4
  133. package/dist/db/run-context.d.ts +103 -0
  134. package/dist/db/run-context.d.ts.map +1 -0
  135. package/dist/db/run-context.js +224 -0
  136. package/dist/db/run-dlq.d.ts +100 -0
  137. package/dist/db/run-dlq.d.ts.map +1 -0
  138. package/dist/db/run-dlq.js +191 -0
  139. package/dist/db/run-journal.d.ts +33 -5
  140. package/dist/db/run-journal.d.ts.map +1 -1
  141. package/dist/db/run-journal.js +78 -14
  142. package/dist/db/run-resume.d.ts +10 -2
  143. package/dist/db/run-resume.d.ts.map +1 -1
  144. package/dist/db/run-resume.js +39 -13
  145. package/dist/db/runs-repo.d.ts +32 -7
  146. package/dist/db/runs-repo.d.ts.map +1 -1
  147. package/dist/db/runs-repo.js +50 -11
  148. package/dist/db/schema.d.ts +2 -2
  149. package/dist/db/schema.d.ts.map +1 -1
  150. package/dist/db/schema.js +216 -3
  151. package/dist/db/settings-repo.d.ts +11 -0
  152. package/dist/db/settings-repo.d.ts.map +1 -1
  153. package/dist/db/settings-repo.js +25 -0
  154. package/dist/db/step-idempotency.d.ts +51 -0
  155. package/dist/db/step-idempotency.d.ts.map +1 -0
  156. package/dist/db/step-idempotency.js +136 -0
  157. package/dist/history.d.ts +1 -1
  158. package/dist/history.d.ts.map +1 -1
  159. package/dist/i18n.d.ts +5 -0
  160. package/dist/i18n.d.ts.map +1 -1
  161. package/dist/i18n.js +11 -4
  162. package/dist/index.d.ts +140 -6
  163. package/dist/index.d.ts.map +1 -1
  164. package/dist/index.js +480 -18
  165. package/dist/notifications.d.ts +22 -0
  166. package/dist/notifications.d.ts.map +1 -1
  167. package/dist/notifications.js +36 -8
  168. package/dist/profiles.d.ts.map +1 -1
  169. package/dist/profiles.js +25 -4
  170. package/dist/rpc.d.ts +924 -0
  171. package/dist/rpc.d.ts.map +1 -1
  172. package/dist/rpc.js +352 -0
  173. package/dist/server.d.ts +46 -0
  174. package/dist/server.d.ts.map +1 -1
  175. package/dist/server.js +172 -53
  176. package/dist/settings.d.ts +2 -2
  177. package/dist/settings.d.ts.map +1 -1
  178. package/dist/settings.js +3 -3
  179. package/dist/shared/jobs-view.d.ts +1 -1
  180. package/dist/shared/jobs-view.d.ts.map +1 -1
  181. package/dist/shared/jobs-view.js +2 -0
  182. package/dist/task-transfer.d.ts +16 -0
  183. package/dist/task-transfer.d.ts.map +1 -1
  184. package/dist/task-transfer.js +16 -0
  185. package/dist/types.d.ts.map +1 -1
  186. package/dist/types.js +7 -0
  187. package/dist/workspaces.d.ts +25 -3
  188. package/dist/workspaces.d.ts.map +1 -1
  189. package/dist/workspaces.js +43 -8
  190. package/docs/ARCHITECTURE.md +498 -58
  191. package/docs/COMPATIBILITY.md +2 -2
  192. package/docs/CONCEPT.md +185 -91
  193. package/docs/CROSS_PLATFORM.ru.md +20 -0
  194. package/docs/CROSS_PLATFORM.zh.md +18 -0
  195. package/docs/EXECUTION-LOOP.md +211 -0
  196. package/docs/FEATURES.md +65 -4
  197. package/docs/FEATURES.zh.md +52 -4
  198. package/docs/MIGRATION.md +2 -2
  199. package/docs/PIPELINE.md +293 -0
  200. package/docs/README.ru.md +44 -5
  201. package/docs/README.zh.md +46 -6
  202. package/docs/SAFETY.md +142 -0
  203. package/docs/SAVINGS.md +29 -0
  204. package/docs/SAVINGS.ru.md +29 -0
  205. package/docs/SAVINGS.zh.md +18 -0
  206. package/gui-experimental.cjs +9 -8
  207. package/locales/en.json +84 -1
  208. package/locales/ru.json +84 -1
  209. package/locales/zh.json +84 -1
  210. package/opencode.pipeline.yaml +35 -0
  211. package/package.json +46 -2
  212. package/scripts/audit-bundle.mjs +215 -0
  213. package/scripts/test-home.mjs +83 -0
  214. package/src/cli.ts +412 -0
  215. package/src/core/dlq-api.ts +98 -0
  216. package/src/core/dry-run.ts +27 -3
  217. package/src/core/execution.ts +538 -0
  218. package/src/core/file-watcher.ts +2 -2
  219. package/src/core/gate-integrity.ts +160 -0
  220. package/src/core/git-trigger.ts +18 -5
  221. package/src/core/guard-run.ts +119 -0
  222. package/src/core/guard.ts +431 -0
  223. package/src/core/lock.ts +244 -30
  224. package/src/core/matrix.ts +95 -50
  225. package/src/core/mission.ts +485 -0
  226. package/src/core/native-notify.ts +1 -1
  227. package/src/core/one-shot.ts +36 -8
  228. package/src/core/opencode-cli.ts +103 -0
  229. package/src/core/opencode-models.ts +315 -0
  230. package/src/core/pipeline-apply.ts +158 -0
  231. package/src/core/pipeline-io.ts +79 -0
  232. package/src/core/pipeline-map.ts +264 -0
  233. package/src/core/pipeline-spec.ts +775 -0
  234. package/src/core/ps-wrapper.ts +274 -64
  235. package/src/core/record-history.ts +229 -104
  236. package/src/core/router/dispatch.ts +94 -0
  237. package/src/core/router/escalation.ts +129 -0
  238. package/src/core/router/planner.ts +166 -0
  239. package/src/core/router/rules.ts +115 -0
  240. package/src/core/run-panel-api.ts +262 -0
  241. package/src/core/schedule-gate.ts +7 -3
  242. package/src/core/schedule-v2.ts +114 -5
  243. package/src/core/scheduler/at-fallback.ts +190 -5
  244. package/src/core/scheduler/linux.ts +72 -21
  245. package/src/core/scheduler/logs.ts +2 -2
  246. package/src/core/scheduler/mac.ts +174 -14
  247. package/src/core/scheduler/posix.ts +20 -1
  248. package/src/core/scheduler/registry.ts +107 -26
  249. package/src/core/scheduler/run-now.ts +32 -0
  250. package/src/core/scheduler/windows.ts +19 -15
  251. package/src/core/secrets.ts +131 -31
  252. package/src/core/session.ts +23 -10
  253. package/src/core/structured-log.ts +22 -5
  254. package/src/core/task-name.ts +67 -0
  255. package/src/core/telegram.ts +2 -2
  256. package/src/core/triage-worker.ts +7 -7
  257. package/src/core/triage.ts +2 -2
  258. package/src/core/worktree-run.ts +199 -0
  259. package/src/core/worktree.ts +600 -0
  260. package/src/core/wrappers/bash.ts +239 -27
  261. package/src/db/capability-repo.ts +402 -0
  262. package/src/db/history-repo.ts +151 -22
  263. package/src/db/index.ts +37 -1
  264. package/src/db/metrics-repo.ts +2 -2
  265. package/src/db/migrate.ts +3 -1
  266. package/src/db/recovery.ts +5 -4
  267. package/src/db/run-context.ts +370 -0
  268. package/src/db/run-dlq.ts +310 -0
  269. package/src/db/run-journal.ts +100 -13
  270. package/src/db/run-resume.ts +65 -13
  271. package/src/db/runs-repo.ts +66 -13
  272. package/src/db/schema.ts +218 -3
  273. package/src/db/settings-repo.ts +31 -0
  274. package/src/db/step-idempotency.ts +185 -0
  275. package/src/gui.tsx +692 -13
  276. package/src/history.ts +1 -1
  277. package/src/i18n.ts +12 -4
  278. package/src/index.ts +648 -8
  279. package/src/notifications.ts +38 -8
  280. package/src/profiles.ts +26 -4
  281. package/src/rpc.ts +379 -0
  282. package/src/server.ts +206 -54
  283. package/src/settings.ts +5 -5
  284. package/src/shared/jobs-view.ts +3 -1
  285. package/src/task-transfer.ts +31 -0
  286. package/src/types.ts +9 -0
  287. package/src/workspaces.ts +58 -9
@@ -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,34 @@ 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;
79
90
  }
80
91
 
92
+ /**
93
+ * B6: разбор PID из lock-токена для bash-обёртки.
94
+ *
95
+ * Понимает единый `<pid>-<iso>` (Node и PS), legacy PS `<iso>|<pid>`
96
+ * и голый `<pid>` (pid-файл самой bash-обёртки). Legacy PS проверяется
97
+ * первым: иначе год из ISO был бы принят за PID.
98
+ */
99
+ export const BASH_LOCK_PID_FUNCTION = `parse_lock_pid() {
100
+ local text="$1"
101
+ case "$text" in
102
+ *"|"*) printf '%s' "\${text##*|}" ;;
103
+ [0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]T*) printf '' ;;
104
+ [0-9]*-*) printf '%s' "\${text%%-*}" ;;
105
+ [0-9]*) printf '%s' "$text" ;;
106
+ *) printf '' ;;
107
+ esac
108
+ }`;
109
+
81
110
  /**
82
111
  * Собирает текст bash-обёртки.
83
112
  *
@@ -96,6 +125,7 @@ export interface BashWrapperOptions {
96
125
  */
97
126
  export function buildBashWrapperScript(options: BashWrapperOptions): string {
98
127
  const {
128
+ sanitizedName,
99
129
  taskName,
100
130
  promptFile,
101
131
  timeoutSeconds,
@@ -119,8 +149,37 @@ export function buildBashWrapperScript(options: BashWrapperOptions): string {
119
149
  scheduleGate,
120
150
  envFile,
121
151
  gateTimeoutSeconds,
152
+ worktree,
153
+ worktreeHelper,
154
+ guards,
155
+ guardHelper,
122
156
  } = options;
123
157
 
158
+ // G-1.2: фиксируем входы гейта при создании обёртки и передаём путь
159
+ // snapshot'а и помощника проверки в сгенерированный скрипт.
160
+ let gateSnapshot = "";
161
+ let gateIntegrity = "";
162
+ if (qualityGate?.trim()) {
163
+ const safeGateTimeout =
164
+ typeof gateTimeoutSeconds === "number" && Number.isFinite(gateTimeoutSeconds)
165
+ ? Math.max(0, Math.floor(gateTimeoutSeconds))
166
+ : 300;
167
+ let prompt = "";
168
+ try {
169
+ prompt = fsSync.readFileSync(promptFile || "", "utf8");
170
+ } catch {
171
+ // Промпт мог быть удалён — snapshot всё равно уникален для задачи.
172
+ }
173
+ gateSnapshot = createGateSnapshot(sanitizedName || taskName, {
174
+ gate: qualityGate,
175
+ prompt,
176
+ gateTimeoutSeconds: safeGateTimeout,
177
+ });
178
+ gateIntegrity = recorderFile
179
+ ? path.join(path.dirname(recorderFile), "gate-integrity.js")
180
+ : "";
181
+ }
182
+
124
183
  const effectivePermissions = resolvePermissions({
125
184
  policy,
126
185
  legacyShell,
@@ -139,9 +198,23 @@ export function buildBashWrapperScript(options: BashWrapperOptions): string {
139
198
  `LOCK_FILE=${shellQuote(lockFile)}`,
140
199
  `WORKDIR=${shellQuote(workdir || process.cwd())}`,
141
200
  `WORKSPACE_NAME=${shellQuote(workspaceName ?? "")}`,
201
+ // W-1 (0.0.6): одноразовый git worktree на запуск.
202
+ `WORKTREE_MODE=${worktree ? 1 : 0}`,
203
+ `WORKTREE_HELPER=${shellQuote(worktreeHelper ?? "")}`,
204
+ // W-3 (0.0.6): guard-условия. Пустая строка = guard не настроен.
205
+ `GUARD_HELPER=${shellQuote(guardHelper ?? "")}`,
206
+ `GUARD_B64=${shellQuote(guards ? Buffer.from(JSON.stringify(guards), "utf8").toString("base64") : "")}`,
207
+ // W-4 (0.0.6): причина пропуска в history (fixed, без произвольного текста из лога).
208
+ `GUARD_SKIP_B64=${shellQuote(Buffer.from("guard conditions not met", "utf8").toString("base64"))}`,
142
209
  `TIMEOUT_SECONDS=${Number.isFinite(timeoutSeconds) ? Math.max(0, Math.floor(timeoutSeconds)) : 3600}`,
210
+ // Маркер сработавшего watchdog: по нему обёртка отличает таймаут от
211
+ // обычного ненулевого кода возврата (SIGTERM/SIGKILL неотличимы от падения).
212
+ `TIMEOUT_MARKER=${shellQuote(`${lockFile}.timeout`)}`,
143
213
  `RECORDER_FILE=${shellQuote(recorderFile ?? "")}`,
144
214
  `QUALITY_GATE=${shellQuote(qualityGate ?? "")}`,
215
+ // G-1.2: путь к snapshot'у и CLI проверки целостности входов гейта.
216
+ `GATE_SNAPSHOT=${shellQuote(gateSnapshot)}`,
217
+ `GATE_INTEGRITY=${shellQuote(gateIntegrity)}`,
145
218
  `MODEL=${shellQuote(model ?? "")}`,
146
219
  // Спринт 24: режим сессии — "new" (по умолчанию), "reuse" (--session <id>), "last" (--continue).
147
220
  `SESSION_MODE=${shellQuote(sessionMode ?? "new")}`,
@@ -185,6 +258,8 @@ export function buildBashWrapperScript(options: BashWrapperOptions): string {
185
258
  ' printf \'[%s] %s\\n\' "$(date \'+%Y-%m-%d %H:%M:%S\')" "$*" >> "$LOG_FILE" 2>/dev/null || true',
186
259
  "}",
187
260
  "",
261
+ BASH_LOCK_PID_FUNCTION,
262
+ "",
188
263
  'log "[role-scoped] opencode config passed via OPENCODE_CONFIG_CONTENT"',
189
264
  `log ${shellQuote(`[policy] ${formatPolicyLog(effectivePermissions)}`)}`,
190
265
  ...effectivePermissions.deniedByPolicy.map(
@@ -207,7 +282,18 @@ export function buildBashWrapperScript(options: BashWrapperOptions): string {
207
282
  ' "$@" &',
208
283
  " GATE_CHILD=$!",
209
284
  " set +m 2>/dev/null || true",
210
- ' ( sleep "$GATE_LIMIT"; kill -TERM -- "-$GATE_CHILD" 2>/dev/null || kill -TERM "$GATE_CHILD" 2>/dev/null; sleep 5; kill -KILL -- "-$GATE_CHILD" 2>/dev/null || kill -KILL "$GATE_CHILD" 2>/dev/null ) >/dev/null 2>&1 &',
285
+ " (",
286
+ " WD_SLEEP_PID=",
287
+ " trap 'if [ -n \"$WD_SLEEP_PID\" ]; then kill \"$WD_SLEEP_PID\" 2>/dev/null || true; fi; exit 0' TERM INT",
288
+ ' sleep "$GATE_LIMIT" &',
289
+ " WD_SLEEP_PID=$!",
290
+ ' wait "$WD_SLEEP_PID" 2>/dev/null || true',
291
+ ' kill -TERM -- "-$GATE_CHILD" 2>/dev/null || kill -TERM "$GATE_CHILD" 2>/dev/null',
292
+ " sleep 5 &",
293
+ " WD_SLEEP_PID=$!",
294
+ ' wait "$WD_SLEEP_PID" 2>/dev/null || true',
295
+ ' kill -KILL -- "-$GATE_CHILD" 2>/dev/null || kill -KILL "$GATE_CHILD" 2>/dev/null',
296
+ " ) >/dev/null 2>&1 &",
211
297
  " GATE_WATCHDOG=$!",
212
298
  ' wait "$GATE_CHILD"',
213
299
  " GATE_CODE=$?",
@@ -240,8 +326,35 @@ export function buildBashWrapperScript(options: BashWrapperOptions): string {
240
326
  "fi",
241
327
  "",
242
328
  "# Атомарная блокировка: mkdir завершается ошибкой, если каталог уже есть.",
243
- "# В каталог пишем PID: после kill -9 осиротевший lock снимается, а не",
244
- "# блокирует задачу до истечения STALE_LOCK_MAX_AGE_MS.",
329
+ "# B6: перед своим каталогом проверяем файловый lock Node/PS (<lock>):",
330
+ "# они держат файл, а bash — каталог. Без этой проверки Node-процесс и",
331
+ "# bash-обёртка могли выполнять одну задачу одновременно.",
332
+ 'if [ -f "$LOCK_FILE" ]; then',
333
+ ' LOCK_OWNER_RAW="$(cat "$LOCK_FILE" 2>/dev/null || true)"',
334
+ ' LOCK_FILE_PID="$(parse_lock_pid "$LOCK_OWNER_RAW")"',
335
+ ' if [ -z "$LOCK_FILE_PID" ]; then',
336
+ ' log "[scheduler] Не удалось определить владельца lock — пропуск запуска."',
337
+ " exit 0",
338
+ " fi",
339
+ ' if kill -0 "$LOCK_FILE_PID" 2>/dev/null; then',
340
+ ' log "[scheduler] Задача \'$TASK_NAME\' уже выполняется (pid $LOCK_FILE_PID) — пропуск запуска."',
341
+ " exit 0",
342
+ " fi",
343
+ " # Владелец мёртв: атомарно уводим файл, чтобы не удалить lock, который",
344
+ " # другой воркер успел пересоздать.",
345
+ ' STALE_LOCK_FILE="$LOCK_FILE.stale-$$-$(date +%s)"',
346
+ ' if ! mv "$LOCK_FILE" "$STALE_LOCK_FILE" 2>/dev/null; then',
347
+ ' if [ -f "$LOCK_FILE" ]; then',
348
+ ' log "[scheduler] Не удалось вытеснить осиротевший lock \'$LOCK_FILE\' — пропуск запуска."',
349
+ " exit 0",
350
+ " fi",
351
+ " else",
352
+ ' rm -f "$STALE_LOCK_FILE" 2>/dev/null || true',
353
+ " fi",
354
+ "fi",
355
+ "",
356
+ "# B6: в pid-файл пишем `<pid>-<iso>`, а не голый PID — так его читают",
357
+ "# Node и PS общим парсером. После kill -9 lock снимается по мёртвому PID.",
245
358
  'if ! mkdir "$LOCK_FILE.d" 2>/dev/null; then',
246
359
  ' if [ ! -d "$LOCK_FILE.d" ]; then',
247
360
  ' log "[scheduler] Не удалось создать lock \'$LOCK_FILE.d\' — запуск отменён."',
@@ -249,7 +362,7 @@ export function buildBashWrapperScript(options: BashWrapperOptions): string {
249
362
  " fi",
250
363
  ' LOCK_PID=""',
251
364
  ' if [ -f "$LOCK_FILE.d/pid" ]; then',
252
- ' LOCK_PID="$(cat "$LOCK_FILE.d/pid" 2>/dev/null || true)"',
365
+ ' LOCK_PID="$(parse_lock_pid "$(cat "$LOCK_FILE.d/pid" 2>/dev/null || true)")"',
253
366
  " fi",
254
367
  " LOCK_ALIVE=1",
255
368
  ' if [ -n "$LOCK_PID" ]; then',
@@ -274,14 +387,61 @@ export function buildBashWrapperScript(options: BashWrapperOptions): string {
274
387
  " exit 0",
275
388
  " fi",
276
389
  "fi",
277
- 'printf \'%s\\n\' "$$" > "$LOCK_FILE.d/pid" 2>/dev/null || true',
278
- 'cleanup() { rmdir "$LOCK_FILE.d" 2>/dev/null || rm -rf "$LOCK_FILE.d" 2>/dev/null; }',
390
+ 'printf \'%s\\n\' "$$-$(date -u +%Y-%m-%dT%H:%M:%SZ)" > "$LOCK_FILE.d/pid" 2>/dev/null || true',
391
+ "cleanup_worktree() {",
392
+ " if [ -n \"${AGENT_STEWARD_WORKTREE:-}\" ] && [ -n \"$WORKTREE_HELPER\" ] && command -v node >/dev/null 2>&1; then",
393
+ " cd \"$WORKDIR\" 2>/dev/null || true",
394
+ " node \"$WORKTREE_HELPER\" cleanup --path \"$AGENT_STEWARD_WORKTREE\" --repo \"$WORKDIR\" >> \"$LOG_FILE\" 2>&1 || true",
395
+ ' AGENT_STEWARD_WORKTREE=""',
396
+ " fi",
397
+ "}",
398
+ 'cleanup() { cleanup_worktree; rmdir "$LOCK_FILE.d" 2>/dev/null || rm -rf "$LOCK_FILE.d" 2>/dev/null; }',
279
399
  "trap cleanup EXIT INT TERM",
280
400
  "",
281
401
  'if [ -n "$WORKDIR" ] && [ -d "$WORKDIR" ]; then',
282
402
  ' cd "$WORKDIR" || { log "[scheduler] Не удалось перейти в $WORKDIR"; exit 1; }',
283
403
  "fi",
284
404
  "",
405
+ "# W-1 (0.0.6): одноразовый git worktree. Ошибка создания — fail-closed:",
406
+ "# задача не должна молча работать в основном дереве репозитория.",
407
+ 'if [ "$WORKTREE_MODE" = "1" ]; then',
408
+ ' if [ -z "$WORKTREE_HELPER" ] || ! command -v node >/dev/null 2>&1; then',
409
+ ' log "[scheduler] ОШИБКА: помощник worktree недоступен (нет node или worktree-run.js). Запуск отменён."',
410
+ " exit 1",
411
+ " fi",
412
+ ' AGENT_STEWARD_WORKTREE="$(node "$WORKTREE_HELPER" --repo "$WORKDIR" --task "$TASK_NAME" 2>> "$LOG_FILE" | tail -n 1)"',
413
+ ' if [ -z "$AGENT_STEWARD_WORKTREE" ]; then',
414
+ ' log "[scheduler] ОШИБКА: не удалось создать git worktree для \'$TASK_NAME\' — запуск отменён."',
415
+ " exit 1",
416
+ " fi",
417
+ " export AGENT_STEWARD_WORKTREE",
418
+ ' export AGENT_STEWARD_WORKTREE_REPO="$WORKDIR"',
419
+ ' log "[scheduler] Git worktree: $AGENT_STEWARD_WORKTREE"',
420
+ ' cd "$AGENT_STEWARD_WORKTREE" || { log "[scheduler] Не удалось перейти в worktree $AGENT_STEWARD_WORKTREE"; exit 1; }',
421
+ "fi",
422
+ "",
423
+ ...(guards
424
+ ? [
425
+ "# W-3 (0.0.6): guard-условия до запуска opencode. Код 4 — штатный skip,",
426
+ "# ненулевой код — ошибка проверки. В обоих случаях opencode не запускается,",
427
+ "# а созданный worktree убирается через trap cleanup.",
428
+ 'if [ -n "$GUARD_HELPER" ] && [ -n "$GUARD_B64" ]; then',
429
+ ' node "$GUARD_HELPER" --cwd "$PWD" --guards-b64 "$GUARD_B64" >> "$LOG_FILE" 2>&1',
430
+ " GUARD_STATUS=$?",
431
+ ' if [ "$GUARD_STATUS" -eq 4 ]; then',
432
+ ' log "[scheduler] guard: run skipped (условия не выполнены)"',
433
+ ' if [ -n "$RECORDER_FILE" ] && command -v node >/dev/null 2>&1; then',
434
+ ' node "$RECORDER_FILE" --skip "$TASK_NAME" "$GUARD_SKIP_B64" >> "$LOG_FILE" 2>&1 || true',
435
+ " fi",
436
+ " exit 0",
437
+ ' elif [ "$GUARD_STATUS" -ne 0 ]; then',
438
+ ' log "[scheduler] ОШИБКА: guard helper завершился с кодом $GUARD_STATUS — запуск отменён."',
439
+ " exit 1",
440
+ " fi",
441
+ "fi",
442
+ "",
443
+ ]
444
+ : []),
285
445
  "# Спринт 21: env-переменные workspace. Файл пишет плагин, значения не логируются.",
286
446
  'if [ -n "$ENV_FILE" ] && [ -f "$ENV_FILE" ]; then',
287
447
  ' while IFS= read -r env_line || [ -n "$env_line" ]; do',
@@ -291,6 +451,14 @@ export function buildBashWrapperScript(options: BashWrapperOptions): string {
291
451
  ' env_value="${env_line#*=}"',
292
452
  ' case "$env_key" in *[!A-Za-z0-9_]*) continue ;; esac',
293
453
  ' case "$env_key" in [A-Za-z_]*) ;; *) continue ;; esac',
454
+ // P2-21: неразрешённая ссылка означает, что секрет удалён/переименован.
455
+ // Запускать агента с литералом "${secret:NAME}" нельзя — fail closed.
456
+ ' case "$env_value" in',
457
+ " *'${secret:'*)",
458
+ ' log "[scheduler] ОШИБКА: переменная $env_key содержит неразрешённый секрет (\\${secret:...}). Запуск отменён."',
459
+ " exit 78",
460
+ " ;;",
461
+ " esac",
294
462
  ' export "$env_key=$env_value"',
295
463
  ' done < "$ENV_FILE"',
296
464
  ' log "[scheduler] Переменные окружения workspace загружены."',
@@ -316,11 +484,17 @@ export function buildBashWrapperScript(options: BashWrapperOptions): string {
316
484
  "fi",
317
485
  "",
318
486
  'PROMPT="$(cat "$PROMPT_FILE" 2>/dev/null || true)"',
487
+ "# W-1: сообщаем агенту, что он работает в одноразовом git worktree.",
488
+ 'if [ -n "${AGENT_STEWARD_WORKTREE:-}" ]; then',
489
+ ' PROMPT="[agent-steward] Рабочая директория запуска - одноразовый git worktree: $AGENT_STEWARD_WORKTREE',
490
+ '$PROMPT"',
491
+ "fi",
319
492
  "# T-09: backstop размера промпта на POSIX (argv ограничен MAX_ARG_STRLEN",
320
- "# 128 КиБ на аргумент в Linux). Считаем байты, а не символы.",
493
+ "# 128 КиБ на аргумент в Linux). Считаем байты, а не символы. Лимит включает",
494
+ "# завершающий NUL, поэтому максимум полезных данных — 131071 байт (B11.2).",
321
495
  'PROMPT_BYTES="$(printf %s "$PROMPT" | wc -c | tr -d \' \')"',
322
- 'if [ "$PROMPT_BYTES" -gt 131072 ] 2>/dev/null; then',
323
- ' log "[scheduler] ОШИБКА: промпт слишком длинный для argv POSIX: ${PROMPT_BYTES} байт (максимум 131072)."',
496
+ 'if [ "$PROMPT_BYTES" -ge 131072 ] 2>/dev/null; then',
497
+ ' log "[scheduler] ОШИБКА: промпт слишком длинный для argv POSIX: ${PROMPT_BYTES} байт (максимум 131071)."',
324
498
  " exit 1",
325
499
  "fi",
326
500
  'START_EPOCH="$(date +%s)"',
@@ -371,28 +545,28 @@ export function buildBashWrapperScript(options: BashWrapperOptions): string {
371
545
  " fi",
372
546
  ' if [ -n "$SESSION_ID" ]; then',
373
547
  ' if [ -n "$MODEL" ]; then',
374
- ' exec opencode run --auto --session "$SESSION_ID" --model "$MODEL" "$PROMPT"',
548
+ ' exec opencode run --auto --session "$SESSION_ID" --model "$MODEL" -- "$PROMPT"',
375
549
  " else",
376
- ' exec opencode run --auto --session "$SESSION_ID" "$PROMPT"',
550
+ ' exec opencode run --auto --session "$SESSION_ID" -- "$PROMPT"',
377
551
  " fi",
378
552
  " else",
379
553
  ' if [ -n "$MODEL" ]; then',
380
- ' exec opencode run --auto --model "$MODEL" "$PROMPT"',
554
+ ' exec opencode run --auto --model "$MODEL" -- "$PROMPT"',
381
555
  " else",
382
- ' exec opencode run --auto "$PROMPT"',
556
+ ' exec opencode run --auto -- "$PROMPT"',
383
557
  " fi",
384
558
  " fi",
385
559
  ' elif [ "$SESSION_MODE" = "last" ]; then',
386
560
  ' if [ -n "$MODEL" ]; then',
387
- ' exec opencode run --auto --continue --model "$MODEL" "$PROMPT"',
561
+ ' exec opencode run --auto --continue --model "$MODEL" -- "$PROMPT"',
388
562
  " else",
389
- ' exec opencode run --auto --continue "$PROMPT"',
563
+ ' exec opencode run --auto --continue -- "$PROMPT"',
390
564
  " fi",
391
565
  " else",
392
566
  ' if [ -n "$MODEL" ]; then',
393
- ' exec opencode run --auto --model "$MODEL" "$PROMPT"',
567
+ ' exec opencode run --auto --model "$MODEL" -- "$PROMPT"',
394
568
  " else",
395
- ' exec opencode run --auto "$PROMPT"',
569
+ ' exec opencode run --auto -- "$PROMPT"',
396
570
  " fi",
397
571
  " fi",
398
572
  "}",
@@ -402,12 +576,26 @@ export function buildBashWrapperScript(options: BashWrapperOptions): string {
402
576
  "# T-10: как и в run_with_timeout, opencode запускается в собственной группе",
403
577
  "# процессов (exec внутри run_opencode сохраняет лидера группы), поэтому",
404
578
  "# watchdog убивает всё дерево, а внуки не переживают таймаут.",
579
+ // Маркер мог остаться от предыдущего запуска (краш до очистки).
580
+ 'rm -f "$TIMEOUT_MARKER" 2>/dev/null || true',
405
581
  "set -m 2>/dev/null || true",
406
582
  'run_opencode >> "$LOG_FILE" 2>&1 &',
407
583
  "CHILD=$!",
408
584
  "set +m 2>/dev/null || true",
409
585
  'if [ "$TIMEOUT_SECONDS" -gt 0 ] 2>/dev/null; then',
410
- ' ( sleep "$TIMEOUT_SECONDS"; kill -TERM -- "-$CHILD" 2>/dev/null || kill -TERM "$CHILD" 2>/dev/null; sleep 5; kill -KILL -- "-$CHILD" 2>/dev/null || kill -KILL "$CHILD" 2>/dev/null ) &',
586
+ " (",
587
+ " WD_SLEEP_PID=",
588
+ " trap 'if [ -n \"$WD_SLEEP_PID\" ]; then kill \"$WD_SLEEP_PID\" 2>/dev/null || true; fi; exit 0' TERM INT",
589
+ ' sleep "$TIMEOUT_SECONDS" &',
590
+ " WD_SLEEP_PID=$!",
591
+ ' wait "$WD_SLEEP_PID" 2>/dev/null || true',
592
+ ' : > "$TIMEOUT_MARKER" 2>/dev/null || true',
593
+ ' kill -TERM -- "-$CHILD" 2>/dev/null || kill -TERM "$CHILD" 2>/dev/null',
594
+ " sleep 5 &",
595
+ " WD_SLEEP_PID=$!",
596
+ ' wait "$WD_SLEEP_PID" 2>/dev/null || true',
597
+ ' kill -KILL -- "-$CHILD" 2>/dev/null || kill -KILL "$CHILD" 2>/dev/null',
598
+ " ) &",
411
599
  " WATCHDOG=$!",
412
600
  "fi",
413
601
  'wait "$CHILD"',
@@ -419,7 +607,15 @@ export function buildBashWrapperScript(options: BashWrapperOptions): string {
419
607
  "",
420
608
  "# Конфиг прав живёт только в переменной окружения — файл не создаётся.",
421
609
  "",
422
- 'if [ "$EXIT_CODE" -ne 0 ]; then',
610
+ "TIMED_OUT=0",
611
+ 'if [ -f "$TIMEOUT_MARKER" ]; then',
612
+ " TIMED_OUT=1",
613
+ " EXIT_CODE=124",
614
+ // 124 — общепринятый код coreutils timeout; маркер нужен, потому что
615
+ // SIGTERM/SIGKILL сами по себе неотличимы от обычного падения.
616
+ ' ERROR_MESSAGE="Таймаут: превышено ${TIMEOUT_SECONDS} с"',
617
+ ' log "[scheduler] Задача \'$TASK_NAME\' прервана по таймауту (${TIMEOUT_SECONDS} с)."',
618
+ 'elif [ "$EXIT_CODE" -ne 0 ]; then',
423
619
  ' log "[scheduler] Задача \'$TASK_NAME\' завершилась с кодом $EXIT_CODE."',
424
620
  ' ERROR_MESSAGE="Код возврата $EXIT_CODE"',
425
621
  "else",
@@ -427,15 +623,30 @@ export function buildBashWrapperScript(options: BashWrapperOptions): string {
427
623
  "fi",
428
624
  "",
429
625
  'if [ -n "$QUALITY_GATE" ] && [ "$EXIT_CODE" -eq 0 ]; then',
430
- ' log "[scheduler] Запуск Quality Gate: $QUALITY_GATE"',
431
- ' run_with_timeout "$GATE_TIMEOUT_SECONDS" bash -c "$QUALITY_GATE" >> "$LOG_FILE" 2>&1',
432
- " GATE_CODE=$?",
433
- ' if [ "$GATE_CODE" -ne 0 ]; then',
434
- ' log "[scheduler] ОШИБКА: Quality Gate провален. Код возврата: $GATE_CODE"',
435
- ' ERROR_MESSAGE="Quality Gate провален. Код возврата: $GATE_CODE"',
626
+ // G-1.2: сверяем входы гейта со snapshot'ом, снятым при создании задачи.
627
+ " GATE_INTEGRITY_OK=1",
628
+ ' if [ -n "$GATE_SNAPSHOT" ] && [ -n "$GATE_INTEGRITY" ] && [ -f "$GATE_SNAPSHOT" ] && [ -f "$GATE_INTEGRITY" ]; then',
629
+ ' node "$GATE_INTEGRITY" verify --snapshot "$GATE_SNAPSHOT" --gate-command "$QUALITY_GATE" --prompt-file "$PROMPT_FILE" --timeout "$GATE_TIMEOUT_SECONDS" >> "$LOG_FILE" 2>&1',
630
+ " VERIFY_CODE=$?",
631
+ ' if [ "$VERIFY_CODE" -ne 0 ]; then GATE_INTEGRITY_OK=0; fi',
632
+ " else",
633
+ " GATE_INTEGRITY_OK=0",
634
+ " fi",
635
+ ' if [ "$GATE_INTEGRITY_OK" -eq 0 ]; then',
636
+ ' log "[scheduler] ОШИБКА: целостность входов Quality Gate нарушена (snapshot mismatch)."',
637
+ ' ERROR_MESSAGE="Quality Gate: целостность входов нарушена (snapshot mismatch)"',
436
638
  " EXIT_CODE=1",
437
639
  " else",
438
- ' log "[scheduler] Quality Gate пройден."',
640
+ ' log "[scheduler] Запуск Quality Gate: $QUALITY_GATE"',
641
+ ' run_with_timeout "$GATE_TIMEOUT_SECONDS" bash -c "$QUALITY_GATE" >> "$LOG_FILE" 2>&1',
642
+ " GATE_CODE=$?",
643
+ ' if [ "$GATE_CODE" -ne 0 ]; then',
644
+ ' log "[scheduler] ОШИБКА: Quality Gate провален. Код возврата: $GATE_CODE"',
645
+ ' ERROR_MESSAGE="Quality Gate провален. Код возврата: $GATE_CODE"',
646
+ " EXIT_CODE=1",
647
+ " else",
648
+ ' log "[scheduler] Quality Gate пройден."',
649
+ " fi",
439
650
  " fi",
440
651
  "fi",
441
652
  "",
@@ -462,7 +673,8 @@ export function buildBashWrapperScript(options: BashWrapperOptions): string {
462
673
  'END_EPOCH="$(date +%s)"',
463
674
  "DURATION_MS=$(( (END_EPOCH - START_EPOCH) * 1000 ))",
464
675
  'STATUS="error"',
465
- 'if [ "$EXIT_CODE" -eq 0 ]; then STATUS="success"; fi',
676
+ 'if [ "$TIMED_OUT" -eq 1 ]; then STATUS="timeout"; elif [ "$EXIT_CODE" -eq 0 ]; then STATUS="success"; fi',
677
+ 'rm -f "$TIMEOUT_MARKER" 2>/dev/null || true',
466
678
  "",
467
679
  'if [ -n "$RECORDER_FILE" ] && command -v node >/dev/null 2>&1; then',
468
680
  ' if [ -n "$RUN_ID" ]; then',