agent-steward 0.0.2 → 0.0.4

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 (263) hide show
  1. package/CHANGELOG.md +45 -2
  2. package/CROSS_PLATFORM.md +11 -9
  3. package/README.md +11 -10
  4. package/ROADMAP-STRATEGY.md +93 -44
  5. package/ROADMAP.md +148 -1017
  6. package/dist/core/cron-to-schtasks.d.ts +0 -8
  7. package/dist/core/cron-to-schtasks.d.ts.map +1 -1
  8. package/dist/core/cron-to-schtasks.js +11 -86
  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 +19 -2
  14. package/dist/core/file-watcher.js +9 -9
  15. package/dist/core/git-trigger.js +4 -4
  16. package/dist/core/lock.d.ts +20 -4
  17. package/dist/core/lock.d.ts.map +1 -1
  18. package/dist/core/lock.js +99 -26
  19. package/dist/core/one-shot.d.ts +31 -5
  20. package/dist/core/one-shot.d.ts.map +1 -1
  21. package/dist/core/one-shot.js +78 -10
  22. package/dist/core/opencode-cli.d.ts +28 -0
  23. package/dist/core/opencode-cli.d.ts.map +1 -0
  24. package/dist/core/opencode-cli.js +74 -0
  25. package/dist/core/opencode-models.d.ts +62 -0
  26. package/dist/core/opencode-models.d.ts.map +1 -0
  27. package/dist/core/opencode-models.js +277 -0
  28. package/dist/core/otel.js +2 -2
  29. package/dist/core/ps-wrapper.d.ts +1 -1
  30. package/dist/core/ps-wrapper.d.ts.map +1 -1
  31. package/dist/core/ps-wrapper.js +66 -36
  32. package/dist/core/record-history.d.ts +15 -0
  33. package/dist/core/record-history.d.ts.map +1 -1
  34. package/dist/core/record-history.js +78 -54
  35. package/dist/core/router/dispatch.d.ts +36 -0
  36. package/dist/core/router/dispatch.d.ts.map +1 -0
  37. package/dist/core/router/dispatch.js +59 -0
  38. package/dist/core/router/escalation.d.ts +47 -0
  39. package/dist/core/router/escalation.d.ts.map +1 -0
  40. package/dist/core/router/escalation.js +87 -0
  41. package/dist/core/router/planner.d.ts +53 -0
  42. package/dist/core/router/planner.d.ts.map +1 -0
  43. package/dist/core/router/planner.js +113 -0
  44. package/dist/core/router/rules.d.ts +46 -0
  45. package/dist/core/router/rules.d.ts.map +1 -0
  46. package/dist/core/router/rules.js +85 -0
  47. package/dist/core/run-panel-api.d.ts +94 -0
  48. package/dist/core/run-panel-api.d.ts.map +1 -0
  49. package/dist/core/run-panel-api.js +169 -0
  50. package/dist/core/schedule-gate.js +5 -1
  51. package/dist/core/schedule-v2.d.ts +36 -2
  52. package/dist/core/schedule-v2.d.ts.map +1 -1
  53. package/dist/core/schedule-v2.js +98 -12
  54. package/dist/core/scheduler/at-fallback.d.ts +95 -0
  55. package/dist/core/scheduler/at-fallback.d.ts.map +1 -0
  56. package/dist/core/scheduler/at-fallback.js +200 -0
  57. package/dist/core/scheduler/linux.d.ts +13 -2
  58. package/dist/core/scheduler/linux.d.ts.map +1 -1
  59. package/dist/core/scheduler/linux.js +67 -13
  60. package/dist/core/scheduler/mac.d.ts +14 -8
  61. package/dist/core/scheduler/mac.d.ts.map +1 -1
  62. package/dist/core/scheduler/mac.js +71 -22
  63. package/dist/core/scheduler/posix.d.ts.map +1 -1
  64. package/dist/core/scheduler/posix.js +37 -2
  65. package/dist/core/scheduler/registry.d.ts +13 -0
  66. package/dist/core/scheduler/registry.d.ts.map +1 -1
  67. package/dist/core/scheduler/registry.js +83 -21
  68. package/dist/core/scheduler/run-now.d.ts +16 -0
  69. package/dist/core/scheduler/run-now.d.ts.map +1 -0
  70. package/dist/core/scheduler/run-now.js +28 -0
  71. package/dist/core/scheduler/windows.d.ts +16 -3
  72. package/dist/core/scheduler/windows.d.ts.map +1 -1
  73. package/dist/core/scheduler/windows.js +249 -96
  74. package/dist/core/secrets.d.ts.map +1 -1
  75. package/dist/core/secrets.js +127 -30
  76. package/dist/core/self-analysis.js +55 -55
  77. package/dist/core/session.d.ts.map +1 -1
  78. package/dist/core/session.js +18 -11
  79. package/dist/core/summary.js +1 -1
  80. package/dist/core/task-name.d.ts +24 -0
  81. package/dist/core/task-name.d.ts.map +1 -0
  82. package/dist/core/task-name.js +40 -0
  83. package/dist/core/triage-chain.js +1 -1
  84. package/dist/core/triage-worker.js +2 -2
  85. package/dist/core/triage.js +1 -1
  86. package/dist/core/wrappers/bash.d.ts.map +1 -1
  87. package/dist/core/wrappers/bash.js +82 -37
  88. package/dist/db/capability-repo.d.ts +83 -0
  89. package/dist/db/capability-repo.d.ts.map +1 -0
  90. package/dist/db/capability-repo.js +182 -0
  91. package/dist/db/history-repo.d.ts +8 -0
  92. package/dist/db/history-repo.d.ts.map +1 -1
  93. package/dist/db/history-repo.js +19 -0
  94. package/dist/db/index.d.ts +6 -0
  95. package/dist/db/index.d.ts.map +1 -1
  96. package/dist/db/index.js +48 -2
  97. package/dist/db/migrate.d.ts.map +1 -1
  98. package/dist/db/migrate.js +3 -1
  99. package/dist/db/run-context.d.ts +103 -0
  100. package/dist/db/run-context.d.ts.map +1 -0
  101. package/dist/db/run-context.js +224 -0
  102. package/dist/db/run-dlq.d.ts +100 -0
  103. package/dist/db/run-dlq.d.ts.map +1 -0
  104. package/dist/db/run-dlq.js +191 -0
  105. package/dist/db/run-journal.d.ts +60 -0
  106. package/dist/db/run-journal.d.ts.map +1 -0
  107. package/dist/db/run-journal.js +143 -0
  108. package/dist/db/run-resume.d.ts +51 -0
  109. package/dist/db/run-resume.d.ts.map +1 -0
  110. package/dist/db/run-resume.js +156 -0
  111. package/dist/db/runs-repo.d.ts +128 -0
  112. package/dist/db/runs-repo.d.ts.map +1 -0
  113. package/dist/db/runs-repo.js +342 -0
  114. package/dist/db/schema.d.ts +16 -2
  115. package/dist/db/schema.d.ts.map +1 -1
  116. package/dist/db/schema.js +342 -35
  117. package/dist/db/settings-repo.d.ts +11 -0
  118. package/dist/db/settings-repo.d.ts.map +1 -1
  119. package/dist/db/settings-repo.js +25 -0
  120. package/dist/db/step-idempotency.d.ts +51 -0
  121. package/dist/db/step-idempotency.d.ts.map +1 -0
  122. package/dist/db/step-idempotency.js +136 -0
  123. package/dist/index.d.ts +5 -5
  124. package/dist/index.d.ts.map +1 -1
  125. package/dist/index.js +168 -40
  126. package/dist/notifications.js +18 -18
  127. package/dist/profiles.d.ts +7 -3
  128. package/dist/profiles.d.ts.map +1 -1
  129. package/dist/profiles.js +85 -7
  130. package/dist/rpc.d.ts +787 -0
  131. package/dist/rpc.d.ts.map +1 -1
  132. package/dist/rpc.js +324 -0
  133. package/dist/server.d.ts +33 -2
  134. package/dist/server.d.ts.map +1 -1
  135. package/dist/server.js +115 -54
  136. package/dist/shared/jobs-view.d.ts.map +1 -1
  137. package/dist/skill.js +1 -1
  138. package/dist/task-transfer.d.ts +1 -1
  139. package/dist/task-transfer.d.ts.map +1 -1
  140. package/dist/task-transfer.js +14 -10
  141. package/dist/types.d.ts +20 -4
  142. package/dist/types.d.ts.map +1 -1
  143. package/dist/types.js +44 -9
  144. package/dist/workspaces.d.ts +25 -3
  145. package/dist/workspaces.d.ts.map +1 -1
  146. package/dist/workspaces.js +44 -9
  147. package/docs/ARCHITECTURE.md +335 -9
  148. package/docs/COMPATIBILITY.md +10 -6
  149. package/docs/CONCEPT.md +183 -91
  150. package/docs/CROSS_PLATFORM.ru.md +11 -9
  151. package/docs/CROSS_PLATFORM.zh.md +11 -9
  152. package/docs/EXECUTION-LOOP.md +196 -0
  153. package/docs/FAQ.md +2 -2
  154. package/docs/FAQ.ru.md +2 -2
  155. package/docs/FAQ.zh.md +2 -2
  156. package/docs/FEATURES.md +5 -4
  157. package/docs/FEATURES.zh.md +5 -4
  158. package/docs/MIGRATION.md +34 -26
  159. package/docs/README.ru.md +27 -8
  160. package/docs/README.zh.md +11 -10
  161. package/docs/SAFETY.md +122 -0
  162. package/docs/SAVINGS.md +29 -0
  163. package/docs/SAVINGS.ru.md +29 -0
  164. package/docs/SAVINGS.zh.md +18 -0
  165. package/docs/V1-V2-COMPATIBILITY-PLAN.md +6 -6
  166. package/gui-experimental.cjs +8 -8
  167. package/index.js +1 -0
  168. package/locales/en.json +68 -0
  169. package/locales/ru.json +68 -0
  170. package/locales/zh.json +68 -0
  171. package/package.json +57 -11
  172. package/scripts/audit-bundle.mjs +215 -0
  173. package/src/core/analytics.ts +2 -2
  174. package/src/core/audit.ts +17 -17
  175. package/src/core/cron-to-schtasks.ts +14 -93
  176. package/src/core/dlq-api.ts +98 -0
  177. package/src/core/dry-run.ts +51 -27
  178. package/src/core/file-watcher.ts +17 -17
  179. package/src/core/git-trigger.ts +9 -9
  180. package/src/core/glob.ts +1 -1
  181. package/src/core/local-ai.ts +2 -2
  182. package/src/core/lock.ts +104 -31
  183. package/src/core/matrix.ts +31 -31
  184. package/src/core/native-notify.ts +2 -2
  185. package/src/core/one-shot.ts +91 -13
  186. package/src/core/opencode-cli.ts +103 -0
  187. package/src/core/opencode-models.ts +315 -0
  188. package/src/core/otel.ts +4 -4
  189. package/src/core/permissions.ts +5 -5
  190. package/src/core/prometheus.ts +17 -17
  191. package/src/core/ps-wrapper.ts +68 -38
  192. package/src/core/record-history.ts +114 -76
  193. package/src/core/retention.ts +3 -3
  194. package/src/core/router/dispatch.ts +94 -0
  195. package/src/core/router/escalation.ts +129 -0
  196. package/src/core/router/planner.ts +166 -0
  197. package/src/core/router/rules.ts +109 -0
  198. package/src/core/run-panel-api.ts +262 -0
  199. package/src/core/savings.ts +1 -1
  200. package/src/core/schedule-gate.ts +17 -13
  201. package/src/core/schedule-v2.ts +138 -29
  202. package/src/core/scheduler/at-fallback.ts +298 -0
  203. package/src/core/scheduler/index.ts +3 -3
  204. package/src/core/scheduler/linux.ts +92 -19
  205. package/src/core/scheduler/logs.ts +1 -1
  206. package/src/core/scheduler/mac.ts +112 -60
  207. package/src/core/scheduler/posix.ts +35 -2
  208. package/src/core/scheduler/registry.ts +109 -26
  209. package/src/core/scheduler/run-now.ts +32 -0
  210. package/src/core/scheduler/windows.ts +295 -125
  211. package/src/core/secrets.ts +139 -39
  212. package/src/core/self-analysis.ts +61 -61
  213. package/src/core/session.ts +26 -13
  214. package/src/core/structured-log.ts +3 -3
  215. package/src/core/summary.ts +25 -25
  216. package/src/core/task-name.ts +67 -0
  217. package/src/core/telegram.ts +16 -16
  218. package/src/core/triage-chain.ts +4 -4
  219. package/src/core/triage-compare.ts +8 -8
  220. package/src/core/triage-rules.ts +4 -4
  221. package/src/core/triage-shadow.ts +7 -7
  222. package/src/core/triage-worker.ts +6 -6
  223. package/src/core/triage.ts +23 -23
  224. package/src/core/watch-paths.ts +1 -1
  225. package/src/core/wrappers/bash.ts +90 -45
  226. package/src/db/capability-repo.ts +285 -0
  227. package/src/db/git-state-repo.ts +1 -1
  228. package/src/db/history-repo.ts +44 -22
  229. package/src/db/index.ts +53 -7
  230. package/src/db/metrics-repo.ts +10 -10
  231. package/src/db/migrate.ts +13 -11
  232. package/src/db/recovery.ts +3 -3
  233. package/src/db/run-context.ts +370 -0
  234. package/src/db/run-dlq.ts +310 -0
  235. package/src/db/run-journal.ts +212 -0
  236. package/src/db/run-resume.ts +256 -0
  237. package/src/db/runs-repo.ts +504 -0
  238. package/src/db/schema.ts +357 -44
  239. package/src/db/settings-repo.ts +33 -2
  240. package/src/db/step-idempotency.ts +185 -0
  241. package/src/db/tasks-repo.ts +10 -10
  242. package/src/db/templates-repo.ts +7 -7
  243. package/src/gui.tsx +516 -1
  244. package/src/history.ts +4 -4
  245. package/src/i18n.ts +7 -7
  246. package/src/index.ts +465 -308
  247. package/src/integrations.ts +6 -6
  248. package/src/notifications.ts +76 -76
  249. package/src/profiles.ts +98 -7
  250. package/src/rpc.ts +347 -1
  251. package/src/schtasks.ts +2 -2
  252. package/src/server.ts +155 -78
  253. package/src/settings.ts +44 -44
  254. package/src/shared/jobs-view.ts +60 -60
  255. package/src/skill.ts +1 -1
  256. package/src/task-transfer.ts +58 -56
  257. package/src/templates.ts +1 -1
  258. package/src/types.ts +54 -10
  259. package/src/workspaces.ts +73 -24
  260. package/dist/core/self-analysis.test.d.ts +0 -2
  261. package/dist/core/self-analysis.test.d.ts.map +0 -1
  262. package/dist/core/self-analysis.test.js +0 -219
  263. package/dist/gui-experimental.cjs +0 -1
@@ -25,9 +25,34 @@ export class PosixSchedulerBase {
25
25
  createdAt: new Date().toISOString(),
26
26
  ...(options.model ? { model: options.model } : {}),
27
27
  ...(options.priority !== undefined ? { priority: options.priority } : {}),
28
+ ...(options.timezone ? { timezone: options.timezone } : {}),
28
29
  };
30
+ // P2-17: запись нужна в реестре ДО installEntry — Linux пересобирает crontab
31
+ // из реестра. Но если установка упала, запись-призрак останется навсегда,
32
+ // поэтому откатываем реестр к предыдущему состоянию.
33
+ const previous = await this.registry.find(entry.name);
29
34
  await this.registry.upsert(entry);
30
- await this.installEntry(entry);
35
+ try {
36
+ await this.installEntry(entry);
37
+ }
38
+ catch (err) {
39
+ try {
40
+ if (previous)
41
+ await this.registry.upsert(previous);
42
+ else
43
+ await this.registry.remove(entry.name);
44
+ }
45
+ catch {
46
+ // Не маскируем исходную ошибку установки ошибкой отката.
47
+ }
48
+ try {
49
+ await this.uninstallEntry(entry);
50
+ }
51
+ catch {
52
+ // Частичная установка могла не создать запись — это не ошибка отката.
53
+ }
54
+ throw err;
55
+ }
31
56
  // installEntry может записать atJobId для Linux one-shot.
32
57
  await this.registry.upsert(entry);
33
58
  }
@@ -74,6 +99,16 @@ export class PosixSchedulerBase {
74
99
  stdio: "ignore",
75
100
  cwd: entry.workingDirectory || process.cwd(),
76
101
  });
102
+ // spawn не бросает синхронно: ошибки (например, удалённый
103
+ // workingDirectory → ENOENT) приходят событием 'error'. Без слушателя
104
+ // это uncaught exception в plugin-host. Ждём 'spawn' либо 'error'.
105
+ const spawnError = await new Promise((resolve) => {
106
+ child.once("spawn", () => resolve(null));
107
+ child.once("error", (error) => resolve(error));
108
+ });
109
+ if (spawnError) {
110
+ throw new Error(`Не удалось запустить задачу "${name}": ${spawnError.message}`);
111
+ }
77
112
  child.unref();
78
113
  return { alreadyRunning: false };
79
114
  }
@@ -85,5 +120,5 @@ export class PosixSchedulerBase {
85
120
  export function shellQuote(value) {
86
121
  if (value === "")
87
122
  return "''";
88
- return `'${value.replace(/'/g, `'\\''`)}'`;
123
+ return `'${value.replace(/'/g, "'\\''")}'`;
89
124
  }
@@ -23,16 +23,29 @@ export interface RegistryEntry {
23
23
  model?: string;
24
24
  /** Приоритет задачи 0..10 (опционально). */
25
25
  priority?: number;
26
+ /** IANA-таймзона задачи (опционально, undefined — системная). */
27
+ timezone?: string;
26
28
  }
27
29
  /** Реестр задач конкретного бэкенда: <pluginDir>/scheduler-<backend>.json. */
28
30
  export declare class TaskRegistry {
29
31
  private readonly file;
30
32
  private readonly dir;
33
+ private readonly backendId;
34
+ private readonly lock;
31
35
  constructor(backendId: string, profile?: string);
32
36
  /** Путь к файлу реестра (для диагностики). */
33
37
  get path(): string;
38
+ /** Маркер того, что реестр был повреждён и перемещён в карантин. */
39
+ private get blockedPath();
34
40
  load(): Promise<RegistryEntry[]>;
41
+ /** Перемещает повреждённый файл в карантин и блокирует дальнейшие записи. */
42
+ private quarantineCorrupt;
35
43
  save(entries: RegistryEntry[]): Promise<void>;
44
+ /**
45
+ * Read-modify-write под межпроцессной блокировкой: два процесса на одном
46
+ * профиле не должны терять чужие записи (P2-16).
47
+ */
48
+ private mutate;
36
49
  find(name: string): Promise<RegistryEntry | undefined>;
37
50
  upsert(entry: RegistryEntry): Promise<void>;
38
51
  remove(name: string): Promise<void>;
@@ -1 +1 @@
1
- {"version":3,"file":"registry.d.ts","sourceRoot":"","sources":["../../../src/core/scheduler/registry.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAE9C;;;;;;GAMG;AACH,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,WAAW,EAAE,WAAW,CAAC;IACzB,yEAAyE;IACzE,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,iEAAiE;IACjE,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,OAAO,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,uCAAuC;IACvC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,4CAA4C;IAC5C,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,8EAA8E;AAC9E,qBAAa,YAAY;IACvB,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAS;IAC9B,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAS;gBAEjB,SAAS,EAAE,MAAM,EAAE,OAAO,GAAE,MAAyB;IAKjE,8CAA8C;IAC9C,IAAI,IAAI,IAAI,MAAM,CAEjB;IAEK,IAAI,IAAI,OAAO,CAAC,aAAa,EAAE,CAAC;IAchC,IAAI,CAAC,OAAO,EAAE,aAAa,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAO7C,IAAI,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC;IAKtD,MAAM,CAAC,KAAK,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IAU3C,MAAM,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAOnC,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;CAS9D"}
1
+ {"version":3,"file":"registry.d.ts","sourceRoot":"","sources":["../../../src/core/scheduler/registry.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAE9C;;;;;;GAMG;AACH,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,WAAW,EAAE,WAAW,CAAC;IACzB,yEAAyE;IACzE,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,iEAAiE;IACjE,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,OAAO,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,uCAAuC;IACvC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,4CAA4C;IAC5C,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,iEAAiE;IACjE,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,8EAA8E;AAC9E,qBAAa,YAAY;IACvB,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAS;IAC9B,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAS;IAC7B,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAS;IACnC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAc;gBAEvB,SAAS,EAAE,MAAM,EAAE,OAAO,GAAE,MAAyB;IASjE,8CAA8C;IAC9C,IAAI,IAAI,IAAI,MAAM,CAEjB;IAED,oEAAoE;IACpE,OAAO,KAAK,WAAW,GAEtB;IAEK,IAAI,IAAI,OAAO,CAAC,aAAa,EAAE,CAAC;IAmCtC,6EAA6E;YAC/D,iBAAiB;IAwBzB,IAAI,CAAC,OAAO,EAAE,aAAa,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAUnD;;;OAGG;YACW,MAAM;IAed,IAAI,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC;IAKtD,MAAM,CAAC,KAAK,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IAU3C,MAAM,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IASnC,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;CAQ9D"}
@@ -1,57 +1,119 @@
1
1
  import fs from "node:fs/promises";
2
2
  import path from "node:path";
3
3
  import { getProfileDir, getProfileName } from "../../profiles.js";
4
+ import { LockManager, withLockWait } from "../lock.js";
4
5
  /** Реестр задач конкретного бэкенда: <pluginDir>/scheduler-<backend>.json. */
5
6
  export class TaskRegistry {
6
7
  constructor(backendId, profile = getProfileName()) {
8
+ this.backendId = backendId;
7
9
  this.dir = getProfileDir(profile);
8
10
  this.file = path.join(this.dir, `scheduler-${backendId}.json`);
11
+ // P2-16: мутации реестра — read-modify-write. Лок сериализует их между
12
+ // процессами (хост OpenCode, CLI, detached record-history).
13
+ this.lock = new LockManager(path.join(this.dir, "locks"));
9
14
  }
10
15
  /** Путь к файлу реестра (для диагностики). */
11
16
  get path() {
12
17
  return this.file;
13
18
  }
19
+ /** Маркер того, что реестр был повреждён и перемещён в карантин. */
20
+ get blockedPath() {
21
+ return `${this.file}.blocked`;
22
+ }
14
23
  async load() {
24
+ let raw;
15
25
  try {
16
- const raw = await fs.readFile(this.file, "utf8");
17
- const parsed = JSON.parse(raw);
18
- if (!Array.isArray(parsed))
26
+ raw = await fs.readFile(this.file, "utf8");
27
+ }
28
+ catch (err) {
29
+ if (err?.code === "ENOENT") {
30
+ // Карантин уже переместил файл. Пустой реестр нельзя выдавать за
31
+ // «задач нет»: rebuildCrontab вычистил бы все cron-строки плагина.
32
+ const blocked = await fs.readFile(this.blockedPath, "utf8").catch(() => null);
33
+ if (blocked) {
34
+ throw new Error(`Реестр задач повреждён (карантин: ${blocked.trim()}). ` +
35
+ `Восстановите ${this.file} вручную или удалите маркер ${this.blockedPath}.`);
36
+ }
19
37
  return [];
20
- return parsed.filter((entry) => entry && typeof entry.name === "string" && typeof entry.command === "string");
38
+ }
39
+ throw err;
40
+ }
41
+ let parsed;
42
+ try {
43
+ parsed = JSON.parse(raw);
21
44
  }
22
- catch {
23
- return [];
45
+ catch (err) {
46
+ return this.quarantineCorrupt(err);
24
47
  }
48
+ if (!Array.isArray(parsed)) {
49
+ return this.quarantineCorrupt(new Error("expected an array of registry entries"));
50
+ }
51
+ return parsed.filter((entry) => entry && typeof entry.name === "string" && typeof entry.command === "string");
52
+ }
53
+ /** Перемещает повреждённый файл в карантин и блокирует дальнейшие записи. */
54
+ async quarantineCorrupt(err) {
55
+ const stamp = new Date().toISOString().replace(/[:.]/g, "-");
56
+ const target = `${this.file}.corrupt-${stamp}`;
57
+ let moved = "";
58
+ try {
59
+ await fs.rename(this.file, target);
60
+ await fs.writeFile(this.blockedPath, target, "utf8");
61
+ moved = ` Файл перемещён в ${target}.`;
62
+ console.warn(`[scheduler] Реестр ${path.basename(this.file)} повреждён и перемещён в ${target}. ` +
63
+ `Запись заблокирована маркером ${this.blockedPath}.`, err);
64
+ }
65
+ catch (renameErr) {
66
+ console.error(`[scheduler] Не удалось переместить повреждённый реестр ${this.file} в ${target}.`, renameErr);
67
+ }
68
+ throw new Error(`Реестр задач повреждён.${moved} Восстановите ${this.file} вручную или удалите маркер ${this.blockedPath}.`);
25
69
  }
26
70
  async save(entries) {
27
71
  await fs.mkdir(this.dir, { recursive: true });
28
72
  const tmp = `${this.file}.tmp`;
29
73
  await fs.writeFile(tmp, JSON.stringify(entries, null, 2), "utf8");
30
74
  await fs.rename(tmp, this.file);
75
+ await fs.rm(this.blockedPath, { force: true }).catch(() => {
76
+ /* маркера могло не быть */
77
+ });
78
+ }
79
+ /**
80
+ * Read-modify-write под межпроцессной блокировкой: два процесса на одном
81
+ * профиле не должны терять чужие записи (P2-16).
82
+ */
83
+ async mutate(fn) {
84
+ await this.lock.initialize();
85
+ return withLockWait(this.lock, `registry-${this.backendId}`, async () => {
86
+ const entries = await this.load();
87
+ const result = await fn(entries);
88
+ await this.save(entries);
89
+ return result;
90
+ }, { timeoutMs: 15000, staleMs: 60000 });
31
91
  }
32
92
  async find(name) {
33
93
  const entries = await this.load();
34
94
  return entries.find((e) => e.name.toLowerCase() === name.toLowerCase());
35
95
  }
36
96
  async upsert(entry) {
37
- const entries = await this.load();
38
- const index = entries.findIndex((e) => e.name.toLowerCase() === entry.name.toLowerCase());
39
- if (index === -1)
40
- entries.push(entry);
41
- else
42
- entries[index] = entry;
43
- await this.save(entries);
97
+ await this.mutate((entries) => {
98
+ const index = entries.findIndex((e) => e.name.toLowerCase() === entry.name.toLowerCase());
99
+ if (index === -1)
100
+ entries.push(entry);
101
+ else
102
+ entries[index] = entry;
103
+ });
44
104
  }
45
105
  async remove(name) {
46
- const entries = await this.load();
47
- await this.save(entries.filter((e) => e.name.toLowerCase() !== name.toLowerCase()));
106
+ await this.mutate((entries) => {
107
+ const index = entries.findIndex((e) => e.name.toLowerCase() === name.toLowerCase());
108
+ if (index !== -1)
109
+ entries.splice(index, 1);
110
+ });
48
111
  }
49
112
  async setPaused(name, paused) {
50
- const entries = await this.load();
51
- const entry = entries.find((e) => e.name.toLowerCase() === name.toLowerCase());
52
- if (!entry)
53
- return;
54
- entry.paused = paused;
55
- await this.save(entries);
113
+ await this.mutate((entries) => {
114
+ const entry = entries.find((e) => e.name.toLowerCase() === name.toLowerCase());
115
+ if (entry)
116
+ entry.paused = paused;
117
+ });
56
118
  }
57
119
  }
@@ -0,0 +1,16 @@
1
+ import type { RunTaskResult, SchedulerBackend } from "./types.js";
2
+ /**
3
+ * Немедленный запуск задачи в обход schedule-gate.
4
+ *
5
+ * Зачем: для poll-режима (расширенный cron / чужая IANA-таймзона / окно
6
+ * запуска) обёртка всегда прогоняет schedule-gate, и запуск вне cron-окна
7
+ * молча завершается с exit 3. Это касается не только `run_task_now`, но и
8
+ * цепочек (nextTaskOnSuccess / nextTaskOnError), DAG-зависимостей и retry:
9
+ * они тоже запускают задачу «сейчас», а не «по расписанию».
10
+ *
11
+ * Маркер `requestImmediateRun` снимает проверку расписания внутри обёртки.
12
+ * Если планировщик не принял запуск, маркер удаляется, чтобы он не «разрешил»
13
+ * следующий плановый тик в обход расписания.
14
+ */
15
+ export declare function runTaskNow(taskName: string, backend?: SchedulerBackend): Promise<RunTaskResult>;
16
+ //# sourceMappingURL=run-now.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"run-now.d.ts","sourceRoot":"","sources":["../../../src/core/scheduler/run-now.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAElE;;;;;;;;;;;;GAYG;AACH,wBAAsB,UAAU,CAC9B,QAAQ,EAAE,MAAM,EAChB,OAAO,GAAE,gBAA2C,GACnD,OAAO,CAAC,aAAa,CAAC,CAUxB"}
@@ -0,0 +1,28 @@
1
+ import fs from "node:fs/promises";
2
+ import { requestImmediateRun } from "../ps-wrapper.js";
3
+ import { createSchedulerBackend } from "./index.js";
4
+ /**
5
+ * Немедленный запуск задачи в обход schedule-gate.
6
+ *
7
+ * Зачем: для poll-режима (расширенный cron / чужая IANA-таймзона / окно
8
+ * запуска) обёртка всегда прогоняет schedule-gate, и запуск вне cron-окна
9
+ * молча завершается с exit 3. Это касается не только `run_task_now`, но и
10
+ * цепочек (nextTaskOnSuccess / nextTaskOnError), DAG-зависимостей и retry:
11
+ * они тоже запускают задачу «сейчас», а не «по расписанию».
12
+ *
13
+ * Маркер `requestImmediateRun` снимает проверку расписания внутри обёртки.
14
+ * Если планировщик не принял запуск, маркер удаляется, чтобы он не «разрешил»
15
+ * следующий плановый тик в обход расписания.
16
+ */
17
+ export async function runTaskNow(taskName, backend = createSchedulerBackend()) {
18
+ const forceFile = await requestImmediateRun(taskName);
19
+ try {
20
+ return await backend.runTask(taskName);
21
+ }
22
+ catch (err) {
23
+ await fs.unlink(forceFile).catch(() => {
24
+ /* маркер мог быть уже поглощён gate'ом или удалён по TTL */
25
+ });
26
+ throw err;
27
+ }
28
+ }
@@ -2,8 +2,12 @@ import type { ScheduledTaskInfo } from "../../types.js";
2
2
  import type { CreateTaskOptions, RunTaskResult, SchedulerBackend } from "./types.js";
3
3
  /** Префикс папки задач плагина в Планировщике заданий Windows. */
4
4
  export declare const WINDOWS_TASK_PREFIX: string;
5
- /** Префикс папки задач конкретного профиля (для удаления неактивного профиля). */
5
+ /** Префикс старой папки (до переименования) — поддерживается для миграции. */
6
+ export declare const LEGACY_WINDOWS_TASK_PREFIX: string;
7
+ /** Префикс папки конкретного профиля (для удаления неактивного профиля). */
6
8
  export declare function windowsTaskPrefixForProfile(profile: string): string;
9
+ /** Префикс старой папки конкретного профиля. */
10
+ export declare function legacyWindowsTaskPrefixForProfile(profile: string): string;
7
11
  /** Полное имя задачи в папке конкретного профиля. */
8
12
  export declare function taskFullNameForProfile(name: string, profile: string): string;
9
13
  /**
@@ -73,16 +77,23 @@ export declare function taskFullName(name: string): string;
73
77
  */
74
78
  export declare class WindowsScheduler implements SchedulerBackend {
75
79
  readonly platform: NodeJS.Platform;
76
- readonly title = "\u041F\u043B\u0430\u043D\u0438\u0440\u043E\u0432\u0449\u0438\u043A Windows";
80
+ readonly title = "agent-steward by DeadSno";
77
81
  /** Имя папки задач и её префикс — в пространстве имён своего профиля. */
78
82
  private readonly taskFolderName;
79
83
  private readonly taskPrefix;
84
+ /** Старая (до переименования) папка — только чтение/миграция. */
85
+ private readonly legacyTaskFolderName;
86
+ private readonly legacyTaskPrefix;
80
87
  constructor(profile?: string);
81
88
  /** Полное имя задачи (\OpenCode\<профиль>\<name>) для этого бэкенда. */
82
89
  private fullName;
83
- /** Убирает папку профиля из полного имени задачи. */
90
+ /** Оба возможных полных имени: новое и старое (для поиска legacy-задач). */
91
+ private fullNames;
92
+ /** Убирает папку профиля (новую или старую) из полного имени задачи. */
84
93
  private shortName;
85
94
  createTask(options: CreateTaskOptions): Promise<void>;
95
+ /** Удаляет одноимённую задачу из старой папки, если она там осталась. */
96
+ private removeLegacyDuplicate;
86
97
  listTasks(): Promise<ScheduledTaskInfo[]>;
87
98
  deleteTask(name: string): Promise<void>;
88
99
  /** Ставит задачу на паузу (/disable). */
@@ -96,4 +107,6 @@ export declare class WindowsScheduler implements SchedulerBackend {
96
107
  private isTaskRunning;
97
108
  runTask(name: string): Promise<RunTaskResult>;
98
109
  }
110
+ /** Сохраняет поле в объект задачи, преобразуя ключи schtasks в camelCase. */
111
+ export declare function setTaskField(task: any, key: string, value: string): void;
99
112
  //# sourceMappingURL=windows.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"windows.d.ts","sourceRoot":"","sources":["../../../src/core/scheduler/windows.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AAMxD,OAAO,KAAK,EACV,iBAAiB,EACjB,aAAa,EACb,gBAAgB,EACjB,MAAM,YAAY,CAAC;AAOpB,kEAAkE;AAClE,eAAO,MAAM,mBAAmB,QAA4C,CAAC;AAE7E,kFAAkF;AAClF,wBAAgB,2BAA2B,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAEnE;AAED,qDAAqD;AACrD,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,MAAM,CAG5E;AAQD;;;;;;;;;;GAUG;AACH,wBAAsB,cAAc,IAAI,OAAO,CAAC,MAAM,CAAC,CAoCtD;AAED;;;;GAIG;AACH,wBAAgB,uBAAuB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,GAAG,IAAI,GAAG,MAAM,CAWvF;AAED;;;;;;;;GAQG;AACH,wBAAsB,mBAAmB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,GAAG,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,CAgBlG;AAqBD,6CAA6C;AAC7C,MAAM,WAAW,cAAc;IAC7B,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;CACrB;AAED;;;;;;GAMG;AACH,wBAAgB,oBAAoB,CAClC,IAAI,EAAE,MAAM,GAAG,IAAI,EACnB,IAAI,EAAE,MAAM,GACX,MAAM,GAAG,IAAI,CAgDf;AAED,kCAAkC;AAClC,qBAAa,aAAc,SAAQ,KAAK;aAGpB,IAAI,EAAE,MAAM,GAAG,IAAI;aACnB,MAAM,EAAE,MAAM;gBAF9B,OAAO,EAAE,MAAM,EACC,IAAI,EAAE,MAAM,GAAG,IAAI,EACnB,MAAM,EAAE,MAAM;CAMjC;AAED;;;;;;;GAOG;AACH,wBAAsB,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,cAAc,CAAC,CAsBzE;AAED,oDAAoD;AACpD,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAKjD;AASD;;;;;GAKG;AACH,qBAAa,gBAAiB,YAAW,gBAAgB;IACvD,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC,QAAQ,CAAW;IAC7C,QAAQ,CAAC,KAAK,gFAAyB;IAEvC,yEAAyE;IACzE,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAS;IACxC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAS;gBAExB,OAAO,GAAE,MAAyB;IAK9C,wEAAwE;IACxE,OAAO,CAAC,QAAQ;IAIhB,qDAAqD;IACrD,OAAO,CAAC,SAAS;IAMX,UAAU,CAAC,OAAO,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC;IA+FrD,SAAS,IAAI,OAAO,CAAC,iBAAiB,EAAE,CAAC;IAmDzC,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IA4B7C,yCAAyC;IACnC,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAoB5C,wCAAwC;IAClC,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAoB7C;;;OAGG;YACW,aAAa;IAYrB,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC;CAmCpD"}
1
+ {"version":3,"file":"windows.d.ts","sourceRoot":"","sources":["../../../src/core/scheduler/windows.ts"],"names":[],"mappings":"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"}