agent-steward 0.0.2 → 0.0.3
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 +25 -2
- package/CROSS_PLATFORM.md +11 -9
- package/README.md +9 -8
- package/ROADMAP-STRATEGY.md +93 -44
- package/ROADMAP.md +114 -999
- package/dist/core/cron-to-schtasks.d.ts +0 -8
- package/dist/core/cron-to-schtasks.d.ts.map +1 -1
- package/dist/core/cron-to-schtasks.js +11 -86
- package/dist/core/dry-run.js +1 -1
- package/dist/core/file-watcher.js +9 -9
- package/dist/core/git-trigger.js +4 -4
- package/dist/core/lock.js +2 -4
- package/dist/core/one-shot.d.ts +27 -5
- package/dist/core/one-shot.d.ts.map +1 -1
- package/dist/core/one-shot.js +53 -10
- package/dist/core/otel.js +2 -2
- package/dist/core/ps-wrapper.d.ts +1 -1
- package/dist/core/ps-wrapper.d.ts.map +1 -1
- package/dist/core/ps-wrapper.js +55 -35
- package/dist/core/record-history.js +22 -22
- package/dist/core/schedule-v2.d.ts +2 -2
- package/dist/core/schedule-v2.d.ts.map +1 -1
- package/dist/core/schedule-v2.js +7 -7
- package/dist/core/scheduler/at-fallback.d.ts +42 -0
- package/dist/core/scheduler/at-fallback.d.ts.map +1 -0
- package/dist/core/scheduler/at-fallback.js +70 -0
- package/dist/core/scheduler/linux.d.ts +3 -1
- package/dist/core/scheduler/linux.d.ts.map +1 -1
- package/dist/core/scheduler/linux.js +43 -7
- package/dist/core/scheduler/mac.d.ts +14 -8
- package/dist/core/scheduler/mac.d.ts.map +1 -1
- package/dist/core/scheduler/mac.js +71 -22
- package/dist/core/scheduler/posix.d.ts.map +1 -1
- package/dist/core/scheduler/posix.js +12 -1
- package/dist/core/scheduler/registry.d.ts +2 -0
- package/dist/core/scheduler/registry.d.ts.map +1 -1
- package/dist/core/scheduler/windows.d.ts +16 -3
- package/dist/core/scheduler/windows.d.ts.map +1 -1
- package/dist/core/scheduler/windows.js +249 -96
- package/dist/core/secrets.js +2 -2
- package/dist/core/self-analysis.js +55 -55
- package/dist/core/summary.js +1 -1
- package/dist/core/triage-chain.js +1 -1
- package/dist/core/triage-worker.js +2 -2
- package/dist/core/triage.js +1 -1
- package/dist/core/wrappers/bash.js +33 -33
- package/dist/db/index.d.ts +2 -0
- package/dist/db/index.d.ts.map +1 -1
- package/dist/db/index.js +9 -1
- package/dist/db/run-journal.d.ts +60 -0
- package/dist/db/run-journal.d.ts.map +1 -0
- package/dist/db/run-journal.js +143 -0
- package/dist/db/run-resume.d.ts +48 -0
- package/dist/db/run-resume.d.ts.map +1 -0
- package/dist/db/run-resume.js +137 -0
- package/dist/db/runs-repo.d.ts +120 -0
- package/dist/db/runs-repo.d.ts.map +1 -0
- package/dist/db/runs-repo.js +319 -0
- package/dist/db/schema.d.ts +16 -2
- package/dist/db/schema.d.ts.map +1 -1
- package/dist/db/schema.js +190 -35
- package/dist/index.d.ts +1 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +66 -36
- package/dist/notifications.js +18 -18
- package/dist/profiles.d.ts +7 -3
- package/dist/profiles.d.ts.map +1 -1
- package/dist/profiles.js +85 -7
- package/dist/rpc.d.ts +109 -0
- package/dist/rpc.d.ts.map +1 -1
- package/dist/rpc.js +89 -0
- package/dist/server.d.ts +2 -2
- package/dist/server.d.ts.map +1 -1
- package/dist/server.js +20 -19
- package/dist/shared/jobs-view.d.ts.map +1 -1
- package/dist/skill.js +1 -1
- package/dist/task-transfer.d.ts +1 -1
- package/dist/task-transfer.d.ts.map +1 -1
- package/dist/task-transfer.js +14 -10
- package/dist/types.d.ts +20 -4
- package/dist/types.d.ts.map +1 -1
- package/dist/types.js +37 -9
- package/dist/workspaces.js +1 -1
- package/docs/ARCHITECTURE.md +110 -8
- package/docs/COMPATIBILITY.md +10 -6
- package/docs/CONCEPT.md +15 -3
- package/docs/CROSS_PLATFORM.ru.md +11 -9
- package/docs/CROSS_PLATFORM.zh.md +11 -9
- package/docs/FAQ.md +2 -2
- package/docs/FAQ.ru.md +2 -2
- package/docs/FAQ.zh.md +2 -2
- package/docs/FEATURES.md +5 -4
- package/docs/FEATURES.zh.md +5 -4
- package/docs/MIGRATION.md +34 -26
- package/docs/README.ru.md +26 -7
- package/docs/README.zh.md +9 -8
- package/docs/V1-V2-COMPATIBILITY-PLAN.md +6 -6
- package/gui-experimental.cjs +8 -8
- package/index.js +1 -0
- package/locales/en.json +1 -0
- package/locales/ru.json +1 -0
- package/locales/zh.json +1 -0
- package/package.json +31 -10
- package/src/core/analytics.ts +2 -2
- package/src/core/audit.ts +17 -17
- package/src/core/cron-to-schtasks.ts +14 -93
- package/src/core/dry-run.ts +26 -26
- package/src/core/file-watcher.ts +17 -17
- package/src/core/git-trigger.ts +9 -9
- package/src/core/glob.ts +1 -1
- package/src/core/local-ai.ts +2 -2
- package/src/core/lock.ts +9 -9
- package/src/core/matrix.ts +31 -31
- package/src/core/native-notify.ts +2 -2
- package/src/core/one-shot.ts +63 -13
- package/src/core/otel.ts +4 -4
- package/src/core/permissions.ts +5 -5
- package/src/core/prometheus.ts +17 -17
- package/src/core/ps-wrapper.ts +57 -37
- package/src/core/record-history.ts +40 -40
- package/src/core/retention.ts +3 -3
- package/src/core/savings.ts +1 -1
- package/src/core/schedule-gate.ts +12 -12
- package/src/core/schedule-v2.ts +24 -24
- package/src/core/scheduler/at-fallback.ts +113 -0
- package/src/core/scheduler/index.ts +3 -3
- package/src/core/scheduler/linux.ts +64 -13
- package/src/core/scheduler/logs.ts +1 -1
- package/src/core/scheduler/mac.ts +112 -60
- package/src/core/scheduler/posix.ts +15 -1
- package/src/core/scheduler/registry.ts +6 -4
- package/src/core/scheduler/windows.ts +295 -125
- package/src/core/secrets.ts +13 -13
- package/src/core/self-analysis.ts +61 -61
- package/src/core/session.ts +3 -3
- package/src/core/structured-log.ts +3 -3
- package/src/core/summary.ts +25 -25
- package/src/core/telegram.ts +16 -16
- package/src/core/triage-chain.ts +4 -4
- package/src/core/triage-compare.ts +8 -8
- package/src/core/triage-rules.ts +4 -4
- package/src/core/triage-shadow.ts +7 -7
- package/src/core/triage-worker.ts +6 -6
- package/src/core/triage.ts +23 -23
- package/src/core/watch-paths.ts +1 -1
- package/src/core/wrappers/bash.ts +41 -41
- package/src/db/git-state-repo.ts +1 -1
- package/src/db/history-repo.ts +22 -22
- package/src/db/index.ts +16 -6
- package/src/db/metrics-repo.ts +10 -10
- package/src/db/migrate.ts +10 -10
- package/src/db/recovery.ts +3 -3
- package/src/db/run-journal.ts +212 -0
- package/src/db/run-resume.ts +220 -0
- package/src/db/runs-repo.ts +481 -0
- package/src/db/schema.ts +205 -44
- package/src/db/settings-repo.ts +2 -2
- package/src/db/tasks-repo.ts +10 -10
- package/src/db/templates-repo.ts +7 -7
- package/src/gui.tsx +1 -1
- package/src/history.ts +4 -4
- package/src/i18n.ts +7 -7
- package/src/index.ts +341 -304
- package/src/integrations.ts +6 -6
- package/src/notifications.ts +76 -76
- package/src/profiles.ts +98 -7
- package/src/rpc.ts +96 -1
- package/src/schtasks.ts +2 -2
- package/src/server.ts +43 -42
- package/src/settings.ts +44 -44
- package/src/shared/jobs-view.ts +60 -60
- package/src/skill.ts +1 -1
- package/src/task-transfer.ts +58 -56
- package/src/templates.ts +1 -1
- package/src/types.ts +45 -10
- package/src/workspaces.ts +16 -16
- package/dist/core/self-analysis.test.d.ts +0 -2
- package/dist/core/self-analysis.test.d.ts.map +0 -1
- package/dist/core/self-analysis.test.js +0 -219
- package/dist/gui-experimental.cjs +0 -1
package/src/task-transfer.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import fs from "node:fs/promises";
|
|
2
2
|
import path from "node:path";
|
|
3
|
-
import { PLUGIN_DIR, sanitizeName } from "./types.js";
|
|
3
|
+
import { PLUGIN_DIR, sanitizeName, TASK_FOLDER_NAME, LEGACY_TASK_FOLDER_NAME } from "./types.js";
|
|
4
4
|
import type { ScheduledTaskInfo } from "./types.js";
|
|
5
5
|
import {
|
|
6
6
|
listTasks,
|
|
@@ -227,7 +227,8 @@ export interface TaskDefinition {
|
|
|
227
227
|
createdAt?: string;
|
|
228
228
|
}
|
|
229
229
|
|
|
230
|
-
const PREFIX =
|
|
230
|
+
const PREFIX = `\\OpenCode\\${TASK_FOLDER_NAME}\\`;
|
|
231
|
+
const LEGACY_PREFIX = `\\OpenCode\\${LEGACY_TASK_FOLDER_NAME}\\`;
|
|
231
232
|
|
|
232
233
|
/** Приоритет по умолчанию — «Обычный». */
|
|
233
234
|
export const DEFAULT_PRIORITY = 5;
|
|
@@ -270,9 +271,11 @@ export async function removeTaskDefinition(name: string): Promise<void> {
|
|
|
270
271
|
deleteTask(name);
|
|
271
272
|
}
|
|
272
273
|
|
|
273
|
-
/** Убирает префикс папки плагина из полного имени
|
|
274
|
+
/** Убирает префикс папки плагина из полного имени задачи (новый или старый). */
|
|
274
275
|
export function stripTaskPrefix(fullName: string): string {
|
|
275
|
-
|
|
276
|
+
if (fullName.startsWith(PREFIX)) return fullName.slice(PREFIX.length);
|
|
277
|
+
if (fullName.startsWith(LEGACY_PREFIX)) return fullName.slice(LEGACY_PREFIX.length);
|
|
278
|
+
return fullName;
|
|
276
279
|
}
|
|
277
280
|
|
|
278
281
|
/**
|
|
@@ -283,11 +286,11 @@ export function stripTaskPrefix(fullName: string): string {
|
|
|
283
286
|
* Если расписания нет, оно останется пустым — импорт такую запись пропустит.
|
|
284
287
|
*/
|
|
285
288
|
export async function buildExportJson(
|
|
286
|
-
tasks: ScheduledTaskInfo[]
|
|
289
|
+
tasks: ScheduledTaskInfo[],
|
|
287
290
|
): Promise<{ data: string; count: number }> {
|
|
288
291
|
const definitions = await loadTaskDefinitions();
|
|
289
292
|
const byName = new Map(
|
|
290
|
-
definitions.map((item) => [item.name.toLowerCase(), item])
|
|
293
|
+
definitions.map((item) => [item.name.toLowerCase(), item]),
|
|
291
294
|
);
|
|
292
295
|
|
|
293
296
|
const exported: TaskDefinition[] = [];
|
|
@@ -303,7 +306,7 @@ export async function buildExportJson(
|
|
|
303
306
|
prompt = (
|
|
304
307
|
await fs.readFile(
|
|
305
308
|
path.join(PLUGIN_DIR, "prompts", `${sanitizeName(name)}.txt`),
|
|
306
|
-
"utf8"
|
|
309
|
+
"utf8",
|
|
307
310
|
)
|
|
308
311
|
).replace(/^\uFEFF/, "");
|
|
309
312
|
} catch {
|
|
@@ -351,9 +354,9 @@ export async function buildExportJson(
|
|
|
351
354
|
: {}),
|
|
352
355
|
...(definition?.triggerType === "once"
|
|
353
356
|
? {
|
|
354
|
-
|
|
355
|
-
|
|
356
|
-
|
|
357
|
+
triggerType: "once" as const,
|
|
358
|
+
...(definition.runAt ? { runAt: definition.runAt } : {}),
|
|
359
|
+
}
|
|
357
360
|
: {}),
|
|
358
361
|
// Спринт 24: сессии. sessionId экспортируется только для reuse; счётчик не экспортируем.
|
|
359
362
|
...(definition?.session
|
|
@@ -408,18 +411,17 @@ export async function buildExportJson(
|
|
|
408
411
|
...(definition?.matrixParentId
|
|
409
412
|
? { matrixParentId: definition.matrixParentId }
|
|
410
413
|
: {}),
|
|
411
|
-
...(definition?.mcpEvent &&
|
|
412
|
-
definition.mcpEvent.event &&
|
|
414
|
+
...(definition?.mcpEvent?.event &&
|
|
413
415
|
definition.mcpEvent.server
|
|
414
416
|
? {
|
|
415
|
-
|
|
416
|
-
|
|
417
|
-
|
|
418
|
-
|
|
419
|
-
|
|
420
|
-
|
|
421
|
-
|
|
422
|
-
|
|
417
|
+
mcpEvent: {
|
|
418
|
+
server: definition.mcpEvent.server,
|
|
419
|
+
event: definition.mcpEvent.event,
|
|
420
|
+
...(definition.mcpEvent.filter
|
|
421
|
+
? { filter: definition.mcpEvent.filter }
|
|
422
|
+
: {}),
|
|
423
|
+
},
|
|
424
|
+
}
|
|
423
425
|
: {}),
|
|
424
426
|
});
|
|
425
427
|
}
|
|
@@ -448,7 +450,7 @@ export function parseImportJson(raw: string): ParsedImport {
|
|
|
448
450
|
parsed = JSON.parse(raw);
|
|
449
451
|
} catch (err: any) {
|
|
450
452
|
throw new Error(
|
|
451
|
-
`Файл не является корректным JSON: ${err?.message ?? String(err)}
|
|
453
|
+
`Файл не является корректным JSON: ${err?.message ?? String(err)}`,
|
|
452
454
|
);
|
|
453
455
|
}
|
|
454
456
|
|
|
@@ -482,12 +484,12 @@ export function parseImportJson(raw: string): ParsedImport {
|
|
|
482
484
|
source.triggerType === "file"
|
|
483
485
|
? "file"
|
|
484
486
|
: source.triggerType === "git"
|
|
485
|
-
|
|
486
|
-
|
|
487
|
-
|
|
488
|
-
|
|
489
|
-
|
|
490
|
-
|
|
487
|
+
? "git"
|
|
488
|
+
: source.triggerType === "mcp-event"
|
|
489
|
+
? "mcp-event"
|
|
490
|
+
: source.triggerType === "once"
|
|
491
|
+
? "once"
|
|
492
|
+
: "cron";
|
|
491
493
|
const watchPath =
|
|
492
494
|
typeof source.watchPath === "string" ? source.watchPath.trim() : "";
|
|
493
495
|
const rawRunAt =
|
|
@@ -504,15 +506,15 @@ export function parseImportJson(raw: string): ParsedImport {
|
|
|
504
506
|
typeof rawMcpEvent.event === "string" &&
|
|
505
507
|
rawMcpEvent.event.trim()
|
|
506
508
|
? {
|
|
507
|
-
|
|
509
|
+
server:
|
|
508
510
|
typeof rawMcpEvent.server === "string"
|
|
509
511
|
? rawMcpEvent.server.trim()
|
|
510
512
|
: "",
|
|
511
|
-
|
|
512
|
-
|
|
513
|
-
|
|
514
|
-
|
|
515
|
-
|
|
513
|
+
event: rawMcpEvent.event.trim(),
|
|
514
|
+
...(typeof rawMcpEvent.filter === "string" && rawMcpEvent.filter.trim()
|
|
515
|
+
? { filter: rawMcpEvent.filter.trim() }
|
|
516
|
+
: {}),
|
|
517
|
+
}
|
|
516
518
|
: undefined;
|
|
517
519
|
|
|
518
520
|
// Для файлового/MCP-триггера расписание не нужно.
|
|
@@ -533,10 +535,10 @@ export function parseImportJson(raw: string): ParsedImport {
|
|
|
533
535
|
(triggerType === "file"
|
|
534
536
|
? ", а также watchPath для файлового триггера."
|
|
535
537
|
: triggerType === "mcp-event"
|
|
536
|
-
|
|
537
|
-
|
|
538
|
-
|
|
539
|
-
|
|
538
|
+
? ", а также mcpEvent.event для MCP-триггера."
|
|
539
|
+
: triggerType === "once"
|
|
540
|
+
? ", а также runAt или delaySeconds для one-shot."
|
|
541
|
+
: ", а также schedule."),
|
|
540
542
|
);
|
|
541
543
|
return;
|
|
542
544
|
}
|
|
@@ -549,7 +551,7 @@ export function parseImportJson(raw: string): ParsedImport {
|
|
|
549
551
|
});
|
|
550
552
|
if (!normalized.ok) {
|
|
551
553
|
errors.push(
|
|
552
|
-
`Запись ${position}${name ? ` (${name})` : ""}: ${normalized.error}
|
|
554
|
+
`Запись ${position}${name ? ` (${name})` : ""}: ${normalized.error}`,
|
|
553
555
|
);
|
|
554
556
|
return;
|
|
555
557
|
}
|
|
@@ -567,7 +569,7 @@ export function parseImportJson(raw: string): ParsedImport {
|
|
|
567
569
|
session = source.session;
|
|
568
570
|
} else {
|
|
569
571
|
errors.push(
|
|
570
|
-
`Запись ${position}${name ? ` (${name})` : ""}: неизвестный session «${String(source.session)}» (ожидается new, reuse или last)
|
|
572
|
+
`Запись ${position}${name ? ` (${name})` : ""}: неизвестный session «${String(source.session)}» (ожидается new, reuse или last).`,
|
|
571
573
|
);
|
|
572
574
|
return;
|
|
573
575
|
}
|
|
@@ -578,7 +580,7 @@ export function parseImportJson(raw: string): ParsedImport {
|
|
|
578
580
|
: undefined;
|
|
579
581
|
if (sessionId && !isValidSessionId(sessionId)) {
|
|
580
582
|
errors.push(
|
|
581
|
-
`Запись ${position}${name ? ` (${name})` : ""}: некорректный sessionId «${sessionId}
|
|
583
|
+
`Запись ${position}${name ? ` (${name})` : ""}: некорректный sessionId «${String(sessionId)}».`,
|
|
582
584
|
);
|
|
583
585
|
return;
|
|
584
586
|
}
|
|
@@ -589,7 +591,7 @@ export function parseImportJson(raw: string): ParsedImport {
|
|
|
589
591
|
sessionMaxRuns = Math.floor(raw);
|
|
590
592
|
} else {
|
|
591
593
|
errors.push(
|
|
592
|
-
`Запись ${position}${name ? ` (${name})` : ""}: sessionMaxRuns должен быть целым числом ≥ 0 (0 — без ограничения)
|
|
594
|
+
`Запись ${position}${name ? ` (${name})` : ""}: sessionMaxRuns должен быть целым числом ≥ 0 (0 — без ограничения).`,
|
|
593
595
|
);
|
|
594
596
|
return;
|
|
595
597
|
}
|
|
@@ -607,8 +609,8 @@ export function parseImportJson(raw: string): ParsedImport {
|
|
|
607
609
|
typeof source.workingDirectory === "string" && source.workingDirectory.trim()
|
|
608
610
|
? source.workingDirectory.trim()
|
|
609
611
|
: typeof source.workdir === "string" && source.workdir.trim()
|
|
610
|
-
|
|
611
|
-
|
|
612
|
+
? source.workdir.trim()
|
|
613
|
+
: undefined;
|
|
612
614
|
|
|
613
615
|
const retryCount =
|
|
614
616
|
typeof source.retryCount === "number" &&
|
|
@@ -639,7 +641,7 @@ export function parseImportJson(raw: string): ParsedImport {
|
|
|
639
641
|
// Спринт 27: git-триггер, glob-маски и временные окна.
|
|
640
642
|
if (triggerType === "git" && !workspaceId && !workingDirectory) {
|
|
641
643
|
errors.push(
|
|
642
|
-
`Запись ${position}${name ? ` (${name})` : ""}: для git-триггера нужна рабочая директория (workingDirectory или workspaceId)
|
|
644
|
+
`Запись ${position}${name ? ` (${name})` : ""}: для git-триггера нужна рабочая директория (workingDirectory или workspaceId).`,
|
|
643
645
|
);
|
|
644
646
|
return;
|
|
645
647
|
}
|
|
@@ -666,11 +668,11 @@ export function parseImportJson(raw: string): ParsedImport {
|
|
|
666
668
|
if (rawDays) {
|
|
667
669
|
const days = rawDays.filter(
|
|
668
670
|
(value): value is number =>
|
|
669
|
-
typeof value === "number" && Number.isInteger(value) && value >= 0 && value <= 6
|
|
671
|
+
typeof value === "number" && Number.isInteger(value) && value >= 0 && value <= 6,
|
|
670
672
|
);
|
|
671
673
|
if (days.length !== rawDays.length) {
|
|
672
674
|
errors.push(
|
|
673
|
-
`Запись ${position}${name ? ` (${name})` : ""}: activeDays должен содержать числа 0..6 (0 = воскресенье)
|
|
675
|
+
`Запись ${position}${name ? ` (${name})` : ""}: activeDays должен содержать числа 0..6 (0 = воскресенье).`,
|
|
674
676
|
);
|
|
675
677
|
return;
|
|
676
678
|
}
|
|
@@ -686,7 +688,7 @@ export function parseImportJson(raw: string): ParsedImport {
|
|
|
686
688
|
windowPolicy = source.windowPolicy;
|
|
687
689
|
} else {
|
|
688
690
|
errors.push(
|
|
689
|
-
`Запись ${position}${name ? ` (${name})` : ""}: неизвестный windowPolicy «${String(source.windowPolicy)}» (ожидается skip, postpone или run)
|
|
691
|
+
`Запись ${position}${name ? ` (${name})` : ""}: неизвестный windowPolicy «${String(source.windowPolicy)}» (ожидается skip, postpone или run).`,
|
|
690
692
|
);
|
|
691
693
|
return;
|
|
692
694
|
}
|
|
@@ -697,7 +699,7 @@ export function parseImportJson(raw: string): ParsedImport {
|
|
|
697
699
|
if (timezone && !isValidIanaTimeZone(timezone)) {
|
|
698
700
|
errors.push(
|
|
699
701
|
`Запись ${position}${name ? ` (${name})` : ""}: неизвестный часовой пояс ` +
|
|
700
|
-
`«${timezone}» (нужна IANA-зона, например Europe/Moscow)
|
|
702
|
+
`«${timezone}» (нужна IANA-зона, например Europe/Moscow).`,
|
|
701
703
|
);
|
|
702
704
|
}
|
|
703
705
|
const notBefore = readOptionalString(source.notBefore);
|
|
@@ -710,7 +712,7 @@ export function parseImportJson(raw: string): ParsedImport {
|
|
|
710
712
|
if (pausedUntil && Number.isNaN(Date.parse(pausedUntil))) {
|
|
711
713
|
errors.push(
|
|
712
714
|
`Запись ${position}${name ? ` (${name})` : ""}: pausedUntil должен быть ` +
|
|
713
|
-
|
|
715
|
+
"датой в формате ISO (например 2026-12-01T09:00:00Z).",
|
|
714
716
|
);
|
|
715
717
|
}
|
|
716
718
|
// Спринт 27.5.8: бессрочная пауза импортируется вместе с задачей.
|
|
@@ -748,7 +750,7 @@ export function parseImportJson(raw: string): ParsedImport {
|
|
|
748
750
|
if (allowedRaw === "empty") {
|
|
749
751
|
errors.push(
|
|
750
752
|
`Запись ${position}${name ? ` (${name})` : ""}: пустой allowedTools запрещён — ` +
|
|
751
|
-
|
|
753
|
+
"задайте список инструментов или уберите поле.",
|
|
752
754
|
);
|
|
753
755
|
} else {
|
|
754
756
|
allowedTools = allowedRaw;
|
|
@@ -770,7 +772,7 @@ export function parseImportJson(raw: string): ParsedImport {
|
|
|
770
772
|
const candidate = rawMatrix as Record<string, unknown>;
|
|
771
773
|
if (workspaceId) {
|
|
772
774
|
errors.push(
|
|
773
|
-
`${label}: нельзя одновременно workspaceId и matrix.workspaceIds
|
|
775
|
+
`${label}: нельзя одновременно workspaceId и matrix.workspaceIds.`,
|
|
774
776
|
);
|
|
775
777
|
} else {
|
|
776
778
|
const idsRaw = candidate.workspaceIds;
|
|
@@ -805,7 +807,7 @@ export function parseImportJson(raw: string): ParsedImport {
|
|
|
805
807
|
candidate.concurrency < 1
|
|
806
808
|
) {
|
|
807
809
|
errors.push(
|
|
808
|
-
`${label}: matrix.concurrency должен быть числом не меньше 1
|
|
810
|
+
`${label}: matrix.concurrency должен быть числом не меньше 1.`,
|
|
809
811
|
);
|
|
810
812
|
} else {
|
|
811
813
|
concurrency = Math.floor(candidate.concurrency);
|
|
@@ -821,19 +823,19 @@ export function parseImportJson(raw: string): ParsedImport {
|
|
|
821
823
|
const allowed = new Set(ids);
|
|
822
824
|
const parsedOverrides: Record<string, MatrixWorkspaceOverride> = {};
|
|
823
825
|
for (const [key, value] of Object.entries(
|
|
824
|
-
rawOverrides as Record<string, unknown
|
|
826
|
+
rawOverrides as Record<string, unknown>,
|
|
825
827
|
)) {
|
|
826
828
|
const workspaceKey = key.trim();
|
|
827
829
|
if (!workspaceKey || !allowed.has(workspaceKey)) {
|
|
828
830
|
errors.push(
|
|
829
831
|
`${label}: matrix.overrides содержит workspace "${workspaceKey}", ` +
|
|
830
|
-
|
|
832
|
+
"которого нет в workspaceIds.",
|
|
831
833
|
);
|
|
832
834
|
continue;
|
|
833
835
|
}
|
|
834
836
|
if (typeof value !== "object" || value === null || Array.isArray(value)) {
|
|
835
837
|
errors.push(
|
|
836
|
-
`${label}: matrix.overrides["${workspaceKey}"] должен быть
|
|
838
|
+
`${label}: matrix.overrides["${workspaceKey}"] должен быть объектом.`,
|
|
837
839
|
);
|
|
838
840
|
continue;
|
|
839
841
|
}
|
|
@@ -876,7 +878,7 @@ export function parseImportJson(raw: string): ParsedImport {
|
|
|
876
878
|
}
|
|
877
879
|
}
|
|
878
880
|
const matrixParentId = readOptionalString(
|
|
879
|
-
(source as { matrixParentId?: unknown }).matrixParentId
|
|
881
|
+
(source as { matrixParentId?: unknown }).matrixParentId,
|
|
880
882
|
);
|
|
881
883
|
|
|
882
884
|
// DAG-зависимости: массив непустых имён без дублей (сравнение без регистра).
|
package/src/templates.ts
CHANGED
|
@@ -56,7 +56,7 @@ export async function loadTemplates(): Promise<TaskTemplate[]> {
|
|
|
56
56
|
* Если id не передан — генерируется новый. Возвращает сохранённый шаблон.
|
|
57
57
|
*/
|
|
58
58
|
export async function saveTemplate(
|
|
59
|
-
template: Omit<TaskTemplate, "id"> & { id?: string }
|
|
59
|
+
template: Omit<TaskTemplate, "id"> & { id?: string },
|
|
60
60
|
): Promise<TaskTemplate> {
|
|
61
61
|
return saveTemplateRow(template);
|
|
62
62
|
}
|
package/src/types.ts
CHANGED
|
@@ -2,22 +2,32 @@ import path from "node:path";
|
|
|
2
2
|
import { z } from "zod";
|
|
3
3
|
import { getProfileDir, getProfileName } from "./profiles.js";
|
|
4
4
|
|
|
5
|
-
/** Префикс всех задач плагина (историческое имя, сохраняется для совместимости). */
|
|
6
|
-
export const TASK_PREFIX = "OpenCode\\windows-scheduler";
|
|
7
|
-
|
|
8
5
|
/** Папка задач плагина в планировщике ОС (Windows). */
|
|
9
6
|
export const TASK_FOLDER = "OpenCode";
|
|
10
7
|
/**
|
|
11
8
|
* Имя папки/блока задач. У нестандартного профиля своё пространство имён,
|
|
12
9
|
* иначе профили делят одну папку Планировщика Windows и один блок crontab.
|
|
13
|
-
*
|
|
14
|
-
*
|
|
10
|
+
* Новое имя — agent-steward; историческое windows-scheduler поддерживается
|
|
11
|
+
* как legacy (см. legacyTaskFolderNameForProfile).
|
|
15
12
|
*/
|
|
16
13
|
export function taskFolderNameForProfile(profile: string = getProfileName()): string {
|
|
14
|
+
return profile === "default" ? "agent-steward" : `agent-steward-${profile}`;
|
|
15
|
+
}
|
|
16
|
+
|
|
17
|
+
/** Историческое имя папки/блока задач — для чтения и удаления старых задач. */
|
|
18
|
+
export function legacyTaskFolderNameForProfile(
|
|
19
|
+
profile: string = getProfileName(),
|
|
20
|
+
): string {
|
|
17
21
|
return profile === "default" ? "windows-scheduler" : `windows-scheduler-${profile}`;
|
|
18
22
|
}
|
|
19
23
|
|
|
20
24
|
export const TASK_FOLDER_NAME = taskFolderNameForProfile();
|
|
25
|
+
export const LEGACY_TASK_FOLDER_NAME = legacyTaskFolderNameForProfile();
|
|
26
|
+
|
|
27
|
+
/** Префикс всех задач плагина. */
|
|
28
|
+
export const TASK_PREFIX = `OpenCode\\${TASK_FOLDER_NAME}`;
|
|
29
|
+
/** Исторический префикс задач (до переименования). */
|
|
30
|
+
export const LEGACY_TASK_PREFIX = `OpenCode\\${LEGACY_TASK_FOLDER_NAME}`;
|
|
21
31
|
|
|
22
32
|
/**
|
|
23
33
|
* Директория для хранения файлов плагина (обёртки, логи, блокировки, история).
|
|
@@ -64,6 +74,29 @@ export function sanitizeName(name: string): string {
|
|
|
64
74
|
return result || "task";
|
|
65
75
|
}
|
|
66
76
|
|
|
77
|
+
/**
|
|
78
|
+
* Проверяет идентификатор LLM-модели перед подстановкой в командную строку.
|
|
79
|
+
*
|
|
80
|
+
* Формат: `provider/model` (вариант — `provider/model#variant`).
|
|
81
|
+
* Разрешены только латиница, цифры и символы `. _ : / -` (плюс `#` для
|
|
82
|
+
* варианта). Это исключает PowerShell-subexpression (`$(...)`, backtick)
|
|
83
|
+
* и прочие спецсимволы. Пустая строка — «модель не задана», это допустимо.
|
|
84
|
+
*
|
|
85
|
+
* @returns текст ошибки или null, если значение допустимо.
|
|
86
|
+
*/
|
|
87
|
+
export function validateModelId(raw: string): string | null {
|
|
88
|
+
const model = raw.trim();
|
|
89
|
+
if (!model) return null;
|
|
90
|
+
if (!/^[A-Za-z0-9._:/-]+(?:#[A-Za-z0-9._-]+)?$/.test(model)) {
|
|
91
|
+
return (
|
|
92
|
+
`Недопустимый идентификатор модели «${raw}». ` +
|
|
93
|
+
"Разрешены латиница, цифры и символы «.», «_», «:», «/», «-» " +
|
|
94
|
+
"(вариант — через «#»)."
|
|
95
|
+
);
|
|
96
|
+
}
|
|
97
|
+
return null;
|
|
98
|
+
}
|
|
99
|
+
|
|
67
100
|
/**
|
|
68
101
|
* Проверяет имя задачи до создания файлов и записи в БД.
|
|
69
102
|
*
|
|
@@ -82,7 +115,7 @@ export function validateTaskName(raw: string): string | null {
|
|
|
82
115
|
if (/[\u0000-\u001f\u007f]/.test(name)) {
|
|
83
116
|
return "Имя задачи не должно содержать управляющие символы.";
|
|
84
117
|
}
|
|
85
|
-
const invalid =
|
|
118
|
+
const invalid = /[^\p{L}\p{N}_\-. ]/u.exec(name);
|
|
86
119
|
if (invalid) {
|
|
87
120
|
return (
|
|
88
121
|
`Имя задачи содержит недопустимый символ «${invalid[0]}». ` +
|
|
@@ -92,14 +125,14 @@ export function validateTaskName(raw: string): string | null {
|
|
|
92
125
|
// schtasks ограничивает /tn в 237 символов вместе с полным путём задачи.
|
|
93
126
|
// Полный путь: \OpenCode\<TASK_FOLDER_NAME>\<taskName>
|
|
94
127
|
// leading \ + TASK_FOLDER + \ + TASK_FOLDER_NAME + \ — префикс перед именем задачи.
|
|
95
|
-
// Для default: \OpenCode\
|
|
96
|
-
// Для не-default профиля: \OpenCode\
|
|
128
|
+
// Для default: \OpenCode\agent-steward\ = 24 символа → 213 на имя.
|
|
129
|
+
// Для не-default профиля: \OpenCode\agent-steward-<profile>\ → чем длиннее профиль, тем меньше места.
|
|
97
130
|
const prefixLength = 1 + TASK_FOLDER.length + 1 + TASK_FOLDER_NAME.length + 1;
|
|
98
131
|
const MAX_TASK_NAME_LENGTH = 237 - prefixLength;
|
|
99
132
|
if (name.length > MAX_TASK_NAME_LENGTH) {
|
|
100
133
|
return (
|
|
101
134
|
`Имя задачи "${name}" слишком длинное (${name.length} символов, максимум ${MAX_TASK_NAME_LENGTH} ` +
|
|
102
|
-
|
|
135
|
+
"с учётом папки планировщика). Сократите имя или имя workspace (для клонов матрицы)."
|
|
103
136
|
);
|
|
104
137
|
}
|
|
105
138
|
return null;
|
|
@@ -119,7 +152,9 @@ export const ScheduleJobArgs = z.object({
|
|
|
119
152
|
ctx.addIssue({ code: z.ZodIssueCode.custom, message: error });
|
|
120
153
|
}
|
|
121
154
|
})
|
|
122
|
-
.describe(
|
|
155
|
+
.describe(
|
|
156
|
+
"Имя задачи (уникально в рамках префикса OpenCode\\agent-steward; legacy OpenCode\\windows-scheduler поддерживается)",
|
|
157
|
+
),
|
|
123
158
|
schedule: z
|
|
124
159
|
.string()
|
|
125
160
|
.min(1)
|
package/src/workspaces.ts
CHANGED
|
@@ -63,7 +63,7 @@ const ENV_KEY_RE = /^[A-Za-z_][A-Za-z0-9_]*$/;
|
|
|
63
63
|
* Бросает понятную ошибку при нарушении (её показывает GUI/RPC).
|
|
64
64
|
*/
|
|
65
65
|
export function normalizeWorkspaceEnv(
|
|
66
|
-
value: unknown
|
|
66
|
+
value: unknown,
|
|
67
67
|
): Record<string, string> | undefined {
|
|
68
68
|
if (value == null) return undefined;
|
|
69
69
|
if (typeof value !== "object" || Array.isArray(value)) {
|
|
@@ -72,7 +72,7 @@ export function normalizeWorkspaceEnv(
|
|
|
72
72
|
const entries = Object.entries(value as Record<string, unknown>);
|
|
73
73
|
if (entries.length > MAX_WORKSPACE_ENV_PAIRS) {
|
|
74
74
|
throw new Error(
|
|
75
|
-
`Слишком много env-переменных: ${entries.length} (максимум ${MAX_WORKSPACE_ENV_PAIRS})
|
|
75
|
+
`Слишком много env-переменных: ${entries.length} (максимум ${MAX_WORKSPACE_ENV_PAIRS}).`,
|
|
76
76
|
);
|
|
77
77
|
}
|
|
78
78
|
const result: Record<string, string> = {};
|
|
@@ -80,7 +80,7 @@ export function normalizeWorkspaceEnv(
|
|
|
80
80
|
const key = String(rawKey).trim();
|
|
81
81
|
if (!ENV_KEY_RE.test(key)) {
|
|
82
82
|
throw new Error(
|
|
83
|
-
`Недопустимое имя env-переменной '${rawKey}': нужны латиница, цифры и '_', не с
|
|
83
|
+
`Недопустимое имя env-переменной '${rawKey}': нужны латиница, цифры и '_', не с цифры.`,
|
|
84
84
|
);
|
|
85
85
|
}
|
|
86
86
|
if (rawValue == null) {
|
|
@@ -141,7 +141,7 @@ export function readWorkspaceEnvFile(envFile?: string): Record<string, string> {
|
|
|
141
141
|
*/
|
|
142
142
|
export function resolveWorkspaceEnv(
|
|
143
143
|
workspace: Workspace | undefined,
|
|
144
|
-
allowedSecretNames?: string[]
|
|
144
|
+
allowedSecretNames?: string[],
|
|
145
145
|
): Record<string, string> {
|
|
146
146
|
if (!workspace) return {};
|
|
147
147
|
const merged = {
|
|
@@ -151,7 +151,7 @@ export function resolveWorkspaceEnv(
|
|
|
151
151
|
const resolved = resolveSecretRefs(merged, allowedSecretNames);
|
|
152
152
|
if (resolved.missing.length > 0) {
|
|
153
153
|
console.warn(
|
|
154
|
-
`[workspace] "${workspace.name}": не найдены секреты: ${resolved.missing.join(", ")}
|
|
154
|
+
`[workspace] "${workspace.name}": не найдены секреты: ${resolved.missing.join(", ")}`,
|
|
155
155
|
);
|
|
156
156
|
}
|
|
157
157
|
return resolved.env;
|
|
@@ -200,7 +200,7 @@ export function writeWorkspaceEnvFile(
|
|
|
200
200
|
workspace: Workspace | undefined,
|
|
201
201
|
pluginDir: string,
|
|
202
202
|
sanitizedName: string,
|
|
203
|
-
allowedSecretNames?: string[]
|
|
203
|
+
allowedSecretNames?: string[],
|
|
204
204
|
): string | undefined {
|
|
205
205
|
if (!workspace) return undefined;
|
|
206
206
|
const file = join(workspaceEnvDir(pluginDir), `${sanitizedName}.env`);
|
|
@@ -308,7 +308,7 @@ export function readGitBranch(workspacePath: string): string | undefined {
|
|
|
308
308
|
const result = spawnSync(
|
|
309
309
|
"git",
|
|
310
310
|
["-C", workspacePath, "rev-parse", "--abbrev-ref", "HEAD"],
|
|
311
|
-
{ encoding: "utf8", timeout: 5000, windowsHide: true }
|
|
311
|
+
{ encoding: "utf8", timeout: 5000, windowsHide: true },
|
|
312
312
|
);
|
|
313
313
|
if (result.status !== 0) return undefined;
|
|
314
314
|
const branch = String(result.stdout || "").trim();
|
|
@@ -322,14 +322,14 @@ export function readGitBranch(workspacePath: string): string | undefined {
|
|
|
322
322
|
export function listWorkspaces(): Workspace[] {
|
|
323
323
|
const rows = getDb()
|
|
324
324
|
.prepare("SELECT * FROM workspaces ORDER BY name COLLATE NOCASE ASC")
|
|
325
|
-
.all()
|
|
325
|
+
.all();
|
|
326
326
|
return rows.map(rowToWorkspace);
|
|
327
327
|
}
|
|
328
328
|
|
|
329
329
|
/** Workspace по id. */
|
|
330
330
|
export function getWorkspace(id: string): Workspace | undefined {
|
|
331
331
|
if (!id) return undefined;
|
|
332
|
-
const row = getDb().prepare("SELECT * FROM workspaces WHERE id = ?").get(id)
|
|
332
|
+
const row = getDb().prepare("SELECT * FROM workspaces WHERE id = ?").get(id);
|
|
333
333
|
return row ? rowToWorkspace(row) : undefined;
|
|
334
334
|
}
|
|
335
335
|
|
|
@@ -338,7 +338,7 @@ export function getWorkspaceByPath(workspacePath: string): Workspace | undefined
|
|
|
338
338
|
const normalized = normalizePath(workspacePath);
|
|
339
339
|
const row = getDb()
|
|
340
340
|
.prepare("SELECT * FROM workspaces WHERE lower(path) = lower(?) LIMIT 1")
|
|
341
|
-
.get(normalized)
|
|
341
|
+
.get(normalized);
|
|
342
342
|
return row ? rowToWorkspace(row) : undefined;
|
|
343
343
|
}
|
|
344
344
|
|
|
@@ -374,7 +374,7 @@ export function addWorkspace(input: AddWorkspaceInput): Workspace {
|
|
|
374
374
|
getDb()
|
|
375
375
|
.prepare(
|
|
376
376
|
`INSERT INTO workspaces (id, name, path, git_remote, color, env_json, env_file, created_at)
|
|
377
|
-
VALUES (?, ?, ?, ?, ?, ?, ?, ?)
|
|
377
|
+
VALUES (?, ?, ?, ?, ?, ?, ?, ?)`,
|
|
378
378
|
)
|
|
379
379
|
.run(
|
|
380
380
|
id,
|
|
@@ -384,7 +384,7 @@ export function addWorkspace(input: AddWorkspaceInput): Workspace {
|
|
|
384
384
|
color,
|
|
385
385
|
env ? JSON.stringify(env) : null,
|
|
386
386
|
envFile ?? null,
|
|
387
|
-
createdAt
|
|
387
|
+
createdAt,
|
|
388
388
|
);
|
|
389
389
|
|
|
390
390
|
return { id, name, path: workspacePath, gitRemote, color, env, envFile, createdAt };
|
|
@@ -435,7 +435,7 @@ export function updateWorkspace(id: string, patch: UpdateWorkspacePatch): Worksp
|
|
|
435
435
|
|
|
436
436
|
getDb()
|
|
437
437
|
.prepare(
|
|
438
|
-
"UPDATE workspaces SET name = ?, path = ?, git_remote = ?, color = ?, env_json = ?, env_file = ? WHERE id = ?"
|
|
438
|
+
"UPDATE workspaces SET name = ?, path = ?, git_remote = ?, color = ?, env_json = ?, env_file = ? WHERE id = ?",
|
|
439
439
|
)
|
|
440
440
|
.run(
|
|
441
441
|
nextName,
|
|
@@ -444,7 +444,7 @@ export function updateWorkspace(id: string, patch: UpdateWorkspacePatch): Worksp
|
|
|
444
444
|
nextColor ?? null,
|
|
445
445
|
nextEnv ? JSON.stringify(nextEnv) : null,
|
|
446
446
|
nextEnvFile ?? null,
|
|
447
|
-
id
|
|
447
|
+
id,
|
|
448
448
|
);
|
|
449
449
|
|
|
450
450
|
return {
|
|
@@ -472,7 +472,7 @@ export function deleteWorkspace(id: string): boolean {
|
|
|
472
472
|
console.warn(
|
|
473
473
|
`[workspace] Удалён workspace '${workspace.name}'. ` +
|
|
474
474
|
`Отвязано задач: ${affected.length} (${affected.join(", ")}). ` +
|
|
475
|
-
|
|
475
|
+
"Задачи не удалены, workspaceId очищен.",
|
|
476
476
|
);
|
|
477
477
|
}
|
|
478
478
|
|
|
@@ -482,6 +482,6 @@ export function deleteWorkspace(id: string): boolean {
|
|
|
482
482
|
|
|
483
483
|
/** Количество workspace (для сводок и тестов). */
|
|
484
484
|
export function countWorkspaces(): number {
|
|
485
|
-
const row = getDb().prepare("SELECT COUNT(*) AS count FROM workspaces").get()
|
|
485
|
+
const row = getDb().prepare("SELECT COUNT(*) AS count FROM workspaces").get();
|
|
486
486
|
return Number(row?.count) || 0;
|
|
487
487
|
}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"self-analysis.test.d.ts","sourceRoot":"","sources":["../../src/core/self-analysis.test.ts"],"names":[],"mappings":""}
|