opencode-windows-scheduler 1.5.0 → 1.5.2

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.
Files changed (87) hide show
  1. package/CHANGELOG.md +47 -1
  2. package/LICENSE +21 -21
  3. package/README.md +24 -2
  4. package/ROADMAP-STRATEGY.md +16 -16
  5. package/ROADMAP.md +649 -160
  6. package/dist/core/audit.d.ts +27 -0
  7. package/dist/core/audit.d.ts.map +1 -1
  8. package/dist/core/audit.js +60 -0
  9. package/dist/core/dry-run.d.ts +10 -0
  10. package/dist/core/dry-run.d.ts.map +1 -1
  11. package/dist/core/dry-run.js +55 -34
  12. package/dist/core/git-trigger.d.ts.map +1 -1
  13. package/dist/core/git-trigger.js +15 -9
  14. package/dist/core/matrix.d.ts.map +1 -1
  15. package/dist/core/matrix.js +48 -22
  16. package/dist/core/ps-wrapper.d.ts +1 -1
  17. package/dist/core/ps-wrapper.d.ts.map +1 -1
  18. package/dist/core/ps-wrapper.js +47 -10
  19. package/dist/core/schedule-v2.d.ts.map +1 -1
  20. package/dist/core/schedule-v2.js +29 -17
  21. package/dist/core/scheduler/types.d.ts +6 -0
  22. package/dist/core/scheduler/types.d.ts.map +1 -1
  23. package/dist/core/scheduler/windows.d.ts +6 -2
  24. package/dist/core/scheduler/windows.d.ts.map +1 -1
  25. package/dist/core/scheduler/windows.js +25 -10
  26. package/dist/core/secrets.d.ts +10 -3
  27. package/dist/core/secrets.d.ts.map +1 -1
  28. package/dist/core/secrets.js +28 -4
  29. package/dist/core/telegram.d.ts.map +1 -1
  30. package/dist/core/telegram.js +13 -10
  31. package/dist/core/wrappers/bash.d.ts +1 -0
  32. package/dist/core/wrappers/bash.d.ts.map +1 -1
  33. package/dist/core/wrappers/bash.js +91 -5
  34. package/dist/i18n.d.ts +52 -0
  35. package/dist/i18n.d.ts.map +1 -0
  36. package/dist/i18n.js +292 -0
  37. package/dist/index.d.ts +6 -0
  38. package/dist/index.d.ts.map +1 -1
  39. package/dist/index.js +788 -183
  40. package/dist/notifications.d.ts.map +1 -1
  41. package/dist/notifications.js +74 -40
  42. package/dist/rpc.d.ts +15 -2
  43. package/dist/rpc.d.ts.map +1 -1
  44. package/dist/rpc.js +6 -2
  45. package/dist/server.d.ts.map +1 -1
  46. package/dist/server.js +89 -48
  47. package/dist/settings.d.ts +3 -0
  48. package/dist/settings.d.ts.map +1 -1
  49. package/dist/settings.js +20 -8
  50. package/dist/task-transfer.d.ts +13 -0
  51. package/dist/task-transfer.d.ts.map +1 -1
  52. package/dist/task-transfer.js +11 -0
  53. package/dist/types.d.ts +11 -0
  54. package/dist/types.d.ts.map +1 -1
  55. package/dist/types.js +32 -0
  56. package/dist/workspaces.d.ts +2 -2
  57. package/dist/workspaces.d.ts.map +1 -1
  58. package/dist/workspaces.js +6 -4
  59. package/docs/ARCHITECTURE.md +96 -4
  60. package/docs/FEATURES.md +34 -5
  61. package/docs/README.ru.md +17 -1
  62. package/gui-experimental.cjs +9 -9
  63. package/locales/en.json +695 -0
  64. package/locales/ru.json +695 -0
  65. package/package.json +6 -3
  66. package/scripts/test-locale.mjs +44 -0
  67. package/src/core/audit.ts +89 -0
  68. package/src/core/dry-run.ts +76 -38
  69. package/src/core/git-trigger.ts +15 -9
  70. package/src/core/matrix.ts +52 -26
  71. package/src/core/ps-wrapper.ts +47 -10
  72. package/src/core/schedule-v2.ts +47 -17
  73. package/src/core/scheduler/types.ts +6 -0
  74. package/src/core/scheduler/windows.ts +25 -10
  75. package/src/core/secrets.ts +34 -10
  76. package/src/core/telegram.ts +16 -10
  77. package/src/core/wrappers/bash.ts +112 -5
  78. package/src/gui.tsx +575 -480
  79. package/src/i18n.ts +339 -0
  80. package/src/index.ts +960 -193
  81. package/src/notifications.ts +83 -42
  82. package/src/rpc.ts +6 -2
  83. package/src/server.ts +89 -48
  84. package/src/settings.ts +38 -10
  85. package/src/task-transfer.ts +24 -0
  86. package/src/types.ts +37 -0
  87. package/src/workspaces.ts +9 -4
@@ -51,6 +51,33 @@ export declare function redactAuditDetails(value: unknown, depth?: number): unkn
51
51
  * Возвращает id записи или null при ошибке.
52
52
  */
53
53
  export declare function recordAudit(entry: AuditEntryInput): number | null;
54
+ export interface ToolBlockedInput {
55
+ /** Имя задачи, для которой действует запрет. */
56
+ task: string;
57
+ /** Заблокированный инструмент (например, shell или write). */
58
+ tool: string;
59
+ actor?: AuditActor;
60
+ source?: string | null;
61
+ /** Дополнительные детали события; можно переопределить/дополнить. */
62
+ details?: Record<string, unknown>;
63
+ }
64
+ /**
65
+ * Записывает событие tool.blocked для задачи и инструмента.
66
+ *
67
+ * Детали события — обычный объект, поэтому вызывающая сторона может добавить
68
+ * причину, список разрешённых инструментов и любые другие поля.
69
+ * Возвращает id записи или null, если журнал недоступен.
70
+ */
71
+ export declare function recordToolBlocked(input: ToolBlockedInput): number | null;
72
+ /**
73
+ * Фиксирует запреты задачи из её политики allowedTools/deniedTools.
74
+ *
75
+ * Явно запрещённые инструменты попадают в аудит по одному событию на
76
+ * инструмент. Для режима «только разрешённые» пишется одно событие с
77
+ * инструментом `*`, потому что список заблокированных в этом режиме
78
+ * неограничен. Возвращает число записанных событий.
79
+ */
80
+ export declare function recordTaskToolBlocks(task: string, allowedTools: readonly string[] | null | undefined, deniedTools: readonly string[] | null | undefined, actor?: AuditActor, source?: string): number;
54
81
  /** Читает журнал аудита (новые сверху). */
55
82
  export declare function readAuditLog(filter?: ReadAuditFilter): ReadAuditResult;
56
83
  /**
@@ -1 +1 @@
1
- {"version":3,"file":"audit.d.ts","sourceRoot":"","sources":["../../src/core/audit.ts"],"names":[],"mappings":"AAGA;;;;;;;GAOG;AAEH,MAAM,MAAM,UAAU,GAAG,KAAK,GAAG,KAAK,GAAG,MAAM,GAAG,QAAQ,GAAG,MAAM,CAAC;AAEpE,MAAM,WAAW,eAAe;IAC9B,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,KAAK,EAAE,UAAU,CAAC;IAClB,wDAAwD;IACxD,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,kDAAkD;IAClD,EAAE,CAAC,EAAE,MAAM,CAAC;CACb;AAED,MAAM,WAAW,WAAW;IAC1B,EAAE,EAAE,MAAM,CAAC;IACX,EAAE,EAAE,MAAM,CAAC;IACX,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,OAAO,EAAE,OAAO,CAAC;IACjB,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;CACvB;AAED,MAAM,WAAW,eAAe;IAC9B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,eAAe;IAC9B,OAAO,EAAE,WAAW,EAAE,CAAC;IACvB,KAAK,EAAE,MAAM,CAAC;CACf;AAED,eAAO,MAAM,4BAA4B,KAAK,CAAC;AAC/C,eAAO,MAAM,yBAAyB,QAAS,CAAC;AAShD,qEAAqE;AACrE,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,OAAO,EAAE,KAAK,SAAI,GAAG,OAAO,CAoBrE;AAaD;;;GAGG;AACH,wBAAgB,WAAW,CAAC,KAAK,EAAE,eAAe,GAAG,MAAM,GAAG,IAAI,CAiCjE;AA0CD,2CAA2C;AAC3C,wBAAgB,YAAY,CAAC,MAAM,GAAE,eAAoB,GAAG,eAAe,CA8C1E;AAED;;;GAGG;AACH,wBAAgB,eAAe,CAAC,OAAO,GAAE;IACvC,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,UAAU,CAAC,EAAE,MAAM,CAAC;CAChB,GAAG,MAAM,CA4Cd;AAED,iDAAiD;AACjD,wBAAgB,aAAa,IAAI,IAAI,CAMpC;AAED,iDAAiD;AACjD,wBAAgB,yBAAyB,IAAI,IAAI,CAEhD"}
1
+ {"version":3,"file":"audit.d.ts","sourceRoot":"","sources":["../../src/core/audit.ts"],"names":[],"mappings":"AAGA;;;;;;;GAOG;AAEH,MAAM,MAAM,UAAU,GAAG,KAAK,GAAG,KAAK,GAAG,MAAM,GAAG,QAAQ,GAAG,MAAM,CAAC;AAEpE,MAAM,WAAW,eAAe;IAC9B,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,KAAK,EAAE,UAAU,CAAC;IAClB,wDAAwD;IACxD,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,kDAAkD;IAClD,EAAE,CAAC,EAAE,MAAM,CAAC;CACb;AAED,MAAM,WAAW,WAAW;IAC1B,EAAE,EAAE,MAAM,CAAC;IACX,EAAE,EAAE,MAAM,CAAC;IACX,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,OAAO,EAAE,OAAO,CAAC;IACjB,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;CACvB;AAED,MAAM,WAAW,eAAe;IAC9B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,eAAe;IAC9B,OAAO,EAAE,WAAW,EAAE,CAAC;IACvB,KAAK,EAAE,MAAM,CAAC;CACf;AAED,eAAO,MAAM,4BAA4B,KAAK,CAAC;AAC/C,eAAO,MAAM,yBAAyB,QAAS,CAAC;AAShD,qEAAqE;AACrE,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,OAAO,EAAE,KAAK,SAAI,GAAG,OAAO,CAoBrE;AAaD;;;GAGG;AACH,wBAAgB,WAAW,CAAC,KAAK,EAAE,eAAe,GAAG,MAAM,GAAG,IAAI,CAiCjE;AA0CD,MAAM,WAAW,gBAAgB;IAC/B,gDAAgD;IAChD,IAAI,EAAE,MAAM,CAAC;IACb,8DAA8D;IAC9D,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,UAAU,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,qEAAqE;IACrE,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACnC;AAED;;;;;;GAMG;AACH,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,gBAAgB,GAAG,MAAM,GAAG,IAAI,CASxE;AAED;;;;;;;GAOG;AACH,wBAAgB,oBAAoB,CAClC,IAAI,EAAE,MAAM,EACZ,YAAY,EAAE,SAAS,MAAM,EAAE,GAAG,IAAI,GAAG,SAAS,EAClD,WAAW,EAAE,SAAS,MAAM,EAAE,GAAG,IAAI,GAAG,SAAS,EACjD,KAAK,GAAE,UAAqB,EAC5B,MAAM,SAAW,GAChB,MAAM,CA4CR;AAED,2CAA2C;AAC3C,wBAAgB,YAAY,CAAC,MAAM,GAAE,eAAoB,GAAG,eAAe,CA8C1E;AAED;;;GAGG;AACH,wBAAgB,eAAe,CAAC,OAAO,GAAE;IACvC,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,UAAU,CAAC,EAAE,MAAM,CAAC;CAChB,GAAG,MAAM,CA4Cd;AAED,iDAAiD;AACjD,wBAAgB,aAAa,IAAI,IAAI,CAMpC;AAED,iDAAiD;AACjD,wBAAgB,yBAAyB,IAAI,IAAI,CAEhD"}
@@ -108,6 +108,66 @@ function rowToRecord(row) {
108
108
  remote: row.remote == null ? null : String(row.remote),
109
109
  };
110
110
  }
111
+ /**
112
+ * Записывает событие tool.blocked для задачи и инструмента.
113
+ *
114
+ * Детали события — обычный объект, поэтому вызывающая сторона может добавить
115
+ * причину, список разрешённых инструментов и любые другие поля.
116
+ * Возвращает id записи или null, если журнал недоступен.
117
+ */
118
+ export function recordToolBlocked(input) {
119
+ return recordAudit({
120
+ action: "tool.blocked",
121
+ targetType: "task",
122
+ target: input.task,
123
+ actor: input.actor ?? "system",
124
+ source: input.source ?? "policy",
125
+ details: { tool: input.tool, ...(input.details ?? {}) },
126
+ });
127
+ }
128
+ /**
129
+ * Фиксирует запреты задачи из её политики allowedTools/deniedTools.
130
+ *
131
+ * Явно запрещённые инструменты попадают в аудит по одному событию на
132
+ * инструмент. Для режима «только разрешённые» пишется одно событие с
133
+ * инструментом `*`, потому что список заблокированных в этом режиме
134
+ * неограничен. Возвращает число записанных событий.
135
+ */
136
+ export function recordTaskToolBlocks(task, allowedTools, deniedTools, actor = "system", source = "policy") {
137
+ const normalizedDenied = Array.from(new Set((deniedTools ?? [])
138
+ .map((tool) => String(tool).trim())
139
+ .filter(Boolean)));
140
+ const normalizedAllowed = Array.from(new Set((allowedTools ?? [])
141
+ .map((tool) => String(tool).trim())
142
+ .filter(Boolean)));
143
+ const details = {
144
+ reason: "deniedTools",
145
+ allowedTools: normalizedAllowed.length > 0 ? normalizedAllowed : null,
146
+ deniedTools: normalizedDenied.length > 0 ? normalizedDenied : null,
147
+ };
148
+ let written = 0;
149
+ for (const tool of normalizedDenied) {
150
+ if (recordToolBlocked({ task, tool, actor, source, details }) != null) {
151
+ written++;
152
+ }
153
+ }
154
+ if (normalizedDenied.length === 0 && normalizedAllowed.length > 0) {
155
+ if (recordToolBlocked({
156
+ task,
157
+ tool: "*",
158
+ actor,
159
+ source,
160
+ details: {
161
+ reason: "allowedTools",
162
+ allowedTools: normalizedAllowed,
163
+ deniedTools: null,
164
+ },
165
+ }) != null) {
166
+ written++;
167
+ }
168
+ }
169
+ return written;
170
+ }
111
171
  /** Читает журнал аудита (новые сверху). */
112
172
  export function readAuditLog(filter = {}) {
113
173
  const limit = Math.max(1, Math.min(5000, Math.floor(filter.limit ?? 200) || 200));
@@ -54,6 +54,16 @@ export interface DryRunTaskItem {
54
54
  session?: string | null;
55
55
  /** Идентификатор переиспользуемой сессии (только для session=reuse). */
56
56
  sessionId?: string | null;
57
+ /**
58
+ * Windows-режим входа (Спринт 27.5.4): false — задача интерактивная и идёт
59
+ * только при активном входе пользователя (Interactive only); true — запуск
60
+ * без входа через `/ru SYSTEM` (session 0, без профиля пользователя).
61
+ * На Linux/macOS поле всегда false: cron работает без входа, launchd-агент —
62
+ * только при входе.
63
+ */
64
+ runWhenLoggedOff?: boolean;
65
+ /** Человекочитаемое пояснение к режиму входа (для отчёта dry-run). */
66
+ logonMode?: string | null;
57
67
  /**
58
68
  * Эффективное расписание cron-задачи (Спринт 19): пояс, окно запуска и
59
69
  * ближайшие срабатывания с учётом часового пояса. Позволяет проверить
@@ -1 +1 @@
1
- {"version":3,"file":"dry-run.d.ts","sourceRoot":"","sources":["../../src/core/dry-run.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"dry-run.d.ts","sourceRoot":"","sources":["../../src/core/dry-run.ts"],"names":[],"mappings":"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"}
@@ -12,14 +12,15 @@ import { getWorkspace } from "../workspaces.js";
12
12
  import { expandMatrixTask } from "./matrix.js";
13
13
  import { nextRun, activeWindowState } from "./schedule-v2.js";
14
14
  import { checkGitTrigger } from "./git-trigger.js";
15
+ import { t } from "../i18n.js";
15
16
  /** Сколько последних успешных/любых запусков усредняем для оценки. */
16
17
  const ESTIMATE_SAMPLE = 10;
17
18
  /** Средняя цена за 1K токенов (должна совпадать с dashboards/server.ts). */
18
19
  export const ESTIMATED_COST_PER_1K_TOKENS_USD = 0.003;
19
- /** Опасные паттерны, о которых обязательно предупреждаем. */
20
+ /** Опасные паттерны, о которых обязательно предупреждаем (ключи каталога). */
20
21
  const DANGEROUS_PATTERNS = [
21
- { test: /rm\s+-rf\s+\/(?:\s|$)/, message: "возможна рекурсивная очистка корня файловой системы (`rm -rf /`)" },
22
- { test: /git\s+push\s+.*--force(?:\s|$)/, message: "принудительный push в git (`git push --force`)" },
22
+ { test: /rm\s+-rf\s+\/(?:\s|$)/, messageKey: "dryRun.danger.rmRoot" },
23
+ { test: /git\s+push\s+.*--force(?:\s|$)/, messageKey: "dryRun.danger.forcePush" },
23
24
  ];
24
25
  /**
25
26
  * Описывает триггер задачи: что запускает задачу, не будет ли запуск
@@ -54,14 +55,16 @@ async function describeTrigger(opts) {
54
55
  };
55
56
  base.explanation = result.message;
56
57
  if (result.status === "no-repo") {
57
- warnings.push("Задача с git-триггером, но рабочая директория не является git-репозиторием.");
58
+ warnings.push(t("dryRun.git.notRepo"));
58
59
  }
59
60
  else if (result.status === "branch-mismatch") {
60
- warnings.push(`Ветка не подходит под фильтр «${def.gitBranch ?? ""}».`);
61
+ warnings.push(t("dryRun.git.branchMismatch", { branch: def.gitBranch ?? "" }));
61
62
  }
62
63
  }
63
64
  catch (err) {
64
- base.explanation = `Git-триггер: ошибка проверки — ${err instanceof Error ? err.message : String(err)}.`;
65
+ base.explanation = t("dryRun.git.checkError", {
66
+ error: err instanceof Error ? err.message : String(err),
67
+ });
65
68
  warnings.push(base.explanation);
66
69
  }
67
70
  break;
@@ -76,36 +79,46 @@ async function describeTrigger(opts) {
76
79
  if (def.watchPath)
77
80
  parts.push(`«${def.watchPath}»`);
78
81
  if (def.watchGlobs?.length)
79
- parts.push(`маски: ${def.watchGlobs.length}`);
82
+ parts.push(t("dryRun.file.globs", { count: def.watchGlobs.length }));
80
83
  if (def.watchIgnore?.length)
81
- parts.push(`исключения: ${def.watchIgnore.length}`);
84
+ parts.push(t("dryRun.file.ignore", { count: def.watchIgnore.length }));
82
85
  base.explanation =
83
86
  parts.length > 0
84
- ? `Файловый триггер: ${parts.join("; ")}.`
85
- : "Файловый триггер: любое изменение подходит.";
87
+ ? t("dryRun.file.trigger", { parts: parts.join("; ") })
88
+ : t("dryRun.file.any");
86
89
  break;
87
90
  }
88
91
  case "mcp-event": {
89
92
  const ev = def.mcpEvent;
90
93
  base.explanation = ev && ev.event
91
- ? `MCP-событие ${ev.server}:${ev.event}${ev.filter ? ` (фильтр «${ev.filter}»)` : ""}.`
92
- : "MCP-событие (параметры не заданы).";
94
+ ? t("dryRun.mcp.event", {
95
+ server: ev.server,
96
+ event: ev.event,
97
+ filter: ev.filter
98
+ ? t("dryRun.mcp.filter", { filter: ev.filter })
99
+ : "",
100
+ })
101
+ : t("dryRun.mcp.missing");
93
102
  break;
94
103
  }
95
104
  case "cron": {
96
- let text = `По расписанию «${def.schedule}»`;
97
- if (def.timezone)
98
- text += ` (${def.timezone})`;
99
- base.explanation = text + ".";
105
+ base.explanation = def.timezone
106
+ ? t("dryRun.cronTimezone", {
107
+ schedule: def.schedule,
108
+ timezone: def.timezone,
109
+ })
110
+ : t("dryRun.cron", { schedule: def.schedule });
100
111
  break;
101
112
  }
102
113
  case "once": {
103
- base.explanation = def.runAt ? `Однократно в ${def.runAt}.` : "Однократный запуск.";
114
+ base.explanation = def.runAt
115
+ ? t("dryRun.once.at", { runAt: def.runAt })
116
+ : t("dryRun.once");
104
117
  break;
105
118
  }
106
119
  case "manual":
107
120
  default: {
108
- base.explanation = "Запуск вручную (в составе конвейера).";
121
+ base.explanation = t("dryRun.manual");
109
122
  break;
110
123
  }
111
124
  }
@@ -123,19 +136,22 @@ async function describeTrigger(opts) {
123
136
  nextOpenAt: state.nextOpenAt ? state.nextOpenAt.toISOString() : null,
124
137
  };
125
138
  if (!state.active && policy !== "run") {
139
+ const reason = state.reason ?? t("dryRun.window.outside");
126
140
  if (policy === "skip") {
127
- warnings.push(`Сейчас ${state.reason ?? "вне окна"}: при политике skip запуск будет пропущен.`);
141
+ warnings.push(t("dryRun.window.skip", { reason }));
128
142
  }
129
143
  else {
130
144
  // postpone — переносим на ближайшее открытие.
131
145
  const iso = base.activeWindow.nextOpenAt ?? null;
132
146
  warnings.push(iso
133
- ? `Сейчас ${state.reason ?? "вне окна"}: запуск будет перенесён на ${iso}.`
134
- : `Сейчас ${state.reason ?? "вне окна"}: открытие окна не найдено, запуск пропущен.`);
147
+ ? t("dryRun.window.postpone", { reason, nextOpenAt: iso })
148
+ : t("dryRun.window.noOpening", { reason }));
135
149
  }
136
150
  }
137
151
  else if (!state.active && policy === "run") {
138
- warnings.push(`Сейчас ${state.reason ?? "вне окна"}: политика run — задача выполнится всё равно.`);
152
+ warnings.push(t("dryRun.window.run", {
153
+ reason: state.reason ?? t("dryRun.window.outside"),
154
+ }));
139
155
  }
140
156
  }
141
157
  return base;
@@ -150,7 +166,7 @@ export async function simulatePipeline(taskName) {
150
166
  const rootLower = taskName.trim().toLowerCase();
151
167
  const root = allDefs.find((d) => d.name.toLowerCase() === rootLower);
152
168
  if (!root) {
153
- throw new Error(`Задача "${taskName}" не найдена.`);
169
+ throw new Error(t("dryRun.taskNotFound", { task: taskName }));
154
170
  }
155
171
  // Собираем подграф зависимостей рекурсивно, обнаруживая циклы.
156
172
  const byLower = new Map(allDefs.map((d) => [d.name.toLowerCase(), d]));
@@ -160,7 +176,7 @@ export async function simulatePipeline(taskName) {
160
176
  const collect = (lowerName) => {
161
177
  if (visiting.has(lowerName)) {
162
178
  const list = warningsPerTask.get(lowerName) ?? [];
163
- list.push(`Обнаружена циклическая зависимость вокруг задачи "${lowerName}" — конвейер разорван на этом узле.`);
179
+ list.push(t("dryRun.cycle", { task: lowerName }));
164
180
  warningsPerTask.set(lowerName, list);
165
181
  return undefined;
166
182
  }
@@ -170,7 +186,7 @@ export async function simulatePipeline(taskName) {
170
186
  const def = byLower.get(lowerName);
171
187
  if (!def) {
172
188
  const list = warningsPerTask.get(lowerName) ?? [];
173
- list.push(`Зависимость "${lowerName}" не найдена среди задач — узел пропущен.`);
189
+ list.push(t("dryRun.dependencyMissing", { task: lowerName }));
174
190
  warningsPerTask.set(lowerName, list);
175
191
  return undefined;
176
192
  }
@@ -228,13 +244,15 @@ export async function simulatePipeline(taskName) {
228
244
  if (def.matrix) {
229
245
  try {
230
246
  const clones = expandMatrixTask(def);
231
- warnings.push(`[${def.name}] Родитель матрицы не выполняется сам — показаны ${clones.length} клон(а/ов) по workspace.`);
247
+ warnings.push(t("dryRun.matrix.parent", { name: def.name, count: clones.length }));
232
248
  for (const clone of clones)
233
249
  units.push({ def: clone, matrixParent: def.name });
234
250
  }
235
251
  catch (err) {
236
252
  const list = warningsPerTask.get(def.name.toLowerCase()) ?? [];
237
- list.push(`Матрица не может быть развёрнута: ${err instanceof Error ? err.message : String(err)}`);
253
+ list.push(t("dryRun.matrix.expandError", {
254
+ error: err instanceof Error ? err.message : String(err),
255
+ }));
238
256
  warningsPerTask.set(def.name.toLowerCase(), list);
239
257
  warnings.push(`[${def.name}] ${list[list.length - 1]}`);
240
258
  }
@@ -255,17 +273,17 @@ export async function simulatePipeline(taskName) {
255
273
  const workspace = def.workspaceId ? getWorkspace(def.workspaceId) : undefined;
256
274
  const cwd = workspace?.path || def.workingDirectory || def.workdir || "";
257
275
  if (!cwd) {
258
- taskWarnings.push("Рабочая директория не задана явно — будет использована папка текущего проекта.");
276
+ taskWarnings.push(t("dryRun.cwdImplicit"));
259
277
  }
260
278
  else {
261
279
  try {
262
280
  const stat = fs.statSync(cwd);
263
281
  if (!stat.isDirectory()) {
264
- taskWarnings.push(`Путь "${cwd}" существует, но не является директорией.`);
282
+ taskWarnings.push(t("dryRun.cwdNotDir", { path: cwd }));
265
283
  }
266
284
  }
267
285
  catch {
268
- taskWarnings.push(`Рабочая директория "${cwd}" не существует на диске.`);
286
+ taskWarnings.push(t("dryRun.cwdMissing", { path: cwd }));
269
287
  }
270
288
  }
271
289
  // Триггер: корневая задача (или клон корневой матрицы) — manual,
@@ -293,7 +311,7 @@ export async function simulatePipeline(taskName) {
293
311
  let estimatedCostUsd = null;
294
312
  let estimatedTokens = null;
295
313
  if (records.length === 0) {
296
- taskWarnings.push("Нет успешных запусков в истории — оценка длительности/токенов/стоимости недоступна.");
314
+ taskWarnings.push(t("dryRun.noHistory"));
297
315
  }
298
316
  else {
299
317
  const sample = records.slice(0, ESTIMATE_SAMPLE);
@@ -314,9 +332,9 @@ export async function simulatePipeline(taskName) {
314
332
  .filter((s) => typeof s === "string")
315
333
  .join("\n")
316
334
  .toLowerCase();
317
- for (const { test, message } of DANGEROUS_PATTERNS) {
335
+ for (const { test, messageKey } of DANGEROUS_PATTERNS) {
318
336
  if (test.test(scanned)) {
319
- taskWarnings.push(`Опасный паттерн: ${message}.`);
337
+ taskWarnings.push(t("dryRun.dangerPattern", { message: t(messageKey) }));
320
338
  }
321
339
  }
322
340
  const roleScoped = Array.isArray(def.allowedTools) && def.allowedTools.length > 0
@@ -352,7 +370,7 @@ export async function simulatePipeline(taskName) {
352
370
  }
353
371
  }
354
372
  catch {
355
- taskWarnings.push(`Не удалось разобрать cron "${def.schedule}" для расчёта ближайших запусков.`);
373
+ taskWarnings.push(t("dryRun.cronParseError", { schedule: def.schedule }));
356
374
  }
357
375
  scheduleDetails = {
358
376
  cron: def.schedule,
@@ -369,6 +387,9 @@ export async function simulatePipeline(taskName) {
369
387
  trigger,
370
388
  session: def.session ?? "new",
371
389
  sessionId: def.session === "reuse" ? def.sessionId ?? null : null,
390
+ // Спринт 27.5.4: показываем режим входа до регистрации в ОС.
391
+ runWhenLoggedOff: def.runWhenLoggedOff === true,
392
+ logonMode: def.runWhenLoggedOff === true ? "background" : "interactive",
372
393
  cwd,
373
394
  command,
374
395
  workspace: workspace ? { name: workspace.name, path: workspace.path } : undefined,
@@ -1 +1 @@
1
- {"version":3,"file":"git-trigger.d.ts","sourceRoot":"","sources":["../../src/core/git-trigger.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"git-trigger.d.ts","sourceRoot":"","sources":["../../src/core/git-trigger.ts"],"names":[],"mappings":"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"}
@@ -5,6 +5,7 @@ import { loadTaskDefinitions } from "../task-transfer.js";
5
5
  import { getGitState, setGitState, deleteGitState } from "../db/git-state-repo.js";
6
6
  import { filterPaths } from "./glob.js";
7
7
  import { getWorkspace } from "../workspaces.js";
8
+ import { t } from "../i18n.js";
8
9
  /**
9
10
  * Git-триггеры (Спринт 27).
10
11
  *
@@ -108,7 +109,7 @@ export async function checkGitTrigger(task, options = {}) {
108
109
  status: "no-repo",
109
110
  files: [],
110
111
  matched: [],
111
- message: `«${task.cwd}» не git-репозиторий — git-триггер не сработает.`,
112
+ message: t("gitTrigger.noRepo", { cwd: task.cwd }),
112
113
  };
113
114
  }
114
115
  const state = getGitState(task.name);
@@ -121,7 +122,7 @@ export async function checkGitTrigger(task, options = {}) {
121
122
  branch: probe.branch,
122
123
  files: [],
123
124
  matched: [],
124
- message: `Запомнен текущий коммит ${probe.head.slice(0, 7)} — задача запустится на следующем изменении.`,
125
+ message: t("gitTrigger.baseline", { commit: probe.head.slice(0, 7) }),
125
126
  };
126
127
  }
127
128
  if (!branchMatches(probe.branch, task.branch)) {
@@ -132,7 +133,10 @@ export async function checkGitTrigger(task, options = {}) {
132
133
  from: state.commitSha,
133
134
  files: [],
134
135
  matched: [],
135
- message: `Ветка ${probe.branch ?? "(detached)"} не подходит под фильтр «${task.branch}».`,
136
+ message: t("gitTrigger.branchMismatch", {
137
+ branch: probe.branch ?? "(detached)",
138
+ pattern: task.branch,
139
+ }),
136
140
  };
137
141
  }
138
142
  if (probe.head === state.commitSha) {
@@ -143,7 +147,7 @@ export async function checkGitTrigger(task, options = {}) {
143
147
  from: state.commitSha,
144
148
  files: [],
145
149
  matched: [],
146
- message: "Новых коммитов нет.",
150
+ message: t("gitTrigger.noChanges"),
147
151
  };
148
152
  }
149
153
  const files = await gitChangedFiles(task.cwd, state.commitSha, probe.head, run);
@@ -159,8 +163,8 @@ export async function checkGitTrigger(task, options = {}) {
159
163
  files,
160
164
  matched: [],
161
165
  message: files.length === 0
162
- ? "Новых коммитов нет."
163
- : `Изменено файлов: ${files.length}, но ни один не подходит под фильтры.`,
166
+ ? t("gitTrigger.noChanges")
167
+ : t("gitTrigger.ignored", { count: files.length }),
164
168
  };
165
169
  }
166
170
  if (persist)
@@ -172,9 +176,11 @@ export async function checkGitTrigger(task, options = {}) {
172
176
  from: state.commitSha,
173
177
  files,
174
178
  matched,
175
- message: `Новый коммит ${probe.head.slice(0, 7)}: изменено файлов ${matched.length} (${matched
176
- .slice(0, 3)
177
- .join(", ")}${matched.length > 3 ? ", …" : ""}).`,
179
+ message: t("gitTrigger.changed", {
180
+ commit: probe.head.slice(0, 7),
181
+ count: matched.length,
182
+ files: `${matched.slice(0, 3).join(", ")}${matched.length > 3 ? ", …" : ""}`,
183
+ }),
178
184
  };
179
185
  }
180
186
  function cwdOf(def) {
@@ -1 +1 @@
1
- {"version":3,"file":"matrix.d.ts","sourceRoot":"","sources":["../../src/core/matrix.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"matrix.d.ts","sourceRoot":"","sources":["../../src/core/matrix.ts"],"names":[],"mappings":"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"}