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
@@ -4,6 +4,7 @@ import os from "node:os";
4
4
  import path from "node:path";
5
5
  import { spawnSync } from "node:child_process";
6
6
  import { PLUGIN_DIR } from "../types.js";
7
+ import { isProcessAlive } from "./lock.js";
7
8
 
8
9
  /**
9
10
  * Зашифрованное хранилище секретов (Спринт 26).
@@ -26,6 +27,85 @@ export const SECRET_REF_RE = /\$\{secret:([A-Za-z0-9_.-]{1,64})\}/g;
26
27
  const SECRET_NAME_RE = /^[A-Za-z0-9_.-]{1,64}$/;
27
28
  const KEY_BYTES = 32;
28
29
 
30
+ /**
31
+ * P2-20: межпроцессная блокировка записи секретов.
32
+ *
33
+ * setSecret/deleteSecret — это read-modify-write одного JSON. Каждое завершение
34
+ * задачи может быть отдельным процессом, поэтому без лока параллельные записи
35
+ * теряли секреты. Лок синхронный: API setSecret/deleteSecret синхронный и
36
+ * используется из CLI/GUI/плагина, переписывать его на async нельзя.
37
+ */
38
+ const SECRETS_LOCK_FILE = `${SECRETS_FILE}.lock`;
39
+ const SECRETS_LOCK_STALE_MS = 10_000;
40
+ const SECRETS_LOCK_TIMEOUT_MS = 5_000;
41
+ let secretsLockDepth = 0;
42
+
43
+ function sleepSync(ms: number): void {
44
+ Atomics.wait(new Int32Array(new SharedArrayBuffer(4)), 0, 0, ms);
45
+ }
46
+
47
+ function withSecretsLock<T>(fn: () => T): T {
48
+ // Реентерабельность: loadKey()/readFileSafe() вызываются внутри setSecret.
49
+ if (secretsLockDepth > 0) {
50
+ secretsLockDepth += 1;
51
+ try {
52
+ return fn();
53
+ } finally {
54
+ secretsLockDepth -= 1;
55
+ }
56
+ }
57
+
58
+ ensureDir();
59
+ const deadline = Date.now() + SECRETS_LOCK_TIMEOUT_MS;
60
+ for (;;) {
61
+ try {
62
+ const fd = fs.openSync(SECRETS_LOCK_FILE, "wx");
63
+ try {
64
+ fs.writeFileSync(fd, String(process.pid));
65
+ } finally {
66
+ fs.closeSync(fd);
67
+ }
68
+ secretsLockDepth = 1;
69
+ break;
70
+ } catch (err: unknown) {
71
+ if ((err as NodeJS.ErrnoException | undefined)?.code !== "EEXIST") throw err;
72
+ try {
73
+ const stat = fs.statSync(SECRETS_LOCK_FILE);
74
+ if (Date.now() - stat.mtimeMs > SECRETS_LOCK_STALE_MS) {
75
+ const owner = Number.parseInt(
76
+ fs.readFileSync(SECRETS_LOCK_FILE, "utf8").trim(),
77
+ 10,
78
+ );
79
+ if (!Number.isInteger(owner) || !isProcessAlive(owner)) {
80
+ fs.rmSync(SECRETS_LOCK_FILE, { force: true });
81
+ continue;
82
+ }
83
+ }
84
+ } catch {
85
+ // Лок исчез между stat и read — повторяем попытку.
86
+ }
87
+ if (Date.now() >= deadline) {
88
+ throw new Error(
89
+ "Не удалось получить блокировку хранилища секретов за " +
90
+ `${SECRETS_LOCK_TIMEOUT_MS} мс.`,
91
+ );
92
+ }
93
+ sleepSync(25);
94
+ }
95
+ }
96
+
97
+ try {
98
+ return fn();
99
+ } finally {
100
+ secretsLockDepth = 0;
101
+ try {
102
+ fs.rmSync(SECRETS_LOCK_FILE, { force: true });
103
+ } catch {
104
+ // Не критично: лок всё равно станет stale.
105
+ }
106
+ }
107
+ }
108
+
29
109
  interface StoredSecret {
30
110
  /** IV в base64 (12 байт). */
31
111
  iv: string;
@@ -159,13 +239,30 @@ function loadKey(): Buffer {
159
239
  chmodPrivate(SECRETS_KEY_FILE);
160
240
  keyCache = { stamp, key: raw };
161
241
  return raw;
162
- } catch (err: any) {
163
- if (err?.code !== "ENOENT") throw err;
164
- const key = crypto.randomBytes(KEY_BYTES);
165
- fs.writeFileSync(SECRETS_KEY_FILE, key, { mode: 0o600 });
166
- chmodPrivate(SECRETS_KEY_FILE);
167
- keyCache = { stamp: `${fs.statSync(SECRETS_KEY_FILE).mtimeMs}:${KEY_BYTES}`, key };
168
- return key;
242
+ } catch (err: unknown) {
243
+ if ((err as NodeJS.ErrnoException | undefined)?.code !== "ENOENT") throw err;
244
+ // Два процесса могли одновременно не найти ключ и сгенерировать разный.
245
+ // Под локом перечитываем файл: побеждает первый, остальные используют его ключ.
246
+ return withSecretsLock(() => {
247
+ try {
248
+ const raw = fs.readFileSync(SECRETS_KEY_FILE);
249
+ if (raw.length !== KEY_BYTES) {
250
+ throw new Error("повреждён файл ключа секретов");
251
+ }
252
+ keyCache = {
253
+ stamp: `${fs.statSync(SECRETS_KEY_FILE).mtimeMs}:${raw.length}`,
254
+ key: raw,
255
+ };
256
+ return raw;
257
+ } catch (readErr: unknown) {
258
+ if ((readErr as NodeJS.ErrnoException | undefined)?.code !== "ENOENT") throw readErr;
259
+ }
260
+ const key = crypto.randomBytes(KEY_BYTES);
261
+ fs.writeFileSync(SECRETS_KEY_FILE, key, { mode: 0o600 });
262
+ chmodPrivate(SECRETS_KEY_FILE);
263
+ keyCache = { stamp: `${fs.statSync(SECRETS_KEY_FILE).mtimeMs}:${KEY_BYTES}`, key };
264
+ return key;
265
+ });
169
266
  }
170
267
  }
171
268
 
@@ -240,8 +337,8 @@ function readFileSafe(): SecretsFile {
240
337
  const file: SecretsFile = { version: 1, secrets };
241
338
  cache = { stamp, file };
242
339
  return file;
243
- } catch (err: any) {
244
- if (err?.code === "ENOENT") return emptyFile();
340
+ } catch (err: unknown) {
341
+ if ((err as NodeJS.ErrnoException | undefined)?.code === "ENOENT") return emptyFile();
245
342
  // Не глотаем повреждение молча: иначе setSecret запишет пустой файл поверх.
246
343
  quarantineCorruptStore(err);
247
344
  return emptyFile();
@@ -251,13 +348,11 @@ function readFileSafe(): SecretsFile {
251
348
  /** Атомарная запись: temp + rename, права 0600. */
252
349
  function writeFileSafe(file: SecretsFile): void {
253
350
  ensureDir();
254
- const tmp = `${SECRETS_FILE}.tmp`;
351
+ // Уникальный temp: два процесса не должны писать в один и тот же файл.
352
+ const tmp = `${SECRETS_FILE}.${process.pid}.${Date.now()}.tmp`;
255
353
  fs.writeFileSync(tmp, JSON.stringify(file, null, 2), { encoding: "utf8", mode: 0o600 });
256
- try {
257
- fs.rmSync(SECRETS_FILE, { force: true });
258
- } catch {
259
- // файла нет — не ошибка
260
- }
354
+ // Без предварительного rm: rename на POSIX и Windows атомарно заменяет файл,
355
+ // а rm открывал окно, в котором secrets.json отсутствовал при краше.
261
356
  fs.renameSync(tmp, SECRETS_FILE);
262
357
  chmodPrivate(SECRETS_FILE);
263
358
  try {
@@ -305,15 +400,17 @@ export function setSecret(name: string, value: string): SecretListItem {
305
400
  }
306
401
  const secretName = validateSecretName(name);
307
402
  const text = String(value ?? "");
308
- const key = loadKey();
309
- const file = readFileSafe();
310
- file.secrets[secretName] = encryptValue(secretName, text, key);
311
- writeFileSafe(file);
312
- return {
313
- name: secretName,
314
- preview: previewOf(text),
315
- updatedAt: file.secrets[secretName].updatedAt,
316
- };
403
+ return withSecretsLock(() => {
404
+ const key = loadKey();
405
+ const file = readFileSafe();
406
+ file.secrets[secretName] = encryptValue(secretName, text, key);
407
+ writeFileSafe(file);
408
+ return {
409
+ name: secretName,
410
+ preview: previewOf(text),
411
+ updatedAt: file.secrets[secretName].updatedAt,
412
+ };
413
+ });
317
414
  }
318
415
 
319
416
  /** Читает секрет; undefined, если его нет или он не расшифровывается. */
@@ -338,11 +435,13 @@ export function hasSecret(name: string): boolean {
338
435
  /** Удаляет секрет; true — запись была. */
339
436
  export function deleteSecret(name: string): boolean {
340
437
  const secretName = validateSecretName(name);
341
- const file = readFileSafe();
342
- if (!(secretName in file.secrets)) return false;
343
- delete file.secrets[secretName];
344
- writeFileSafe(file);
345
- return true;
438
+ return withSecretsLock(() => {
439
+ const file = readFileSafe();
440
+ if (!(secretName in file.secrets)) return false;
441
+ delete file.secrets[secretName];
442
+ writeFileSafe(file);
443
+ return true;
444
+ });
346
445
  }
347
446
 
348
447
  function previewOf(value: string): string {
@@ -465,8 +564,9 @@ export function redactSecretsInText(text: unknown): string {
465
564
  }
466
565
 
467
566
  result = result.replace(
468
- /\b([A-Za-z0-9_]*(?:TOKEN|SECRET|PASSWORD|PASSWD|API_KEY|APIKEY|CREDENTIAL|AUTH)[A-Za-z0-9_]*)\b(\s*[=:]\s*)(["']?)([^\s"',;]+)\3/gi,
469
- (_match: string, key: string, sep: string, quote: string) => `${key}${sep}${quote}***${quote}`,
567
+ /(["']?)\b([A-Za-z0-9_]*(?:TOKEN|SECRET|PASSWORD|PASSWD|API_KEY|APIKEY|CREDENTIAL|AUTH)[A-Za-z0-9_]*)\b\1(\s*[=:]\s*)(["']?)([^\s"',;]+)\4/gi,
568
+ (_match: string, openQuote: string, key: string, sep: string, quote: string) =>
569
+ `${openQuote}${key}${openQuote}${sep}${quote}***${quote}`,
470
570
  );
471
571
 
472
572
  // Восстанавливаем защищённые ссылки.
@@ -1,7 +1,7 @@
1
1
  import crypto from "node:crypto";
2
2
  import fs from "node:fs/promises";
3
3
  import path from "node:path";
4
- import { execFile } from "node:child_process";
4
+ import { runOpencode } from "./opencode-cli.js";
5
5
  import { getTask, saveTask } from "../db/tasks-repo.js";
6
6
  import { appendStructuredLog } from "./structured-log.js";
7
7
  import { WRAPPER_DIR, sanitizeName } from "../types.js";
@@ -119,16 +119,29 @@ export async function rotateSessionIfNeeded(taskName: string): Promise<void> {
119
119
  const count = (def.sessionRunCount ?? 0) + 1;
120
120
 
121
121
  if (shouldRotateSession(count, maxRuns)) {
122
- const sessionId = def.sessionId;
123
- if (sessionId && isValidSessionId(sessionId)) {
124
- try {
125
- await new Promise<void>((resolve) => {
126
- execFile("opencode", ["session", "delete", sessionId], () => resolve());
127
- });
128
- } catch {
129
- // Удаление не должно мешать: просто фиксируем в логе ниже.
122
+ const oldSessionId = def.sessionId;
123
+ const hasOldSession = Boolean(oldSessionId && isValidSessionId(oldSessionId));
124
+ let deleteError: string | undefined;
125
+
126
+ if (hasOldSession && oldSessionId) {
127
+ // На Windows `opencode` — это `opencode.cmd`, который Node не запускает
128
+ // напрямую через execFile (ENOENT/EINVAL). Общий модуль сам выбирает
129
+ // cmd.exe на Windows, поэтому удаление действительно выполняется.
130
+ const result = await runOpencode(["session", "delete", oldSessionId]);
131
+ if (!result.ok) {
132
+ deleteError = result.error ?? "неизвестная ошибка";
133
+ console.warn(
134
+ `[session] Не удалось удалить сессию ${oldSessionId} задачи "${taskName}": ${deleteError}`,
135
+ );
130
136
  }
131
137
  }
138
+
139
+ const rotationNote = !hasOldSession
140
+ ? "старой сессии не было"
141
+ : deleteError
142
+ ? `старую сессию удалить не удалось (${deleteError})`
143
+ : "сессия удалена";
144
+
132
145
  const newSessionId = generateSessionId();
133
146
  await saveTask({
134
147
  ...def,
@@ -139,7 +152,7 @@ export async function rotateSessionIfNeeded(taskName: string): Promise<void> {
139
152
  appendStructuredLog({
140
153
  event: "session.rotated",
141
154
  task: taskName,
142
- reason: `maxRuns=${maxRuns} достигнут; сессия удалена, создана новая, счётчик сброшен`,
155
+ reason: `maxRuns=${maxRuns} достигнут; ${rotationNote}, создана новая, счётчик сброшен`,
143
156
  });
144
157
  } else {
145
158
  await saveTask({ ...def, sessionRunCount: count });
@@ -18,7 +18,18 @@ import { redactSecretsInText } from "./secrets.js";
18
18
  */
19
19
 
20
20
  /** События структурированного лога. */
21
- export type StructuredLogEvent = "run.started" | "run.finished" | "hook.received" | string;
21
+ export type StructuredLogEvent =
22
+ | "run.started"
23
+ | "run.finished"
24
+ | "hook.received"
25
+ | "matrix.started"
26
+ | "matrix.advanced"
27
+ | "matrix.queue_started"
28
+ | "matrix.cancelled"
29
+ | "matrix.aggregated"
30
+ | "matrix.aggregator_started"
31
+ | "matrix.error"
32
+ | string;
22
33
 
23
34
  export interface StructuredLogRecord {
24
35
  /** Время записи (ISO). */
@@ -49,6 +60,12 @@ export interface StructuredLogRecord {
49
60
  payloadBytes?: number;
50
61
  /** Причина отказа/пропуска. */
51
62
  reason?: string;
63
+ /** Родительская задача матрицы (matrixId === task для событий matrix.*). */
64
+ matrixId?: string;
65
+ /** Имя клона матрицы, к которому относится событие. */
66
+ cloneName?: string;
67
+ /** Шаг матричного сценария: started, advanced, cancelled, aggregated и т.п. */
68
+ step?: string;
52
69
  }
53
70
 
54
71
  export interface ReadStructuredLogsFilter {
@@ -101,9 +118,9 @@ function rotateIfNeeded(): void {
101
118
  // Нет старого архива — не страшно.
102
119
  }
103
120
  fs.renameSync(STRUCTURED_LOG_FILE, STRUCTURED_LOG_ARCHIVE);
104
- } catch (err: any) {
121
+ } catch (err: unknown) {
105
122
  // ENOENT — файла ещё нет, это нормально.
106
- if (err?.code !== "ENOENT") warn("не удалось ротировать лог", err);
123
+ if ((err as NodeJS.ErrnoException | undefined)?.code !== "ENOENT") warn("не удалось ротировать лог", err);
107
124
  }
108
125
  }
109
126
 
@@ -143,8 +160,8 @@ function readLines(file: string): string[] {
143
160
  .readFileSync(file, "utf8")
144
161
  .split(/\r?\n/)
145
162
  .filter((line) => line.trim().length > 0);
146
- } catch (err: any) {
147
- if (err?.code !== "ENOENT") warn(`не удалось прочитать ${file}`, err);
163
+ } catch (err: unknown) {
164
+ if ((err as NodeJS.ErrnoException | undefined)?.code !== "ENOENT") warn(`не удалось прочитать ${file}`, err);
148
165
  return [];
149
166
  }
150
167
  }
@@ -0,0 +1,67 @@
1
+ import { existsSync } from "node:fs";
2
+ import path from "node:path";
3
+ import { PLUGIN_DIR, WRAPPER_DIR, sanitizeName } from "../types.js";
4
+
5
+ /**
6
+ * P1-10: разные имена задач могут сжаться в один sanitized-идентификатор
7
+ * («my task» и «my-task» → «my-task»), после чего делят wrapper, prompt,
8
+ * lock и log. При создании новой задачи такую коллизию нужно отклонить,
9
+ * иначе вторая задача молча перезапишет файлы первой.
10
+ */
11
+ export type SanitizedConflict =
12
+ | { kind: "task"; taskName: string }
13
+ | { kind: "file"; file: string };
14
+
15
+ /**
16
+ * Ищет конфликт sanitized-имени среди существующих задач и их артефактов.
17
+ *
18
+ * @param name имя создаваемой задачи;
19
+ * @param existingNames имена уже существующих задач (без самой создаваемой);
20
+ * @param artifactExists проверка существования файла — подменяется в тестах.
21
+ */
22
+ export function findSanitizedNameConflict(
23
+ name: string,
24
+ existingNames: readonly string[],
25
+ artifactExists: (file: string) => boolean = existsSync,
26
+ ): SanitizedConflict | null {
27
+ const sanitized = sanitizeName(name);
28
+ const self = name.toLowerCase();
29
+
30
+ const dbConflict = existingNames.find(
31
+ (existing) =>
32
+ existing.toLowerCase() !== self && sanitizeName(existing) === sanitized,
33
+ );
34
+ if (dbConflict) {
35
+ return { kind: "task", taskName: dbConflict };
36
+ }
37
+
38
+ // Осиротевшие артефакты: в БД задачи уже нет, но файлы остались.
39
+ // Перезапись промпта/обёртки молча сломала бы такую задачу.
40
+ const artifacts = [
41
+ path.join(WRAPPER_DIR, `run-${sanitized}.cmd`),
42
+ path.join(WRAPPER_DIR, `run-${sanitized}.sh`),
43
+ path.join(PLUGIN_DIR, "prompts", `${sanitized}.txt`),
44
+ ];
45
+ const orphan = artifacts.find((file) => artifactExists(file));
46
+ if (orphan) {
47
+ return { kind: "file", file: orphan };
48
+ }
49
+ return null;
50
+ }
51
+
52
+ /** Человекочитаемое объяснение конфликта для ошибки создания задачи. */
53
+ export function sanitizedConflictMessage(
54
+ name: string,
55
+ conflict: SanitizedConflict,
56
+ ): string {
57
+ const sanitized = sanitizeName(name);
58
+ const reason =
59
+ conflict.kind === "task"
60
+ ? `существующая задача «${conflict.taskName}»`
61
+ : `оставшиеся файлы задачи (${conflict.file})`;
62
+ return (
63
+ `Имя задачи «${name}» приводит к тому же имени файла «${sanitized}», ` +
64
+ `что и ${reason}. Выберите другое имя` +
65
+ (conflict.kind === "file" ? " или удалите старые файлы." : ".")
66
+ );
67
+ }
@@ -418,8 +418,8 @@ export async function sendTelegramMessage(
418
418
  );
419
419
  }
420
420
  break;
421
- } catch (err: any) {
422
- if (err?.name === "AbortError") {
421
+ } catch (err: unknown) {
422
+ if ((err as Error | undefined)?.name === "AbortError") {
423
423
  throw new Error(
424
424
  t("notify.error.telegramTimeout", {
425
425
  seconds: Math.floor(timeoutMs / 1000),
@@ -65,8 +65,8 @@ function processAlive(pid: number): boolean {
65
65
  try {
66
66
  process.kill(pid, 0);
67
67
  return true;
68
- } catch (err: any) {
69
- return err?.code === "EPERM";
68
+ } catch (err: unknown) {
69
+ return (err as NodeJS.ErrnoException | undefined)?.code === "EPERM";
70
70
  }
71
71
  }
72
72
 
@@ -82,8 +82,8 @@ function acquireWorkerSlot(dir: string): string | null {
82
82
  fs.writeFileSync(fd, String(process.pid));
83
83
  fs.closeSync(fd);
84
84
  return slot;
85
- } catch (err: any) {
86
- if (err?.code !== "EEXIST") continue;
85
+ } catch (err: unknown) {
86
+ if ((err as NodeJS.ErrnoException | undefined)?.code !== "EEXIST") continue;
87
87
  let holder = 0;
88
88
  try {
89
89
  holder = parseInt(fs.readFileSync(slot, "utf8").trim(), 10);
@@ -245,7 +245,7 @@ export function scheduleTriageJob(
245
245
  const dir = options.tmpDir ?? os.tmpdir();
246
246
  pruneTriageArtifacts(dir);
247
247
  file = writeTriageJob(input, triage, { tmpDir: dir });
248
- } catch (err: any) {
248
+ } catch (err: unknown) {
249
249
  return {
250
250
  scheduled: false,
251
251
  error: err instanceof Error ? err.message : String(err),
@@ -267,7 +267,7 @@ export function scheduleTriageJob(
267
267
  // Если процесс не стартовал, файл задания останется сиротой — убираем.
268
268
  child.on?.("error", () => safeUnlink(file));
269
269
  return { scheduled: true, file };
270
- } catch (err: any) {
270
+ } catch (err: unknown) {
271
271
  safeUnlink(file);
272
272
  return {
273
273
  scheduled: false,
@@ -315,7 +315,7 @@ async function drainQueue(first: string): Promise<void> {
315
315
  const file: string = current;
316
316
  try {
317
317
  await runTriageJob(file);
318
- } catch (err: any) {
318
+ } catch (err: unknown) {
319
319
  console.error(
320
320
  `[agent-steward] triage worker: ${
321
321
  err instanceof Error ? err.message : String(err)
@@ -161,7 +161,7 @@ function parseVerdict(raw: string): TriageVerdict {
161
161
  let parsed: unknown;
162
162
  try {
163
163
  parsed = JSON.parse(text.slice(start, end + 1));
164
- } catch (err: any) {
164
+ } catch (err: unknown) {
165
165
  throw new ParseFailure(
166
166
  "invalid-json",
167
167
  `Ответ модели не парсится как JSON: ${err instanceof Error ? err.message : String(err)}`,
@@ -333,7 +333,7 @@ export async function classifyNotification(
333
333
  protocol,
334
334
  };
335
335
  }
336
- } catch (err: any) {
336
+ } catch (err: unknown) {
337
337
  const aborted = controller.signal.aborted;
338
338
  const failure: TriageFailure = aborted
339
339
  ? "timeout"
@@ -0,0 +1,199 @@
1
+ #!/usr/bin/env node
2
+ /**
3
+ * W-1/W-2 (0.0.6): CLI-помощник обёртки для одноразовых git worktree.
4
+ *
5
+ * Создание (вызывается из сгенерированного .cmd/.sh):
6
+ * node worktree-run.js --repo "<workdir>" --task "<task name>" [--root <dir>] [--json]
7
+ * node worktree-run.js create --repo ... --task ...
8
+ *
9
+ * Очистка (после прогона и для остатков):
10
+ * node worktree-run.js cleanup --path "<worktree>" [--repo <root>] [--root <dir>] [--keep-branch] [--json]
11
+ * node worktree-run.js cleanup --stale [--root <dir>] [--max-age-hours <n>] [--json]
12
+ *
13
+ * При создании в stdout печатается только путь к worktree (одна строка) —
14
+ * обёртка ловит его и переходит туда. Диагностика и ошибки идут в stderr.
15
+ * При ошибке exit 1: обёртка обязана упасть fail-closed, а не работать в
16
+ * основном дереве.
17
+ */
18
+ import path from "node:path";
19
+ import { pathToFileURL } from "node:url";
20
+ import {
21
+ cleanupStaleWorktrees,
22
+ createRunWorktree,
23
+ DEFAULT_STALE_AFTER_MS,
24
+ removeRunWorktree,
25
+ } from "./worktree.js";
26
+
27
+ type Mode = "create" | "cleanup";
28
+
29
+ interface HelperArgs {
30
+ mode: Mode;
31
+ repo?: string;
32
+ task?: string;
33
+ root?: string;
34
+ path?: string;
35
+ branch?: string;
36
+ keepBranch: boolean;
37
+ stale: boolean;
38
+ maxAgeHours?: number;
39
+ json: boolean;
40
+ }
41
+
42
+ function parseArgs(argv: string[]): { args: HelperArgs; error?: string } {
43
+ const args: HelperArgs = { mode: "create", keepBranch: false, stale: false, json: false };
44
+ let index = 0;
45
+
46
+ // Подкоманда необязательна: старые обёртки вызывают помощник без неё.
47
+ if (argv[0] === "create" || argv[0] === "cleanup") {
48
+ args.mode = argv[0];
49
+ index = 1;
50
+ }
51
+
52
+ for (; index < argv.length; index += 1) {
53
+ const flag = argv[index];
54
+ const value = argv[index + 1];
55
+ switch (flag) {
56
+ case "--json":
57
+ args.json = true;
58
+ break;
59
+ case "--keep-branch":
60
+ args.keepBranch = true;
61
+ break;
62
+ case "--stale":
63
+ args.stale = true;
64
+ break;
65
+ case "--repo":
66
+ case "--task":
67
+ case "--root":
68
+ case "--path":
69
+ case "--branch":
70
+ case "--max-age-hours": {
71
+ if (!value || value.startsWith("--")) {
72
+ return { args, error: `Флаг ${flag} требует значение.` };
73
+ }
74
+ if (flag === "--repo") args.repo = value;
75
+ if (flag === "--task") args.task = value;
76
+ if (flag === "--root") args.root = value;
77
+ if (flag === "--path") args.path = value;
78
+ if (flag === "--branch") args.branch = value;
79
+ if (flag === "--max-age-hours") {
80
+ const hours = Number(value);
81
+ if (!Number.isFinite(hours) || hours < 0) {
82
+ return { args, error: "Флаг --max-age-hours требует неотрицательное число." };
83
+ }
84
+ args.maxAgeHours = hours;
85
+ }
86
+ index += 1;
87
+ break;
88
+ }
89
+ default:
90
+ return { args, error: `Неизвестный аргумент: ${flag}` };
91
+ }
92
+ }
93
+ return { args };
94
+ }
95
+
96
+ function usage(): string {
97
+ return [
98
+ "Использование:",
99
+ " worktree-run.js --repo <dir> --task <name> [--root <dir>] [--json]",
100
+ " worktree-run.js create --repo <dir> --task <name> [--root <dir>] [--json]",
101
+ " worktree-run.js cleanup --path <worktree> [--repo <root>] [--root <dir>] [--keep-branch] [--json]",
102
+ " worktree-run.js cleanup --stale [--root <dir>] [--max-age-hours <n>] [--json]",
103
+ ].join("\n");
104
+ }
105
+
106
+ async function runCreate(args: HelperArgs): Promise<number> {
107
+ if (!args.repo || !args.task) {
108
+ process.stderr.write(`[worktree] ${usage()}\n`);
109
+ return 1;
110
+ }
111
+
112
+ // W-2.2: попутная уборка остатков. Не влияет на создание: ошибки уборки
113
+ // игнорируются, свежие worktree не трогаются.
114
+ await cleanupStaleWorktrees({ rootDir: args.root }).catch(() => undefined);
115
+
116
+ const result = await createRunWorktree({
117
+ repoDir: args.repo,
118
+ taskName: args.task,
119
+ rootDir: args.root,
120
+ });
121
+ if (!result.ok) {
122
+ process.stderr.write(`[worktree] ${result.error}\n`);
123
+ return 1;
124
+ }
125
+
126
+ process.stdout.write(
127
+ args.json ? `${JSON.stringify(result.worktree)}\n` : `${result.worktree.path}\n`,
128
+ );
129
+ return 0;
130
+ }
131
+
132
+ async function runCleanup(args: HelperArgs): Promise<number> {
133
+ if (args.stale && args.path) {
134
+ process.stderr.write("[worktree] Нельзя совмещать --stale и --path.\n");
135
+ return 1;
136
+ }
137
+
138
+ if (args.stale) {
139
+ const summary = await cleanupStaleWorktrees({
140
+ rootDir: args.root,
141
+ maxAgeMs:
142
+ args.maxAgeHours === undefined
143
+ ? DEFAULT_STALE_AFTER_MS
144
+ : args.maxAgeHours * 60 * 60 * 1000,
145
+ });
146
+ process.stdout.write(
147
+ args.json
148
+ ? `${JSON.stringify(summary)}\n`
149
+ : `[worktree] Удалено: ${summary.removed.length}, пропущено: ${summary.skipped.length}, sidecar: ${summary.pruned.length}, ошибок: ${summary.errors.length}${summary.locked ? " (уборка уже выполняется)" : ""}\n`,
150
+ );
151
+ if (summary.errors.length > 0) {
152
+ for (const error of summary.errors) process.stderr.write(`[worktree] ${error}\n`);
153
+ return 1;
154
+ }
155
+ return 0;
156
+ }
157
+
158
+ if (!args.path) {
159
+ process.stderr.write(`[worktree] ${usage()}\n`);
160
+ return 1;
161
+ }
162
+
163
+ const result = await removeRunWorktree({
164
+ path: args.path,
165
+ repoRoot: args.repo,
166
+ branch: args.branch,
167
+ rootDir: args.root,
168
+ deleteBranch: !args.keepBranch,
169
+ });
170
+ if (!result.ok) {
171
+ process.stderr.write(`[worktree] ${result.error}\n`);
172
+ return 1;
173
+ }
174
+ if (args.json) process.stdout.write(`${JSON.stringify({ ok: true, path: args.path })}\n`);
175
+ return 0;
176
+ }
177
+
178
+ /** Точка входа для тестов: возвращает exit code, ничего не завершает. */
179
+ export async function main(argv: string[] = process.argv.slice(2)): Promise<number> {
180
+ const parsed = parseArgs(argv);
181
+ if (parsed.error) {
182
+ process.stderr.write(`[worktree] ${parsed.error}\n`);
183
+ return 1;
184
+ }
185
+ return parsed.args.mode === "cleanup" ? runCleanup(parsed.args) : runCreate(parsed.args);
186
+ }
187
+
188
+ const invokedPath = process.argv[1] ? pathToFileURL(path.resolve(process.argv[1])).href : "";
189
+ if (import.meta.url === invokedPath) {
190
+ main().then(
191
+ (code) => {
192
+ process.exitCode = code;
193
+ },
194
+ (err: unknown) => {
195
+ process.stderr.write(`[worktree] ${err instanceof Error ? err.message : String(err)}\n`);
196
+ process.exitCode = 1;
197
+ },
198
+ );
199
+ }