opencode-windows-scheduler 1.1.0 → 1.2.1
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 +60 -1
- package/README.md +18 -8
- package/README.ru.md +13 -3
- package/ROADMAP-STRATEGY.md +2 -2
- package/ROADMAP.md +51 -18
- package/dist/core/analytics.d.ts +10 -0
- package/dist/core/analytics.d.ts.map +1 -1
- package/dist/core/analytics.js +21 -0
- package/dist/core/dry-run.d.ts +18 -1
- package/dist/core/dry-run.d.ts.map +1 -1
- package/dist/core/dry-run.js +49 -3
- package/dist/core/matrix.d.ts.map +1 -1
- package/dist/core/matrix.js +10 -0
- package/dist/core/one-shot.d.ts +62 -0
- package/dist/core/one-shot.d.ts.map +1 -0
- package/dist/core/one-shot.js +126 -0
- package/dist/core/otel.d.ts +4 -0
- package/dist/core/otel.d.ts.map +1 -0
- package/dist/core/otel.js +98 -0
- package/dist/core/prometheus.d.ts +23 -0
- package/dist/core/prometheus.d.ts.map +1 -0
- package/dist/core/prometheus.js +146 -0
- package/dist/core/ps-wrapper.d.ts +36 -2
- package/dist/core/ps-wrapper.d.ts.map +1 -1
- package/dist/core/ps-wrapper.js +124 -4
- package/dist/core/record-history.d.ts.map +1 -1
- package/dist/core/record-history.js +9 -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/linux.d.ts +12 -3
- package/dist/core/scheduler/linux.d.ts.map +1 -1
- package/dist/core/scheduler/linux.js +80 -3
- package/dist/core/scheduler/mac.d.ts.map +1 -1
- package/dist/core/scheduler/mac.js +17 -3
- package/dist/core/scheduler/posix.d.ts.map +1 -1
- package/dist/core/scheduler/posix.js +3 -0
- package/dist/core/scheduler/registry.d.ts +4 -0
- package/dist/core/scheduler/registry.d.ts.map +1 -1
- package/dist/core/scheduler/types.d.ts +20 -3
- 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 +23 -2
- package/dist/core/session.d.ts +34 -0
- package/dist/core/session.d.ts.map +1 -0
- package/dist/core/session.js +105 -0
- package/dist/core/structured-log.d.ts +84 -0
- package/dist/core/structured-log.d.ts.map +1 -0
- package/dist/core/structured-log.js +137 -0
- package/dist/core/wrappers/bash.d.ts +24 -0
- package/dist/core/wrappers/bash.d.ts.map +1 -1
- package/dist/core/wrappers/bash.js +70 -3
- package/dist/db/history-repo.d.ts +8 -0
- package/dist/db/history-repo.d.ts.map +1 -1
- package/dist/db/history-repo.js +76 -6
- package/dist/db/metrics-repo.d.ts +3 -0
- package/dist/db/metrics-repo.d.ts.map +1 -1
- package/dist/db/metrics-repo.js +16 -8
- package/dist/db/migrate.d.ts.map +1 -1
- package/dist/db/migrate.js +8 -1
- package/dist/db/schema.d.ts +1 -1
- package/dist/db/schema.d.ts.map +1 -1
- package/dist/db/schema.js +19 -0
- package/dist/gui-experimental.cjs +1 -0
- package/dist/history.d.ts +7 -0
- package/dist/history.d.ts.map +1 -1
- package/dist/history.js +13 -0
- package/dist/index.d.ts +137 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +1323 -78
- package/dist/integrations.d.ts +64 -0
- package/dist/integrations.d.ts.map +1 -0
- package/dist/integrations.js +205 -0
- 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 +592 -4
- package/dist/rpc.d.ts.map +1 -1
- package/dist/rpc.js +233 -6
- package/dist/server.d.ts +2 -0
- package/dist/server.d.ts.map +1 -1
- package/dist/server.js +473 -58
- package/dist/settings.d.ts +95 -0
- package/dist/settings.d.ts.map +1 -1
- package/dist/settings.js +186 -8
- package/dist/shared/jobs-view.d.ts +43 -5
- package/dist/shared/jobs-view.d.ts.map +1 -1
- package/dist/shared/jobs-view.js +125 -7
- package/dist/task-transfer.d.ts +32 -3
- package/dist/task-transfer.d.ts.map +1 -1
- package/dist/task-transfer.js +101 -3
- package/dist/types.d.ts.map +1 -1
- package/dist/types.js +3 -11
- 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 +32 -12
- package/docs/FEATURES.md +186 -10
- package/gui-experimental.cjs +4 -2
- package/package.json +15 -2
- package/scripts/demo-dashboard.mjs +12 -2
- package/src/core/analytics.ts +36 -0
- package/src/core/dry-run.ts +65 -4
- package/src/core/matrix.ts +10 -0
- package/src/core/one-shot.ts +173 -0
- package/src/core/otel.ts +128 -0
- package/src/core/prometheus.ts +215 -0
- package/src/core/ps-wrapper.ts +144 -4
- package/src/core/record-history.ts +13 -0
- package/src/core/schedule-gate.ts +213 -0
- package/src/core/schedule-v2.ts +533 -0
- package/src/core/scheduler/linux.ts +90 -3
- package/src/core/scheduler/mac.ts +35 -4
- package/src/core/scheduler/posix.ts +3 -0
- package/src/core/scheduler/registry.ts +4 -0
- package/src/core/scheduler/types.ts +20 -3
- package/src/core/scheduler/windows.ts +24 -2
- package/src/core/session.ts +115 -0
- package/src/core/structured-log.ts +205 -0
- package/src/core/wrappers/bash.ts +98 -2
- package/src/db/history-repo.ts +90 -7
- package/src/db/metrics-repo.ts +19 -7
- package/src/db/migrate.ts +7 -1
- package/src/db/schema.ts +25 -0
- package/src/gui.tsx +3832 -2868
- package/src/history.ts +17 -0
- package/src/index.ts +1670 -117
- package/src/integrations.ts +253 -0
- package/src/notifications.ts +516 -40
- package/src/profiles.ts +236 -0
- package/src/rpc.ts +244 -6
- package/src/server.ts +506 -58
- package/src/settings.ts +336 -9
- package/src/shared/jobs-view.ts +158 -8
- package/src/task-transfer.ts +151 -5
- package/src/tui.tsx +290 -14
- package/src/types.ts +3 -13
- package/src/workspaces.ts +214 -8
package/dist/task-transfer.d.ts
CHANGED
|
@@ -99,10 +99,26 @@ export interface TaskDefinition {
|
|
|
99
99
|
*/
|
|
100
100
|
dependsOn?: string[];
|
|
101
101
|
/**
|
|
102
|
-
* Чем запускается задача: по расписанию ("cron", по умолчанию)
|
|
103
|
-
* при изменении файла ("file")
|
|
102
|
+
* Чем запускается задача: по расписанию ("cron", по умолчанию),
|
|
103
|
+
* при изменении файла ("file"), по MCP-событию ("mcp-event") или
|
|
104
|
+
* однократно в runAt ("once"). Для file/mcp-event/once расписание не нужно.
|
|
104
105
|
*/
|
|
105
|
-
triggerType?: "cron" | "file" | "mcp-event";
|
|
106
|
+
triggerType?: "cron" | "file" | "mcp-event" | "once";
|
|
107
|
+
/** Абсолютное время однократного запуска (ISO-8601, triggerType "once"). */
|
|
108
|
+
runAt?: string;
|
|
109
|
+
/**
|
|
110
|
+
* Режим сессии OpenCode для запусков задачи (Спринт 24):
|
|
111
|
+
* "new" (по умолчанию — свежая сессия на каждый запуск),
|
|
112
|
+
* "reuse" — переиспользовать сохранённую сессию (`sessionId`),
|
|
113
|
+
* "last" — продолжать последнюю сессию рабочего каталога (`--continue`).
|
|
114
|
+
*/
|
|
115
|
+
session?: "new" | "reuse" | "last";
|
|
116
|
+
/** Идентификатор переиспользуемой сессии (генерируется плагином для режима "reuse"). */
|
|
117
|
+
sessionId?: string;
|
|
118
|
+
/** Сколько запусков переживает сессия до ротации (удаление и чистый старт). 0/undefined — без ограничения. */
|
|
119
|
+
sessionMaxRuns?: number;
|
|
120
|
+
/** Внутренний счётчик запусков текущей сессии (не экспортируется). */
|
|
121
|
+
sessionRunCount?: number;
|
|
106
122
|
/** Путь к файлу/папке, изменения которого запускают задачу (для triggerType === "file"). */
|
|
107
123
|
watchPath?: string;
|
|
108
124
|
/** Параметры MCP-события (для triggerType === "mcp-event"). */
|
|
@@ -128,6 +144,19 @@ export interface TaskDefinition {
|
|
|
128
144
|
matrixQueue?: string[];
|
|
129
145
|
/** Для родителя матрицы — true (флаг для фильтров/DAG). */
|
|
130
146
|
isMatrixParent?: boolean;
|
|
147
|
+
/**
|
|
148
|
+
* IANA-часовой пояс задачи (Спринт 19), например "Europe/Moscow".
|
|
149
|
+
* Не задан — системный пояс. Если отличается от системного, задача
|
|
150
|
+
* регистрируется в poll-режиме: ОС будит её каждую минуту, а cron
|
|
151
|
+
* проверяется в обёртке с учётом этого пояса.
|
|
152
|
+
*/
|
|
153
|
+
timezone?: string;
|
|
154
|
+
/** Начало окна запуска "HH:MM" (Спринт 19); вне окна запуск переносится. */
|
|
155
|
+
notBefore?: string;
|
|
156
|
+
/** Конец окна запуска "HH:MM"; может быть меньше notBefore (через полночь). */
|
|
157
|
+
notAfter?: string;
|
|
158
|
+
/** Пауза до даты (ISO, Спринт 19): плагин включит задачу автоматически. */
|
|
159
|
+
pausedUntil?: string;
|
|
131
160
|
/** Когда задача была создана — защита от ложного catch-up сразу после создания. */
|
|
132
161
|
createdAt?: string;
|
|
133
162
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"task-transfer.d.ts","sourceRoot":"","sources":["../src/task-transfer.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"task-transfer.d.ts","sourceRoot":"","sources":["../src/task-transfer.ts"],"names":[],"mappings":"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"}
|
package/dist/task-transfer.js
CHANGED
|
@@ -2,6 +2,9 @@ import fs from "node:fs/promises";
|
|
|
2
2
|
import path from "node:path";
|
|
3
3
|
import { PLUGIN_DIR, sanitizeName } from "./types.js";
|
|
4
4
|
import { listTasks, saveTask, deleteTask, } from "./db/tasks-repo.js";
|
|
5
|
+
import { normalizeOneShotRunAt } from "./core/one-shot.js";
|
|
6
|
+
import { isValidIanaTimeZone, validateLaunchWindow } from "./core/schedule-v2.js";
|
|
7
|
+
import { isValidSessionId } from "./core/session.js";
|
|
5
8
|
const PREFIX = "\\OpenCode\\windows-scheduler\\";
|
|
6
9
|
/** Приоритет по умолчанию — «Обычный». */
|
|
7
10
|
export const DEFAULT_PRIORITY = 5;
|
|
@@ -108,7 +111,27 @@ export async function buildExportJson(tasks) {
|
|
|
108
111
|
...(definition?.triggerType === "mcp-event"
|
|
109
112
|
? { triggerType: "mcp-event" }
|
|
110
113
|
: {}),
|
|
114
|
+
...(definition?.triggerType === "once"
|
|
115
|
+
? {
|
|
116
|
+
triggerType: "once",
|
|
117
|
+
...(definition.runAt ? { runAt: definition.runAt } : {}),
|
|
118
|
+
}
|
|
119
|
+
: {}),
|
|
120
|
+
// Спринт 24: сессии. sessionId экспортируется только для reuse; счётчик не экспортируем.
|
|
121
|
+
...(definition?.session
|
|
122
|
+
? { session: definition.session }
|
|
123
|
+
: {}),
|
|
124
|
+
...(definition?.session === "reuse" && definition.sessionId
|
|
125
|
+
? { sessionId: definition.sessionId }
|
|
126
|
+
: {}),
|
|
127
|
+
...(definition?.sessionMaxRuns !== undefined
|
|
128
|
+
? { sessionMaxRuns: definition.sessionMaxRuns }
|
|
129
|
+
: {}),
|
|
111
130
|
...(definition?.watchPath ? { watchPath: definition.watchPath } : {}),
|
|
131
|
+
...(definition?.timezone ? { timezone: definition.timezone } : {}),
|
|
132
|
+
...(definition?.notBefore ? { notBefore: definition.notBefore } : {}),
|
|
133
|
+
...(definition?.notAfter ? { notAfter: definition.notAfter } : {}),
|
|
134
|
+
...(definition?.pausedUntil ? { pausedUntil: definition.pausedUntil } : {}),
|
|
112
135
|
...(Array.isArray(definition?.allowedTools) && definition.allowedTools.length > 0
|
|
113
136
|
? { allowedTools: definition.allowedTools }
|
|
114
137
|
: {}),
|
|
@@ -182,8 +205,12 @@ export function parseImportJson(raw) {
|
|
|
182
205
|
? "file"
|
|
183
206
|
: source.triggerType === "mcp-event"
|
|
184
207
|
? "mcp-event"
|
|
185
|
-
: "
|
|
208
|
+
: source.triggerType === "once"
|
|
209
|
+
? "once"
|
|
210
|
+
: "cron";
|
|
186
211
|
const watchPath = typeof source.watchPath === "string" ? source.watchPath.trim() : "";
|
|
212
|
+
const rawRunAt = typeof source.runAt === "string" ? source.runAt.trim() : "";
|
|
213
|
+
const rawDelaySeconds = typeof source.delaySeconds === "number" ? source.delaySeconds : undefined;
|
|
187
214
|
const rawMcpEvent = source.mcpEvent && typeof source.mcpEvent === "object"
|
|
188
215
|
? source.mcpEvent
|
|
189
216
|
: undefined;
|
|
@@ -207,15 +234,61 @@ export function parseImportJson(raw) {
|
|
|
207
234
|
const scheduleOk = triggerType === "cron" ? Boolean(schedule) : true;
|
|
208
235
|
const watchOk = triggerType === "file" ? Boolean(watchPath) || Boolean(matrixParentHint) : true;
|
|
209
236
|
const eventOk = triggerType === "mcp-event" ? Boolean(mcpEvent?.event) : true;
|
|
210
|
-
|
|
237
|
+
const onceOk = triggerType === "once" ? Boolean(rawRunAt) || rawDelaySeconds !== undefined : true;
|
|
238
|
+
if (!name || !scheduleOk || !watchOk || !eventOk || !onceOk || !prompt) {
|
|
211
239
|
errors.push(`Запись ${position}${name ? ` (${name})` : ""}: нужны непустые поля name и prompt` +
|
|
212
240
|
(triggerType === "file"
|
|
213
241
|
? ", а также watchPath для файлового триггера."
|
|
214
242
|
: triggerType === "mcp-event"
|
|
215
243
|
? ", а также mcpEvent.event для MCP-триггера."
|
|
216
|
-
:
|
|
244
|
+
: triggerType === "once"
|
|
245
|
+
? ", а также runAt или delaySeconds для one-shot."
|
|
246
|
+
: ", а также schedule."));
|
|
247
|
+
return;
|
|
248
|
+
}
|
|
249
|
+
let runAt;
|
|
250
|
+
if (triggerType === "once") {
|
|
251
|
+
const normalized = normalizeOneShotRunAt({
|
|
252
|
+
runAt: rawRunAt || undefined,
|
|
253
|
+
delaySeconds: rawDelaySeconds,
|
|
254
|
+
});
|
|
255
|
+
if (!normalized.ok) {
|
|
256
|
+
errors.push(`Запись ${position}${name ? ` (${name})` : ""}: ${normalized.error}`);
|
|
257
|
+
return;
|
|
258
|
+
}
|
|
259
|
+
runAt = normalized.runAt;
|
|
260
|
+
}
|
|
261
|
+
// Спринт 24: режим сессии. Отсутствие полей — "new" (совместимость со старыми экспортами).
|
|
262
|
+
let session = "new";
|
|
263
|
+
if (source.session !== undefined) {
|
|
264
|
+
if (source.session === "new" ||
|
|
265
|
+
source.session === "reuse" ||
|
|
266
|
+
source.session === "last") {
|
|
267
|
+
session = source.session;
|
|
268
|
+
}
|
|
269
|
+
else {
|
|
270
|
+
errors.push(`Запись ${position}${name ? ` (${name})` : ""}: неизвестный session «${String(source.session)}» (ожидается new, reuse или last).`);
|
|
271
|
+
return;
|
|
272
|
+
}
|
|
273
|
+
}
|
|
274
|
+
const sessionId = typeof source.sessionId === "string" && source.sessionId.trim()
|
|
275
|
+
? source.sessionId.trim()
|
|
276
|
+
: undefined;
|
|
277
|
+
if (sessionId && !isValidSessionId(sessionId)) {
|
|
278
|
+
errors.push(`Запись ${position}${name ? ` (${name})` : ""}: некорректный sessionId «${sessionId}».`);
|
|
217
279
|
return;
|
|
218
280
|
}
|
|
281
|
+
let sessionMaxRuns;
|
|
282
|
+
if (source.sessionMaxRuns !== undefined) {
|
|
283
|
+
const raw = source.sessionMaxRuns;
|
|
284
|
+
if (typeof raw === "number" && Number.isFinite(raw) && raw >= 1) {
|
|
285
|
+
sessionMaxRuns = Math.floor(raw);
|
|
286
|
+
}
|
|
287
|
+
else {
|
|
288
|
+
errors.push(`Запись ${position}${name ? ` (${name})` : ""}: sessionMaxRuns должен быть целым числом ≥ 1.`);
|
|
289
|
+
return;
|
|
290
|
+
}
|
|
291
|
+
}
|
|
219
292
|
const timeoutSeconds = typeof source.timeoutSeconds === "number" &&
|
|
220
293
|
Number.isFinite(source.timeoutSeconds) &&
|
|
221
294
|
source.timeoutSeconds > 0
|
|
@@ -246,6 +319,23 @@ export function parseImportJson(raw) {
|
|
|
246
319
|
const model = readOptionalString(source.model);
|
|
247
320
|
const priority = normalizePriority(source.priority);
|
|
248
321
|
const workspaceId = readOptionalString(source.workspaceId);
|
|
322
|
+
// Планирование 2.0 (Спринт 19): IANA-зона, окно запуска, пауза до даты.
|
|
323
|
+
const timezone = readOptionalString(source.timezone);
|
|
324
|
+
if (timezone && !isValidIanaTimeZone(timezone)) {
|
|
325
|
+
errors.push(`Запись ${position}${name ? ` (${name})` : ""}: неизвестный часовой пояс ` +
|
|
326
|
+
`«${timezone}» (нужна IANA-зона, например Europe/Moscow).`);
|
|
327
|
+
}
|
|
328
|
+
const notBefore = readOptionalString(source.notBefore);
|
|
329
|
+
const notAfter = readOptionalString(source.notAfter);
|
|
330
|
+
const windowError = validateLaunchWindow(notBefore, notAfter);
|
|
331
|
+
if (windowError) {
|
|
332
|
+
errors.push(`Запись ${position}${name ? ` (${name})` : ""}: ${windowError}`);
|
|
333
|
+
}
|
|
334
|
+
const pausedUntil = readOptionalString(source.pausedUntil);
|
|
335
|
+
if (pausedUntil && Number.isNaN(Date.parse(pausedUntil))) {
|
|
336
|
+
errors.push(`Запись ${position}${name ? ` (${name})` : ""}: pausedUntil должен быть ` +
|
|
337
|
+
`датой в формате ISO (например 2026-12-01T09:00:00Z).`);
|
|
338
|
+
}
|
|
249
339
|
// Ограничения инструментов (Спринт 14): массив непустых строк без дублей.
|
|
250
340
|
// Пустой allowedTools отклоняется с явной ошибкой (избегаем «запрещено всё»).
|
|
251
341
|
const readToolList = (raw, fieldLabel) => {
|
|
@@ -430,7 +520,15 @@ export function parseImportJson(raw) {
|
|
|
430
520
|
...(nextTaskOnError !== undefined ? { nextTaskOnError } : {}),
|
|
431
521
|
...(dependsOn !== undefined ? { dependsOn } : {}),
|
|
432
522
|
...(triggerType === "cron" ? {} : { triggerType }),
|
|
523
|
+
...(runAt ? { runAt } : {}),
|
|
524
|
+
...(session !== "new" ? { session } : {}),
|
|
525
|
+
...(session === "reuse" && sessionId ? { sessionId } : {}),
|
|
526
|
+
...(sessionMaxRuns !== undefined ? { sessionMaxRuns } : {}),
|
|
433
527
|
...(watchPath ? { watchPath } : {}),
|
|
528
|
+
...(timezone !== undefined ? { timezone } : {}),
|
|
529
|
+
...(notBefore !== undefined ? { notBefore } : {}),
|
|
530
|
+
...(notAfter !== undefined ? { notAfter } : {}),
|
|
531
|
+
...(pausedUntil !== undefined ? { pausedUntil } : {}),
|
|
434
532
|
...(mcpEvent ? { mcpEvent } : {}),
|
|
435
533
|
...(allowedTools !== undefined ? { allowedTools } : {}),
|
|
436
534
|
...(deniedTools !== undefined ? { deniedTools } : {}),
|
package/dist/types.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAGxB,oFAAoF;AACpF,eAAO,MAAM,WAAW,gCAAgC,CAAC;AAEzD,uDAAuD;AACvD,eAAO,MAAM,WAAW,aAAa,CAAC;AACtC,eAAO,MAAM,gBAAgB,sBAAsB,CAAC;AAcpD,eAAO,MAAM,UAAU,QAAqB,CAAC;AAE7C,eAAO,MAAM,QAAQ,QAAiC,CAAC;AACvD,eAAO,MAAM,OAAO,QAAgC,CAAC;AACrD,eAAO,MAAM,WAAW,QAAoC,CAAC;AAE7D,4CAA4C;AAC5C,eAAO,MAAM,UAAU,SAA+B,CAAC;AAEvD,iFAAiF;AACjF,eAAO,MAAM,qBAAqB,QAAsB,CAAC;AAEzD;;;;GAIG;AACH,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAcjD;AAED;;;GAGG;AACH,eAAO,MAAM,eAAe;;;;;;iBAsB1B,CAAC;AAEH,MAAM,MAAM,eAAe,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,eAAe,CAAC,CAAC;AAE9D,eAAO,MAAM,aAAa;;iBAExB,CAAC;AACH,MAAM,MAAM,aAAa,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,aAAa,CAAC,CAAC;AAE1D,eAAO,MAAM,aAAa;;iBAExB,CAAC;AACH,MAAM,MAAM,aAAa,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,aAAa,CAAC,CAAC;AAE1D,eAAO,MAAM,YAAY,gCAAe,CAAC;AACzC,MAAM,MAAM,YAAY,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,YAAY,CAAC,CAAC;AAExD;;GAEG;AACH,MAAM,WAAW,cAAc;IAC7B,yDAAyD;IACzD,EAAE,EAAE,QAAQ,GAAG,QAAQ,GAAG,OAAO,GAAG,QAAQ,CAAC;IAC7C,sEAAsE;IACtE,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,kDAAkD;IAClD,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,sCAAsC;IACtC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,+CAA+C;IAC/C,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED;;GAEG;AACH,MAAM,WAAW,iBAAiB;IAChC,oDAAoD;IACpD,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,oDAAoD;IACpD,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB"}
|
package/dist/types.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import os from "node:os";
|
|
2
1
|
import path from "node:path";
|
|
3
2
|
import { z } from "zod";
|
|
3
|
+
import { getProfileDir, getProfileName } from "./profiles.js";
|
|
4
4
|
/** Префикс всех задач плагина (историческое имя, сохраняется для совместимости). */
|
|
5
5
|
export const TASK_PREFIX = "OpenCode\\windows-scheduler";
|
|
6
6
|
/** Папка задач плагина в планировщике ОС (Windows). */
|
|
@@ -12,18 +12,10 @@ export const TASK_FOLDER_NAME = "windows-scheduler";
|
|
|
12
12
|
* Windows: %APPDATA%\opencode\windows-scheduler (как раньше — без миграции).
|
|
13
13
|
* macOS/Linux: $XDG_CONFIG_HOME/opencode/windows-scheduler или
|
|
14
14
|
* ~/.config/opencode/windows-scheduler.
|
|
15
|
+
* Спринт 21: директория зависит от активного профиля (см. src/profiles.ts).
|
|
15
16
|
*/
|
|
16
17
|
function resolvePluginDir() {
|
|
17
|
-
|
|
18
|
-
const custom = process.env.OPENCODE_SCHEDULER_HOME?.trim();
|
|
19
|
-
if (custom)
|
|
20
|
-
return path.resolve(custom);
|
|
21
|
-
if (process.platform === "win32") {
|
|
22
|
-
const base = process.env.APPDATA || path.join(os.homedir(), "AppData", "Roaming");
|
|
23
|
-
return path.join(base, "opencode", TASK_FOLDER_NAME);
|
|
24
|
-
}
|
|
25
|
-
const configHome = process.env.XDG_CONFIG_HOME || path.join(os.homedir(), ".config");
|
|
26
|
-
return path.join(configHome, "opencode", TASK_FOLDER_NAME);
|
|
18
|
+
return getProfileDir(getProfileName());
|
|
27
19
|
}
|
|
28
20
|
export const PLUGIN_DIR = resolvePluginDir();
|
|
29
21
|
export const LOCK_DIR = path.join(PLUGIN_DIR, "locks");
|
package/dist/workspaces.d.ts
CHANGED
|
@@ -11,21 +11,64 @@ export interface Workspace {
|
|
|
11
11
|
path: string;
|
|
12
12
|
gitRemote?: string;
|
|
13
13
|
color?: string;
|
|
14
|
+
/** Env-переменные workspace (Спринт 21). Значения хранятся как есть. */
|
|
15
|
+
env?: Record<string, string>;
|
|
16
|
+
/** Путь к .env-файлу, переменные которого подмешиваются к env (Спринт 21). */
|
|
17
|
+
envFile?: string;
|
|
14
18
|
createdAt: string;
|
|
15
19
|
}
|
|
16
20
|
export interface AddWorkspaceInput {
|
|
17
21
|
name?: string;
|
|
18
22
|
path: string;
|
|
19
23
|
color?: string;
|
|
24
|
+
env?: Record<string, string> | null;
|
|
25
|
+
envFile?: string | null;
|
|
20
26
|
}
|
|
21
27
|
export interface UpdateWorkspacePatch {
|
|
22
28
|
name?: string;
|
|
23
29
|
path?: string;
|
|
24
30
|
color?: string;
|
|
25
31
|
gitRemote?: string | null;
|
|
32
|
+
env?: Record<string, string> | null;
|
|
33
|
+
envFile?: string | null;
|
|
26
34
|
}
|
|
35
|
+
/** Максимум пар env на workspace — защита от раздувания строки JSON. */
|
|
36
|
+
export declare const MAX_WORKSPACE_ENV_PAIRS = 100;
|
|
27
37
|
/** Палитра цветных маркеров для GUI/дашборда. */
|
|
28
38
|
export declare const WORKSPACE_COLORS: string[];
|
|
39
|
+
/**
|
|
40
|
+
* Нормализует пары env: ключи — валидные имена переменных, значения — строки.
|
|
41
|
+
* Бросает понятную ошибку при нарушении (её показывает GUI/RPC).
|
|
42
|
+
*/
|
|
43
|
+
export declare function normalizeWorkspaceEnv(value: unknown): Record<string, string> | undefined;
|
|
44
|
+
/**
|
|
45
|
+
* Разбирает содержимое .env: строки KEY=VALUE, комментарии `#`, пустые строки,
|
|
46
|
+
* префикс `export `, кавычки вокруг значения снимаются.
|
|
47
|
+
*/
|
|
48
|
+
export declare function parseEnvFileContent(content: string): Record<string, string>;
|
|
49
|
+
/** Читает .env-файл workspace (если он задан и существует). */
|
|
50
|
+
export declare function readWorkspaceEnvFile(envFile?: string): Record<string, string>;
|
|
51
|
+
/**
|
|
52
|
+
* Итоговые env-переменные workspace: сначала .env-файл, затем явные пары
|
|
53
|
+
* (пары важнее файла). Никогда не бросает.
|
|
54
|
+
*/
|
|
55
|
+
export declare function resolveWorkspaceEnv(workspace: Workspace | undefined): Record<string, string>;
|
|
56
|
+
/** Маскирует значение секрета для логов. */
|
|
57
|
+
export declare function maskSecretValue(): string;
|
|
58
|
+
/** Копия env для логов: значения «секретных» ключей заменены на ***. */
|
|
59
|
+
export declare function maskEnvForLog(env: Record<string, string> | undefined): Record<string, string>;
|
|
60
|
+
/**
|
|
61
|
+
* Каталог env-файлов задач внутри каталога плагина (по одному файлу на задачу).
|
|
62
|
+
* Файлы содержат реальные значения и не попадают в git/логи.
|
|
63
|
+
*/
|
|
64
|
+
export declare function workspaceEnvDir(pluginDir: string): string;
|
|
65
|
+
/**
|
|
66
|
+
* Пишет env-файл задачи в формате KEY=VALUE (Спринт 21).
|
|
67
|
+
*
|
|
68
|
+
* Возвращает путь к файлу или undefined, если у workspace нет переменных.
|
|
69
|
+
* Пустой env удаляет ранее созданный файл. На POSIX права 0600.
|
|
70
|
+
*/
|
|
71
|
+
export declare function writeWorkspaceEnvFile(workspace: Workspace | undefined, pluginDir: string, sanitizedName: string): string | undefined;
|
|
29
72
|
/** Проверяет, что путь существует и является директорией. */
|
|
30
73
|
export declare function validateWorkspacePath(workspacePath: string): void;
|
|
31
74
|
/**
|
package/dist/workspaces.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workspaces.d.ts","sourceRoot":"","sources":["../src/workspaces.ts"],"names":[],"mappings":"AAOA;;;;;;GAMG;AACH,MAAM,WAAW,SAAS;IACxB,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,iBAAiB;IAChC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"workspaces.d.ts","sourceRoot":"","sources":["../src/workspaces.ts"],"names":[],"mappings":"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"}
|
package/dist/workspaces.js
CHANGED
|
@@ -1,9 +1,11 @@
|
|
|
1
1
|
import { randomUUID } from "node:crypto";
|
|
2
|
-
import { statSync } from "node:fs";
|
|
3
|
-
import { basename, resolve } from "node:path";
|
|
2
|
+
import { chmodSync, mkdirSync, readFileSync, rmSync, statSync, writeFileSync } from "node:fs";
|
|
3
|
+
import { basename, join, resolve } from "node:path";
|
|
4
4
|
import { spawnSync } from "node:child_process";
|
|
5
5
|
import { getDb } from "./db/index.js";
|
|
6
6
|
import { clearWorkspaceAssignments } from "./db/tasks-repo.js";
|
|
7
|
+
/** Максимум пар env на workspace — защита от раздувания строки JSON. */
|
|
8
|
+
export const MAX_WORKSPACE_ENV_PAIRS = 100;
|
|
7
9
|
/** Палитра цветных маркеров для GUI/дашборда. */
|
|
8
10
|
export const WORKSPACE_COLORS = [
|
|
9
11
|
"#5b8def",
|
|
@@ -13,13 +15,163 @@ export const WORKSPACE_COLORS = [
|
|
|
13
15
|
"#8b6fe8",
|
|
14
16
|
"#3aa8b8",
|
|
15
17
|
];
|
|
18
|
+
const ENV_KEY_RE = /^[A-Za-z_][A-Za-z0-9_]*$/;
|
|
19
|
+
/**
|
|
20
|
+
* Нормализует пары env: ключи — валидные имена переменных, значения — строки.
|
|
21
|
+
* Бросает понятную ошибку при нарушении (её показывает GUI/RPC).
|
|
22
|
+
*/
|
|
23
|
+
export function normalizeWorkspaceEnv(value) {
|
|
24
|
+
if (value == null)
|
|
25
|
+
return undefined;
|
|
26
|
+
if (typeof value !== "object" || Array.isArray(value)) {
|
|
27
|
+
throw new Error("env должен быть объектом «ключ → значение».");
|
|
28
|
+
}
|
|
29
|
+
const entries = Object.entries(value);
|
|
30
|
+
if (entries.length > MAX_WORKSPACE_ENV_PAIRS) {
|
|
31
|
+
throw new Error(`Слишком много env-переменных: ${entries.length} (максимум ${MAX_WORKSPACE_ENV_PAIRS}).`);
|
|
32
|
+
}
|
|
33
|
+
const result = {};
|
|
34
|
+
for (const [rawKey, rawValue] of entries) {
|
|
35
|
+
const key = String(rawKey).trim();
|
|
36
|
+
if (!ENV_KEY_RE.test(key)) {
|
|
37
|
+
throw new Error(`Недопустимое имя env-переменной '${rawKey}': нужны латиница, цифры и '_', не с цифры.`);
|
|
38
|
+
}
|
|
39
|
+
if (rawValue == null) {
|
|
40
|
+
result[key] = "";
|
|
41
|
+
continue;
|
|
42
|
+
}
|
|
43
|
+
if (typeof rawValue === "object") {
|
|
44
|
+
throw new Error(`Значение env '${key}' должно быть строкой.`);
|
|
45
|
+
}
|
|
46
|
+
result[key] = String(rawValue);
|
|
47
|
+
}
|
|
48
|
+
return result;
|
|
49
|
+
}
|
|
50
|
+
/**
|
|
51
|
+
* Разбирает содержимое .env: строки KEY=VALUE, комментарии `#`, пустые строки,
|
|
52
|
+
* префикс `export `, кавычки вокруг значения снимаются.
|
|
53
|
+
*/
|
|
54
|
+
export function parseEnvFileContent(content) {
|
|
55
|
+
const result = {};
|
|
56
|
+
for (const line of String(content).split(/\r?\n/)) {
|
|
57
|
+
const trimmed = line.trim();
|
|
58
|
+
if (!trimmed || trimmed.startsWith("#"))
|
|
59
|
+
continue;
|
|
60
|
+
const withoutExport = trimmed.startsWith("export ")
|
|
61
|
+
? trimmed.slice("export ".length).trim()
|
|
62
|
+
: trimmed;
|
|
63
|
+
const eq = withoutExport.indexOf("=");
|
|
64
|
+
if (eq <= 0)
|
|
65
|
+
continue;
|
|
66
|
+
const key = withoutExport.slice(0, eq).trim();
|
|
67
|
+
if (!ENV_KEY_RE.test(key))
|
|
68
|
+
continue;
|
|
69
|
+
let value = withoutExport.slice(eq + 1).trim();
|
|
70
|
+
if ((value.startsWith('"') && value.endsWith('"') && value.length >= 2) ||
|
|
71
|
+
(value.startsWith("'") && value.endsWith("'") && value.length >= 2)) {
|
|
72
|
+
value = value.slice(1, -1);
|
|
73
|
+
}
|
|
74
|
+
result[key] = value;
|
|
75
|
+
}
|
|
76
|
+
return result;
|
|
77
|
+
}
|
|
78
|
+
/** Читает .env-файл workspace (если он задан и существует). */
|
|
79
|
+
export function readWorkspaceEnvFile(envFile) {
|
|
80
|
+
if (!envFile)
|
|
81
|
+
return {};
|
|
82
|
+
try {
|
|
83
|
+
return parseEnvFileContent(readFileSync(envFile, "utf8"));
|
|
84
|
+
}
|
|
85
|
+
catch {
|
|
86
|
+
return {};
|
|
87
|
+
}
|
|
88
|
+
}
|
|
89
|
+
/**
|
|
90
|
+
* Итоговые env-переменные workspace: сначала .env-файл, затем явные пары
|
|
91
|
+
* (пары важнее файла). Никогда не бросает.
|
|
92
|
+
*/
|
|
93
|
+
export function resolveWorkspaceEnv(workspace) {
|
|
94
|
+
if (!workspace)
|
|
95
|
+
return {};
|
|
96
|
+
return {
|
|
97
|
+
...readWorkspaceEnvFile(workspace.envFile),
|
|
98
|
+
...(workspace.env ?? {}),
|
|
99
|
+
};
|
|
100
|
+
}
|
|
101
|
+
/** Маскирует значение секрета для логов. */
|
|
102
|
+
export function maskSecretValue() {
|
|
103
|
+
return "***";
|
|
104
|
+
}
|
|
105
|
+
const SECRET_KEY_RE = /(TOKEN|SECRET|PASS|PASSWORD|KEY|CREDENTIAL|AUTH)/i;
|
|
106
|
+
/** Копия env для логов: значения «секретных» ключей заменены на ***. */
|
|
107
|
+
export function maskEnvForLog(env) {
|
|
108
|
+
if (!env)
|
|
109
|
+
return {};
|
|
110
|
+
const masked = {};
|
|
111
|
+
for (const [key, value] of Object.entries(env)) {
|
|
112
|
+
masked[key] = SECRET_KEY_RE.test(key) ? maskSecretValue() : value;
|
|
113
|
+
}
|
|
114
|
+
return masked;
|
|
115
|
+
}
|
|
116
|
+
/**
|
|
117
|
+
* Каталог env-файлов задач внутри каталога плагина (по одному файлу на задачу).
|
|
118
|
+
* Файлы содержат реальные значения и не попадают в git/логи.
|
|
119
|
+
*/
|
|
120
|
+
export function workspaceEnvDir(pluginDir) {
|
|
121
|
+
return join(pluginDir, "env");
|
|
122
|
+
}
|
|
123
|
+
/**
|
|
124
|
+
* Пишет env-файл задачи в формате KEY=VALUE (Спринт 21).
|
|
125
|
+
*
|
|
126
|
+
* Возвращает путь к файлу или undefined, если у workspace нет переменных.
|
|
127
|
+
* Пустой env удаляет ранее созданный файл. На POSIX права 0600.
|
|
128
|
+
*/
|
|
129
|
+
export function writeWorkspaceEnvFile(workspace, pluginDir, sanitizedName) {
|
|
130
|
+
const file = join(workspaceEnvDir(pluginDir), `${sanitizedName}.env`);
|
|
131
|
+
const env = resolveWorkspaceEnv(workspace);
|
|
132
|
+
const keys = Object.keys(env);
|
|
133
|
+
if (!keys.length) {
|
|
134
|
+
try {
|
|
135
|
+
rmSync(file, { force: true });
|
|
136
|
+
}
|
|
137
|
+
catch {
|
|
138
|
+
// нечего удалять — не ошибка
|
|
139
|
+
}
|
|
140
|
+
return undefined;
|
|
141
|
+
}
|
|
142
|
+
const body = keys
|
|
143
|
+
.map((key) => `${key}=${String(env[key]).replace(/\r?\n/g, " ")}`)
|
|
144
|
+
.join("\n") + "\n";
|
|
145
|
+
mkdirSync(workspaceEnvDir(pluginDir), { recursive: true });
|
|
146
|
+
writeFileSync(file, body, { encoding: "utf8", mode: 0o600 });
|
|
147
|
+
if (process.platform !== "win32") {
|
|
148
|
+
try {
|
|
149
|
+
chmodSync(file, 0o600);
|
|
150
|
+
}
|
|
151
|
+
catch {
|
|
152
|
+
// права не критичны для работы задачи
|
|
153
|
+
}
|
|
154
|
+
}
|
|
155
|
+
return file;
|
|
156
|
+
}
|
|
16
157
|
function rowToWorkspace(row) {
|
|
158
|
+
let env;
|
|
159
|
+
if (row.env_json) {
|
|
160
|
+
try {
|
|
161
|
+
env = normalizeWorkspaceEnv(JSON.parse(String(row.env_json)));
|
|
162
|
+
}
|
|
163
|
+
catch {
|
|
164
|
+
env = undefined;
|
|
165
|
+
}
|
|
166
|
+
}
|
|
17
167
|
return {
|
|
18
168
|
id: String(row.id),
|
|
19
169
|
name: String(row.name),
|
|
20
170
|
path: String(row.path),
|
|
21
171
|
gitRemote: row.git_remote == null ? undefined : String(row.git_remote),
|
|
22
172
|
color: row.color == null ? undefined : String(row.color),
|
|
173
|
+
env,
|
|
174
|
+
envFile: row.env_file == null ? undefined : String(row.env_file),
|
|
23
175
|
createdAt: String(row.created_at),
|
|
24
176
|
};
|
|
25
177
|
}
|
|
@@ -114,11 +266,13 @@ export function addWorkspace(input) {
|
|
|
114
266
|
WORKSPACE_COLORS[listWorkspaces().length % WORKSPACE_COLORS.length];
|
|
115
267
|
const createdAt = new Date().toISOString();
|
|
116
268
|
const gitRemote = readGitRemote(workspacePath);
|
|
269
|
+
const env = normalizeWorkspaceEnv(input.env);
|
|
270
|
+
const envFile = input.envFile?.trim() || undefined;
|
|
117
271
|
getDb()
|
|
118
|
-
.prepare(`INSERT INTO workspaces (id, name, path, git_remote, color, created_at)
|
|
119
|
-
VALUES (?, ?, ?, ?, ?, ?)`)
|
|
120
|
-
.run(id, name, workspacePath, gitRemote ?? null, color, createdAt);
|
|
121
|
-
return { id, name, path: workspacePath, gitRemote, color, createdAt };
|
|
272
|
+
.prepare(`INSERT INTO workspaces (id, name, path, git_remote, color, env_json, env_file, created_at)
|
|
273
|
+
VALUES (?, ?, ?, ?, ?, ?, ?, ?)`)
|
|
274
|
+
.run(id, name, workspacePath, gitRemote ?? null, color, env ? JSON.stringify(env) : null, envFile ?? null, createdAt);
|
|
275
|
+
return { id, name, path: workspacePath, gitRemote, color, env, envFile, createdAt };
|
|
122
276
|
}
|
|
123
277
|
/** Обновляет имя/путь/цвет workspace. */
|
|
124
278
|
export function updateWorkspace(id, patch) {
|
|
@@ -147,15 +301,27 @@ export function updateWorkspace(id, patch) {
|
|
|
147
301
|
: nextPath !== existing.path
|
|
148
302
|
? readGitRemote(nextPath)
|
|
149
303
|
: existing.gitRemote;
|
|
304
|
+
const nextEnv = patch.env === null
|
|
305
|
+
? undefined
|
|
306
|
+
: patch.env !== undefined
|
|
307
|
+
? normalizeWorkspaceEnv(patch.env)
|
|
308
|
+
: existing.env;
|
|
309
|
+
const nextEnvFile = patch.envFile === null
|
|
310
|
+
? undefined
|
|
311
|
+
: patch.envFile !== undefined
|
|
312
|
+
? patch.envFile.trim() || undefined
|
|
313
|
+
: existing.envFile;
|
|
150
314
|
getDb()
|
|
151
|
-
.prepare("UPDATE workspaces SET name = ?, path = ?, git_remote = ?, color = ? WHERE id = ?")
|
|
152
|
-
.run(nextName, nextPath, nextRemote ?? null, nextColor ?? null, id);
|
|
315
|
+
.prepare("UPDATE workspaces SET name = ?, path = ?, git_remote = ?, color = ?, env_json = ?, env_file = ? WHERE id = ?")
|
|
316
|
+
.run(nextName, nextPath, nextRemote ?? null, nextColor ?? null, nextEnv ? JSON.stringify(nextEnv) : null, nextEnvFile ?? null, id);
|
|
153
317
|
return {
|
|
154
318
|
id,
|
|
155
319
|
name: nextName,
|
|
156
320
|
path: nextPath,
|
|
157
321
|
gitRemote: nextRemote,
|
|
158
322
|
color: nextColor,
|
|
323
|
+
env: nextEnv,
|
|
324
|
+
envFile: nextEnvFile,
|
|
159
325
|
createdAt: existing.createdAt,
|
|
160
326
|
};
|
|
161
327
|
}
|