agent-steward 0.0.4 → 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 +134 -2
- package/CROSS_PLATFORM.md +19 -0
- package/README.md +52 -7
- package/ROADMAP-STRATEGY.md +21 -18
- package/ROADMAP.md +140 -159
- package/dist/cli.d.ts +3 -0
- package/dist/cli.d.ts.map +1 -0
- package/dist/cli.js +351 -0
- 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 +41 -0
- package/dist/core/lock.d.ts.map +1 -1
- package/dist/core/lock.js +141 -29
- 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/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 +250 -62
- package/dist/core/record-history.d.ts.map +1 -1
- package/dist/core/record-history.js +130 -29
- package/dist/core/router/rules.d.ts.map +1 -1
- package/dist/core/router/rules.js +6 -0
- package/dist/core/scheduler/linux.d.ts +8 -1
- package/dist/core/scheduler/linux.d.ts.map +1 -1
- package/dist/core/scheduler/linux.js +34 -9
- 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/windows.d.ts.map +1 -1
- package/dist/core/scheduler/windows.js +15 -12
- package/dist/core/structured-log.d.ts +7 -1
- package/dist/core/structured-log.d.ts.map +1 -1
- 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 +175 -24
- package/dist/db/capability-repo.d.ts +43 -2
- package/dist/db/capability-repo.d.ts.map +1 -1
- package/dist/db/capability-repo.js +96 -11
- package/dist/db/history-repo.d.ts +38 -5
- package/dist/db/history-repo.d.ts.map +1 -1
- package/dist/db/history-repo.js +88 -25
- package/dist/db/metrics-repo.js +2 -2
- package/dist/db/recovery.d.ts.map +1 -1
- package/dist/db/recovery.js +5 -4
- 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 +5 -0
- package/dist/db/run-resume.d.ts.map +1 -1
- package/dist/db/run-resume.js +9 -2
- package/dist/db/runs-repo.d.ts +19 -2
- package/dist/db/runs-repo.d.ts.map +1 -1
- package/dist/db/runs-repo.js +22 -6
- package/dist/db/schema.d.ts +2 -2
- package/dist/db/schema.d.ts.map +1 -1
- package/dist/db/schema.js +63 -2
- 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 +136 -2
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +378 -14
- 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 +246 -0
- package/dist/rpc.d.ts.map +1 -1
- package/dist/rpc.js +117 -0
- package/dist/server.d.ts +15 -0
- package/dist/server.d.ts.map +1 -1
- package/dist/server.js +77 -18
- 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/docs/ARCHITECTURE.md +281 -65
- package/docs/COMPATIBILITY.md +2 -2
- package/docs/CONCEPT.md +18 -4
- package/docs/CROSS_PLATFORM.ru.md +20 -0
- package/docs/CROSS_PLATFORM.zh.md +18 -0
- package/docs/EXECUTION-LOOP.md +22 -7
- 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 +42 -3
- package/docs/README.zh.md +43 -3
- package/docs/SAFETY.md +23 -3
- package/gui-experimental.cjs +9 -8
- package/locales/en.json +17 -1
- package/locales/ru.json +17 -1
- package/locales/zh.json +17 -1
- package/opencode.pipeline.yaml +35 -0
- package/package.json +23 -4
- package/scripts/test-home.mjs +83 -0
- package/src/cli.ts +412 -0
- package/src/core/dry-run.ts +2 -2
- 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 +178 -37
- 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/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 +263 -63
- package/src/core/record-history.ts +164 -77
- package/src/core/router/rules.ts +6 -0
- package/src/core/schedule-gate.ts +1 -1
- package/src/core/scheduler/at-fallback.ts +1 -1
- package/src/core/scheduler/linux.ts +40 -11
- package/src/core/scheduler/logs.ts +2 -2
- package/src/core/scheduler/mac.ts +174 -14
- package/src/core/scheduler/registry.ts +2 -2
- package/src/core/scheduler/windows.ts +19 -15
- package/src/core/secrets.ts +8 -8
- package/src/core/structured-log.ts +22 -5
- 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 +190 -23
- package/src/db/capability-repo.ts +127 -10
- package/src/db/history-repo.ts +129 -22
- package/src/db/metrics-repo.ts +2 -2
- package/src/db/recovery.ts +5 -4
- package/src/db/run-journal.ts +100 -13
- package/src/db/run-resume.ts +17 -1
- package/src/db/runs-repo.ts +36 -6
- package/src/db/schema.ts +65 -2
- package/src/gui.tsx +177 -13
- package/src/history.ts +1 -1
- package/src/i18n.ts +12 -4
- package/src/index.ts +524 -4
- package/src/notifications.ts +38 -8
- package/src/profiles.ts +26 -4
- package/src/rpc.ts +128 -0
- package/src/server.ts +94 -18
- package/src/settings.ts +5 -5
- package/src/shared/jobs-view.ts +3 -1
- package/src/task-transfer.ts +31 -0
|
@@ -16,6 +16,12 @@ import type { RegistryEntry } from "./registry.js";
|
|
|
16
16
|
|
|
17
17
|
const execFileAsync = promisify(execFile);
|
|
18
18
|
|
|
19
|
+
/** O-2: неудачная уборка temp/plist не проглатывается молча. */
|
|
20
|
+
function warnCleanupFailure(target: string, error: unknown): void {
|
|
21
|
+
const reason = error instanceof Error ? error.message : String(error);
|
|
22
|
+
console.warn(`[agent-steward] Не удалось удалить plist «${target}»: ${reason}`);
|
|
23
|
+
}
|
|
24
|
+
|
|
19
25
|
/** Папка пользовательских LaunchAgents. */
|
|
20
26
|
const LAUNCH_AGENTS_DIR = path.join(os.homedir(), "Library", "LaunchAgents");
|
|
21
27
|
|
|
@@ -247,12 +253,147 @@ function buildPlist(label: string, entry: RegistryEntry): string {
|
|
|
247
253
|
].join("\n");
|
|
248
254
|
}
|
|
249
255
|
|
|
256
|
+
/** Ошибка запуска launchctl с командой, кодом выхода и stderr. */
|
|
257
|
+
export function describeLaunchctlError(args: string[], err: unknown): string {
|
|
258
|
+
const error = err as {
|
|
259
|
+
code?: number | string;
|
|
260
|
+
signal?: string;
|
|
261
|
+
stderr?: string | Buffer;
|
|
262
|
+
stdout?: string | Buffer;
|
|
263
|
+
message?: string;
|
|
264
|
+
};
|
|
265
|
+
const stderr = String(error.stderr ?? "").trim();
|
|
266
|
+
const stdout = String(error.stdout ?? "").trim();
|
|
267
|
+
const detail = stderr || stdout || error.message || "вывод пуст";
|
|
268
|
+
const status =
|
|
269
|
+
error.code !== undefined
|
|
270
|
+
? `код ${String(error.code)}`
|
|
271
|
+
: error.signal
|
|
272
|
+
? `сигнал ${error.signal}`
|
|
273
|
+
: "без кода выхода";
|
|
274
|
+
return `launchctl ${args.join(" ")}: ${status}: ${detail}`;
|
|
275
|
+
}
|
|
276
|
+
|
|
277
|
+
/**
|
|
278
|
+
* Запускает launchctl и либо пробрасывает ошибку с stderr/exit code,
|
|
279
|
+
* либо глотает её (unload незагруженного агента — штатная ситуация).
|
|
280
|
+
*/
|
|
281
|
+
export async function runLaunchctl(
|
|
282
|
+
runner: (args: string[]) => Promise<unknown>,
|
|
283
|
+
args: string[],
|
|
284
|
+
options: { tolerateFailure?: boolean } = {},
|
|
285
|
+
): Promise<void> {
|
|
286
|
+
try {
|
|
287
|
+
await runner(args);
|
|
288
|
+
} catch (err) {
|
|
289
|
+
if (options.tolerateFailure) return;
|
|
290
|
+
const failure = new Error(describeLaunchctlError(args, err)) as Error & {
|
|
291
|
+
cause?: unknown;
|
|
292
|
+
};
|
|
293
|
+
// target/lib проекта не включает ErrorOptions, поэтому cause ставим вручную.
|
|
294
|
+
failure.cause = err;
|
|
295
|
+
throw failure;
|
|
296
|
+
}
|
|
297
|
+
}
|
|
298
|
+
|
|
299
|
+
/** Команды launchctl при установке записи. */
|
|
300
|
+
export interface LaunchctlInstallPlan {
|
|
301
|
+
/** unload перед перезаписью plist (best effort: агент мог быть не загружен). */
|
|
302
|
+
beforeWrite: string[];
|
|
303
|
+
/** load после записи; null — задача на паузе, загружать её нельзя. */
|
|
304
|
+
afterWrite: string[] | null;
|
|
305
|
+
}
|
|
306
|
+
|
|
307
|
+
/**
|
|
308
|
+
* B5: `load -w` не только загружает агент, но и снимает Disabled,
|
|
309
|
+
* поэтому для приостановленной задачи его вызывать нельзя — иначе
|
|
310
|
+
* установка молча возобновляет задачу. Вместо этого `unload -w`
|
|
311
|
+
* фиксирует Disabled, чтобы launchd не загрузил агент при следующем входе.
|
|
312
|
+
*/
|
|
313
|
+
export function planLaunchctlInstall(
|
|
314
|
+
paused: boolean,
|
|
315
|
+
plistPath: string,
|
|
316
|
+
): LaunchctlInstallPlan {
|
|
317
|
+
if (paused) {
|
|
318
|
+
return {
|
|
319
|
+
beforeWrite: ["unload", "-w", plistPath],
|
|
320
|
+
afterWrite: null,
|
|
321
|
+
};
|
|
322
|
+
}
|
|
323
|
+
return {
|
|
324
|
+
beforeWrite: ["unload", plistPath],
|
|
325
|
+
afterWrite: ["load", "-w", plistPath],
|
|
326
|
+
};
|
|
327
|
+
}
|
|
328
|
+
|
|
329
|
+
/**
|
|
330
|
+
* ML-1: macOS 13 (Darwin 22) заменяет `load`/`unload` на `bootstrap`/`bootout`
|
|
331
|
+
* с явным доменом `gui/<uid>`. `-w` у legacy-команды здесь не нужен: bootstrap
|
|
332
|
+
* сам регистрирует агент, а bootout — снимает регистрацию.
|
|
333
|
+
*/
|
|
334
|
+
export function modernLaunchctlArgs(args: string[], uid: number = process.getuid?.() ?? 501): string[] {
|
|
335
|
+
const [command, ...rest] = args;
|
|
336
|
+
if (command !== "load" && command !== "unload") return args;
|
|
337
|
+
const plist = rest.filter((part) => part !== "-w");
|
|
338
|
+
return [command === "load" ? "bootstrap" : "bootout", `gui/${uid}`, ...plist];
|
|
339
|
+
}
|
|
340
|
+
|
|
341
|
+
/** Современные команды доступны на macOS 13+ (Darwin 22+). */
|
|
342
|
+
export function supportsModernLaunchctl(
|
|
343
|
+
platform: NodeJS.Platform = process.platform,
|
|
344
|
+
release: string = os.release(),
|
|
345
|
+
): boolean {
|
|
346
|
+
if (platform !== "darwin") return true;
|
|
347
|
+
const darwinMajor = Number.parseInt(release.split(".")[0] ?? "", 10);
|
|
348
|
+
return Number.isFinite(darwinMajor) ? darwinMajor >= 22 : true;
|
|
349
|
+
}
|
|
350
|
+
|
|
351
|
+
/** Признак того, что launchctl не знает bootstrap/bootout (максимально старая macOS). */
|
|
352
|
+
function needsLegacyLaunchctlFallback(error: unknown): boolean {
|
|
353
|
+
const source = error as { message?: unknown; stderr?: unknown } | null;
|
|
354
|
+
const text = `${String(source?.message ?? "")}\n${String(source?.stderr ?? "")}`;
|
|
355
|
+
return /unrecognized subcommand|unknown subcommand|invalid subcommand|unrecognized option|Usage:/i.test(
|
|
356
|
+
text,
|
|
357
|
+
);
|
|
358
|
+
}
|
|
359
|
+
|
|
360
|
+
/**
|
|
361
|
+
* Выполняет launchctl через современные команды; при отсутствии поддержки
|
|
362
|
+
* (macOS < 13 или «unrecognized subcommand») повторяет legacy-аргументы.
|
|
363
|
+
*/
|
|
364
|
+
export async function runLaunchctlModern(
|
|
365
|
+
runner: (args: string[]) => Promise<unknown>,
|
|
366
|
+
args: string[],
|
|
367
|
+
options: { tolerateFailure?: boolean } = {},
|
|
368
|
+
): Promise<void> {
|
|
369
|
+
const modern = supportsModernLaunchctl() ? modernLaunchctlArgs(args) : args;
|
|
370
|
+
await runLaunchctl(
|
|
371
|
+
async (call) => {
|
|
372
|
+
try {
|
|
373
|
+
await runner(call);
|
|
374
|
+
} catch (err) {
|
|
375
|
+
if (modern !== args && needsLegacyLaunchctlFallback(err)) {
|
|
376
|
+
await runner(args);
|
|
377
|
+
return;
|
|
378
|
+
}
|
|
379
|
+
throw err;
|
|
380
|
+
}
|
|
381
|
+
},
|
|
382
|
+
modern,
|
|
383
|
+
options,
|
|
384
|
+
);
|
|
385
|
+
}
|
|
386
|
+
|
|
250
387
|
/**
|
|
251
388
|
* Бэкенд планировщика macOS на основе launchd.
|
|
252
389
|
*
|
|
253
390
|
* Каждая задача — отдельный LaunchAgent:
|
|
254
391
|
* ~/Library/LaunchAgents/com.opencode.scheduler.<name>.plist
|
|
255
|
-
* Управление — через launchctl
|
|
392
|
+
* Управление — через `launchctl bootstrap/bootout` (macOS ≥13), с фолбэком
|
|
393
|
+
* на legacy `load/unload -w` для более старых систем. `planLaunchctlInstall`
|
|
394
|
+
* намеренно остаётся на legacy-командах: обратная совместимость контракта.
|
|
395
|
+
* Ошибки загрузки не глотаются: битый plist должен вернуть ошибку установки,
|
|
396
|
+
* а не оставить задачу молча незапланированной.
|
|
256
397
|
*/
|
|
257
398
|
export class MacScheduler extends PosixSchedulerBase {
|
|
258
399
|
readonly platform: NodeJS.Platform = "darwin";
|
|
@@ -288,34 +429,53 @@ export class MacScheduler extends PosixSchedulerBase {
|
|
|
288
429
|
return path.join(LAUNCH_AGENTS_DIR, `${this.label(name)}.plist`);
|
|
289
430
|
}
|
|
290
431
|
|
|
291
|
-
/** Выполняет launchctl
|
|
292
|
-
private async launchctl(
|
|
293
|
-
|
|
294
|
-
|
|
295
|
-
|
|
296
|
-
|
|
297
|
-
|
|
432
|
+
/** Выполняет launchctl; tolerateFailure оставлен только для bootout/unload. */
|
|
433
|
+
private async launchctl(
|
|
434
|
+
args: string[],
|
|
435
|
+
options: { tolerateFailure?: boolean } = {},
|
|
436
|
+
): Promise<void> {
|
|
437
|
+
await runLaunchctlModern(
|
|
438
|
+
(call) => execFileAsync("launchctl", call, { maxBuffer: 1024 * 1024 }),
|
|
439
|
+
args,
|
|
440
|
+
options,
|
|
441
|
+
);
|
|
298
442
|
}
|
|
299
443
|
|
|
300
444
|
protected async installEntry(entry: RegistryEntry): Promise<void> {
|
|
301
445
|
await fs.mkdir(LAUNCH_AGENTS_DIR, { recursive: true });
|
|
302
446
|
const plistPath = this.plistPath(entry.name);
|
|
303
|
-
|
|
304
|
-
|
|
305
|
-
await this.launchctl(
|
|
447
|
+
const plan = planLaunchctlInstall(entry.paused, plistPath);
|
|
448
|
+
// Агент мог быть не загружен — это не ошибка.
|
|
449
|
+
await this.launchctl(plan.beforeWrite, { tolerateFailure: true });
|
|
450
|
+
// Пишем в уникальный temp и переименовываем: launchctl не должен увидеть
|
|
451
|
+
// полузаписанный plist, если процесс упадёт посреди записи.
|
|
452
|
+
const tmpPath = `${plistPath}.${process.pid}.${Date.now()}.tmp`;
|
|
453
|
+
try {
|
|
454
|
+
await fs.writeFile(tmpPath, buildPlist(this.label(entry.name), entry), "utf8");
|
|
455
|
+
await fs.rename(tmpPath, plistPath);
|
|
456
|
+
} catch (error) {
|
|
457
|
+
await fs.rm(tmpPath, { force: true }).catch((cleanupError: unknown) =>
|
|
458
|
+
warnCleanupFailure(tmpPath, cleanupError),
|
|
459
|
+
);
|
|
460
|
+
throw error;
|
|
461
|
+
}
|
|
462
|
+
if (plan.afterWrite) {
|
|
463
|
+
await this.launchctl(plan.afterWrite);
|
|
464
|
+
}
|
|
306
465
|
}
|
|
307
466
|
|
|
308
467
|
protected async uninstallEntry(entry: RegistryEntry): Promise<void> {
|
|
309
468
|
const plistPath = this.plistPath(entry.name);
|
|
310
|
-
await this.launchctl(["unload", "-w", plistPath]);
|
|
311
|
-
await fs.unlink(plistPath).catch(() =>
|
|
469
|
+
await this.launchctl(["unload", "-w", plistPath], { tolerateFailure: true });
|
|
470
|
+
await fs.unlink(plistPath).catch((error: unknown) => warnCleanupFailure(plistPath, error));
|
|
312
471
|
}
|
|
313
472
|
|
|
314
473
|
protected async applyPause(entry: RegistryEntry, paused: boolean): Promise<void> {
|
|
315
474
|
const plistPath = this.plistPath(entry.name);
|
|
316
475
|
if (paused) {
|
|
317
|
-
await this.launchctl(["unload", "-w", plistPath]);
|
|
476
|
+
await this.launchctl(["unload", "-w", plistPath], { tolerateFailure: true });
|
|
318
477
|
} else {
|
|
478
|
+
// Возобновление не должно «удаваться» молча при битом plist.
|
|
319
479
|
await this.launchctl(["load", "-w", plistPath]);
|
|
320
480
|
}
|
|
321
481
|
}
|
|
@@ -62,8 +62,8 @@ export class TaskRegistry {
|
|
|
62
62
|
let raw: string;
|
|
63
63
|
try {
|
|
64
64
|
raw = await fs.readFile(this.file, "utf8");
|
|
65
|
-
} catch (err:
|
|
66
|
-
if (err?.code === "ENOENT") {
|
|
65
|
+
} catch (err: unknown) {
|
|
66
|
+
if ((err as NodeJS.ErrnoException | undefined)?.code === "ENOENT") {
|
|
67
67
|
// Карантин уже переместил файл. Пустой реестр нельзя выдавать за
|
|
68
68
|
// «задач нет»: rebuildCrontab вычистил бы все cron-строки плагина.
|
|
69
69
|
const blocked = await fs.readFile(this.blockedPath, "utf8").catch(() => null);
|
|
@@ -15,25 +15,29 @@ import type {
|
|
|
15
15
|
|
|
16
16
|
const execFileAsync = promisify(execFile);
|
|
17
17
|
|
|
18
|
-
/** Кэш формата даты локали Windows (ShortDatePattern), полученного через PowerShell.
|
|
19
|
-
|
|
18
|
+
/** Кэш формата даты локали Windows (ShortDatePattern), полученного через PowerShell.
|
|
19
|
+
* Храним промис, а не готовую строку: параллельные вызовы ждут один и тот же
|
|
20
|
+
* результат и не запускают PowerShell по несколько раз (гонка при await). */
|
|
21
|
+
let windowsDateFormatCache: Promise<string> | null = null;
|
|
20
22
|
|
|
21
23
|
/** Определяет формат даты системной локали через PowerShell (P1-8). */
|
|
22
24
|
async function getWindowsDateFormat(): Promise<string> {
|
|
23
|
-
if (windowsDateFormatCache
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
25
|
+
if (windowsDateFormatCache === null) {
|
|
26
|
+
windowsDateFormatCache = (async () => {
|
|
27
|
+
try {
|
|
28
|
+
const { stdout } = await execFileAsync(
|
|
29
|
+
"powershell.exe",
|
|
30
|
+
["-NoProfile", "-Command", "(Get-Culture).DateTimeFormat.ShortDatePattern"],
|
|
31
|
+
{ maxBuffer: MAX_OUTPUT_BUFFER },
|
|
32
|
+
);
|
|
33
|
+
const pattern = String(stdout).trim();
|
|
34
|
+
return pattern || "dd.MM.yyyy";
|
|
35
|
+
} catch {
|
|
36
|
+
return "dd.MM.yyyy";
|
|
37
|
+
}
|
|
38
|
+
})();
|
|
36
39
|
}
|
|
40
|
+
return windowsDateFormatCache;
|
|
37
41
|
}
|
|
38
42
|
|
|
39
43
|
/** Форматирует дату «никогда» (заглушка для file/git/mcp-триггеров) в формате локали. */
|
package/src/core/secrets.ts
CHANGED
|
@@ -67,8 +67,8 @@ function withSecretsLock<T>(fn: () => T): T {
|
|
|
67
67
|
}
|
|
68
68
|
secretsLockDepth = 1;
|
|
69
69
|
break;
|
|
70
|
-
} catch (err:
|
|
71
|
-
if (err?.code !== "EEXIST") throw err;
|
|
70
|
+
} catch (err: unknown) {
|
|
71
|
+
if ((err as NodeJS.ErrnoException | undefined)?.code !== "EEXIST") throw err;
|
|
72
72
|
try {
|
|
73
73
|
const stat = fs.statSync(SECRETS_LOCK_FILE);
|
|
74
74
|
if (Date.now() - stat.mtimeMs > SECRETS_LOCK_STALE_MS) {
|
|
@@ -239,8 +239,8 @@ function loadKey(): Buffer {
|
|
|
239
239
|
chmodPrivate(SECRETS_KEY_FILE);
|
|
240
240
|
keyCache = { stamp, key: raw };
|
|
241
241
|
return raw;
|
|
242
|
-
} catch (err:
|
|
243
|
-
if (err?.code !== "ENOENT") throw err;
|
|
242
|
+
} catch (err: unknown) {
|
|
243
|
+
if ((err as NodeJS.ErrnoException | undefined)?.code !== "ENOENT") throw err;
|
|
244
244
|
// Два процесса могли одновременно не найти ключ и сгенерировать разный.
|
|
245
245
|
// Под локом перечитываем файл: побеждает первый, остальные используют его ключ.
|
|
246
246
|
return withSecretsLock(() => {
|
|
@@ -254,8 +254,8 @@ function loadKey(): Buffer {
|
|
|
254
254
|
key: raw,
|
|
255
255
|
};
|
|
256
256
|
return raw;
|
|
257
|
-
} catch (readErr:
|
|
258
|
-
if (readErr?.code !== "ENOENT") throw readErr;
|
|
257
|
+
} catch (readErr: unknown) {
|
|
258
|
+
if ((readErr as NodeJS.ErrnoException | undefined)?.code !== "ENOENT") throw readErr;
|
|
259
259
|
}
|
|
260
260
|
const key = crypto.randomBytes(KEY_BYTES);
|
|
261
261
|
fs.writeFileSync(SECRETS_KEY_FILE, key, { mode: 0o600 });
|
|
@@ -337,8 +337,8 @@ function readFileSafe(): SecretsFile {
|
|
|
337
337
|
const file: SecretsFile = { version: 1, secrets };
|
|
338
338
|
cache = { stamp, file };
|
|
339
339
|
return file;
|
|
340
|
-
} catch (err:
|
|
341
|
-
if (err?.code === "ENOENT") return emptyFile();
|
|
340
|
+
} catch (err: unknown) {
|
|
341
|
+
if ((err as NodeJS.ErrnoException | undefined)?.code === "ENOENT") return emptyFile();
|
|
342
342
|
// Не глотаем повреждение молча: иначе setSecret запишет пустой файл поверх.
|
|
343
343
|
quarantineCorruptStore(err);
|
|
344
344
|
return emptyFile();
|
|
@@ -18,7 +18,18 @@ import { redactSecretsInText } from "./secrets.js";
|
|
|
18
18
|
*/
|
|
19
19
|
|
|
20
20
|
/** События структурированного лога. */
|
|
21
|
-
export type StructuredLogEvent =
|
|
21
|
+
export type StructuredLogEvent =
|
|
22
|
+
| "run.started"
|
|
23
|
+
| "run.finished"
|
|
24
|
+
| "hook.received"
|
|
25
|
+
| "matrix.started"
|
|
26
|
+
| "matrix.advanced"
|
|
27
|
+
| "matrix.queue_started"
|
|
28
|
+
| "matrix.cancelled"
|
|
29
|
+
| "matrix.aggregated"
|
|
30
|
+
| "matrix.aggregator_started"
|
|
31
|
+
| "matrix.error"
|
|
32
|
+
| string;
|
|
22
33
|
|
|
23
34
|
export interface StructuredLogRecord {
|
|
24
35
|
/** Время записи (ISO). */
|
|
@@ -49,6 +60,12 @@ export interface StructuredLogRecord {
|
|
|
49
60
|
payloadBytes?: number;
|
|
50
61
|
/** Причина отказа/пропуска. */
|
|
51
62
|
reason?: string;
|
|
63
|
+
/** Родительская задача матрицы (matrixId === task для событий matrix.*). */
|
|
64
|
+
matrixId?: string;
|
|
65
|
+
/** Имя клона матрицы, к которому относится событие. */
|
|
66
|
+
cloneName?: string;
|
|
67
|
+
/** Шаг матричного сценария: started, advanced, cancelled, aggregated и т.п. */
|
|
68
|
+
step?: string;
|
|
52
69
|
}
|
|
53
70
|
|
|
54
71
|
export interface ReadStructuredLogsFilter {
|
|
@@ -101,9 +118,9 @@ function rotateIfNeeded(): void {
|
|
|
101
118
|
// Нет старого архива — не страшно.
|
|
102
119
|
}
|
|
103
120
|
fs.renameSync(STRUCTURED_LOG_FILE, STRUCTURED_LOG_ARCHIVE);
|
|
104
|
-
} catch (err:
|
|
121
|
+
} catch (err: unknown) {
|
|
105
122
|
// ENOENT — файла ещё нет, это нормально.
|
|
106
|
-
if (err?.code !== "ENOENT") warn("не удалось ротировать лог", err);
|
|
123
|
+
if ((err as NodeJS.ErrnoException | undefined)?.code !== "ENOENT") warn("не удалось ротировать лог", err);
|
|
107
124
|
}
|
|
108
125
|
}
|
|
109
126
|
|
|
@@ -143,8 +160,8 @@ function readLines(file: string): string[] {
|
|
|
143
160
|
.readFileSync(file, "utf8")
|
|
144
161
|
.split(/\r?\n/)
|
|
145
162
|
.filter((line) => line.trim().length > 0);
|
|
146
|
-
} catch (err:
|
|
147
|
-
if (err?.code !== "ENOENT") warn(`не удалось прочитать ${file}`, err);
|
|
163
|
+
} catch (err: unknown) {
|
|
164
|
+
if ((err as NodeJS.ErrnoException | undefined)?.code !== "ENOENT") warn(`не удалось прочитать ${file}`, err);
|
|
148
165
|
return [];
|
|
149
166
|
}
|
|
150
167
|
}
|
package/src/core/telegram.ts
CHANGED
|
@@ -418,8 +418,8 @@ export async function sendTelegramMessage(
|
|
|
418
418
|
);
|
|
419
419
|
}
|
|
420
420
|
break;
|
|
421
|
-
} catch (err:
|
|
422
|
-
if (err?.name === "AbortError") {
|
|
421
|
+
} catch (err: unknown) {
|
|
422
|
+
if ((err as Error | undefined)?.name === "AbortError") {
|
|
423
423
|
throw new Error(
|
|
424
424
|
t("notify.error.telegramTimeout", {
|
|
425
425
|
seconds: Math.floor(timeoutMs / 1000),
|
|
@@ -65,8 +65,8 @@ function processAlive(pid: number): boolean {
|
|
|
65
65
|
try {
|
|
66
66
|
process.kill(pid, 0);
|
|
67
67
|
return true;
|
|
68
|
-
} catch (err:
|
|
69
|
-
return err?.code === "EPERM";
|
|
68
|
+
} catch (err: unknown) {
|
|
69
|
+
return (err as NodeJS.ErrnoException | undefined)?.code === "EPERM";
|
|
70
70
|
}
|
|
71
71
|
}
|
|
72
72
|
|
|
@@ -82,8 +82,8 @@ function acquireWorkerSlot(dir: string): string | null {
|
|
|
82
82
|
fs.writeFileSync(fd, String(process.pid));
|
|
83
83
|
fs.closeSync(fd);
|
|
84
84
|
return slot;
|
|
85
|
-
} catch (err:
|
|
86
|
-
if (err?.code !== "EEXIST") continue;
|
|
85
|
+
} catch (err: unknown) {
|
|
86
|
+
if ((err as NodeJS.ErrnoException | undefined)?.code !== "EEXIST") continue;
|
|
87
87
|
let holder = 0;
|
|
88
88
|
try {
|
|
89
89
|
holder = parseInt(fs.readFileSync(slot, "utf8").trim(), 10);
|
|
@@ -245,7 +245,7 @@ export function scheduleTriageJob(
|
|
|
245
245
|
const dir = options.tmpDir ?? os.tmpdir();
|
|
246
246
|
pruneTriageArtifacts(dir);
|
|
247
247
|
file = writeTriageJob(input, triage, { tmpDir: dir });
|
|
248
|
-
} catch (err:
|
|
248
|
+
} catch (err: unknown) {
|
|
249
249
|
return {
|
|
250
250
|
scheduled: false,
|
|
251
251
|
error: err instanceof Error ? err.message : String(err),
|
|
@@ -267,7 +267,7 @@ export function scheduleTriageJob(
|
|
|
267
267
|
// Если процесс не стартовал, файл задания останется сиротой — убираем.
|
|
268
268
|
child.on?.("error", () => safeUnlink(file));
|
|
269
269
|
return { scheduled: true, file };
|
|
270
|
-
} catch (err:
|
|
270
|
+
} catch (err: unknown) {
|
|
271
271
|
safeUnlink(file);
|
|
272
272
|
return {
|
|
273
273
|
scheduled: false,
|
|
@@ -315,7 +315,7 @@ async function drainQueue(first: string): Promise<void> {
|
|
|
315
315
|
const file: string = current;
|
|
316
316
|
try {
|
|
317
317
|
await runTriageJob(file);
|
|
318
|
-
} catch (err:
|
|
318
|
+
} catch (err: unknown) {
|
|
319
319
|
console.error(
|
|
320
320
|
`[agent-steward] triage worker: ${
|
|
321
321
|
err instanceof Error ? err.message : String(err)
|
package/src/core/triage.ts
CHANGED
|
@@ -161,7 +161,7 @@ function parseVerdict(raw: string): TriageVerdict {
|
|
|
161
161
|
let parsed: unknown;
|
|
162
162
|
try {
|
|
163
163
|
parsed = JSON.parse(text.slice(start, end + 1));
|
|
164
|
-
} catch (err:
|
|
164
|
+
} catch (err: unknown) {
|
|
165
165
|
throw new ParseFailure(
|
|
166
166
|
"invalid-json",
|
|
167
167
|
`Ответ модели не парсится как JSON: ${err instanceof Error ? err.message : String(err)}`,
|
|
@@ -333,7 +333,7 @@ export async function classifyNotification(
|
|
|
333
333
|
protocol,
|
|
334
334
|
};
|
|
335
335
|
}
|
|
336
|
-
} catch (err:
|
|
336
|
+
} catch (err: unknown) {
|
|
337
337
|
const aborted = controller.signal.aborted;
|
|
338
338
|
const failure: TriageFailure = aborted
|
|
339
339
|
? "timeout"
|
|
@@ -0,0 +1,199 @@
|
|
|
1
|
+
#!/usr/bin/env node
|
|
2
|
+
/**
|
|
3
|
+
* W-1/W-2 (0.0.6): CLI-помощник обёртки для одноразовых git worktree.
|
|
4
|
+
*
|
|
5
|
+
* Создание (вызывается из сгенерированного .cmd/.sh):
|
|
6
|
+
* node worktree-run.js --repo "<workdir>" --task "<task name>" [--root <dir>] [--json]
|
|
7
|
+
* node worktree-run.js create --repo ... --task ...
|
|
8
|
+
*
|
|
9
|
+
* Очистка (после прогона и для остатков):
|
|
10
|
+
* node worktree-run.js cleanup --path "<worktree>" [--repo <root>] [--root <dir>] [--keep-branch] [--json]
|
|
11
|
+
* node worktree-run.js cleanup --stale [--root <dir>] [--max-age-hours <n>] [--json]
|
|
12
|
+
*
|
|
13
|
+
* При создании в stdout печатается только путь к worktree (одна строка) —
|
|
14
|
+
* обёртка ловит его и переходит туда. Диагностика и ошибки идут в stderr.
|
|
15
|
+
* При ошибке exit 1: обёртка обязана упасть fail-closed, а не работать в
|
|
16
|
+
* основном дереве.
|
|
17
|
+
*/
|
|
18
|
+
import path from "node:path";
|
|
19
|
+
import { pathToFileURL } from "node:url";
|
|
20
|
+
import {
|
|
21
|
+
cleanupStaleWorktrees,
|
|
22
|
+
createRunWorktree,
|
|
23
|
+
DEFAULT_STALE_AFTER_MS,
|
|
24
|
+
removeRunWorktree,
|
|
25
|
+
} from "./worktree.js";
|
|
26
|
+
|
|
27
|
+
type Mode = "create" | "cleanup";
|
|
28
|
+
|
|
29
|
+
interface HelperArgs {
|
|
30
|
+
mode: Mode;
|
|
31
|
+
repo?: string;
|
|
32
|
+
task?: string;
|
|
33
|
+
root?: string;
|
|
34
|
+
path?: string;
|
|
35
|
+
branch?: string;
|
|
36
|
+
keepBranch: boolean;
|
|
37
|
+
stale: boolean;
|
|
38
|
+
maxAgeHours?: number;
|
|
39
|
+
json: boolean;
|
|
40
|
+
}
|
|
41
|
+
|
|
42
|
+
function parseArgs(argv: string[]): { args: HelperArgs; error?: string } {
|
|
43
|
+
const args: HelperArgs = { mode: "create", keepBranch: false, stale: false, json: false };
|
|
44
|
+
let index = 0;
|
|
45
|
+
|
|
46
|
+
// Подкоманда необязательна: старые обёртки вызывают помощник без неё.
|
|
47
|
+
if (argv[0] === "create" || argv[0] === "cleanup") {
|
|
48
|
+
args.mode = argv[0];
|
|
49
|
+
index = 1;
|
|
50
|
+
}
|
|
51
|
+
|
|
52
|
+
for (; index < argv.length; index += 1) {
|
|
53
|
+
const flag = argv[index];
|
|
54
|
+
const value = argv[index + 1];
|
|
55
|
+
switch (flag) {
|
|
56
|
+
case "--json":
|
|
57
|
+
args.json = true;
|
|
58
|
+
break;
|
|
59
|
+
case "--keep-branch":
|
|
60
|
+
args.keepBranch = true;
|
|
61
|
+
break;
|
|
62
|
+
case "--stale":
|
|
63
|
+
args.stale = true;
|
|
64
|
+
break;
|
|
65
|
+
case "--repo":
|
|
66
|
+
case "--task":
|
|
67
|
+
case "--root":
|
|
68
|
+
case "--path":
|
|
69
|
+
case "--branch":
|
|
70
|
+
case "--max-age-hours": {
|
|
71
|
+
if (!value || value.startsWith("--")) {
|
|
72
|
+
return { args, error: `Флаг ${flag} требует значение.` };
|
|
73
|
+
}
|
|
74
|
+
if (flag === "--repo") args.repo = value;
|
|
75
|
+
if (flag === "--task") args.task = value;
|
|
76
|
+
if (flag === "--root") args.root = value;
|
|
77
|
+
if (flag === "--path") args.path = value;
|
|
78
|
+
if (flag === "--branch") args.branch = value;
|
|
79
|
+
if (flag === "--max-age-hours") {
|
|
80
|
+
const hours = Number(value);
|
|
81
|
+
if (!Number.isFinite(hours) || hours < 0) {
|
|
82
|
+
return { args, error: "Флаг --max-age-hours требует неотрицательное число." };
|
|
83
|
+
}
|
|
84
|
+
args.maxAgeHours = hours;
|
|
85
|
+
}
|
|
86
|
+
index += 1;
|
|
87
|
+
break;
|
|
88
|
+
}
|
|
89
|
+
default:
|
|
90
|
+
return { args, error: `Неизвестный аргумент: ${flag}` };
|
|
91
|
+
}
|
|
92
|
+
}
|
|
93
|
+
return { args };
|
|
94
|
+
}
|
|
95
|
+
|
|
96
|
+
function usage(): string {
|
|
97
|
+
return [
|
|
98
|
+
"Использование:",
|
|
99
|
+
" worktree-run.js --repo <dir> --task <name> [--root <dir>] [--json]",
|
|
100
|
+
" worktree-run.js create --repo <dir> --task <name> [--root <dir>] [--json]",
|
|
101
|
+
" worktree-run.js cleanup --path <worktree> [--repo <root>] [--root <dir>] [--keep-branch] [--json]",
|
|
102
|
+
" worktree-run.js cleanup --stale [--root <dir>] [--max-age-hours <n>] [--json]",
|
|
103
|
+
].join("\n");
|
|
104
|
+
}
|
|
105
|
+
|
|
106
|
+
async function runCreate(args: HelperArgs): Promise<number> {
|
|
107
|
+
if (!args.repo || !args.task) {
|
|
108
|
+
process.stderr.write(`[worktree] ${usage()}\n`);
|
|
109
|
+
return 1;
|
|
110
|
+
}
|
|
111
|
+
|
|
112
|
+
// W-2.2: попутная уборка остатков. Не влияет на создание: ошибки уборки
|
|
113
|
+
// игнорируются, свежие worktree не трогаются.
|
|
114
|
+
await cleanupStaleWorktrees({ rootDir: args.root }).catch(() => undefined);
|
|
115
|
+
|
|
116
|
+
const result = await createRunWorktree({
|
|
117
|
+
repoDir: args.repo,
|
|
118
|
+
taskName: args.task,
|
|
119
|
+
rootDir: args.root,
|
|
120
|
+
});
|
|
121
|
+
if (!result.ok) {
|
|
122
|
+
process.stderr.write(`[worktree] ${result.error}\n`);
|
|
123
|
+
return 1;
|
|
124
|
+
}
|
|
125
|
+
|
|
126
|
+
process.stdout.write(
|
|
127
|
+
args.json ? `${JSON.stringify(result.worktree)}\n` : `${result.worktree.path}\n`,
|
|
128
|
+
);
|
|
129
|
+
return 0;
|
|
130
|
+
}
|
|
131
|
+
|
|
132
|
+
async function runCleanup(args: HelperArgs): Promise<number> {
|
|
133
|
+
if (args.stale && args.path) {
|
|
134
|
+
process.stderr.write("[worktree] Нельзя совмещать --stale и --path.\n");
|
|
135
|
+
return 1;
|
|
136
|
+
}
|
|
137
|
+
|
|
138
|
+
if (args.stale) {
|
|
139
|
+
const summary = await cleanupStaleWorktrees({
|
|
140
|
+
rootDir: args.root,
|
|
141
|
+
maxAgeMs:
|
|
142
|
+
args.maxAgeHours === undefined
|
|
143
|
+
? DEFAULT_STALE_AFTER_MS
|
|
144
|
+
: args.maxAgeHours * 60 * 60 * 1000,
|
|
145
|
+
});
|
|
146
|
+
process.stdout.write(
|
|
147
|
+
args.json
|
|
148
|
+
? `${JSON.stringify(summary)}\n`
|
|
149
|
+
: `[worktree] Удалено: ${summary.removed.length}, пропущено: ${summary.skipped.length}, sidecar: ${summary.pruned.length}, ошибок: ${summary.errors.length}${summary.locked ? " (уборка уже выполняется)" : ""}\n`,
|
|
150
|
+
);
|
|
151
|
+
if (summary.errors.length > 0) {
|
|
152
|
+
for (const error of summary.errors) process.stderr.write(`[worktree] ${error}\n`);
|
|
153
|
+
return 1;
|
|
154
|
+
}
|
|
155
|
+
return 0;
|
|
156
|
+
}
|
|
157
|
+
|
|
158
|
+
if (!args.path) {
|
|
159
|
+
process.stderr.write(`[worktree] ${usage()}\n`);
|
|
160
|
+
return 1;
|
|
161
|
+
}
|
|
162
|
+
|
|
163
|
+
const result = await removeRunWorktree({
|
|
164
|
+
path: args.path,
|
|
165
|
+
repoRoot: args.repo,
|
|
166
|
+
branch: args.branch,
|
|
167
|
+
rootDir: args.root,
|
|
168
|
+
deleteBranch: !args.keepBranch,
|
|
169
|
+
});
|
|
170
|
+
if (!result.ok) {
|
|
171
|
+
process.stderr.write(`[worktree] ${result.error}\n`);
|
|
172
|
+
return 1;
|
|
173
|
+
}
|
|
174
|
+
if (args.json) process.stdout.write(`${JSON.stringify({ ok: true, path: args.path })}\n`);
|
|
175
|
+
return 0;
|
|
176
|
+
}
|
|
177
|
+
|
|
178
|
+
/** Точка входа для тестов: возвращает exit code, ничего не завершает. */
|
|
179
|
+
export async function main(argv: string[] = process.argv.slice(2)): Promise<number> {
|
|
180
|
+
const parsed = parseArgs(argv);
|
|
181
|
+
if (parsed.error) {
|
|
182
|
+
process.stderr.write(`[worktree] ${parsed.error}\n`);
|
|
183
|
+
return 1;
|
|
184
|
+
}
|
|
185
|
+
return parsed.args.mode === "cleanup" ? runCleanup(parsed.args) : runCreate(parsed.args);
|
|
186
|
+
}
|
|
187
|
+
|
|
188
|
+
const invokedPath = process.argv[1] ? pathToFileURL(path.resolve(process.argv[1])).href : "";
|
|
189
|
+
if (import.meta.url === invokedPath) {
|
|
190
|
+
main().then(
|
|
191
|
+
(code) => {
|
|
192
|
+
process.exitCode = code;
|
|
193
|
+
},
|
|
194
|
+
(err: unknown) => {
|
|
195
|
+
process.stderr.write(`[worktree] ${err instanceof Error ? err.message : String(err)}\n`);
|
|
196
|
+
process.exitCode = 1;
|
|
197
|
+
},
|
|
198
|
+
);
|
|
199
|
+
}
|