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
@@ -0,0 +1,200 @@
1
+ import { spawn } from "node:child_process";
2
+ import fs from "node:fs";
3
+ import { shellQuote } from "./posix.js";
4
+ const PID_JOB_PREFIX = "pid:";
5
+ const FALLBACK_MARKER_PREFIX = "opencode-scheduler-at-fallback:";
6
+ /** Ошибка `spawn("at")`, означающая, что бинарник не найден. */
7
+ export function isAtMissingError(err) {
8
+ if (!err || typeof err !== "object")
9
+ return false;
10
+ const code = err.code;
11
+ if (code === "ENOENT")
12
+ return true;
13
+ const message = err.message;
14
+ return typeof message === "string" && /ENOENT|not found|no such file/i.test(message);
15
+ }
16
+ /** Сколько секунд осталось до `runAt` (0, если момент уже прошёл). */
17
+ export function computeDelaySeconds(runAt, nowMs) {
18
+ const target = Date.parse(runAt);
19
+ if (!Number.isFinite(target)) {
20
+ throw new Error(`Некорректное время one-shot: «${runAt}».`);
21
+ }
22
+ return Math.max(0, Math.ceil((target - nowMs) / 1000));
23
+ }
24
+ /**
25
+ * Маркер fallback-процесса конкретной задачи.
26
+ *
27
+ * Лежит в командной строке (`/proc/<pid>/cmdline`), поэтому позволяет
28
+ * проверить, что pid всё ещё принадлежит нашей задаче, а не переиспользован
29
+ * другим процессом после перезагрузки/завершения.
30
+ */
31
+ export function fallbackMarker(taskName) {
32
+ return `${FALLBACK_MARKER_PREFIX}${Buffer.from(taskName, "utf8").toString("base64url")}`;
33
+ }
34
+ /** Скрипт для `/bin/bash -c`: подождать и выполнить команду задачи. */
35
+ export function buildDetachedOneShotScript(entry, command, nowMs) {
36
+ if (!entry.runAt) {
37
+ throw new Error(`Задача "${entry.name}": не задано runAt для one-shot.`);
38
+ }
39
+ const delay = computeDelaySeconds(entry.runAt, nowMs);
40
+ // Маркер — обычный shell-комментарий в конце, поэтому на выполнение не влияет.
41
+ return `sleep ${delay}; ${command} # ${fallbackMarker(entry.name)}`;
42
+ }
43
+ /** Является ли сохранённый id задания pid-ом fallback-процесса. */
44
+ export function isPidJobId(jobId) {
45
+ return typeof jobId === "string" && jobId.startsWith(PID_JOB_PREFIX);
46
+ }
47
+ function pidFromJobId(jobId) {
48
+ return Number.parseInt(jobId.slice(PID_JOB_PREFIX.length), 10);
49
+ }
50
+ /** Читает командную строку процесса из /proc; null, если процесс недоступен. */
51
+ export function readProcessCmdline(pid) {
52
+ if (!Number.isFinite(pid) || pid <= 0)
53
+ return null;
54
+ try {
55
+ return fs
56
+ .readFileSync(`/proc/${pid}/cmdline`, "utf8")
57
+ .split("\0")
58
+ .join(" ")
59
+ .trim();
60
+ }
61
+ catch {
62
+ return null;
63
+ }
64
+ }
65
+ /**
66
+ * Живой ли это fallback-процесс именно этой задачи.
67
+ *
68
+ * Без проверки маркера `pid:` из персистентного реестра после перезагрузки
69
+ * может указывать на совершенно другой процесс.
70
+ */
71
+ export function isFallbackProcessAlive(pid, taskName) {
72
+ const cmdline = readProcessCmdline(pid);
73
+ return cmdline !== null && cmdline.includes(fallbackMarker(taskName));
74
+ }
75
+ function hasProcfs() {
76
+ try {
77
+ return fs.existsSync("/proc/self/cmdline");
78
+ }
79
+ catch {
80
+ return false;
81
+ }
82
+ }
83
+ /**
84
+ * Запускает отвязанный one-shot и возвращает `pid:<pid>` для `cancelAt`.
85
+ * Промис резолвится сразу после успешного `spawn`, не дожидаясь выполнения.
86
+ */
87
+ export async function scheduleAtFallback(entry, command, deps = {}) {
88
+ const spawnFn = deps.spawnFn ?? spawn;
89
+ const now = deps.now ? deps.now() : Date.now();
90
+ const script = buildDetachedOneShotScript(entry, command, now);
91
+ return new Promise((resolve, reject) => {
92
+ const child = spawnFn("/bin/bash", ["-c", script], {
93
+ detached: true,
94
+ stdio: "ignore",
95
+ });
96
+ child.once("error", reject);
97
+ child.once("spawn", () => {
98
+ child.unref();
99
+ resolve(`${PID_JOB_PREFIX}${child.pid ?? 0}`);
100
+ });
101
+ });
102
+ }
103
+ /**
104
+ * Снимает fallback-процесс.
105
+ *
106
+ * Требует имя задачи и сверяет маркер в `/proc/<pid>/cmdline`: голый pid из
107
+ * реестра после перезагрузки может принадлежать чужому процессу. Убивает
108
+ * группу процессов (fallback запущен detached и является её лидером).
109
+ */
110
+ export function cancelAtFallback(jobId, taskName, deps = {}) {
111
+ if (!isPidJobId(jobId))
112
+ return false;
113
+ const pid = pidFromJobId(jobId);
114
+ if (!Number.isFinite(pid) || pid <= 0)
115
+ return false;
116
+ if (!taskName)
117
+ return false;
118
+ const isAlive = deps.isAlive ?? isFallbackProcessAlive;
119
+ if (!isAlive(pid, taskName))
120
+ return false;
121
+ const kill = deps.kill ??
122
+ ((target, signal) => process.kill(target, signal));
123
+ try {
124
+ kill(-pid, "SIGTERM");
125
+ return true;
126
+ }
127
+ catch {
128
+ try {
129
+ kill(pid, "SIGTERM");
130
+ return true;
131
+ }
132
+ catch {
133
+ return false;
134
+ }
135
+ }
136
+ }
137
+ /** Команда, которую выполняет fallback: обёртка задачи + перенаправление лога. */
138
+ function buildFallbackCommand(entry) {
139
+ const log = entry.logFile ? ` >> ${shellQuote(entry.logFile)} 2>&1` : "";
140
+ return `/bin/bash ${shellQuote(entry.command)}${log}`;
141
+ }
142
+ /**
143
+ * Чистит `pid:`-записи, пережившие перезагрузку.
144
+ *
145
+ * Вызывается один раз при старте плагина. Живые процессы с совпадающим
146
+ * маркером сохраняются; мёртвые — удаляются. Будущие one-shot пересоздаются,
147
+ * прошедшие — помечаются пропущенными с предупреждением.
148
+ */
149
+ export async function pruneStaleFallbackEntries(registry, deps = {}) {
150
+ const nowMs = deps.now ? deps.now() : Date.now();
151
+ const isAlive = deps.isAlive ?? isFallbackProcessAlive;
152
+ const warn = deps.warn ?? ((message) => console.warn(message));
153
+ const schedule = deps.schedule ??
154
+ ((entry, command, at) => scheduleAtFallback(entry, command, { now: () => at }));
155
+ // В системах без /proc проверить личность pid нельзя. Без инъекции
156
+ // isAlive ничего не трогаем, чтобы не убить чужой процесс.
157
+ if (!deps.isAlive && !hasProcfs()) {
158
+ return { kept: 0, removed: 0, rescheduled: 0, missed: 0, skipped: true };
159
+ }
160
+ const entries = await registry.load();
161
+ const report = {
162
+ kept: 0,
163
+ removed: 0,
164
+ rescheduled: 0,
165
+ missed: 0,
166
+ skipped: false,
167
+ };
168
+ let changed = false;
169
+ for (const entry of entries) {
170
+ if (!isPidJobId(entry.atJobId))
171
+ continue;
172
+ const pid = pidFromJobId(entry.atJobId);
173
+ if (isAlive(pid, entry.name)) {
174
+ report.kept += 1;
175
+ continue;
176
+ }
177
+ delete entry.atJobId;
178
+ changed = true;
179
+ report.removed += 1;
180
+ if (entry.triggerType !== "once" || entry.paused)
181
+ continue;
182
+ const target = entry.runAt ? Date.parse(entry.runAt) : Number.NaN;
183
+ if (Number.isFinite(target) && target > nowMs) {
184
+ try {
185
+ entry.atJobId = await schedule(entry, buildFallbackCommand(entry), nowMs);
186
+ report.rescheduled += 1;
187
+ }
188
+ catch (err) {
189
+ warn(`[scheduler] Не удалось пересоздать fallback для "${entry.name}": ${err instanceof Error ? err.message : String(err)}`);
190
+ }
191
+ continue;
192
+ }
193
+ report.missed += 1;
194
+ warn(`[scheduler] One-shot "${entry.name}" не будет запущена: fallback-процесс потерян, ` +
195
+ `время запуска уже прошло (${entry.runAt ?? "runAt не задан"}).`);
196
+ }
197
+ if (changed)
198
+ await registry.save(entries);
199
+ return report;
200
+ }
@@ -1,3 +1,4 @@
1
+ import { type PruneAtFallbackReport } from "./at-fallback.js";
1
2
  import { PosixSchedulerBase } from "./posix.js";
2
3
  import type { RegistryEntry } from "./registry.js";
3
4
  /**
@@ -13,9 +14,11 @@ import type { RegistryEntry } from "./registry.js";
13
14
  */
14
15
  export declare class LinuxScheduler extends PosixSchedulerBase {
15
16
  readonly platform: NodeJS.Platform;
16
- readonly title = "OpenCode Scheduler";
17
+ readonly title = "agent-steward by DeadSno";
17
18
  private readonly blockBegin;
18
19
  private readonly blockEnd;
20
+ private readonly legacyBlockBegin;
21
+ private readonly legacyBlockEnd;
19
22
  private readonly ownsLegacyBlock;
20
23
  constructor(profile?: string);
21
24
  private cronLine;
@@ -28,7 +31,10 @@ export declare class LinuxScheduler extends PosixSchedulerBase {
28
31
  private writeCrontab;
29
32
  /** Перегенерирует блок плагина из реестра. */
30
33
  private rebuildCrontab;
31
- /** Строка команды one-shot для stdin `at`. */
34
+ /** Строка команды one-shot для stdin `at`.
35
+ * P1-7.T1.3: без `-c` bash трактует аргумент как ИМЯ ФАЙЛА скрипта
36
+ * (exit 127 «No such file or directory»), поэтому at «выполнял» задание,
37
+ * но команда на самом деле не запускалась. */
32
38
  private atCommand;
33
39
  /**
34
40
  * Ставит one-shot в `at` и возвращает id задания.
@@ -37,6 +43,11 @@ export declare class LinuxScheduler extends PosixSchedulerBase {
37
43
  private scheduleAt;
38
44
  /** Отменяет задание at, если оно ещё существует. */
39
45
  private cancelAt;
46
+ /**
47
+ * P1-14: чистит `pid:`-записи fallback'а, пережившие перезагрузку.
48
+ * Вызывается из старта плагина; на других платформах не используется.
49
+ */
50
+ pruneStaleFallbacks(): Promise<PruneAtFallbackReport>;
40
51
  protected installEntry(entry: RegistryEntry): Promise<void>;
41
52
  protected uninstallEntry(entry: RegistryEntry): Promise<void>;
42
53
  protected applyPause(entry: RegistryEntry, paused: boolean): Promise<void>;
@@ -1 +1 @@
1
- {"version":3,"file":"linux.d.ts","sourceRoot":"","sources":["../../../src/core/scheduler/linux.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,kBAAkB,EAAc,MAAM,YAAY,CAAC;AAC5D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAInD;;;;;;;;;;GAUG;AACH,qBAAa,cAAe,SAAQ,kBAAkB;IACpD,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC,QAAQ,CAAW;IAC7C,QAAQ,CAAC,KAAK,wBAAwB;IAEtC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAS;IACpC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAS;IAClC,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAU;gBAE9B,OAAO,GAAE,MAAyB;IAQ9C,OAAO,CAAC,QAAQ;IAchB,OAAO,CAAC,WAAW;IAYnB,0EAA0E;YAC5D,WAAW;IAkBzB,0DAA0D;IAC1D,OAAO,CAAC,UAAU;IA2BlB,mDAAmD;YACrC,YAAY;IAgB1B,8CAA8C;YAChC,cAAc;IA4B5B,8CAA8C;IAC9C,OAAO,CAAC,SAAS;IAKjB;;;OAGG;YACW,UAAU;IA8CxB,oDAAoD;YACtC,QAAQ;cAUN,YAAY,CAAC,KAAK,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;cAUjD,cAAc,CAAC,KAAK,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;cAQnD,UAAU,CAAC,KAAK,EAAE,aAAa,EAAE,MAAM,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;CAYjF"}
1
+ {"version":3,"file":"linux.d.ts","sourceRoot":"","sources":["../../../src/core/scheduler/linux.ts"],"names":[],"mappings":"AAIA,OAAO,EAML,KAAK,qBAAqB,EAC3B,MAAM,kBAAkB,CAAC;AAK1B,OAAO,EAAE,kBAAkB,EAAc,MAAM,YAAY,CAAC;AAC5D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAInD;;;;;;;;;;GAUG;AACH,qBAAa,cAAe,SAAQ,kBAAkB;IACpD,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC,QAAQ,CAAW;IAC7C,QAAQ,CAAC,KAAK,8BAA8B;IAE5C,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAS;IACpC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAS;IAClC,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAS;IAC1C,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAS;IACxC,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAU;gBAE9B,OAAO,GAAE,MAAyB;IAY9C,OAAO,CAAC,QAAQ;IAkBhB,OAAO,CAAC,WAAW;IAYnB,0EAA0E;YAC5D,WAAW;IAkBzB,0DAA0D;IAC1D,OAAO,CAAC,UAAU;IA+BlB,mDAAmD;YACrC,YAAY;IAgB1B,8CAA8C;YAChC,cAAc;IA4B5B;;;mDAG+C;IAC/C,OAAO,CAAC,SAAS;IAKjB;;;OAGG;YACW,UAAU;IAuExB,oDAAoD;YACtC,QAAQ;IAiBtB;;;OAGG;IACG,mBAAmB,IAAI,OAAO,CAAC,qBAAqB,CAAC;cAI3C,YAAY,CAAC,KAAK,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;cAUjD,cAAc,CAAC,KAAK,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;cAQnD,UAAU,CAAC,KAAK,EAAE,aAAa,EAAE,MAAM,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;CAoBjF"}
@@ -2,10 +2,11 @@ import { execFile, spawn } from "node:child_process";
2
2
  import path from "node:path";
3
3
  import { promisify } from "node:util";
4
4
  import { buildAtTimestamp } from "../one-shot.js";
5
- import { needsPollMode } from "../schedule-v2.js";
5
+ import { cancelAtFallback, isAtMissingError, isPidJobId, pruneStaleFallbackEntries, scheduleAtFallback, } from "./at-fallback.js";
6
+ import { needsPosixPollMode } from "../schedule-v2.js";
6
7
  import { LockManager, withLockWait } from "../lock.js";
7
8
  import { getBasePluginDir, getProfileName } from "../../profiles.js";
8
- import { taskFolderNameForProfile } from "../../types.js";
9
+ import { taskFolderNameForProfile, legacyTaskFolderNameForProfile } from "../../types.js";
9
10
  import { PosixSchedulerBase, shellQuote } from "./posix.js";
10
11
  const execFileAsync = promisify(execFile);
11
12
  /**
@@ -23,11 +24,15 @@ export class LinuxScheduler extends PosixSchedulerBase {
23
24
  constructor(profile = getProfileName()) {
24
25
  super("linux", profile);
25
26
  this.platform = "linux";
26
- this.title = "OpenCode Scheduler";
27
+ this.title = "agent-steward by DeadSno";
27
28
  const folderName = taskFolderNameForProfile(profile);
29
+ const legacyFolderName = legacyTaskFolderNameForProfile(profile);
28
30
  this.blockBegin = `# >>> opencode-scheduler:${folderName} >>>`;
29
31
  this.blockEnd = `# <<< opencode-scheduler:${folderName} <<<`;
30
- this.ownsLegacyBlock = folderName === "windows-scheduler";
32
+ this.legacyBlockBegin = `# >>> opencode-scheduler:${legacyFolderName} >>>`;
33
+ this.legacyBlockEnd = `# <<< opencode-scheduler:${legacyFolderName} <<<`;
34
+ // Древний бессуффиксный блок принадлежит только профилю default.
35
+ this.ownsLegacyBlock = profile === "default";
31
36
  }
32
37
  cronLine(entry) {
33
38
  if (entry.triggerType !== "cron") {
@@ -36,10 +41,14 @@ export class LinuxScheduler extends PosixSchedulerBase {
36
41
  }
37
42
  const log = entry.logFile ? ` >> ${shellQuote(entry.logFile)} 2>&1` : "";
38
43
  const cmd = `/bin/bash ${shellQuote(entry.command)}${log}`;
39
- // crontab понимает только 5-полевой cron. Расширенные выражения (L, #,
40
- // списки, @daily и т.п.) нельзя писать в crontab как есть — опрашиваем
41
- // каждую минуту, а решение о запуске принимает gate во враппере.
42
- const schedule = needsPollMode(entry.schedule) ? "* * * * *" : entry.schedule;
44
+ // Vixie-совместимый 5-полевой cron crontab выполняет сам: списки,
45
+ // диапазоны, шаги и имена месяцев/дней недели писать как есть можно.
46
+ // Quartz-расширения (L, d#n) и @-макросы (не 5 полей) crontab не понимает —
47
+ // для них "* * * * *" + gate во враппере. Чужая IANA-таймзона тоже уходит
48
+ // в poll: иначе crontab сработает по системному времени задачи.
49
+ const schedule = needsPosixPollMode(entry.schedule, entry.timezone)
50
+ ? "* * * * *"
51
+ : entry.schedule;
43
52
  return `${schedule} ${cmd}`;
44
53
  }
45
54
  renderBlock(entries) {
@@ -80,8 +89,12 @@ export class LinuxScheduler extends PosixSchedulerBase {
80
89
  const legacyBegin = "# >>> opencode-scheduler >>>";
81
90
  const legacyEnd = "# <<< opencode-scheduler <<<";
82
91
  const ownsLegacy = this.ownsLegacyBlock;
83
- const isBegin = (line) => line === this.blockBegin || (ownsLegacy && line === legacyBegin);
84
- const isEnd = (line) => line === this.blockEnd || (ownsLegacy && line === legacyEnd);
92
+ const isBegin = (line) => line === this.blockBegin ||
93
+ line === this.legacyBlockBegin ||
94
+ (ownsLegacy && line === legacyBegin);
95
+ const isEnd = (line) => line === this.blockEnd ||
96
+ line === this.legacyBlockEnd ||
97
+ (ownsLegacy && line === legacyEnd);
85
98
  const lines = content.split(/\r?\n/);
86
99
  const result = [];
87
100
  let inside = false;
@@ -137,10 +150,13 @@ export class LinuxScheduler extends PosixSchedulerBase {
137
150
  await this.writeCrontab(next);
138
151
  }, { timeoutMs: 15000, staleMs: 60000 });
139
152
  }
140
- /** Строка команды one-shot для stdin `at`. */
153
+ /** Строка команды one-shot для stdin `at`.
154
+ * P1-7.T1.3: без `-c` bash трактует аргумент как ИМЯ ФАЙЛА скрипта
155
+ * (exit 127 «No such file or directory»), поэтому at «выполнял» задание,
156
+ * но команда на самом деле не запускалась. */
141
157
  atCommand(entry) {
142
158
  const log = entry.logFile ? ` >> ${shellQuote(entry.logFile)} 2>&1` : "";
143
- return `/bin/bash ${shellQuote(entry.command)}${log}`;
159
+ return `/bin/bash -c ${shellQuote(entry.command)}${log}`;
144
160
  }
145
161
  /**
146
162
  * Ставит one-shot в `at` и возвращает id задания.
@@ -164,6 +180,22 @@ export class LinuxScheduler extends PosixSchedulerBase {
164
180
  stderr += String(chunk);
165
181
  });
166
182
  child.on("error", (err) => {
183
+ // P1-7.T1.2: `at` может отсутствовать (минимальные образы, Alpine и
184
+ // т.п.). Не роняем задачу — планируем отвязанный bash-процесс.
185
+ if (isAtMissingError(err)) {
186
+ void scheduleAtFallback(entry, this.atCommand(entry))
187
+ .then((jobId) => {
188
+ console.warn(`[agent-steward] at не найден — задача "${entry.name}" запланирована через fallback (${jobId}). ` +
189
+ "Fallback не переживает перезагрузку; установите пакет at.");
190
+ resolve(jobId);
191
+ })
192
+ .catch((fallbackErr) => {
193
+ reject(new Error(`Не удалось вызвать at и fallback-планировщик: ${fallbackErr instanceof Error
194
+ ? fallbackErr.message
195
+ : String(fallbackErr)}`));
196
+ });
197
+ return;
198
+ }
167
199
  reject(new Error(`Не удалось вызвать at (установите пакет at): ${err instanceof Error ? err.message : String(err)}`));
168
200
  });
169
201
  child.on("close", (code) => {
@@ -171,7 +203,8 @@ export class LinuxScheduler extends PosixSchedulerBase {
171
203
  reject(new Error(`at завершился с кодом ${code}: ${stderr.trim() || stdout.trim()}`));
172
204
  return;
173
205
  }
174
- const match = /job\s+(\d+)/i.exec(stdout);
206
+ // GNU at пишет «job N at …» в stderr, а не в stdout — ищем в обоих потоках.
207
+ const match = /job\s+(\d+)/i.exec(stdout + "\n" + stderr);
175
208
  if (!match) {
176
209
  reject(new Error(`at не вернул id задания: ${stdout.trim()}`));
177
210
  return;
@@ -185,6 +218,13 @@ export class LinuxScheduler extends PosixSchedulerBase {
185
218
  async cancelAt(entry) {
186
219
  if (!entry.atJobId)
187
220
  return;
221
+ if (isPidJobId(entry.atJobId)) {
222
+ // P1-7.T1.2: снимаем fallback-процесс, а не at-задание.
223
+ // P1-14: передаём имя — без сверки маркера pid мог быть переиспользован.
224
+ cancelAtFallback(entry.atJobId, entry.name);
225
+ delete entry.atJobId;
226
+ return;
227
+ }
188
228
  try {
189
229
  await execFileAsync("atrm", [entry.atJobId]);
190
230
  }
@@ -193,6 +233,13 @@ export class LinuxScheduler extends PosixSchedulerBase {
193
233
  }
194
234
  delete entry.atJobId;
195
235
  }
236
+ /**
237
+ * P1-14: чистит `pid:`-записи fallback'а, пережившие перезагрузку.
238
+ * Вызывается из старта плагина; на других платформах не используется.
239
+ */
240
+ async pruneStaleFallbacks() {
241
+ return pruneStaleFallbackEntries(this.registry);
242
+ }
196
243
  async installEntry(entry) {
197
244
  if (entry.triggerType === "once") {
198
245
  if (!entry.paused) {
@@ -210,6 +257,10 @@ export class LinuxScheduler extends PosixSchedulerBase {
210
257
  await this.rebuildCrontab();
211
258
  }
212
259
  async applyPause(entry, paused) {
260
+ // P1-12: entry получен из find() ДО setPaused(), поэтому без этой строки
261
+ // upsert ниже возвращал в реестр paused:false, и listTasks() показывал
262
+ // приостановленную one-shot задачу как Ready.
263
+ entry.paused = paused;
213
264
  if (entry.triggerType === "once") {
214
265
  if (paused) {
215
266
  await this.cancelAt(entry);
@@ -217,6 +268,9 @@ export class LinuxScheduler extends PosixSchedulerBase {
217
268
  else if (entry.runAt && Date.parse(entry.runAt) > Date.now()) {
218
269
  entry.atJobId = await this.scheduleAt(entry);
219
270
  }
271
+ else {
272
+ console.warn(`[scheduler] Задача "${entry.name}" не будет перезапущена: время one-shot запуска уже прошло (${entry.runAt ?? "runAt не задан"}). Создайте новую задачу.`);
273
+ }
220
274
  await this.registry.upsert(entry);
221
275
  return;
222
276
  }
@@ -1,15 +1,21 @@
1
1
  import { PosixSchedulerBase } from "./posix.js";
2
2
  import type { RegistryEntry } from "./registry.js";
3
+ /** Один элемент StartCalendarInterval. */
4
+ interface LaunchdCalendar {
5
+ Minute?: number;
6
+ Hour?: number;
7
+ Weekday?: number;
8
+ Month?: number;
9
+ Day?: number;
10
+ }
3
11
  /** Расписание launchd, полученное из cron-выражения. */
4
12
  interface LaunchdSchedule {
5
- /** StartInterval в секундах (для «каждые N минут»). */
13
+ /** StartInterval в секундах (для poll-режима «каждую минуту»). */
6
14
  interval?: number;
7
- /** StartCalendarInterval (для фиксированного времени). */
8
- calendar?: {
9
- Minute?: number;
10
- Hour?: number;
11
- Weekday?: number;
12
- };
15
+ /** Одиночный StartCalendarInterval (фиксированное время). */
16
+ calendar?: LaunchdCalendar;
17
+ /** Массив StartCalendarInterval (например, минуты 0,15,30,45). */
18
+ calendars?: LaunchdCalendar[];
13
19
  }
14
20
  /**
15
21
  * Преобразует поддерживаемое 5-полевое cron-выражение в расписание launchd.
@@ -25,7 +31,7 @@ export declare function cronToLaunchdSchedule(cron: string): LaunchdSchedule;
25
31
  */
26
32
  export declare class MacScheduler extends PosixSchedulerBase {
27
33
  readonly platform: NodeJS.Platform;
28
- readonly title = "OpenCode Scheduler";
34
+ readonly title = "agent-steward by DeadSno";
29
35
  constructor(profile?: string);
30
36
  private readonly profile;
31
37
  private label;
@@ -1 +1 @@
1
- {"version":3,"file":"mac.d.ts","sourceRoot":"","sources":["../../../src/core/scheduler/mac.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAChD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAgBnD,wDAAwD;AACxD,UAAU,eAAe;IACvB,uDAAuD;IACvD,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,0DAA0D;IAC1D,QAAQ,CAAC,EAAE;QAAE,MAAM,CAAC,EAAE,MAAM,CAAC;QAAC,IAAI,CAAC,EAAE,MAAM,CAAC;QAAC,OAAO,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;CACjE;AAED;;;GAGG;AACH,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,MAAM,GAAG,eAAe,CAsDnE;AAyGD;;;;;;GAMG;AACH,qBAAa,YAAa,SAAQ,kBAAkB;IAClD,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC,QAAQ,CAAY;IAC9C,QAAQ,CAAC,KAAK,wBAAwB;gBAE1B,OAAO,GAAE,MAAyB;IAK9C,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAS;IAEjC,OAAO,CAAC,KAAK;IAmBb,OAAO,CAAC,SAAS;IAIjB,gFAAgF;YAClE,SAAS;cAQP,YAAY,CAAC,KAAK,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;cAQjD,cAAc,CAAC,KAAK,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;cAMnD,UAAU,CAAC,KAAK,EAAE,aAAa,EAAE,MAAM,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;CAQjF"}
1
+ {"version":3,"file":"mac.d.ts","sourceRoot":"","sources":["../../../src/core/scheduler/mac.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAChD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAgBnD,0CAA0C;AAC1C,UAAU,eAAe;IACvB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,GAAG,CAAC,EAAE,MAAM,CAAC;CACd;AAED,wDAAwD;AACxD,UAAU,eAAe;IACvB,kEAAkE;IAClE,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,6DAA6D;IAC7D,QAAQ,CAAC,EAAE,eAAe,CAAC;IAC3B,kEAAkE;IAClE,SAAS,CAAC,EAAE,eAAe,EAAE,CAAC;CAC/B;AAED;;;GAGG;AACH,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,MAAM,GAAG,eAAe,CA6DnE;AAuID;;;;;;GAMG;AACH,qBAAa,YAAa,SAAQ,kBAAkB;IAClD,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC,QAAQ,CAAY;IAC9C,QAAQ,CAAC,KAAK,8BAA8B;gBAEhC,OAAO,GAAE,MAAyB;IAK9C,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAS;IAEjC,OAAO,CAAC,KAAK;IAmBb,OAAO,CAAC,SAAS;IAIjB,gFAAgF;YAClE,SAAS;cAQP,YAAY,CAAC,KAAK,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;cAQjD,cAAc,CAAC,KAAK,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;cAMnD,UAAU,CAAC,KAAK,EAAE,aAAa,EAAE,MAAM,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;CAQjF"}
@@ -6,7 +6,8 @@ import path from "node:path";
6
6
  import { promisify } from "node:util";
7
7
  import { sanitizeName } from "../../types.js";
8
8
  import { getProfileDir, getProfileName } from "../../profiles.js";
9
- import { buildLaunchdCalendar, launchdLabel } from "../one-shot.js";
9
+ import { buildLaunchdCalendar, buildOneShotGuardCommand, launchdLabel } from "../one-shot.js";
10
+ import { systemTimeZone, } from "../schedule-v2.js";
10
11
  import { PosixSchedulerBase } from "./posix.js";
11
12
  const execFileAsync = promisify(execFile);
12
13
  /** Папка пользовательских LaunchAgents. */
@@ -42,8 +43,15 @@ export function cronToLaunchdSchedule(cron) {
42
43
  const step = /^\*\/(\d+)$/.exec(minute);
43
44
  if (step && star(hour) && star(dayOfMonth) && star(month) && star(dayOfWeek)) {
44
45
  const n = parseInt(step[1], 10);
45
- if (n > 0)
46
- return { interval: n * 60 };
46
+ if (n > 0) {
47
+ // P1-6: выравниваем по cron-сетке (0, N, 2N, …), а не отсчитываем
48
+ // интервал от момента загрузки агента. launchd принимает массив
49
+ // StartCalendarInterval — по dict на каждую минуту.
50
+ const calendars = [];
51
+ for (let m = 0; m < 60; m += n)
52
+ calendars.push({ Minute: m });
53
+ return { calendars };
54
+ }
47
55
  }
48
56
  const m = intIn(minute, 0, 59);
49
57
  const h = intIn(hour, 0, 23);
@@ -68,6 +76,21 @@ export function cronToLaunchdSchedule(cron) {
68
76
  }
69
77
  return { calendar: { Minute: m, Hour: h, Weekday: d } };
70
78
  }
79
+ /** Добавляет поля одного StartCalendarInterval-dict с заданным отступом. */
80
+ function pushCalendarFields(out, cal, indent) {
81
+ const fields = [
82
+ ["Minute", cal.Minute],
83
+ ["Hour", cal.Hour],
84
+ ["Weekday", cal.Weekday],
85
+ ["Month", cal.Month],
86
+ ["Day", cal.Day],
87
+ ];
88
+ for (const [key, value] of fields) {
89
+ if (value === undefined)
90
+ continue;
91
+ out.push(`${indent}<key>${key}</key>`, `${indent}<integer>${value}</integer>`);
92
+ }
93
+ }
71
94
  /** Собирает XML plist для задачи. */
72
95
  function buildPlist(label, entry) {
73
96
  const schedule = entry.triggerType === "once"
@@ -79,30 +102,40 @@ function buildPlist(label, entry) {
79
102
  })()
80
103
  : entry.triggerType !== "cron"
81
104
  ? { interval: 315360000 } // file/mcp-event: 10 лет — фактически «никогда».
82
- : cronToLaunchdSchedule(entry.schedule);
105
+ : (() => {
106
+ // P1-5: чужой IANA-таймзона — poll-режим (StartInterval 60 + gate во враппере),
107
+ // иначе crontab сработает по системному времени, а не по таймзоне задачи.
108
+ const tz = entry.timezone?.trim();
109
+ if (tz && tz !== systemTimeZone())
110
+ return { interval: 60 };
111
+ // P1-6: неконвертируемый cron (списки, диапазоны, L, #, @daily и т.п.)
112
+ // — poll-режим вместо бросания ошибки. Gate во враппере уже есть
113
+ // (buildScheduleGate), поэтому достаточно StartInterval 60.
114
+ try {
115
+ return cronToLaunchdSchedule(entry.schedule);
116
+ }
117
+ catch {
118
+ return { interval: 60 };
119
+ }
120
+ })();
83
121
  const scheduleXml = [];
84
122
  if (schedule.interval !== undefined) {
85
123
  scheduleXml.push(" <key>StartInterval</key>", ` <integer>${schedule.interval}</integer>`);
86
124
  }
87
125
  if (schedule.calendar) {
88
126
  scheduleXml.push(" <key>StartCalendarInterval</key>", " <dict>");
89
- if (schedule.calendar.Minute !== undefined) {
90
- scheduleXml.push(" <key>Minute</key>", ` <integer>${schedule.calendar.Minute}</integer>`);
91
- }
92
- if (schedule.calendar.Hour !== undefined) {
93
- scheduleXml.push(" <key>Hour</key>", ` <integer>${schedule.calendar.Hour}</integer>`);
94
- }
95
- if (schedule.calendar.Weekday !== undefined) {
96
- scheduleXml.push(" <key>Weekday</key>", ` <integer>${schedule.calendar.Weekday}</integer>`);
97
- }
98
- if (schedule.calendar.Month !== undefined) {
99
- scheduleXml.push(" <key>Month</key>", ` <integer>${schedule.calendar.Month}</integer>`);
100
- }
101
- if (schedule.calendar.Day !== undefined) {
102
- scheduleXml.push(" <key>Day</key>", ` <integer>${schedule.calendar.Day}</integer>`);
103
- }
127
+ pushCalendarFields(scheduleXml, schedule.calendar, " ");
104
128
  scheduleXml.push(" </dict>");
105
129
  }
130
+ if (schedule.calendars && schedule.calendars.length > 0) {
131
+ scheduleXml.push(" <key>StartCalendarInterval</key>", " <array>");
132
+ for (const cal of schedule.calendars) {
133
+ scheduleXml.push(" <dict>");
134
+ pushCalendarFields(scheduleXml, cal, " ");
135
+ scheduleXml.push(" </dict>");
136
+ }
137
+ scheduleXml.push(" </array>");
138
+ }
106
139
  const workdir = entry.workingDirectory || process.cwd();
107
140
  const log = entry.logFile;
108
141
  const logXml = log
@@ -113,6 +146,23 @@ function buildPlist(label, entry) {
113
146
  ` <string>${xmlEscape(log)}</string>`,
114
147
  ]
115
148
  : [];
149
+ // P2-12.T2: launchd не умеет год в StartCalendarInterval. Для one-shot
150
+ // запускаем bash -c с проверкой runAt и маркером выполнения, иначе задача
151
+ // сработает в ближайшую годовщину и повторится через год.
152
+ const programArgsXml = entry.triggerType === "once" && entry.runAt
153
+ ? (() => {
154
+ const epoch = Math.floor(Date.parse(entry.runAt) / 1000);
155
+ const stamp = path.join(LAUNCH_AGENTS_DIR, `${label}.once-${epoch}.done`);
156
+ return [
157
+ " <string>/bin/bash</string>",
158
+ " <string>-c</string>",
159
+ ` <string>${xmlEscape(buildOneShotGuardCommand(entry.command, entry.runAt, stamp))}</string>`,
160
+ ];
161
+ })()
162
+ : [
163
+ " <string>/bin/bash</string>",
164
+ ` <string>${xmlEscape(entry.command)}</string>`,
165
+ ];
116
166
  return [
117
167
  '<?xml version="1.0" encoding="UTF-8"?>',
118
168
  '<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" ' +
@@ -123,8 +173,7 @@ function buildPlist(label, entry) {
123
173
  ` <string>${xmlEscape(label)}</string>`,
124
174
  " <key>ProgramArguments</key>",
125
175
  " <array>",
126
- " <string>/bin/bash</string>",
127
- ` <string>${xmlEscape(entry.command)}</string>`,
176
+ ...programArgsXml,
128
177
  " </array>",
129
178
  " <key>WorkingDirectory</key>",
130
179
  ` <string>${xmlEscape(workdir)}</string>`,
@@ -148,7 +197,7 @@ export class MacScheduler extends PosixSchedulerBase {
148
197
  constructor(profile = getProfileName()) {
149
198
  super("mac", profile);
150
199
  this.platform = "darwin";
151
- this.title = "OpenCode Scheduler";
200
+ this.title = "agent-steward by DeadSno";
152
201
  this.profile = profile;
153
202
  }
154
203
  label(name) {
@@ -1 +1 @@
1
- {"version":3,"file":"posix.d.ts","sourceRoot":"","sources":["../../../src/core/scheduler/posix.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AACxD,OAAO,EAAE,YAAY,EAAE,KAAK,aAAa,EAAE,MAAM,eAAe,CAAC;AACjE,OAAO,KAAK,EACV,iBAAiB,EACjB,aAAa,EACb,gBAAgB,EACjB,MAAM,YAAY,CAAC;AAEpB;;;;;;;GAOG;AACH,8BAAsB,kBAAmB,YAAW,gBAAgB;IAClE,QAAQ,CAAC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC,QAAQ,CAAC;IAC5C,QAAQ,CAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IAEhC,SAAS,CAAC,QAAQ,CAAC,QAAQ,EAAE,YAAY,CAAC;gBAE9B,SAAS,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM;IAI/C,wEAAwE;IACxE,SAAS,CAAC,QAAQ,CAAC,YAAY,CAAC,KAAK,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IACpE,yCAAyC;IACzC,SAAS,CAAC,QAAQ,CAAC,cAAc,CAAC,KAAK,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IACtE,4DAA4D;IAC5D,SAAS,CAAC,QAAQ,CAAC,UAAU,CAAC,KAAK,EAAE,aAAa,EAAE,MAAM,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAE7E,UAAU,CAAC,OAAO,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC;IAqBrD,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAQvC,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAOtC,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAOvC,SAAS,IAAI,OAAO,CAAC,iBAAiB,EAAE,CAAC;IAS/C;;;;OAIG;IACG,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC;CAapD;AAED;;;GAGG;AACH,wBAAgB,UAAU,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAGhD"}
1
+ {"version":3,"file":"posix.d.ts","sourceRoot":"","sources":["../../../src/core/scheduler/posix.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AACxD,OAAO,EAAE,YAAY,EAAE,KAAK,aAAa,EAAE,MAAM,eAAe,CAAC;AACjE,OAAO,KAAK,EACV,iBAAiB,EACjB,aAAa,EACb,gBAAgB,EACjB,MAAM,YAAY,CAAC;AAEpB;;;;;;;GAOG;AACH,8BAAsB,kBAAmB,YAAW,gBAAgB;IAClE,QAAQ,CAAC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC,QAAQ,CAAC;IAC5C,QAAQ,CAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IAEhC,SAAS,CAAC,QAAQ,CAAC,QAAQ,EAAE,YAAY,CAAC;gBAE9B,SAAS,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM;IAI/C,wEAAwE;IACxE,SAAS,CAAC,QAAQ,CAAC,YAAY,CAAC,KAAK,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IACpE,yCAAyC;IACzC,SAAS,CAAC,QAAQ,CAAC,cAAc,CAAC,KAAK,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IACtE,4DAA4D;IAC5D,SAAS,CAAC,QAAQ,CAAC,UAAU,CAAC,KAAK,EAAE,aAAa,EAAE,MAAM,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAE7E,UAAU,CAAC,OAAO,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC;IAyCrD,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAQvC,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAOtC,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAOvC,SAAS,IAAI,OAAO,CAAC,iBAAiB,EAAE,CAAC;IAS/C;;;;OAIG;IACG,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC;CA0BpD;AAED;;;GAGG;AACH,wBAAgB,UAAU,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAGhD"}