opencode-windows-scheduler 1.0.0 → 1.2.0
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.
- package/CHANGELOG.md +58 -7
- package/README.md +14 -4
- package/README.ru.md +14 -4
- package/ROADMAP.md +30 -20
- package/dist/core/analytics.d.ts +129 -0
- package/dist/core/analytics.d.ts.map +1 -0
- package/dist/core/analytics.js +286 -0
- package/dist/core/dry-run.d.ts +13 -0
- package/dist/core/dry-run.d.ts.map +1 -1
- package/dist/core/dry-run.js +30 -0
- package/dist/core/matrix.d.ts.map +1 -1
- package/dist/core/matrix.js +10 -0
- package/dist/core/ps-wrapper.d.ts +32 -2
- package/dist/core/ps-wrapper.d.ts.map +1 -1
- package/dist/core/ps-wrapper.js +101 -3
- package/dist/core/retention.d.ts +29 -0
- package/dist/core/retention.d.ts.map +1 -0
- package/dist/core/retention.js +98 -0
- package/dist/core/schedule-gate.d.ts +2 -0
- package/dist/core/schedule-gate.d.ts.map +1 -0
- package/dist/core/schedule-gate.js +182 -0
- package/dist/core/schedule-v2.d.ts +88 -0
- package/dist/core/schedule-v2.d.ts.map +1 -0
- package/dist/core/schedule-v2.js +496 -0
- package/dist/core/scheduler/types.d.ts +15 -0
- package/dist/core/scheduler/types.d.ts.map +1 -1
- package/dist/core/scheduler/windows.d.ts.map +1 -1
- package/dist/core/scheduler/windows.js +13 -1
- package/dist/core/wrappers/bash.d.ts +15 -0
- package/dist/core/wrappers/bash.d.ts.map +1 -1
- package/dist/core/wrappers/bash.js +44 -1
- package/dist/db/history-repo.d.ts +41 -0
- package/dist/db/history-repo.d.ts.map +1 -1
- package/dist/db/history-repo.js +78 -0
- package/dist/db/schema.d.ts +1 -1
- package/dist/db/schema.d.ts.map +1 -1
- package/dist/db/schema.js +11 -0
- package/dist/index.d.ts +117 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +1094 -56
- package/dist/notifications.d.ts +112 -6
- package/dist/notifications.d.ts.map +1 -1
- package/dist/notifications.js +396 -34
- package/dist/profiles.d.ts +60 -0
- package/dist/profiles.d.ts.map +1 -0
- package/dist/profiles.js +209 -0
- package/dist/rpc.d.ts +645 -0
- package/dist/rpc.d.ts.map +1 -1
- package/dist/rpc.js +251 -2
- package/dist/server.d.ts.map +1 -1
- package/dist/server.js +200 -7
- package/dist/settings.d.ts +80 -0
- package/dist/settings.d.ts.map +1 -1
- package/dist/settings.js +159 -8
- package/dist/task-transfer.d.ts +13 -0
- package/dist/task-transfer.d.ts.map +1 -1
- package/dist/task-transfer.js +26 -0
- package/dist/types.d.ts.map +1 -1
- package/dist/types.js +3 -11
- package/dist/version.d.ts +8 -0
- package/dist/version.d.ts.map +1 -0
- package/dist/version.js +27 -0
- package/dist/workspaces.d.ts +43 -0
- package/dist/workspaces.d.ts.map +1 -1
- package/dist/workspaces.js +174 -8
- package/docs/ARCHITECTURE.md +45 -13
- package/docs/FEATURES.md +103 -12
- package/gui-experimental.cjs +4 -2
- package/package.json +8 -2
- package/src/core/analytics.ts +414 -0
- package/src/core/dry-run.ts +42 -0
- package/src/core/matrix.ts +10 -0
- package/src/core/ps-wrapper.ts +117 -3
- package/src/core/retention.ts +141 -0
- package/src/core/schedule-gate.ts +213 -0
- package/src/core/schedule-v2.ts +533 -0
- package/src/core/scheduler/types.ts +15 -0
- package/src/core/scheduler/windows.ts +13 -1
- package/src/core/wrappers/bash.ts +60 -0
- package/src/db/history-repo.ts +116 -0
- package/src/db/schema.ts +14 -0
- package/src/gui.tsx +3613 -2725
- package/src/index.ts +1325 -55
- package/src/notifications.ts +516 -40
- package/src/profiles.ts +236 -0
- package/src/rpc.ts +267 -2
- package/src/server.ts +226 -7
- package/src/settings.ts +285 -9
- package/src/task-transfer.ts +44 -0
- package/src/types.ts +3 -13
- package/src/version.ts +27 -0
- package/src/workspaces.ts +214 -8
- package/dist/gui-experimental.cjs +0 -1
|
@@ -2,6 +2,7 @@ import fs from "node:fs/promises";
|
|
|
2
2
|
import path from "node:path";
|
|
3
3
|
import { WRAPPER_DIR } from "../../types.js";
|
|
4
4
|
import { shellQuote } from "../scheduler/posix.js";
|
|
5
|
+
import type { ScheduleGateSpec } from "../schedule-v2.js";
|
|
5
6
|
|
|
6
7
|
/** Параметры генерации bash-обёртки. */
|
|
7
8
|
export interface BashWrapperOptions {
|
|
@@ -35,6 +36,20 @@ export interface BashWrapperOptions {
|
|
|
35
36
|
beforeScript?: string;
|
|
36
37
|
/** Post-flight команда: выполняется даже при ошибке основной задачи. */
|
|
37
38
|
afterScript?: string;
|
|
39
|
+
/**
|
|
40
|
+
* Гейт расписания (спринт 19): проверка cron в таймзоне задачи и окна
|
|
41
|
+
* запуска выполняется до lock и запуска opencode.
|
|
42
|
+
*/
|
|
43
|
+
scheduleGate?: ScheduleGateSpec & {
|
|
44
|
+
gateFile: string;
|
|
45
|
+
deferFile?: string;
|
|
46
|
+
forceFile?: string;
|
|
47
|
+
};
|
|
48
|
+
/**
|
|
49
|
+
* Спринт 21: путь к env-файлу workspace (пары KEY=VALUE). Значения
|
|
50
|
+
* подгружаются перед запуском opencode и никогда не пишутся в лог.
|
|
51
|
+
*/
|
|
52
|
+
envFile?: string;
|
|
38
53
|
}
|
|
39
54
|
|
|
40
55
|
/**
|
|
@@ -69,6 +84,8 @@ export function buildBashWrapperScript(options: BashWrapperOptions): string {
|
|
|
69
84
|
afterScript,
|
|
70
85
|
allowedTools,
|
|
71
86
|
deniedTools,
|
|
87
|
+
scheduleGate,
|
|
88
|
+
envFile,
|
|
72
89
|
} = options;
|
|
73
90
|
|
|
74
91
|
const lines: string[] = [
|
|
@@ -91,6 +108,14 @@ export function buildBashWrapperScript(options: BashWrapperOptions): string {
|
|
|
91
108
|
`AFTER_SCRIPT=${shellQuote(afterScript ?? "")}`,
|
|
92
109
|
`ALLOWED_TOOLS=${shellQuote((allowedTools ?? []).join(","))}`,
|
|
93
110
|
`DENIED_TOOLS=${shellQuote((deniedTools ?? []).join(","))}`,
|
|
111
|
+
`SCHEDULE_GATE_FILE=${shellQuote(scheduleGate?.gateFile ?? "")}`,
|
|
112
|
+
`SCHEDULE_CRON=${shellQuote(scheduleGate?.cron ?? "")}`,
|
|
113
|
+
`SCHEDULE_TZ=${shellQuote(scheduleGate?.tz ?? "")}`,
|
|
114
|
+
`SCHEDULE_NOT_BEFORE=${shellQuote(scheduleGate?.notBefore ?? "")}`,
|
|
115
|
+
`SCHEDULE_NOT_AFTER=${shellQuote(scheduleGate?.notAfter ?? "")}`,
|
|
116
|
+
`SCHEDULE_DEFER_FILE=${shellQuote(scheduleGate?.deferFile ?? "")}`,
|
|
117
|
+
`SCHEDULE_FORCE_FILE=${shellQuote(scheduleGate?.forceFile ?? "")}`,
|
|
118
|
+
`ENV_FILE=${shellQuote(envFile ?? "")}`,
|
|
94
119
|
"",
|
|
95
120
|
"# cron запускает задачи с минимальным PATH — добавляем типовые каталоги.",
|
|
96
121
|
'export PATH="/opt/homebrew/bin:/usr/local/bin:$HOME/.local/bin:$HOME/.bun/bin:$PATH"',
|
|
@@ -101,6 +126,27 @@ export function buildBashWrapperScript(options: BashWrapperOptions): string {
|
|
|
101
126
|
' printf \'[%s] %s\\n\' "$(date \'+%Y-%m-%d %H:%M:%S\')" "$*" >> "$LOG_FILE" 2>/dev/null || true',
|
|
102
127
|
"}",
|
|
103
128
|
"",
|
|
129
|
+
"# Спринт 19: гейт расписания — до lock, чтобы ожидание окна не держало блокировку.",
|
|
130
|
+
'if [ -n "$SCHEDULE_GATE_FILE" ]; then',
|
|
131
|
+
' SCHED_GATE_ARGS=()',
|
|
132
|
+
' [ -n "$SCHEDULE_CRON" ] && SCHED_GATE_ARGS+=(--cron "$SCHEDULE_CRON")',
|
|
133
|
+
' [ -n "$SCHEDULE_TZ" ] && SCHED_GATE_ARGS+=(--tz "$SCHEDULE_TZ")',
|
|
134
|
+
' [ -n "$SCHEDULE_NOT_BEFORE" ] && SCHED_GATE_ARGS+=(--not-before "$SCHEDULE_NOT_BEFORE")',
|
|
135
|
+
' [ -n "$SCHEDULE_NOT_AFTER" ] && SCHED_GATE_ARGS+=(--not-after "$SCHEDULE_NOT_AFTER")',
|
|
136
|
+
' [ -n "$SCHEDULE_DEFER_FILE" ] && SCHED_GATE_ARGS+=(--defer-file "$SCHEDULE_DEFER_FILE")',
|
|
137
|
+
' [ -n "$SCHEDULE_FORCE_FILE" ] && SCHED_GATE_ARGS+=(--force-file "$SCHEDULE_FORCE_FILE")',
|
|
138
|
+
' if ! command -v node >/dev/null 2>&1; then',
|
|
139
|
+
' log "[scheduler] Гейт расписания пропущен: node не найден в PATH."',
|
|
140
|
+
" else",
|
|
141
|
+
' node "$SCHEDULE_GATE_FILE" "${SCHED_GATE_ARGS[@]}" >> "$LOG_FILE" 2>&1',
|
|
142
|
+
" SCHED_GATE_CODE=$?",
|
|
143
|
+
' if [ "$SCHED_GATE_CODE" -eq 3 ]; then',
|
|
144
|
+
' log "[scheduler] Гейт расписания: запуск не требуется (cron/окно). Перенос или пропуск тика."',
|
|
145
|
+
" exit 0",
|
|
146
|
+
" fi",
|
|
147
|
+
" fi",
|
|
148
|
+
"fi",
|
|
149
|
+
"",
|
|
104
150
|
"# Атомарная блокировка: mkdir завершается ошибкой, если каталог уже есть.",
|
|
105
151
|
'if ! mkdir "$LOCK_FILE.d" 2>/dev/null; then',
|
|
106
152
|
' log "[scheduler] Задача \'$TASK_NAME\' уже выполняется — пропуск запуска."',
|
|
@@ -113,6 +159,20 @@ export function buildBashWrapperScript(options: BashWrapperOptions): string {
|
|
|
113
159
|
' cd "$WORKDIR" || { log "[scheduler] Не удалось перейти в $WORKDIR"; exit 1; }',
|
|
114
160
|
"fi",
|
|
115
161
|
"",
|
|
162
|
+
"# Спринт 21: env-переменные workspace. Файл пишет плагин, значения не логируются.",
|
|
163
|
+
'if [ -n "$ENV_FILE" ] && [ -f "$ENV_FILE" ]; then',
|
|
164
|
+
' while IFS= read -r env_line || [ -n "$env_line" ]; do',
|
|
165
|
+
" env_line=\"${env_line%$'\\r'}\"",
|
|
166
|
+
" case \"$env_line\" in ''|'#'*) continue ;; esac",
|
|
167
|
+
' env_key="${env_line%%=*}"',
|
|
168
|
+
' env_value="${env_line#*=}"',
|
|
169
|
+
' case "$env_key" in *[!A-Za-z0-9_]*) continue ;; esac',
|
|
170
|
+
' case "$env_key" in [A-Za-z_]*) ;; *) continue ;; esac',
|
|
171
|
+
' export "$env_key=$env_value"',
|
|
172
|
+
' done < "$ENV_FILE"',
|
|
173
|
+
' log "[scheduler] Переменные окружения workspace загружены."',
|
|
174
|
+
"fi",
|
|
175
|
+
"",
|
|
116
176
|
'if [ -n "$WORKSPACE_NAME" ]; then',
|
|
117
177
|
' GIT_BRANCH="$(git -C "$WORKDIR" rev-parse --abbrev-ref HEAD 2>/dev/null || true)"',
|
|
118
178
|
' GIT_REMOTE="$(git -C "$WORKDIR" remote get-url origin 2>/dev/null || true)"',
|
package/src/db/history-repo.ts
CHANGED
|
@@ -301,3 +301,119 @@ export function countHistory(): number {
|
|
|
301
301
|
const row = getDb().prepare("SELECT COUNT(*) AS count FROM history").get() as any;
|
|
302
302
|
return Number(row?.count) || 0;
|
|
303
303
|
}
|
|
304
|
+
|
|
305
|
+
/** Число активных (незавершённых) запусков: глубина очереди для /api/health. */
|
|
306
|
+
export function countRunningRecords(): number {
|
|
307
|
+
const row = getDb()
|
|
308
|
+
.prepare("SELECT COUNT(*) AS count FROM history WHERE finished_at IS NULL")
|
|
309
|
+
.get() as any;
|
|
310
|
+
return Number(row?.count) || 0;
|
|
311
|
+
}
|
|
312
|
+
|
|
313
|
+
/** Запись о незавершённом запуске — для детектора зависших матриц (Спринт 20). */
|
|
314
|
+
export interface RunningHistoryRecord {
|
|
315
|
+
id: number;
|
|
316
|
+
taskName: string;
|
|
317
|
+
startedAt: string;
|
|
318
|
+
}
|
|
319
|
+
|
|
320
|
+
/** Список активных запусков (finished_at IS NULL), самые старые сверху. */
|
|
321
|
+
export function listRunningRecords(): RunningHistoryRecord[] {
|
|
322
|
+
const rows = getDb()
|
|
323
|
+
.prepare(
|
|
324
|
+
`SELECT id, task_name, started_at FROM history
|
|
325
|
+
WHERE finished_at IS NULL
|
|
326
|
+
ORDER BY started_at ASC, id ASC`
|
|
327
|
+
)
|
|
328
|
+
.all() as any[];
|
|
329
|
+
return rows.map((row) => ({
|
|
330
|
+
id: Number(row.id) || 0,
|
|
331
|
+
taskName: String(row.task_name ?? ""),
|
|
332
|
+
startedAt: String(row.started_at ?? ""),
|
|
333
|
+
}));
|
|
334
|
+
}
|
|
335
|
+
|
|
336
|
+
/** Параметры очистки истории (Спринт 18). 0 — ограничение выключено. */
|
|
337
|
+
export interface PruneHistoryOptions {
|
|
338
|
+
/** Удалять завершённые записи старше N дней. */
|
|
339
|
+
retentionDays?: number;
|
|
340
|
+
/** Оставить не более N последних записей. */
|
|
341
|
+
maxRecords?: number;
|
|
342
|
+
/** Опорный момент времени (для тестов). */
|
|
343
|
+
now?: Date;
|
|
344
|
+
}
|
|
345
|
+
|
|
346
|
+
export interface PruneHistoryResult {
|
|
347
|
+
deletedByAge: number;
|
|
348
|
+
deletedByCount: number;
|
|
349
|
+
deleted: number;
|
|
350
|
+
kept: number;
|
|
351
|
+
/** Граница по возрасту (ISO) или null, если возраст не ограничивали. */
|
|
352
|
+
cutoff: string | null;
|
|
353
|
+
}
|
|
354
|
+
|
|
355
|
+
/**
|
|
356
|
+
* Чистит сырую историю: по возрасту и/или по количеству записей.
|
|
357
|
+
*
|
|
358
|
+
* Незавершённые запуски (`finished_at IS NULL`) не удаляются никогда — их
|
|
359
|
+
* обрабатывает crash recovery. Агрегаты в таблице metrics не трогаются:
|
|
360
|
+
* ретеншн чистит детали, а не статистику.
|
|
361
|
+
*/
|
|
362
|
+
export function pruneHistory(options: PruneHistoryOptions = {}): PruneHistoryResult {
|
|
363
|
+
const instance = getDb();
|
|
364
|
+
const now = options.now ?? new Date();
|
|
365
|
+
let deletedByAge = 0;
|
|
366
|
+
let deletedByCount = 0;
|
|
367
|
+
let cutoff: string | null = null;
|
|
368
|
+
|
|
369
|
+
const days = Number(options.retentionDays ?? 0);
|
|
370
|
+
if (Number.isFinite(days) && days > 0) {
|
|
371
|
+
cutoff = new Date(now.getTime() - days * 24 * 60 * 60 * 1000).toISOString();
|
|
372
|
+
const result = instance
|
|
373
|
+
.prepare(
|
|
374
|
+
`DELETE FROM history
|
|
375
|
+
WHERE finished_at IS NOT NULL AND finished_at < ?`
|
|
376
|
+
)
|
|
377
|
+
.run(cutoff);
|
|
378
|
+
deletedByAge = Number(result.changes) || 0;
|
|
379
|
+
}
|
|
380
|
+
|
|
381
|
+
const maxRecords = Number(options.maxRecords ?? 0);
|
|
382
|
+
if (Number.isFinite(maxRecords) && maxRecords > 0) {
|
|
383
|
+
const result = instance
|
|
384
|
+
.prepare(
|
|
385
|
+
`DELETE FROM history
|
|
386
|
+
WHERE finished_at IS NOT NULL
|
|
387
|
+
AND id NOT IN (
|
|
388
|
+
SELECT id FROM history
|
|
389
|
+
WHERE finished_at IS NOT NULL
|
|
390
|
+
ORDER BY started_at DESC, id DESC
|
|
391
|
+
LIMIT ?
|
|
392
|
+
)`
|
|
393
|
+
)
|
|
394
|
+
.run(Math.max(0, Math.floor(maxRecords)));
|
|
395
|
+
deletedByCount = Number(result.changes) || 0;
|
|
396
|
+
}
|
|
397
|
+
|
|
398
|
+
return {
|
|
399
|
+
deletedByAge,
|
|
400
|
+
deletedByCount,
|
|
401
|
+
deleted: deletedByAge + deletedByCount,
|
|
402
|
+
kept: countHistory(),
|
|
403
|
+
cutoff,
|
|
404
|
+
};
|
|
405
|
+
}
|
|
406
|
+
|
|
407
|
+
/**
|
|
408
|
+
* Освобождает место после массового удаления. `PRAGMA incremental_vacuum`
|
|
409
|
+
* работает только при auto_vacuum = INCREMENTAL; иначе это no-op, поэтому
|
|
410
|
+
* вызов безопасен и не требует проверки режима.
|
|
411
|
+
*/
|
|
412
|
+
export function vacuumHistory(): boolean {
|
|
413
|
+
try {
|
|
414
|
+
getDb().exec("PRAGMA incremental_vacuum");
|
|
415
|
+
return true;
|
|
416
|
+
} catch {
|
|
417
|
+
return false;
|
|
418
|
+
}
|
|
419
|
+
}
|
package/src/db/schema.ts
CHANGED
|
@@ -62,6 +62,8 @@ CREATE TABLE IF NOT EXISTS workspaces (
|
|
|
62
62
|
path TEXT NOT NULL UNIQUE,
|
|
63
63
|
git_remote TEXT,
|
|
64
64
|
color TEXT,
|
|
65
|
+
env_json TEXT,
|
|
66
|
+
env_file TEXT,
|
|
65
67
|
created_at TEXT NOT NULL
|
|
66
68
|
);
|
|
67
69
|
`;
|
|
@@ -106,4 +108,16 @@ export function applySchema(db: SchemaDb): void {
|
|
|
106
108
|
if (!taskColumnNames.includes("is_matrix_parent")) {
|
|
107
109
|
db.exec("ALTER TABLE tasks ADD COLUMN is_matrix_parent INTEGER DEFAULT 0");
|
|
108
110
|
}
|
|
111
|
+
|
|
112
|
+
// Спринт 21: env-переменные на workspace (пары ключ-значение и .env-файл).
|
|
113
|
+
const workspaceColumns = db.prepare("PRAGMA table_info(workspaces)").all() as Array<{
|
|
114
|
+
name?: string;
|
|
115
|
+
}>;
|
|
116
|
+
const workspaceColumnNames = workspaceColumns.map((c) => c.name).filter(Boolean);
|
|
117
|
+
if (!workspaceColumnNames.includes("env_json")) {
|
|
118
|
+
db.exec("ALTER TABLE workspaces ADD COLUMN env_json TEXT");
|
|
119
|
+
}
|
|
120
|
+
if (!workspaceColumnNames.includes("env_file")) {
|
|
121
|
+
db.exec("ALTER TABLE workspaces ADD COLUMN env_file TEXT");
|
|
122
|
+
}
|
|
109
123
|
}
|