agent-steward 0.0.3 → 0.0.5
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 +154 -2
- package/CROSS_PLATFORM.md +19 -0
- package/README.md +54 -9
- package/ROADMAP-STRATEGY.md +23 -20
- package/ROADMAP.md +140 -143
- package/dist/cli.d.ts +3 -0
- package/dist/cli.d.ts.map +1 -0
- package/dist/cli.js +351 -0
- package/dist/core/dlq-api.d.ts +44 -0
- package/dist/core/dlq-api.d.ts.map +1 -0
- package/dist/core/dlq-api.js +68 -0
- package/dist/core/dry-run.d.ts.map +1 -1
- package/dist/core/dry-run.js +18 -1
- package/dist/core/execution.d.ts +203 -0
- package/dist/core/execution.d.ts.map +1 -0
- package/dist/core/execution.js +309 -0
- package/dist/core/gate-integrity.d.ts +35 -0
- package/dist/core/gate-integrity.d.ts.map +1 -0
- package/dist/core/gate-integrity.js +132 -0
- package/dist/core/git-trigger.d.ts.map +1 -1
- package/dist/core/git-trigger.js +14 -2
- package/dist/core/guard-run.d.ts +4 -0
- package/dist/core/guard-run.d.ts.map +1 -0
- package/dist/core/guard-run.js +101 -0
- package/dist/core/guard.d.ts +52 -0
- package/dist/core/guard.d.ts.map +1 -0
- package/dist/core/guard.js +362 -0
- package/dist/core/lock.d.ts +61 -4
- package/dist/core/lock.d.ts.map +1 -1
- package/dist/core/lock.js +213 -26
- package/dist/core/matrix.d.ts.map +1 -1
- package/dist/core/matrix.js +75 -15
- package/dist/core/mission.d.ts +83 -0
- package/dist/core/mission.d.ts.map +1 -0
- package/dist/core/mission.js +334 -0
- package/dist/core/one-shot.d.ts +5 -1
- package/dist/core/one-shot.d.ts.map +1 -1
- package/dist/core/one-shot.js +33 -8
- package/dist/core/opencode-cli.d.ts +28 -0
- package/dist/core/opencode-cli.d.ts.map +1 -0
- package/dist/core/opencode-cli.js +74 -0
- package/dist/core/opencode-models.d.ts +62 -0
- package/dist/core/opencode-models.d.ts.map +1 -0
- package/dist/core/opencode-models.js +277 -0
- package/dist/core/pipeline-apply.d.ts +38 -0
- package/dist/core/pipeline-apply.d.ts.map +1 -0
- package/dist/core/pipeline-apply.js +117 -0
- package/dist/core/pipeline-io.d.ts +13 -0
- package/dist/core/pipeline-io.d.ts.map +1 -0
- package/dist/core/pipeline-io.js +64 -0
- package/dist/core/pipeline-map.d.ts +46 -0
- package/dist/core/pipeline-map.d.ts.map +1 -0
- package/dist/core/pipeline-map.js +196 -0
- package/dist/core/pipeline-spec.d.ts +109 -0
- package/dist/core/pipeline-spec.d.ts.map +1 -0
- package/dist/core/pipeline-spec.js +554 -0
- package/dist/core/ps-wrapper.d.ts +19 -2
- package/dist/core/ps-wrapper.d.ts.map +1 -1
- package/dist/core/ps-wrapper.js +261 -63
- package/dist/core/record-history.d.ts +15 -0
- package/dist/core/record-history.d.ts.map +1 -1
- package/dist/core/record-history.js +183 -58
- package/dist/core/router/dispatch.d.ts +36 -0
- package/dist/core/router/dispatch.d.ts.map +1 -0
- package/dist/core/router/dispatch.js +59 -0
- package/dist/core/router/escalation.d.ts +47 -0
- package/dist/core/router/escalation.d.ts.map +1 -0
- package/dist/core/router/escalation.js +87 -0
- package/dist/core/router/planner.d.ts +53 -0
- package/dist/core/router/planner.d.ts.map +1 -0
- package/dist/core/router/planner.js +113 -0
- package/dist/core/router/rules.d.ts +46 -0
- package/dist/core/router/rules.d.ts.map +1 -0
- package/dist/core/router/rules.js +91 -0
- package/dist/core/run-panel-api.d.ts +94 -0
- package/dist/core/run-panel-api.d.ts.map +1 -0
- package/dist/core/run-panel-api.js +169 -0
- package/dist/core/schedule-gate.js +5 -1
- package/dist/core/schedule-v2.d.ts +34 -0
- package/dist/core/schedule-v2.d.ts.map +1 -1
- package/dist/core/schedule-v2.js +91 -5
- package/dist/core/scheduler/at-fallback.d.ts +55 -2
- package/dist/core/scheduler/at-fallback.d.ts.map +1 -1
- package/dist/core/scheduler/at-fallback.js +135 -5
- package/dist/core/scheduler/linux.d.ts +18 -2
- package/dist/core/scheduler/linux.d.ts.map +1 -1
- package/dist/core/scheduler/linux.js +63 -20
- package/dist/core/scheduler/mac.d.ts +44 -2
- package/dist/core/scheduler/mac.d.ts.map +1 -1
- package/dist/core/scheduler/mac.js +126 -15
- package/dist/core/scheduler/posix.d.ts.map +1 -1
- package/dist/core/scheduler/posix.js +25 -1
- package/dist/core/scheduler/registry.d.ts +11 -0
- package/dist/core/scheduler/registry.d.ts.map +1 -1
- package/dist/core/scheduler/registry.js +83 -21
- package/dist/core/scheduler/run-now.d.ts +16 -0
- package/dist/core/scheduler/run-now.d.ts.map +1 -0
- package/dist/core/scheduler/run-now.js +28 -0
- package/dist/core/scheduler/windows.d.ts.map +1 -1
- package/dist/core/scheduler/windows.js +15 -12
- package/dist/core/secrets.d.ts.map +1 -1
- package/dist/core/secrets.js +125 -28
- package/dist/core/session.d.ts.map +1 -1
- package/dist/core/session.js +18 -11
- package/dist/core/structured-log.d.ts +7 -1
- package/dist/core/structured-log.d.ts.map +1 -1
- package/dist/core/task-name.d.ts +24 -0
- package/dist/core/task-name.d.ts.map +1 -0
- package/dist/core/task-name.js +40 -0
- package/dist/core/worktree-run.d.ts +4 -0
- package/dist/core/worktree-run.d.ts.map +1 -0
- package/dist/core/worktree-run.js +164 -0
- package/dist/core/worktree.d.ts +115 -0
- package/dist/core/worktree.d.ts.map +1 -0
- package/dist/core/worktree.js +462 -0
- package/dist/core/wrappers/bash.d.ts +17 -0
- package/dist/core/wrappers/bash.d.ts.map +1 -1
- package/dist/core/wrappers/bash.js +224 -28
- package/dist/db/capability-repo.d.ts +124 -0
- package/dist/db/capability-repo.d.ts.map +1 -0
- package/dist/db/capability-repo.js +267 -0
- package/dist/db/history-repo.d.ts +46 -5
- package/dist/db/history-repo.d.ts.map +1 -1
- package/dist/db/history-repo.js +107 -25
- package/dist/db/index.d.ts +4 -0
- package/dist/db/index.d.ts.map +1 -1
- package/dist/db/index.js +39 -1
- package/dist/db/metrics-repo.js +2 -2
- package/dist/db/migrate.d.ts.map +1 -1
- package/dist/db/migrate.js +3 -1
- package/dist/db/recovery.d.ts.map +1 -1
- package/dist/db/recovery.js +5 -4
- package/dist/db/run-context.d.ts +103 -0
- package/dist/db/run-context.d.ts.map +1 -0
- package/dist/db/run-context.js +224 -0
- package/dist/db/run-dlq.d.ts +100 -0
- package/dist/db/run-dlq.d.ts.map +1 -0
- package/dist/db/run-dlq.js +191 -0
- package/dist/db/run-journal.d.ts +33 -5
- package/dist/db/run-journal.d.ts.map +1 -1
- package/dist/db/run-journal.js +78 -14
- package/dist/db/run-resume.d.ts +10 -2
- package/dist/db/run-resume.d.ts.map +1 -1
- package/dist/db/run-resume.js +39 -13
- package/dist/db/runs-repo.d.ts +32 -7
- package/dist/db/runs-repo.d.ts.map +1 -1
- package/dist/db/runs-repo.js +50 -11
- package/dist/db/schema.d.ts +2 -2
- package/dist/db/schema.d.ts.map +1 -1
- package/dist/db/schema.js +216 -3
- package/dist/db/settings-repo.d.ts +11 -0
- package/dist/db/settings-repo.d.ts.map +1 -1
- package/dist/db/settings-repo.js +25 -0
- package/dist/db/step-idempotency.d.ts +51 -0
- package/dist/db/step-idempotency.d.ts.map +1 -0
- package/dist/db/step-idempotency.js +136 -0
- package/dist/history.d.ts +1 -1
- package/dist/history.d.ts.map +1 -1
- package/dist/i18n.d.ts +5 -0
- package/dist/i18n.d.ts.map +1 -1
- package/dist/i18n.js +11 -4
- package/dist/index.d.ts +140 -6
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +480 -18
- package/dist/notifications.d.ts +22 -0
- package/dist/notifications.d.ts.map +1 -1
- package/dist/notifications.js +36 -8
- package/dist/profiles.d.ts.map +1 -1
- package/dist/profiles.js +25 -4
- package/dist/rpc.d.ts +924 -0
- package/dist/rpc.d.ts.map +1 -1
- package/dist/rpc.js +352 -0
- package/dist/server.d.ts +46 -0
- package/dist/server.d.ts.map +1 -1
- package/dist/server.js +172 -53
- package/dist/settings.d.ts +2 -2
- package/dist/settings.d.ts.map +1 -1
- package/dist/settings.js +3 -3
- package/dist/shared/jobs-view.d.ts +1 -1
- package/dist/shared/jobs-view.d.ts.map +1 -1
- package/dist/shared/jobs-view.js +2 -0
- package/dist/task-transfer.d.ts +16 -0
- package/dist/task-transfer.d.ts.map +1 -1
- package/dist/task-transfer.js +16 -0
- package/dist/types.d.ts.map +1 -1
- package/dist/types.js +7 -0
- package/dist/workspaces.d.ts +25 -3
- package/dist/workspaces.d.ts.map +1 -1
- package/dist/workspaces.js +43 -8
- package/docs/ARCHITECTURE.md +498 -58
- package/docs/COMPATIBILITY.md +2 -2
- package/docs/CONCEPT.md +185 -91
- package/docs/CROSS_PLATFORM.ru.md +20 -0
- package/docs/CROSS_PLATFORM.zh.md +18 -0
- package/docs/EXECUTION-LOOP.md +211 -0
- package/docs/FEATURES.md +65 -4
- package/docs/FEATURES.zh.md +52 -4
- package/docs/MIGRATION.md +2 -2
- package/docs/PIPELINE.md +293 -0
- package/docs/README.ru.md +44 -5
- package/docs/README.zh.md +46 -6
- package/docs/SAFETY.md +142 -0
- package/docs/SAVINGS.md +29 -0
- package/docs/SAVINGS.ru.md +29 -0
- package/docs/SAVINGS.zh.md +18 -0
- package/gui-experimental.cjs +9 -8
- package/locales/en.json +84 -1
- package/locales/ru.json +84 -1
- package/locales/zh.json +84 -1
- package/opencode.pipeline.yaml +35 -0
- package/package.json +46 -2
- package/scripts/audit-bundle.mjs +215 -0
- package/scripts/test-home.mjs +83 -0
- package/src/cli.ts +412 -0
- package/src/core/dlq-api.ts +98 -0
- package/src/core/dry-run.ts +27 -3
- package/src/core/execution.ts +538 -0
- package/src/core/file-watcher.ts +2 -2
- package/src/core/gate-integrity.ts +160 -0
- package/src/core/git-trigger.ts +18 -5
- package/src/core/guard-run.ts +119 -0
- package/src/core/guard.ts +431 -0
- package/src/core/lock.ts +244 -30
- package/src/core/matrix.ts +95 -50
- package/src/core/mission.ts +485 -0
- package/src/core/native-notify.ts +1 -1
- package/src/core/one-shot.ts +36 -8
- package/src/core/opencode-cli.ts +103 -0
- package/src/core/opencode-models.ts +315 -0
- package/src/core/pipeline-apply.ts +158 -0
- package/src/core/pipeline-io.ts +79 -0
- package/src/core/pipeline-map.ts +264 -0
- package/src/core/pipeline-spec.ts +775 -0
- package/src/core/ps-wrapper.ts +274 -64
- package/src/core/record-history.ts +229 -104
- package/src/core/router/dispatch.ts +94 -0
- package/src/core/router/escalation.ts +129 -0
- package/src/core/router/planner.ts +166 -0
- package/src/core/router/rules.ts +115 -0
- package/src/core/run-panel-api.ts +262 -0
- package/src/core/schedule-gate.ts +7 -3
- package/src/core/schedule-v2.ts +114 -5
- package/src/core/scheduler/at-fallback.ts +190 -5
- package/src/core/scheduler/linux.ts +72 -21
- package/src/core/scheduler/logs.ts +2 -2
- package/src/core/scheduler/mac.ts +174 -14
- package/src/core/scheduler/posix.ts +20 -1
- package/src/core/scheduler/registry.ts +107 -26
- package/src/core/scheduler/run-now.ts +32 -0
- package/src/core/scheduler/windows.ts +19 -15
- package/src/core/secrets.ts +131 -31
- package/src/core/session.ts +23 -10
- package/src/core/structured-log.ts +22 -5
- package/src/core/task-name.ts +67 -0
- package/src/core/telegram.ts +2 -2
- package/src/core/triage-worker.ts +7 -7
- package/src/core/triage.ts +2 -2
- package/src/core/worktree-run.ts +199 -0
- package/src/core/worktree.ts +600 -0
- package/src/core/wrappers/bash.ts +239 -27
- package/src/db/capability-repo.ts +402 -0
- package/src/db/history-repo.ts +151 -22
- package/src/db/index.ts +37 -1
- package/src/db/metrics-repo.ts +2 -2
- package/src/db/migrate.ts +3 -1
- package/src/db/recovery.ts +5 -4
- package/src/db/run-context.ts +370 -0
- package/src/db/run-dlq.ts +310 -0
- package/src/db/run-journal.ts +100 -13
- package/src/db/run-resume.ts +65 -13
- package/src/db/runs-repo.ts +66 -13
- package/src/db/schema.ts +218 -3
- package/src/db/settings-repo.ts +31 -0
- package/src/db/step-idempotency.ts +185 -0
- package/src/gui.tsx +692 -13
- package/src/history.ts +1 -1
- package/src/i18n.ts +12 -4
- package/src/index.ts +648 -8
- package/src/notifications.ts +38 -8
- package/src/profiles.ts +26 -4
- package/src/rpc.ts +379 -0
- package/src/server.ts +206 -54
- package/src/settings.ts +5 -5
- package/src/shared/jobs-view.ts +3 -1
- package/src/task-transfer.ts +31 -0
- package/src/types.ts +9 -0
- package/src/workspaces.ts +58 -9
|
@@ -22,12 +22,54 @@ interface LaunchdSchedule {
|
|
|
22
22
|
* Поддерживается то же подмножество, что и у Windows-бэкенда.
|
|
23
23
|
*/
|
|
24
24
|
export declare function cronToLaunchdSchedule(cron: string): LaunchdSchedule;
|
|
25
|
+
/** Ошибка запуска launchctl с командой, кодом выхода и stderr. */
|
|
26
|
+
export declare function describeLaunchctlError(args: string[], err: unknown): string;
|
|
27
|
+
/**
|
|
28
|
+
* Запускает launchctl и либо пробрасывает ошибку с stderr/exit code,
|
|
29
|
+
* либо глотает её (unload незагруженного агента — штатная ситуация).
|
|
30
|
+
*/
|
|
31
|
+
export declare function runLaunchctl(runner: (args: string[]) => Promise<unknown>, args: string[], options?: {
|
|
32
|
+
tolerateFailure?: boolean;
|
|
33
|
+
}): Promise<void>;
|
|
34
|
+
/** Команды launchctl при установке записи. */
|
|
35
|
+
export interface LaunchctlInstallPlan {
|
|
36
|
+
/** unload перед перезаписью plist (best effort: агент мог быть не загружен). */
|
|
37
|
+
beforeWrite: string[];
|
|
38
|
+
/** load после записи; null — задача на паузе, загружать её нельзя. */
|
|
39
|
+
afterWrite: string[] | null;
|
|
40
|
+
}
|
|
41
|
+
/**
|
|
42
|
+
* B5: `load -w` не только загружает агент, но и снимает Disabled,
|
|
43
|
+
* поэтому для приостановленной задачи его вызывать нельзя — иначе
|
|
44
|
+
* установка молча возобновляет задачу. Вместо этого `unload -w`
|
|
45
|
+
* фиксирует Disabled, чтобы launchd не загрузил агент при следующем входе.
|
|
46
|
+
*/
|
|
47
|
+
export declare function planLaunchctlInstall(paused: boolean, plistPath: string): LaunchctlInstallPlan;
|
|
48
|
+
/**
|
|
49
|
+
* ML-1: macOS 13 (Darwin 22) заменяет `load`/`unload` на `bootstrap`/`bootout`
|
|
50
|
+
* с явным доменом `gui/<uid>`. `-w` у legacy-команды здесь не нужен: bootstrap
|
|
51
|
+
* сам регистрирует агент, а bootout — снимает регистрацию.
|
|
52
|
+
*/
|
|
53
|
+
export declare function modernLaunchctlArgs(args: string[], uid?: number): string[];
|
|
54
|
+
/** Современные команды доступны на macOS 13+ (Darwin 22+). */
|
|
55
|
+
export declare function supportsModernLaunchctl(platform?: NodeJS.Platform, release?: string): boolean;
|
|
56
|
+
/**
|
|
57
|
+
* Выполняет launchctl через современные команды; при отсутствии поддержки
|
|
58
|
+
* (macOS < 13 или «unrecognized subcommand») повторяет legacy-аргументы.
|
|
59
|
+
*/
|
|
60
|
+
export declare function runLaunchctlModern(runner: (args: string[]) => Promise<unknown>, args: string[], options?: {
|
|
61
|
+
tolerateFailure?: boolean;
|
|
62
|
+
}): Promise<void>;
|
|
25
63
|
/**
|
|
26
64
|
* Бэкенд планировщика macOS на основе launchd.
|
|
27
65
|
*
|
|
28
66
|
* Каждая задача — отдельный LaunchAgent:
|
|
29
67
|
* ~/Library/LaunchAgents/com.opencode.scheduler.<name>.plist
|
|
30
|
-
* Управление — через launchctl
|
|
68
|
+
* Управление — через `launchctl bootstrap/bootout` (macOS ≥13), с фолбэком
|
|
69
|
+
* на legacy `load/unload -w` для более старых систем. `planLaunchctlInstall`
|
|
70
|
+
* намеренно остаётся на legacy-командах: обратная совместимость контракта.
|
|
71
|
+
* Ошибки загрузки не глотаются: битый plist должен вернуть ошибку установки,
|
|
72
|
+
* а не оставить задачу молча незапланированной.
|
|
31
73
|
*/
|
|
32
74
|
export declare class MacScheduler extends PosixSchedulerBase {
|
|
33
75
|
readonly platform: NodeJS.Platform;
|
|
@@ -36,7 +78,7 @@ export declare class MacScheduler extends PosixSchedulerBase {
|
|
|
36
78
|
private readonly profile;
|
|
37
79
|
private label;
|
|
38
80
|
private plistPath;
|
|
39
|
-
/** Выполняет launchctl
|
|
81
|
+
/** Выполняет launchctl; tolerateFailure оставлен только для bootout/unload. */
|
|
40
82
|
private launchctl;
|
|
41
83
|
protected installEntry(entry: RegistryEntry): Promise<void>;
|
|
42
84
|
protected uninstallEntry(entry: RegistryEntry): Promise<void>;
|
|
@@ -1 +1 @@
|
|
|
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;
|
|
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;AAsBnD,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,kEAAkE;AAClE,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,GAAG,EAAE,OAAO,GAAG,MAAM,CAkB3E;AAED;;;GAGG;AACH,wBAAsB,YAAY,CAChC,MAAM,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,OAAO,CAAC,OAAO,CAAC,EAC5C,IAAI,EAAE,MAAM,EAAE,EACd,OAAO,GAAE;IAAE,eAAe,CAAC,EAAE,OAAO,CAAA;CAAO,GAC1C,OAAO,CAAC,IAAI,CAAC,CAYf;AAED,8CAA8C;AAC9C,MAAM,WAAW,oBAAoB;IACnC,gFAAgF;IAChF,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,sEAAsE;IACtE,UAAU,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;CAC7B;AAED;;;;;GAKG;AACH,wBAAgB,oBAAoB,CAClC,MAAM,EAAE,OAAO,EACf,SAAS,EAAE,MAAM,GAChB,oBAAoB,CAWtB;AAED;;;;GAIG;AACH,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,GAAG,GAAE,MAAkC,GAAG,MAAM,EAAE,CAKrG;AAED,8DAA8D;AAC9D,wBAAgB,uBAAuB,CACrC,QAAQ,GAAE,MAAM,CAAC,QAA2B,EAC5C,OAAO,GAAE,MAAqB,GAC7B,OAAO,CAIT;AAWD;;;GAGG;AACH,wBAAsB,kBAAkB,CACtC,MAAM,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,OAAO,CAAC,OAAO,CAAC,EAC5C,IAAI,EAAE,MAAM,EAAE,EACd,OAAO,GAAE;IAAE,eAAe,CAAC,EAAE,OAAO,CAAA;CAAO,GAC1C,OAAO,CAAC,IAAI,CAAC,CAiBf;AAED;;;;;;;;;;GAUG;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,+EAA+E;YACjE,SAAS;cAWP,YAAY,CAAC,KAAK,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;cAuBjD,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;CASjF"}
|
|
@@ -10,6 +10,11 @@ import { buildLaunchdCalendar, buildOneShotGuardCommand, launchdLabel } from "..
|
|
|
10
10
|
import { systemTimeZone, } from "../schedule-v2.js";
|
|
11
11
|
import { PosixSchedulerBase } from "./posix.js";
|
|
12
12
|
const execFileAsync = promisify(execFile);
|
|
13
|
+
/** O-2: неудачная уборка temp/plist не проглатывается молча. */
|
|
14
|
+
function warnCleanupFailure(target, error) {
|
|
15
|
+
const reason = error instanceof Error ? error.message : String(error);
|
|
16
|
+
console.warn(`[agent-steward] Не удалось удалить plist «${target}»: ${reason}`);
|
|
17
|
+
}
|
|
13
18
|
/** Папка пользовательских LaunchAgents. */
|
|
14
19
|
const LAUNCH_AGENTS_DIR = path.join(os.homedir(), "Library", "LaunchAgents");
|
|
15
20
|
/** Экранирует текст для XML. */
|
|
@@ -186,12 +191,108 @@ function buildPlist(label, entry) {
|
|
|
186
191
|
"",
|
|
187
192
|
].join("\n");
|
|
188
193
|
}
|
|
194
|
+
/** Ошибка запуска launchctl с командой, кодом выхода и stderr. */
|
|
195
|
+
export function describeLaunchctlError(args, err) {
|
|
196
|
+
const error = err;
|
|
197
|
+
const stderr = String(error.stderr ?? "").trim();
|
|
198
|
+
const stdout = String(error.stdout ?? "").trim();
|
|
199
|
+
const detail = stderr || stdout || error.message || "вывод пуст";
|
|
200
|
+
const status = error.code !== undefined
|
|
201
|
+
? `код ${String(error.code)}`
|
|
202
|
+
: error.signal
|
|
203
|
+
? `сигнал ${error.signal}`
|
|
204
|
+
: "без кода выхода";
|
|
205
|
+
return `launchctl ${args.join(" ")}: ${status}: ${detail}`;
|
|
206
|
+
}
|
|
207
|
+
/**
|
|
208
|
+
* Запускает launchctl и либо пробрасывает ошибку с stderr/exit code,
|
|
209
|
+
* либо глотает её (unload незагруженного агента — штатная ситуация).
|
|
210
|
+
*/
|
|
211
|
+
export async function runLaunchctl(runner, args, options = {}) {
|
|
212
|
+
try {
|
|
213
|
+
await runner(args);
|
|
214
|
+
}
|
|
215
|
+
catch (err) {
|
|
216
|
+
if (options.tolerateFailure)
|
|
217
|
+
return;
|
|
218
|
+
const failure = new Error(describeLaunchctlError(args, err));
|
|
219
|
+
// target/lib проекта не включает ErrorOptions, поэтому cause ставим вручную.
|
|
220
|
+
failure.cause = err;
|
|
221
|
+
throw failure;
|
|
222
|
+
}
|
|
223
|
+
}
|
|
224
|
+
/**
|
|
225
|
+
* B5: `load -w` не только загружает агент, но и снимает Disabled,
|
|
226
|
+
* поэтому для приостановленной задачи его вызывать нельзя — иначе
|
|
227
|
+
* установка молча возобновляет задачу. Вместо этого `unload -w`
|
|
228
|
+
* фиксирует Disabled, чтобы launchd не загрузил агент при следующем входе.
|
|
229
|
+
*/
|
|
230
|
+
export function planLaunchctlInstall(paused, plistPath) {
|
|
231
|
+
if (paused) {
|
|
232
|
+
return {
|
|
233
|
+
beforeWrite: ["unload", "-w", plistPath],
|
|
234
|
+
afterWrite: null,
|
|
235
|
+
};
|
|
236
|
+
}
|
|
237
|
+
return {
|
|
238
|
+
beforeWrite: ["unload", plistPath],
|
|
239
|
+
afterWrite: ["load", "-w", plistPath],
|
|
240
|
+
};
|
|
241
|
+
}
|
|
242
|
+
/**
|
|
243
|
+
* ML-1: macOS 13 (Darwin 22) заменяет `load`/`unload` на `bootstrap`/`bootout`
|
|
244
|
+
* с явным доменом `gui/<uid>`. `-w` у legacy-команды здесь не нужен: bootstrap
|
|
245
|
+
* сам регистрирует агент, а bootout — снимает регистрацию.
|
|
246
|
+
*/
|
|
247
|
+
export function modernLaunchctlArgs(args, uid = process.getuid?.() ?? 501) {
|
|
248
|
+
const [command, ...rest] = args;
|
|
249
|
+
if (command !== "load" && command !== "unload")
|
|
250
|
+
return args;
|
|
251
|
+
const plist = rest.filter((part) => part !== "-w");
|
|
252
|
+
return [command === "load" ? "bootstrap" : "bootout", `gui/${uid}`, ...plist];
|
|
253
|
+
}
|
|
254
|
+
/** Современные команды доступны на macOS 13+ (Darwin 22+). */
|
|
255
|
+
export function supportsModernLaunchctl(platform = process.platform, release = os.release()) {
|
|
256
|
+
if (platform !== "darwin")
|
|
257
|
+
return true;
|
|
258
|
+
const darwinMajor = Number.parseInt(release.split(".")[0] ?? "", 10);
|
|
259
|
+
return Number.isFinite(darwinMajor) ? darwinMajor >= 22 : true;
|
|
260
|
+
}
|
|
261
|
+
/** Признак того, что launchctl не знает bootstrap/bootout (максимально старая macOS). */
|
|
262
|
+
function needsLegacyLaunchctlFallback(error) {
|
|
263
|
+
const source = error;
|
|
264
|
+
const text = `${String(source?.message ?? "")}\n${String(source?.stderr ?? "")}`;
|
|
265
|
+
return /unrecognized subcommand|unknown subcommand|invalid subcommand|unrecognized option|Usage:/i.test(text);
|
|
266
|
+
}
|
|
267
|
+
/**
|
|
268
|
+
* Выполняет launchctl через современные команды; при отсутствии поддержки
|
|
269
|
+
* (macOS < 13 или «unrecognized subcommand») повторяет legacy-аргументы.
|
|
270
|
+
*/
|
|
271
|
+
export async function runLaunchctlModern(runner, args, options = {}) {
|
|
272
|
+
const modern = supportsModernLaunchctl() ? modernLaunchctlArgs(args) : args;
|
|
273
|
+
await runLaunchctl(async (call) => {
|
|
274
|
+
try {
|
|
275
|
+
await runner(call);
|
|
276
|
+
}
|
|
277
|
+
catch (err) {
|
|
278
|
+
if (modern !== args && needsLegacyLaunchctlFallback(err)) {
|
|
279
|
+
await runner(args);
|
|
280
|
+
return;
|
|
281
|
+
}
|
|
282
|
+
throw err;
|
|
283
|
+
}
|
|
284
|
+
}, modern, options);
|
|
285
|
+
}
|
|
189
286
|
/**
|
|
190
287
|
* Бэкенд планировщика macOS на основе launchd.
|
|
191
288
|
*
|
|
192
289
|
* Каждая задача — отдельный LaunchAgent:
|
|
193
290
|
* ~/Library/LaunchAgents/com.opencode.scheduler.<name>.plist
|
|
194
|
-
* Управление — через launchctl
|
|
291
|
+
* Управление — через `launchctl bootstrap/bootout` (macOS ≥13), с фолбэком
|
|
292
|
+
* на legacy `load/unload -w` для более старых систем. `planLaunchctlInstall`
|
|
293
|
+
* намеренно остаётся на legacy-командах: обратная совместимость контракта.
|
|
294
|
+
* Ошибки загрузки не глотаются: битый plist должен вернуть ошибку установки,
|
|
295
|
+
* а не оставить задачу молча незапланированной.
|
|
195
296
|
*/
|
|
196
297
|
export class MacScheduler extends PosixSchedulerBase {
|
|
197
298
|
constructor(profile = getProfileName()) {
|
|
@@ -223,33 +324,43 @@ export class MacScheduler extends PosixSchedulerBase {
|
|
|
223
324
|
plistPath(name) {
|
|
224
325
|
return path.join(LAUNCH_AGENTS_DIR, `${this.label(name)}.plist`);
|
|
225
326
|
}
|
|
226
|
-
/** Выполняет launchctl
|
|
227
|
-
async launchctl(args) {
|
|
228
|
-
|
|
229
|
-
await execFileAsync("launchctl", args, { maxBuffer: 1024 * 1024 });
|
|
230
|
-
}
|
|
231
|
-
catch {
|
|
232
|
-
// launchctl возвращает ошибку, если агент ещё не загружен — это нормально.
|
|
233
|
-
}
|
|
327
|
+
/** Выполняет launchctl; tolerateFailure оставлен только для bootout/unload. */
|
|
328
|
+
async launchctl(args, options = {}) {
|
|
329
|
+
await runLaunchctlModern((call) => execFileAsync("launchctl", call, { maxBuffer: 1024 * 1024 }), args, options);
|
|
234
330
|
}
|
|
235
331
|
async installEntry(entry) {
|
|
236
332
|
await fs.mkdir(LAUNCH_AGENTS_DIR, { recursive: true });
|
|
237
333
|
const plistPath = this.plistPath(entry.name);
|
|
238
|
-
|
|
239
|
-
|
|
240
|
-
await this.launchctl(
|
|
334
|
+
const plan = planLaunchctlInstall(entry.paused, plistPath);
|
|
335
|
+
// Агент мог быть не загружен — это не ошибка.
|
|
336
|
+
await this.launchctl(plan.beforeWrite, { tolerateFailure: true });
|
|
337
|
+
// Пишем в уникальный temp и переименовываем: launchctl не должен увидеть
|
|
338
|
+
// полузаписанный plist, если процесс упадёт посреди записи.
|
|
339
|
+
const tmpPath = `${plistPath}.${process.pid}.${Date.now()}.tmp`;
|
|
340
|
+
try {
|
|
341
|
+
await fs.writeFile(tmpPath, buildPlist(this.label(entry.name), entry), "utf8");
|
|
342
|
+
await fs.rename(tmpPath, plistPath);
|
|
343
|
+
}
|
|
344
|
+
catch (error) {
|
|
345
|
+
await fs.rm(tmpPath, { force: true }).catch((cleanupError) => warnCleanupFailure(tmpPath, cleanupError));
|
|
346
|
+
throw error;
|
|
347
|
+
}
|
|
348
|
+
if (plan.afterWrite) {
|
|
349
|
+
await this.launchctl(plan.afterWrite);
|
|
350
|
+
}
|
|
241
351
|
}
|
|
242
352
|
async uninstallEntry(entry) {
|
|
243
353
|
const plistPath = this.plistPath(entry.name);
|
|
244
|
-
await this.launchctl(["unload", "-w", plistPath]);
|
|
245
|
-
await fs.unlink(plistPath).catch(() =>
|
|
354
|
+
await this.launchctl(["unload", "-w", plistPath], { tolerateFailure: true });
|
|
355
|
+
await fs.unlink(plistPath).catch((error) => warnCleanupFailure(plistPath, error));
|
|
246
356
|
}
|
|
247
357
|
async applyPause(entry, paused) {
|
|
248
358
|
const plistPath = this.plistPath(entry.name);
|
|
249
359
|
if (paused) {
|
|
250
|
-
await this.launchctl(["unload", "-w", plistPath]);
|
|
360
|
+
await this.launchctl(["unload", "-w", plistPath], { tolerateFailure: true });
|
|
251
361
|
}
|
|
252
362
|
else {
|
|
363
|
+
// Возобновление не должно «удаваться» молча при битом plist.
|
|
253
364
|
await this.launchctl(["load", "-w", plistPath]);
|
|
254
365
|
}
|
|
255
366
|
}
|
|
@@ -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;
|
|
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"}
|
|
@@ -27,8 +27,32 @@ export class PosixSchedulerBase {
|
|
|
27
27
|
...(options.priority !== undefined ? { priority: options.priority } : {}),
|
|
28
28
|
...(options.timezone ? { timezone: options.timezone } : {}),
|
|
29
29
|
};
|
|
30
|
+
// P2-17: запись нужна в реестре ДО installEntry — Linux пересобирает crontab
|
|
31
|
+
// из реестра. Но если установка упала, запись-призрак останется навсегда,
|
|
32
|
+
// поэтому откатываем реестр к предыдущему состоянию.
|
|
33
|
+
const previous = await this.registry.find(entry.name);
|
|
30
34
|
await this.registry.upsert(entry);
|
|
31
|
-
|
|
35
|
+
try {
|
|
36
|
+
await this.installEntry(entry);
|
|
37
|
+
}
|
|
38
|
+
catch (err) {
|
|
39
|
+
try {
|
|
40
|
+
if (previous)
|
|
41
|
+
await this.registry.upsert(previous);
|
|
42
|
+
else
|
|
43
|
+
await this.registry.remove(entry.name);
|
|
44
|
+
}
|
|
45
|
+
catch {
|
|
46
|
+
// Не маскируем исходную ошибку установки ошибкой отката.
|
|
47
|
+
}
|
|
48
|
+
try {
|
|
49
|
+
await this.uninstallEntry(entry);
|
|
50
|
+
}
|
|
51
|
+
catch {
|
|
52
|
+
// Частичная установка могла не создать запись — это не ошибка отката.
|
|
53
|
+
}
|
|
54
|
+
throw err;
|
|
55
|
+
}
|
|
32
56
|
// installEntry может записать atJobId для Linux one-shot.
|
|
33
57
|
await this.registry.upsert(entry);
|
|
34
58
|
}
|
|
@@ -30,11 +30,22 @@ export interface RegistryEntry {
|
|
|
30
30
|
export declare class TaskRegistry {
|
|
31
31
|
private readonly file;
|
|
32
32
|
private readonly dir;
|
|
33
|
+
private readonly backendId;
|
|
34
|
+
private readonly lock;
|
|
33
35
|
constructor(backendId: string, profile?: string);
|
|
34
36
|
/** Путь к файлу реестра (для диагностики). */
|
|
35
37
|
get path(): string;
|
|
38
|
+
/** Маркер того, что реестр был повреждён и перемещён в карантин. */
|
|
39
|
+
private get blockedPath();
|
|
36
40
|
load(): Promise<RegistryEntry[]>;
|
|
41
|
+
/** Перемещает повреждённый файл в карантин и блокирует дальнейшие записи. */
|
|
42
|
+
private quarantineCorrupt;
|
|
37
43
|
save(entries: RegistryEntry[]): Promise<void>;
|
|
44
|
+
/**
|
|
45
|
+
* Read-modify-write под межпроцессной блокировкой: два процесса на одном
|
|
46
|
+
* профиле не должны терять чужие записи (P2-16).
|
|
47
|
+
*/
|
|
48
|
+
private mutate;
|
|
38
49
|
find(name: string): Promise<RegistryEntry | undefined>;
|
|
39
50
|
upsert(entry: RegistryEntry): Promise<void>;
|
|
40
51
|
remove(name: string): Promise<void>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"registry.d.ts","sourceRoot":"","sources":["../../../src/core/scheduler/registry.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"registry.d.ts","sourceRoot":"","sources":["../../../src/core/scheduler/registry.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAE9C;;;;;;GAMG;AACH,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,WAAW,EAAE,WAAW,CAAC;IACzB,yEAAyE;IACzE,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,iEAAiE;IACjE,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,OAAO,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,uCAAuC;IACvC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,4CAA4C;IAC5C,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,iEAAiE;IACjE,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,8EAA8E;AAC9E,qBAAa,YAAY;IACvB,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAS;IAC9B,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAS;IAC7B,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAS;IACnC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAc;gBAEvB,SAAS,EAAE,MAAM,EAAE,OAAO,GAAE,MAAyB;IASjE,8CAA8C;IAC9C,IAAI,IAAI,IAAI,MAAM,CAEjB;IAED,oEAAoE;IACpE,OAAO,KAAK,WAAW,GAEtB;IAEK,IAAI,IAAI,OAAO,CAAC,aAAa,EAAE,CAAC;IAmCtC,6EAA6E;YAC/D,iBAAiB;IAwBzB,IAAI,CAAC,OAAO,EAAE,aAAa,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAUnD;;;OAGG;YACW,MAAM;IAed,IAAI,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC;IAKtD,MAAM,CAAC,KAAK,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IAU3C,MAAM,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IASnC,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;CAQ9D"}
|
|
@@ -1,57 +1,119 @@
|
|
|
1
1
|
import fs from "node:fs/promises";
|
|
2
2
|
import path from "node:path";
|
|
3
3
|
import { getProfileDir, getProfileName } from "../../profiles.js";
|
|
4
|
+
import { LockManager, withLockWait } from "../lock.js";
|
|
4
5
|
/** Реестр задач конкретного бэкенда: <pluginDir>/scheduler-<backend>.json. */
|
|
5
6
|
export class TaskRegistry {
|
|
6
7
|
constructor(backendId, profile = getProfileName()) {
|
|
8
|
+
this.backendId = backendId;
|
|
7
9
|
this.dir = getProfileDir(profile);
|
|
8
10
|
this.file = path.join(this.dir, `scheduler-${backendId}.json`);
|
|
11
|
+
// P2-16: мутации реестра — read-modify-write. Лок сериализует их между
|
|
12
|
+
// процессами (хост OpenCode, CLI, detached record-history).
|
|
13
|
+
this.lock = new LockManager(path.join(this.dir, "locks"));
|
|
9
14
|
}
|
|
10
15
|
/** Путь к файлу реестра (для диагностики). */
|
|
11
16
|
get path() {
|
|
12
17
|
return this.file;
|
|
13
18
|
}
|
|
19
|
+
/** Маркер того, что реестр был повреждён и перемещён в карантин. */
|
|
20
|
+
get blockedPath() {
|
|
21
|
+
return `${this.file}.blocked`;
|
|
22
|
+
}
|
|
14
23
|
async load() {
|
|
24
|
+
let raw;
|
|
15
25
|
try {
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
26
|
+
raw = await fs.readFile(this.file, "utf8");
|
|
27
|
+
}
|
|
28
|
+
catch (err) {
|
|
29
|
+
if (err?.code === "ENOENT") {
|
|
30
|
+
// Карантин уже переместил файл. Пустой реестр нельзя выдавать за
|
|
31
|
+
// «задач нет»: rebuildCrontab вычистил бы все cron-строки плагина.
|
|
32
|
+
const blocked = await fs.readFile(this.blockedPath, "utf8").catch(() => null);
|
|
33
|
+
if (blocked) {
|
|
34
|
+
throw new Error(`Реестр задач повреждён (карантин: ${blocked.trim()}). ` +
|
|
35
|
+
`Восстановите ${this.file} вручную или удалите маркер ${this.blockedPath}.`);
|
|
36
|
+
}
|
|
19
37
|
return [];
|
|
20
|
-
|
|
38
|
+
}
|
|
39
|
+
throw err;
|
|
40
|
+
}
|
|
41
|
+
let parsed;
|
|
42
|
+
try {
|
|
43
|
+
parsed = JSON.parse(raw);
|
|
21
44
|
}
|
|
22
|
-
catch {
|
|
23
|
-
return
|
|
45
|
+
catch (err) {
|
|
46
|
+
return this.quarantineCorrupt(err);
|
|
24
47
|
}
|
|
48
|
+
if (!Array.isArray(parsed)) {
|
|
49
|
+
return this.quarantineCorrupt(new Error("expected an array of registry entries"));
|
|
50
|
+
}
|
|
51
|
+
return parsed.filter((entry) => entry && typeof entry.name === "string" && typeof entry.command === "string");
|
|
52
|
+
}
|
|
53
|
+
/** Перемещает повреждённый файл в карантин и блокирует дальнейшие записи. */
|
|
54
|
+
async quarantineCorrupt(err) {
|
|
55
|
+
const stamp = new Date().toISOString().replace(/[:.]/g, "-");
|
|
56
|
+
const target = `${this.file}.corrupt-${stamp}`;
|
|
57
|
+
let moved = "";
|
|
58
|
+
try {
|
|
59
|
+
await fs.rename(this.file, target);
|
|
60
|
+
await fs.writeFile(this.blockedPath, target, "utf8");
|
|
61
|
+
moved = ` Файл перемещён в ${target}.`;
|
|
62
|
+
console.warn(`[scheduler] Реестр ${path.basename(this.file)} повреждён и перемещён в ${target}. ` +
|
|
63
|
+
`Запись заблокирована маркером ${this.blockedPath}.`, err);
|
|
64
|
+
}
|
|
65
|
+
catch (renameErr) {
|
|
66
|
+
console.error(`[scheduler] Не удалось переместить повреждённый реестр ${this.file} в ${target}.`, renameErr);
|
|
67
|
+
}
|
|
68
|
+
throw new Error(`Реестр задач повреждён.${moved} Восстановите ${this.file} вручную или удалите маркер ${this.blockedPath}.`);
|
|
25
69
|
}
|
|
26
70
|
async save(entries) {
|
|
27
71
|
await fs.mkdir(this.dir, { recursive: true });
|
|
28
72
|
const tmp = `${this.file}.tmp`;
|
|
29
73
|
await fs.writeFile(tmp, JSON.stringify(entries, null, 2), "utf8");
|
|
30
74
|
await fs.rename(tmp, this.file);
|
|
75
|
+
await fs.rm(this.blockedPath, { force: true }).catch(() => {
|
|
76
|
+
/* маркера могло не быть */
|
|
77
|
+
});
|
|
78
|
+
}
|
|
79
|
+
/**
|
|
80
|
+
* Read-modify-write под межпроцессной блокировкой: два процесса на одном
|
|
81
|
+
* профиле не должны терять чужие записи (P2-16).
|
|
82
|
+
*/
|
|
83
|
+
async mutate(fn) {
|
|
84
|
+
await this.lock.initialize();
|
|
85
|
+
return withLockWait(this.lock, `registry-${this.backendId}`, async () => {
|
|
86
|
+
const entries = await this.load();
|
|
87
|
+
const result = await fn(entries);
|
|
88
|
+
await this.save(entries);
|
|
89
|
+
return result;
|
|
90
|
+
}, { timeoutMs: 15000, staleMs: 60000 });
|
|
31
91
|
}
|
|
32
92
|
async find(name) {
|
|
33
93
|
const entries = await this.load();
|
|
34
94
|
return entries.find((e) => e.name.toLowerCase() === name.toLowerCase());
|
|
35
95
|
}
|
|
36
96
|
async upsert(entry) {
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
97
|
+
await this.mutate((entries) => {
|
|
98
|
+
const index = entries.findIndex((e) => e.name.toLowerCase() === entry.name.toLowerCase());
|
|
99
|
+
if (index === -1)
|
|
100
|
+
entries.push(entry);
|
|
101
|
+
else
|
|
102
|
+
entries[index] = entry;
|
|
103
|
+
});
|
|
44
104
|
}
|
|
45
105
|
async remove(name) {
|
|
46
|
-
|
|
47
|
-
|
|
106
|
+
await this.mutate((entries) => {
|
|
107
|
+
const index = entries.findIndex((e) => e.name.toLowerCase() === name.toLowerCase());
|
|
108
|
+
if (index !== -1)
|
|
109
|
+
entries.splice(index, 1);
|
|
110
|
+
});
|
|
48
111
|
}
|
|
49
112
|
async setPaused(name, paused) {
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
await this.save(entries);
|
|
113
|
+
await this.mutate((entries) => {
|
|
114
|
+
const entry = entries.find((e) => e.name.toLowerCase() === name.toLowerCase());
|
|
115
|
+
if (entry)
|
|
116
|
+
entry.paused = paused;
|
|
117
|
+
});
|
|
56
118
|
}
|
|
57
119
|
}
|
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
import type { RunTaskResult, SchedulerBackend } from "./types.js";
|
|
2
|
+
/**
|
|
3
|
+
* Немедленный запуск задачи в обход schedule-gate.
|
|
4
|
+
*
|
|
5
|
+
* Зачем: для poll-режима (расширенный cron / чужая IANA-таймзона / окно
|
|
6
|
+
* запуска) обёртка всегда прогоняет schedule-gate, и запуск вне cron-окна
|
|
7
|
+
* молча завершается с exit 3. Это касается не только `run_task_now`, но и
|
|
8
|
+
* цепочек (nextTaskOnSuccess / nextTaskOnError), DAG-зависимостей и retry:
|
|
9
|
+
* они тоже запускают задачу «сейчас», а не «по расписанию».
|
|
10
|
+
*
|
|
11
|
+
* Маркер `requestImmediateRun` снимает проверку расписания внутри обёртки.
|
|
12
|
+
* Если планировщик не принял запуск, маркер удаляется, чтобы он не «разрешил»
|
|
13
|
+
* следующий плановый тик в обход расписания.
|
|
14
|
+
*/
|
|
15
|
+
export declare function runTaskNow(taskName: string, backend?: SchedulerBackend): Promise<RunTaskResult>;
|
|
16
|
+
//# sourceMappingURL=run-now.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"run-now.d.ts","sourceRoot":"","sources":["../../../src/core/scheduler/run-now.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAElE;;;;;;;;;;;;GAYG;AACH,wBAAsB,UAAU,CAC9B,QAAQ,EAAE,MAAM,EAChB,OAAO,GAAE,gBAA2C,GACnD,OAAO,CAAC,aAAa,CAAC,CAUxB"}
|
|
@@ -0,0 +1,28 @@
|
|
|
1
|
+
import fs from "node:fs/promises";
|
|
2
|
+
import { requestImmediateRun } from "../ps-wrapper.js";
|
|
3
|
+
import { createSchedulerBackend } from "./index.js";
|
|
4
|
+
/**
|
|
5
|
+
* Немедленный запуск задачи в обход schedule-gate.
|
|
6
|
+
*
|
|
7
|
+
* Зачем: для poll-режима (расширенный cron / чужая IANA-таймзона / окно
|
|
8
|
+
* запуска) обёртка всегда прогоняет schedule-gate, и запуск вне cron-окна
|
|
9
|
+
* молча завершается с exit 3. Это касается не только `run_task_now`, но и
|
|
10
|
+
* цепочек (nextTaskOnSuccess / nextTaskOnError), DAG-зависимостей и retry:
|
|
11
|
+
* они тоже запускают задачу «сейчас», а не «по расписанию».
|
|
12
|
+
*
|
|
13
|
+
* Маркер `requestImmediateRun` снимает проверку расписания внутри обёртки.
|
|
14
|
+
* Если планировщик не принял запуск, маркер удаляется, чтобы он не «разрешил»
|
|
15
|
+
* следующий плановый тик в обход расписания.
|
|
16
|
+
*/
|
|
17
|
+
export async function runTaskNow(taskName, backend = createSchedulerBackend()) {
|
|
18
|
+
const forceFile = await requestImmediateRun(taskName);
|
|
19
|
+
try {
|
|
20
|
+
return await backend.runTask(taskName);
|
|
21
|
+
}
|
|
22
|
+
catch (err) {
|
|
23
|
+
await fs.unlink(forceFile).catch(() => {
|
|
24
|
+
/* маркер мог быть уже поглощён gate'ом или удалён по TTL */
|
|
25
|
+
});
|
|
26
|
+
throw err;
|
|
27
|
+
}
|
|
28
|
+
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"windows.d.ts","sourceRoot":"","sources":["../../../src/core/scheduler/windows.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AAMxD,OAAO,KAAK,EACV,iBAAiB,EACjB,aAAa,EACb,gBAAgB,EACjB,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"windows.d.ts","sourceRoot":"","sources":["../../../src/core/scheduler/windows.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,22 +7,25 @@ import { buildScheduleFlags, convertCronToSchTasks } from "../cron-to-schtasks.j
|
|
|
7
7
|
import { buildWindowsOneShotFlags } from "../one-shot.js";
|
|
8
8
|
import { needsPollMode } from "../schedule-v2.js";
|
|
9
9
|
const execFileAsync = promisify(execFile);
|
|
10
|
-
/** Кэш формата даты локали Windows (ShortDatePattern), полученного через PowerShell.
|
|
10
|
+
/** Кэш формата даты локали Windows (ShortDatePattern), полученного через PowerShell.
|
|
11
|
+
* Храним промис, а не готовую строку: параллельные вызовы ждут один и тот же
|
|
12
|
+
* результат и не запускают PowerShell по несколько раз (гонка при await). */
|
|
11
13
|
let windowsDateFormatCache = null;
|
|
12
14
|
/** Определяет формат даты системной локали через PowerShell (P1-8). */
|
|
13
15
|
async function getWindowsDateFormat() {
|
|
14
|
-
if (windowsDateFormatCache
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
16
|
+
if (windowsDateFormatCache === null) {
|
|
17
|
+
windowsDateFormatCache = (async () => {
|
|
18
|
+
try {
|
|
19
|
+
const { stdout } = await execFileAsync("powershell.exe", ["-NoProfile", "-Command", "(Get-Culture).DateTimeFormat.ShortDatePattern"], { maxBuffer: MAX_OUTPUT_BUFFER });
|
|
20
|
+
const pattern = String(stdout).trim();
|
|
21
|
+
return pattern || "dd.MM.yyyy";
|
|
22
|
+
}
|
|
23
|
+
catch {
|
|
24
|
+
return "dd.MM.yyyy";
|
|
25
|
+
}
|
|
26
|
+
})();
|
|
25
27
|
}
|
|
28
|
+
return windowsDateFormatCache;
|
|
26
29
|
}
|
|
27
30
|
/** Форматирует дату «никогда» (заглушка для file/git/mcp-триггеров) в формате локали. */
|
|
28
31
|
async function buildNeverDate(format) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"secrets.d.ts","sourceRoot":"","sources":["../../src/core/secrets.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"secrets.d.ts","sourceRoot":"","sources":["../../src/core/secrets.ts"],"names":[],"mappings":"AAQA;;;;;;;;;;;;;GAaG;AAEH,eAAO,MAAM,YAAY,QAAwC,CAAC;AAClE,eAAO,MAAM,gBAAgB,QAAuC,CAAC;AACrE,eAAO,MAAM,aAAa,QAAyC,CAAC;AAkGpE,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,qEAAqE;IACrE,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;CACnB;AAoBD,0DAA0D;AAC1D,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAQvD;AAED,wEAAwE;AACxE,wBAAgB,YAAY,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAIpD;AAoOD,qEAAqE;AACrE,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,cAAc,CAoBrE;AAED,yEAAyE;AACzE,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAW1D;AAED,uDAAuD;AACvD,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAE/C;AAED,0CAA0C;AAC1C,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CASlD;AASD,6EAA6E;AAC7E,wBAAgB,WAAW,IAAI,cAAc,EAAE,CAc9C;AAED,kMAAkM;AAClM,wBAAgB,gBAAgB,CAC9B,KAAK,EAAE,MAAM,EACb,kBAAkB,CAAC,EAAE,MAAM,EAAE,GAC5B;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,EAAE,CAAA;CAAE,CAkBtC;AAED;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAC/B,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAC3B,kBAAkB,CAAC,EAAE,MAAM,EAAE,GAC5B;IAAE,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAAC,OAAO,EAAE,MAAM,EAAE,CAAA;CAAE,CASpD;AA8BD;;;GAGG;AACH,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,OAAO,GAAG,MAAM,CA+BzD;AAED,qEAAqE;AACrE,wBAAgB,iBAAiB,IAAI,IAAI,CAIxC;AAED;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,GAAG,MAAM,EAAE,CAAC,MAAM,GAAG,SAAS,CAAC,EAAE,GAAG,MAAM,EAAE,CAW9E"}
|