opencode-windows-scheduler 1.5.2 → 1.5.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 +107 -2
- package/CROSS_PLATFORM.md +107 -71
- package/LICENSE +21 -21
- package/README.md +74 -26
- package/ROADMAP-STRATEGY.md +11 -4
- package/ROADMAP.md +322 -112
- package/dist/core/analytics.d.ts +3 -0
- package/dist/core/analytics.d.ts.map +1 -1
- package/dist/core/analytics.js +4 -0
- package/dist/core/audit.d.ts +2 -1
- package/dist/core/audit.d.ts.map +1 -1
- package/dist/core/audit.js +32 -1
- package/dist/core/cron-to-schtasks.d.ts.map +1 -1
- package/dist/core/cron-to-schtasks.js +21 -4
- package/dist/core/file-watcher.d.ts.map +1 -1
- package/dist/core/file-watcher.js +16 -1
- package/dist/core/git-trigger.d.ts +4 -2
- package/dist/core/git-trigger.d.ts.map +1 -1
- package/dist/core/git-trigger.js +34 -16
- package/dist/core/local-ai.d.ts +52 -0
- package/dist/core/local-ai.d.ts.map +1 -0
- package/dist/core/local-ai.js +119 -0
- package/dist/core/lock.d.ts +14 -0
- package/dist/core/lock.d.ts.map +1 -1
- package/dist/core/lock.js +81 -4
- package/dist/core/matrix.d.ts.map +1 -1
- package/dist/core/matrix.js +3 -2
- package/dist/core/native-notify.d.ts.map +1 -1
- package/dist/core/native-notify.js +3 -0
- package/dist/core/one-shot.d.ts +7 -1
- package/dist/core/one-shot.d.ts.map +1 -1
- package/dist/core/one-shot.js +15 -2
- package/dist/core/permissions.d.ts +69 -0
- package/dist/core/permissions.d.ts.map +1 -0
- package/dist/core/permissions.js +143 -0
- package/dist/core/ps-wrapper.d.ts +9 -30
- package/dist/core/ps-wrapper.d.ts.map +1 -1
- package/dist/core/ps-wrapper.js +477 -108
- package/dist/core/record-history.d.ts +11 -0
- package/dist/core/record-history.d.ts.map +1 -1
- package/dist/core/record-history.js +106 -4
- package/dist/core/savings.d.ts +70 -0
- package/dist/core/savings.d.ts.map +1 -0
- package/dist/core/savings.js +87 -0
- package/dist/core/schedule-gate.js +7 -3
- package/dist/core/schedule-v2.js +1 -1
- package/dist/core/scheduler/index.d.ts +13 -1
- package/dist/core/scheduler/index.d.ts.map +1 -1
- package/dist/core/scheduler/index.js +35 -4
- package/dist/core/scheduler/linux.d.ts +4 -1
- package/dist/core/scheduler/linux.d.ts.map +1 -1
- package/dist/core/scheduler/linux.js +53 -20
- package/dist/core/scheduler/mac.d.ts +2 -1
- package/dist/core/scheduler/mac.d.ts.map +1 -1
- package/dist/core/scheduler/mac.js +24 -6
- package/dist/core/scheduler/posix.d.ts +1 -1
- package/dist/core/scheduler/posix.d.ts.map +1 -1
- package/dist/core/scheduler/posix.js +2 -2
- package/dist/core/scheduler/registry.d.ts +3 -2
- package/dist/core/scheduler/registry.d.ts.map +1 -1
- package/dist/core/scheduler/registry.js +6 -5
- package/dist/core/scheduler/windows.d.ts +49 -1
- package/dist/core/scheduler/windows.d.ts.map +1 -1
- package/dist/core/scheduler/windows.js +219 -34
- package/dist/core/secrets.d.ts +5 -3
- package/dist/core/secrets.d.ts.map +1 -1
- package/dist/core/secrets.js +86 -8
- package/dist/core/self-analysis.d.ts +117 -0
- package/dist/core/self-analysis.d.ts.map +1 -0
- package/dist/core/self-analysis.js +539 -0
- package/dist/core/session.d.ts +11 -3
- package/dist/core/session.d.ts.map +1 -1
- package/dist/core/session.js +34 -5
- package/dist/core/shutdown.d.ts +26 -0
- package/dist/core/shutdown.d.ts.map +1 -0
- package/dist/core/shutdown.js +49 -0
- package/dist/core/summary.d.ts +69 -0
- package/dist/core/summary.d.ts.map +1 -0
- package/dist/core/summary.js +250 -0
- package/dist/core/telegram.d.ts +10 -0
- package/dist/core/telegram.d.ts.map +1 -1
- package/dist/core/telegram.js +228 -47
- package/dist/core/triage-chain.d.ts +40 -0
- package/dist/core/triage-chain.d.ts.map +1 -0
- package/dist/core/triage-chain.js +80 -0
- package/dist/core/triage-compare.d.ts +68 -0
- package/dist/core/triage-compare.d.ts.map +1 -0
- package/dist/core/triage-compare.js +184 -0
- package/dist/core/triage-rules.d.ts +23 -0
- package/dist/core/triage-rules.d.ts.map +1 -0
- package/dist/core/triage-rules.js +196 -0
- package/dist/core/triage-shadow.d.ts +91 -0
- package/dist/core/triage-shadow.d.ts.map +1 -0
- package/dist/core/triage-shadow.js +160 -0
- package/dist/core/triage-worker.d.ts +55 -0
- package/dist/core/triage-worker.d.ts.map +1 -0
- package/dist/core/triage-worker.js +314 -0
- package/dist/core/triage.d.ts +76 -0
- package/dist/core/triage.d.ts.map +1 -0
- package/dist/core/triage.js +271 -0
- package/dist/core/watch-paths.d.ts +6 -0
- package/dist/core/watch-paths.d.ts.map +1 -0
- package/dist/core/watch-paths.js +62 -0
- package/dist/core/wrappers/bash.d.ts +15 -3
- package/dist/core/wrappers/bash.d.ts.map +1 -1
- package/dist/core/wrappers/bash.js +153 -120
- package/dist/db/history-repo.d.ts +1 -1
- package/dist/db/history-repo.d.ts.map +1 -1
- package/dist/db/history-repo.js +29 -14
- package/dist/db/schema.d.ts +1 -1
- package/dist/db/schema.d.ts.map +1 -1
- package/dist/db/schema.js +31 -0
- package/dist/history.d.ts +2 -2
- package/dist/history.d.ts.map +1 -1
- package/dist/history.js +3 -3
- package/dist/i18n.d.ts +25 -2
- package/dist/i18n.d.ts.map +1 -1
- package/dist/i18n.js +75 -10
- package/dist/index.d.ts +66 -3
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +527 -68
- package/dist/integrations.d.ts +9 -1
- package/dist/integrations.d.ts.map +1 -1
- package/dist/integrations.js +34 -6
- package/dist/notifications.d.ts +30 -2
- package/dist/notifications.d.ts.map +1 -1
- package/dist/notifications.js +289 -10
- package/dist/profiles.d.ts +1 -1
- package/dist/profiles.d.ts.map +1 -1
- package/dist/profiles.js +21 -3
- package/dist/rpc.d.ts +401 -5
- package/dist/rpc.d.ts.map +1 -1
- package/dist/rpc.js +138 -5
- package/dist/server.d.ts +20 -0
- package/dist/server.d.ts.map +1 -1
- package/dist/server.js +136 -14
- package/dist/settings.d.ts +167 -3
- package/dist/settings.d.ts.map +1 -1
- package/dist/settings.js +322 -3
- package/dist/task-transfer.d.ts +8 -1
- package/dist/task-transfer.d.ts.map +1 -1
- package/dist/task-transfer.js +2 -2
- package/dist/types.d.ts +8 -1
- package/dist/types.d.ts.map +1 -1
- package/dist/types.js +23 -5
- package/dist/workspaces.d.ts +9 -0
- package/dist/workspaces.d.ts.map +1 -1
- package/dist/workspaces.js +25 -0
- package/docs/ARCHITECTURE.md +48 -28
- package/docs/CONCEPT.md +230 -0
- package/docs/CROSS_PLATFORM.ru.md +150 -0
- package/docs/CROSS_PLATFORM.zh.md +146 -0
- package/docs/FAQ.md +52 -0
- package/docs/FAQ.ru.md +53 -0
- package/docs/FAQ.zh.md +43 -0
- package/docs/FEATURES.md +141 -44
- package/docs/FEATURES.zh.md +655 -0
- package/docs/LOCAL-AI.md +300 -0
- package/docs/MIGRATION.md +17 -0
- package/docs/README.ru.md +22 -16
- package/docs/README.zh.md +286 -0
- package/docs/SAVINGS.md +61 -0
- package/docs/SAVINGS.ru.md +60 -0
- package/docs/SAVINGS.zh.md +52 -0
- package/docs/ZH-LOCALE-PLAN.md +324 -0
- package/docs/spikes/local-model-structured-output.md +81 -0
- package/docs/spikes/ollama-qwen3-4b-smoke.json +28 -0
- package/docs/spikes/ollama-qwen3-4b.json +163 -0
- package/gui-experimental.cjs +8 -8
- package/locales/en.json +85 -0
- package/locales/ru.json +85 -0
- package/locales/zh.json +780 -0
- package/package.json +31 -7
- package/scripts/bench-local.mjs +321 -0
- package/scripts/check-zh-locale.mjs +218 -0
- package/scripts/run-tests.mjs +236 -0
- package/scripts/spike-local-structured.mjs +182 -0
- package/scripts/test-locale.mjs +4 -3
- package/skills/scheduled-job-best-practices/SKILL.md +6 -3
- package/skills/scheduled-job-best-practices/references/recipes.md +40 -0
- package/src/core/analytics.ts +10 -0
- package/src/core/audit.ts +39 -1
- package/src/core/cron-to-schtasks.ts +23 -4
- package/src/core/file-watcher.ts +20 -1
- package/src/core/git-trigger.ts +34 -16
- package/src/core/local-ai.ts +173 -0
- package/src/core/lock.ts +88 -3
- package/src/core/matrix.ts +5 -1
- package/src/core/native-notify.ts +3 -0
- package/src/core/one-shot.ts +18 -2
- package/src/core/permissions.ts +200 -0
- package/src/core/ps-wrapper.ts +492 -108
- package/src/core/record-history.ts +111 -4
- package/src/core/savings.ts +150 -0
- package/src/core/schedule-gate.ts +9 -3
- package/src/core/schedule-v2.ts +1 -1
- package/src/core/scheduler/index.ts +41 -3
- package/src/core/scheduler/linux.ts +67 -22
- package/src/core/scheduler/mac.ts +24 -7
- package/src/core/scheduler/posix.ts +2 -2
- package/src/core/scheduler/registry.ts +7 -5
- package/src/core/scheduler/windows.ts +237 -32
- package/src/core/secrets.ts +101 -7
- package/src/core/self-analysis.ts +744 -0
- package/src/core/session.ts +40 -5
- package/src/core/shutdown.ts +69 -0
- package/src/core/summary.ts +318 -0
- package/src/core/telegram.ts +266 -55
- package/src/core/triage-chain.ts +125 -0
- package/src/core/triage-compare.ts +277 -0
- package/src/core/triage-rules.ts +238 -0
- package/src/core/triage-shadow.ts +240 -0
- package/src/core/triage-worker.ts +344 -0
- package/src/core/triage.ts +366 -0
- package/src/core/watch-paths.ts +70 -0
- package/src/core/wrappers/bash.ts +181 -138
- package/src/db/history-repo.ts +31 -18
- package/src/db/schema.ts +31 -0
- package/src/gui.tsx +551 -14
- package/src/history.ts +7 -3
- package/src/i18n.ts +87 -13
- package/src/index.ts +649 -71
- package/src/integrations.ts +50 -6
- package/src/notifications.ts +468 -5
- package/src/profiles.ts +21 -3
- package/src/rpc.ts +143 -5
- package/src/server.ts +135 -16
- package/src/settings.ts +582 -5
- package/src/task-transfer.ts +10 -3
- package/src/types.ts +24 -5
- package/src/workspaces.ts +22 -0
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"analytics.d.ts","sourceRoot":"","sources":["../../src/core/analytics.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;
|
|
1
|
+
{"version":3,"file":"analytics.d.ts","sourceRoot":"","sources":["../../src/core/analytics.ts"],"names":[],"mappings":"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"}
|
package/dist/core/analytics.js
CHANGED
|
@@ -4,6 +4,7 @@
|
|
|
4
4
|
* Чистые функции без БД и HTTP: дашборд и RPC отдают JSON, экспорт — CSV.
|
|
5
5
|
* Так агрегаты легко тестировать без запуска сервера.
|
|
6
6
|
*/
|
|
7
|
+
import { computeSavings, } from "./savings.js";
|
|
7
8
|
/** Оценка стоимости, если запись истории не содержит costUsd. */
|
|
8
9
|
export const ESTIMATED_COST_PER_1K_TOKENS_USD = 0.003;
|
|
9
10
|
function toNumber(value) {
|
|
@@ -75,6 +76,7 @@ export function buildAnalytics(records, options = {}) {
|
|
|
75
76
|
let durationsSum = 0;
|
|
76
77
|
let durationsCount = 0;
|
|
77
78
|
let recordsInWindow = 0;
|
|
79
|
+
const windowRecords = [];
|
|
78
80
|
for (const record of records) {
|
|
79
81
|
const date = recordDate(record);
|
|
80
82
|
if (!date)
|
|
@@ -90,6 +92,7 @@ export function buildAnalytics(records, options = {}) {
|
|
|
90
92
|
// Незавершённые запуски не участвуют в аналитике: их ещё нельзя оценить.
|
|
91
93
|
if (status === "running")
|
|
92
94
|
continue;
|
|
95
|
+
windowRecords.push(record);
|
|
93
96
|
const duration = toNumber(record.durationMs);
|
|
94
97
|
bucket.total += 1;
|
|
95
98
|
bucket.tokens += tokens;
|
|
@@ -233,6 +236,7 @@ export function buildAnalytics(records, options = {}) {
|
|
|
233
236
|
errors: [...byError.values()]
|
|
234
237
|
.sort((a, b) => b.count - a.count || a.message.localeCompare(b.message))
|
|
235
238
|
.slice(0, topLimit),
|
|
239
|
+
savings: computeSavings(windowRecords, { topLimit }),
|
|
236
240
|
sources: {
|
|
237
241
|
historyRecords: records.length,
|
|
238
242
|
recordsInWindow,
|
package/dist/core/audit.d.ts
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { type PermissionPolicy } from "./permissions.js";
|
|
1
2
|
/**
|
|
2
3
|
* Журнал аудита мутаций (Спринт 26).
|
|
3
4
|
*
|
|
@@ -77,7 +78,7 @@ export declare function recordToolBlocked(input: ToolBlockedInput): number | nul
|
|
|
77
78
|
* инструментом `*`, потому что список заблокированных в этом режиме
|
|
78
79
|
* неограничен. Возвращает число записанных событий.
|
|
79
80
|
*/
|
|
80
|
-
export declare function recordTaskToolBlocks(task: string, allowedTools: readonly string[] | null | undefined, deniedTools: readonly string[] | null | undefined, actor?: AuditActor, source?: string): number;
|
|
81
|
+
export declare function recordTaskToolBlocks(task: string, allowedTools: readonly string[] | null | undefined, deniedTools: readonly string[] | null | undefined, actor?: AuditActor, source?: string, policy?: PermissionPolicy, legacyShell?: boolean): number;
|
|
81
82
|
/** Читает журнал аудита (новые сверху). */
|
|
82
83
|
export declare function readAuditLog(filter?: ReadAuditFilter): ReadAuditResult;
|
|
83
84
|
/**
|
package/dist/core/audit.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"audit.d.ts","sourceRoot":"","sources":["../../src/core/audit.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"audit.d.ts","sourceRoot":"","sources":["../../src/core/audit.ts"],"names":[],"mappings":"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"}
|
package/dist/core/audit.js
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { getDb } from "../db/index.js";
|
|
2
2
|
import { redactSecretsInText } from "./secrets.js";
|
|
3
|
+
import { resolvePermissions, } from "./permissions.js";
|
|
3
4
|
export const DEFAULT_AUDIT_RETENTION_DAYS = 90;
|
|
4
5
|
export const DEFAULT_AUDIT_MAX_RECORDS = 10000;
|
|
5
6
|
const SENSITIVE_KEY_RE = /(TOKEN|SECRET|PASS|PASSWORD|PASSWD|API_?KEY|CREDENTIAL|AUTH)/i;
|
|
@@ -133,7 +134,7 @@ export function recordToolBlocked(input) {
|
|
|
133
134
|
* инструментом `*`, потому что список заблокированных в этом режиме
|
|
134
135
|
* неограничен. Возвращает число записанных событий.
|
|
135
136
|
*/
|
|
136
|
-
export function recordTaskToolBlocks(task, allowedTools, deniedTools, actor = "system", source = "policy") {
|
|
137
|
+
export function recordTaskToolBlocks(task, allowedTools, deniedTools, actor = "system", source = "policy", policy, legacyShell) {
|
|
137
138
|
const normalizedDenied = Array.from(new Set((deniedTools ?? [])
|
|
138
139
|
.map((tool) => String(tool).trim())
|
|
139
140
|
.filter(Boolean)));
|
|
@@ -166,6 +167,36 @@ export function recordTaskToolBlocks(task, allowedTools, deniedTools, actor = "s
|
|
|
166
167
|
written++;
|
|
167
168
|
}
|
|
168
169
|
}
|
|
170
|
+
// Спринт 32 / релиз 1.6: фиксируем инструменты, запрещённые политикой по
|
|
171
|
+
// умолчанию (hybrid: shell/question; secure: ещё edit/webfetch/websearch/
|
|
172
|
+
// subagent). Это политика на момент сохранения задачи, а не попытки вызова:
|
|
173
|
+
// detached-обёртка не имеет доступа к SQLite.
|
|
174
|
+
if (policy) {
|
|
175
|
+
const effective = resolvePermissions({
|
|
176
|
+
policy,
|
|
177
|
+
legacyShell,
|
|
178
|
+
allowedTools: normalizedAllowed,
|
|
179
|
+
deniedTools: normalizedDenied,
|
|
180
|
+
});
|
|
181
|
+
for (const denied of effective.deniedByPolicy) {
|
|
182
|
+
if (recordToolBlocked({
|
|
183
|
+
task,
|
|
184
|
+
tool: denied.action,
|
|
185
|
+
actor,
|
|
186
|
+
source,
|
|
187
|
+
details: {
|
|
188
|
+
reason: "default-policy",
|
|
189
|
+
policy: effective.policy,
|
|
190
|
+
legacyShell: effective.legacyShell,
|
|
191
|
+
hint: denied.hint,
|
|
192
|
+
allowedTools: normalizedAllowed.length > 0 ? normalizedAllowed : null,
|
|
193
|
+
deniedTools: normalizedDenied.length > 0 ? normalizedDenied : null,
|
|
194
|
+
},
|
|
195
|
+
}) != null) {
|
|
196
|
+
written++;
|
|
197
|
+
}
|
|
198
|
+
}
|
|
199
|
+
}
|
|
169
200
|
return written;
|
|
170
201
|
}
|
|
171
202
|
/** Читает журнал аудита (новые сверху). */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cron-to-schtasks.d.ts","sourceRoot":"","sources":["../../src/core/cron-to-schtasks.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"cron-to-schtasks.d.ts","sourceRoot":"","sources":["../../src/core/cron-to-schtasks.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAgElD;;;GAGG;AACH,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,MAAM,GAAG,cAAc,CAsHlE;AAED;;;;;;GAMG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,GAAE,IAAiB,GAAG,IAAI,GAAG,IAAI,CA4EjF;AAED;;;GAGG;AACH,wBAAgB,kBAAkB,CAAC,UAAU,EAAE,cAAc,GAAG,MAAM,EAAE,CAUvE"}
|
|
@@ -8,11 +8,15 @@ const UNSUPPORTED_ERROR = "Неподдерживаемое cron-выражен
|
|
|
8
8
|
"Поддерживаемое подмножество cron (5 полей: минута час день_месяца месяц день_недели):\n" +
|
|
9
9
|
" * * * * * -> MINUTE, каждую минуту (/mo 1)\n" +
|
|
10
10
|
" */N * * * * -> MINUTE, каждые N минут (/mo N)\n" +
|
|
11
|
+
" M * * * * -> HOURLY, ежечасно в MM минут (/st 00:MM)\n" +
|
|
11
12
|
" M H * * * -> DAILY, ежедневно в HH:MM (/st HH:MM)\n" +
|
|
12
13
|
" M H * * D -> WEEKLY, по неделям в день D в HH:MM (/d D /st HH:MM)\n" +
|
|
13
14
|
"\n" +
|
|
14
15
|
"Не поддерживаются: диапазоны (1-5), списки (1,2,3), комбинации месяца и дня недели,\n" +
|
|
15
|
-
"*/N
|
|
16
|
+
"*/N в поле дня месяца или дня недели, а также любые другие сложные выражения.\n" +
|
|
17
|
+
"Выражение `M H */N * *` намеренно не превращается в DAILY /mo N: cron отсчитывает\n" +
|
|
18
|
+
"дни от 1-го числа месяца, а /mo N — от даты создания задачи, поэтому расписания\n" +
|
|
19
|
+
"не совпадают. Такие задачи выполняются в режиме минутного опроса (minute-poll).\n" +
|
|
16
20
|
"Пожалуйста, упростите расписание, используя одно из поддерживаемых выше выражений.";
|
|
17
21
|
/** Дни недели для schtasks /d (0 и 7 = воскресенье). */
|
|
18
22
|
const DAY_OF_WEEK_MAP = {
|
|
@@ -89,6 +93,16 @@ export function convertCronToSchTasks(cron) {
|
|
|
89
93
|
" минут превышает максимально допустимый для schtasks (1439 минут).\n\n" +
|
|
90
94
|
UNSUPPORTED_ERROR);
|
|
91
95
|
}
|
|
96
|
+
// schtasks /mo N запускает задачу каждые N минут начиная с момента создания
|
|
97
|
+
// задачи, а cron */N — в минуты 0, N, 2N внутри каждого часа. Семантики
|
|
98
|
+
// совпадают только когда N делит 60 без остатка; иначе отдаём задачу в
|
|
99
|
+
// минутный опрос с gate во враппере (needsPollMode).
|
|
100
|
+
if (60 % stepN !== 0) {
|
|
101
|
+
throw new Error("Интервал */" +
|
|
102
|
+
stepN +
|
|
103
|
+
" не делит час нацело: cron и schtasks понимают его по-разному.\n\n" +
|
|
104
|
+
UNSUPPORTED_ERROR);
|
|
105
|
+
}
|
|
92
106
|
return {
|
|
93
107
|
sc: "MINUTE",
|
|
94
108
|
extraFlags: ["/mo", String(stepN)],
|
|
@@ -165,13 +179,16 @@ export function previousRunTime(cron, now = new Date()) {
|
|
|
165
179
|
if (star(minute) && star(hour) && star(dayOfMonth) && star(month) && star(dayOfWeek)) {
|
|
166
180
|
return new Date(Math.floor(nowMs / 60000) * 60000);
|
|
167
181
|
}
|
|
168
|
-
// */N * * * * — каждые N минут
|
|
182
|
+
// */N * * * * — каждые N минут внутри часа (минуты 0, N, 2N...).
|
|
169
183
|
const step = /^\*\/(\d+)$/.exec(minute);
|
|
170
184
|
if (step && star(hour) && star(dayOfMonth) && star(month) && star(dayOfWeek)) {
|
|
171
185
|
const n = parseInt(step[1], 10);
|
|
172
186
|
if (n > 0) {
|
|
173
|
-
const
|
|
174
|
-
|
|
187
|
+
const result = new Date(now);
|
|
188
|
+
result.setSeconds(0, 0);
|
|
189
|
+
const minuteOfHour = result.getMinutes();
|
|
190
|
+
result.setMinutes(n >= 60 ? 0 : minuteOfHour - (minuteOfHour % n));
|
|
191
|
+
return result;
|
|
175
192
|
}
|
|
176
193
|
return null;
|
|
177
194
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"file-watcher.d.ts","sourceRoot":"","sources":["../../src/core/file-watcher.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"file-watcher.d.ts","sourceRoot":"","sources":["../../src/core/file-watcher.ts"],"names":[],"mappings":"AAMA;;;;GAIG;AACH,eAAO,MAAM,wBAAwB,OAAO,CAAC;AAE7C,MAAM,MAAM,kBAAkB,GAAG,CAC/B,QAAQ,EAAE,MAAM,EAChB,WAAW,EAAE,MAAM,KAChB,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;AAe1B;;;GAGG;AACH,qBAAa,gBAAgB;IAKzB,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,UAAU;IAL7B,OAAO,CAAC,OAAO,CAAkC;IACjD,OAAO,CAAC,OAAO,CAAS;gBAGL,OAAO,EAAE,kBAAkB,EAC3B,UAAU,GAAE,MAAiC;IAGhE,0CAA0C;IAC1C,IAAI,IAAI,IAAI,MAAM,CAEjB;IAED;;;;OAIG;IACG,OAAO,IAAI,OAAO,CAAC,MAAM,CAAC;IAkEhC,iEAAiE;IAC3D,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAO3B,OAAO,CAAC,GAAG;YAsGG,MAAM;CAcrB"}
|
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
import { watch } from "chokidar";
|
|
2
|
+
import { isAbsolute } from "node:path";
|
|
2
3
|
import { loadTaskDefinitions } from "../task-transfer.js";
|
|
3
4
|
import { filterPaths, relativeTo } from "./glob.js";
|
|
5
|
+
import { hasPathControlChars } from "./watch-paths.js";
|
|
4
6
|
/**
|
|
5
7
|
* Задержка между последним изменением файла и запуском задачи.
|
|
6
8
|
* Нужна потому, что редакторы часто пишут файл несколькими порциями
|
|
@@ -45,7 +47,20 @@ export class FileWatchManager {
|
|
|
45
47
|
? d.watchIgnore.filter((g) => typeof g === "string" && g.trim().length > 0)
|
|
46
48
|
: [],
|
|
47
49
|
}))
|
|
48
|
-
.filter((d) => d.name.length > 0)
|
|
50
|
+
.filter((d) => d.name.length > 0)
|
|
51
|
+
.filter((d) => {
|
|
52
|
+
// Защита от legacy-записей и ручного редактирования БД: не запускаем
|
|
53
|
+
// watcher на путях с управляющими символами или выходом через `..`.
|
|
54
|
+
if (hasPathControlChars(d.path)) {
|
|
55
|
+
console.error(`[windows-scheduler] Задача "${d.name}": путь наблюдения содержит управляющие символы — пропущен.`);
|
|
56
|
+
return false;
|
|
57
|
+
}
|
|
58
|
+
if (!isAbsolute(d.path) && d.path.split(/[\\/]/).includes("..")) {
|
|
59
|
+
console.error(`[windows-scheduler] Задача "${d.name}": относительный путь наблюдения выходит за рабочую директорию — пропущен.`);
|
|
60
|
+
return false;
|
|
61
|
+
}
|
|
62
|
+
return true;
|
|
63
|
+
});
|
|
49
64
|
const wantedKeys = new Set(wanted.map((d) => d.name.toLowerCase()));
|
|
50
65
|
// Убираем watcher'ы для задач, которых больше нет или у которых сменился
|
|
51
66
|
// путь/маски (Спринт 27).
|
|
@@ -26,7 +26,7 @@ export interface GitTriggerTask {
|
|
|
26
26
|
ignore?: string[];
|
|
27
27
|
pollSeconds?: number;
|
|
28
28
|
}
|
|
29
|
-
export type GitCheckStatus = "no-repo" | "baseline" | "no-changes" | "branch-mismatch" | "ignored" | "changed";
|
|
29
|
+
export type GitCheckStatus = "no-repo" | "baseline" | "no-changes" | "branch-mismatch" | "ignored" | "changed" | "error";
|
|
30
30
|
export interface GitCheckResult {
|
|
31
31
|
status: GitCheckStatus;
|
|
32
32
|
head?: string;
|
|
@@ -42,7 +42,9 @@ export type GitTriggerHandler = (taskName: string, info: GitCheckResult & {
|
|
|
42
42
|
export type GitRunner = (cwd: string, args: string[]) => Promise<string>;
|
|
43
43
|
/** Текущий HEAD и ветка; null, если это не git-репозиторий. */
|
|
44
44
|
export declare function probeGit(cwd: string, run?: GitRunner): Promise<GitProbe | null>;
|
|
45
|
-
/** Файлы, изменённые между коммитами (или в самом коммите, если from пуст).
|
|
45
|
+
/** Файлы, изменённые между коммитами (или в самом коммите, если from пуст).
|
|
46
|
+
* Ошибка git НЕ превращается в пустой список: иначе state продвигается и
|
|
47
|
+
* коммиты молча теряются. Вызывающий код обязан обработать исключение. */
|
|
46
48
|
export declare function gitChangedFiles(cwd: string, from: string | null, to: string, run?: GitRunner): Promise<string[]>;
|
|
47
49
|
/**
|
|
48
50
|
* Проверяет задачу без побочных эффектов (кроме baseline-записи).
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"git-trigger.d.ts","sourceRoot":"","sources":["../../src/core/git-trigger.ts"],"names":[],"mappings":"AASA;;;;;;;;;GASG;AAEH,eAAO,MAAM,gCAAgC,KAAK,CAAC;AACnD,eAAO,MAAM,4BAA4B,IAAI,CAAC;AAC9C,eAAO,MAAM,sBAAsB,QAAS,CAAC;AAE7C,MAAM,WAAW,QAAQ;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;CACvB;AAED,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,MAAM,CAAC;IACZ,qDAAqD;IACrD,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,+EAA+E;IAC/E,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IACjB,qEAAqE;IACrE,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,MAAM,cAAc,GACtB,SAAS,GACT,UAAU,GACV,YAAY,GACZ,iBAAiB,GACjB,SAAS,GACT,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"git-trigger.d.ts","sourceRoot":"","sources":["../../src/core/git-trigger.ts"],"names":[],"mappings":"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"}
|
package/dist/core/git-trigger.js
CHANGED
|
@@ -59,21 +59,18 @@ export async function probeGit(cwd, run = defaultRunner) {
|
|
|
59
59
|
return null;
|
|
60
60
|
}
|
|
61
61
|
}
|
|
62
|
-
/** Файлы, изменённые между коммитами (или в самом коммите, если from пуст).
|
|
62
|
+
/** Файлы, изменённые между коммитами (или в самом коммите, если from пуст).
|
|
63
|
+
* Ошибка git НЕ превращается в пустой список: иначе state продвигается и
|
|
64
|
+
* коммиты молча теряются. Вызывающий код обязан обработать исключение. */
|
|
63
65
|
export async function gitChangedFiles(cwd, from, to, run = defaultRunner) {
|
|
64
66
|
const args = from
|
|
65
67
|
? ["diff", "--name-only", `${from}..${to}`]
|
|
66
68
|
: ["diff-tree", "--no-commit-id", "--name-only", "-r", to];
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
.filter(Boolean);
|
|
73
|
-
}
|
|
74
|
-
catch {
|
|
75
|
-
return [];
|
|
76
|
-
}
|
|
69
|
+
const out = await run(cwd, args);
|
|
70
|
+
return out
|
|
71
|
+
.split(/\r?\n/)
|
|
72
|
+
.map((line) => line.trim())
|
|
73
|
+
.filter(Boolean);
|
|
77
74
|
}
|
|
78
75
|
function branchMatches(branch, pattern) {
|
|
79
76
|
if (!pattern || !pattern.trim())
|
|
@@ -89,10 +86,10 @@ function branchMatches(branch, pattern) {
|
|
|
89
86
|
if (patterns.length === 0)
|
|
90
87
|
return true;
|
|
91
88
|
return patterns.some((item) => {
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
89
|
+
// Экранируем все regex-метасимволы, включая [ и ] (раньше они ломали
|
|
90
|
+
// шаблон ветки), затем превращаем glob-символы * и ? в regex.
|
|
91
|
+
const escaped = normalize(item).replace(/[.+^${}()|[\]\\]/g, "\\$&");
|
|
92
|
+
const source = escaped.replace(/\*/g, ".*").replace(/\?/g, ".");
|
|
96
93
|
return new RegExp(`^${source}$`).test(target);
|
|
97
94
|
});
|
|
98
95
|
}
|
|
@@ -150,7 +147,25 @@ export async function checkGitTrigger(task, options = {}) {
|
|
|
150
147
|
message: t("gitTrigger.noChanges"),
|
|
151
148
|
};
|
|
152
149
|
}
|
|
153
|
-
|
|
150
|
+
let files;
|
|
151
|
+
try {
|
|
152
|
+
files = await gitChangedFiles(task.cwd, state.commitSha, probe.head, run);
|
|
153
|
+
}
|
|
154
|
+
catch (err) {
|
|
155
|
+
// Не двигаем state: следующий опрос повторит сравнение с тем же коммитом,
|
|
156
|
+
// и пропущенные изменения не потеряются.
|
|
157
|
+
return {
|
|
158
|
+
status: "error",
|
|
159
|
+
head: probe.head,
|
|
160
|
+
branch: probe.branch,
|
|
161
|
+
from: state.commitSha,
|
|
162
|
+
files: [],
|
|
163
|
+
matched: [],
|
|
164
|
+
message: t("gitTrigger.diffFailed", {
|
|
165
|
+
error: err?.message ? String(err.message) : String(err),
|
|
166
|
+
}),
|
|
167
|
+
};
|
|
168
|
+
}
|
|
154
169
|
const matched = filterPaths(files, task.paths, task.ignore);
|
|
155
170
|
if (matched.length === 0) {
|
|
156
171
|
if (persist)
|
|
@@ -264,6 +279,9 @@ export class GitTriggerManager {
|
|
|
264
279
|
if (result.status === "changed") {
|
|
265
280
|
await this.handler(managed.def.name, { ...result, cwd: cwdOf(managed.def) });
|
|
266
281
|
}
|
|
282
|
+
else if (result.status === "error") {
|
|
283
|
+
console.error(`[windows-scheduler] git-триггер «${managed.def.name}»: ${result.message}`);
|
|
284
|
+
}
|
|
267
285
|
}
|
|
268
286
|
catch (err) {
|
|
269
287
|
console.error(`[windows-scheduler] git-триггер «${managed.def.name}»: ${err instanceof Error ? err.message : String(err)}`);
|
|
@@ -0,0 +1,52 @@
|
|
|
1
|
+
import type { TriageFallback, TriageMode, TriageSettings, TriageShadowSettings } from "../settings.js";
|
|
2
|
+
/**
|
|
3
|
+
* Настройки локального ассистента (Спринт 30.7 `manage_local_ai`).
|
|
4
|
+
*
|
|
5
|
+
* Здесь только чистые функции: слияние патча с текущими настройками
|
|
6
|
+
* триажа, нормализация значений и человекочитаемая сводка. Никаких
|
|
7
|
+
* сетевых вызовов и записи на диск — их делают инструмент и GUI.
|
|
8
|
+
*/
|
|
9
|
+
export declare const LOCAL_AI_TIMEOUT_MIN = 1000;
|
|
10
|
+
export declare const LOCAL_AI_TIMEOUT_MAX = 120000;
|
|
11
|
+
export declare const LOCAL_AI_SELF_TEST_PROMPT = "\u0422\u0435\u0441\u0442 \u0441\u0432\u044F\u0437\u0438: \u0437\u0430\u0434\u0430\u0447\u0430 \u0437\u0430\u0432\u0435\u0440\u0448\u0438\u043B\u0430\u0441\u044C \u043E\u0448\u0438\u0431\u043A\u043E\u0439 Quality Gate (2 \u0443\u043F\u0430\u0432\u0448\u0438\u0445 \u0442\u0435\u0441\u0442\u0430).";
|
|
12
|
+
/** Патч настроек: любое подмножество полей. */
|
|
13
|
+
export interface LocalAiPatch {
|
|
14
|
+
mode?: TriageMode;
|
|
15
|
+
baseUrl?: string;
|
|
16
|
+
model?: string;
|
|
17
|
+
timeoutMs?: number;
|
|
18
|
+
fallback?: TriageFallback;
|
|
19
|
+
confidenceThreshold?: number;
|
|
20
|
+
shadow?: Partial<TriageShadowSettings>;
|
|
21
|
+
}
|
|
22
|
+
/** Сводка настроек для ответа инструмента и GUI. */
|
|
23
|
+
export interface LocalAiSummary {
|
|
24
|
+
mode: TriageMode;
|
|
25
|
+
baseUrl: string;
|
|
26
|
+
model: string;
|
|
27
|
+
timeoutMs: number;
|
|
28
|
+
fallback: TriageFallback;
|
|
29
|
+
confidenceThreshold: number;
|
|
30
|
+
/** Сколько пользовательских правил задано; null — встроенный набор. */
|
|
31
|
+
rules: number | null;
|
|
32
|
+
shadow: TriageShadowSettings;
|
|
33
|
+
/** Триаж реально спрашивает модель (mode llm/auto и заполнены baseUrl+model). */
|
|
34
|
+
llmReady: boolean;
|
|
35
|
+
/** Идёт shadow-период: решения пишутся в отчёт, но не подавляют. */
|
|
36
|
+
shadowActive: boolean;
|
|
37
|
+
/** Протокол по baseUrl: `.../v1` — OpenAI-совместимый, иначе Ollama. */
|
|
38
|
+
protocol: "openai" | "ollama";
|
|
39
|
+
}
|
|
40
|
+
/** Протокол по базовому URL — то же правило, что в `classifyNotification`. */
|
|
41
|
+
export declare function protocolFor(baseUrl: string): "openai" | "ollama";
|
|
42
|
+
/**
|
|
43
|
+
* Сливает патч с текущими настройками. Возвращает новые настройки и
|
|
44
|
+
* список имён изменённых полей (для ответа инструмента и аудита).
|
|
45
|
+
*/
|
|
46
|
+
export declare function applyLocalAiPatch(current: TriageSettings, patch: LocalAiPatch): {
|
|
47
|
+
settings: TriageSettings;
|
|
48
|
+
changed: string[];
|
|
49
|
+
};
|
|
50
|
+
/** Компактная сводка настроек для ответа инструмента. */
|
|
51
|
+
export declare function summarizeLocalAi(settings: TriageSettings): LocalAiSummary;
|
|
52
|
+
//# sourceMappingURL=local-ai.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"local-ai.d.ts","sourceRoot":"","sources":["../../src/core/local-ai.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,cAAc,EACd,UAAU,EACV,cAAc,EACd,oBAAoB,EACrB,MAAM,gBAAgB,CAAC;AAGxB;;;;;;GAMG;AAEH,eAAO,MAAM,oBAAoB,OAAQ,CAAC;AAC1C,eAAO,MAAM,oBAAoB,SAAU,CAAC;AAC5C,eAAO,MAAM,yBAAyB,4SACoC,CAAC;AAE3E,+CAA+C;AAC/C,MAAM,WAAW,YAAY;IAC3B,IAAI,CAAC,EAAE,UAAU,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,cAAc,CAAC;IAC1B,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,MAAM,CAAC,EAAE,OAAO,CAAC,oBAAoB,CAAC,CAAC;CACxC;AAED,oDAAoD;AACpD,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,UAAU,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,cAAc,CAAC;IACzB,mBAAmB,EAAE,MAAM,CAAC;IAC5B,uEAAuE;IACvE,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,MAAM,EAAE,oBAAoB,CAAC;IAC7B,iFAAiF;IACjF,QAAQ,EAAE,OAAO,CAAC;IAClB,oEAAoE;IACpE,YAAY,EAAE,OAAO,CAAC;IACtB,wEAAwE;IACxE,QAAQ,EAAE,QAAQ,GAAG,QAAQ,CAAC;CAC/B;AAWD,8EAA8E;AAC9E,wBAAgB,WAAW,CAAC,OAAO,EAAE,MAAM,GAAG,QAAQ,GAAG,QAAQ,CAGhE;AAED;;;GAGG;AACH,wBAAgB,iBAAiB,CAC/B,OAAO,EAAE,cAAc,EACvB,KAAK,EAAE,YAAY,GAClB;IAAE,QAAQ,EAAE,cAAc,CAAC;IAAC,OAAO,EAAE,MAAM,EAAE,CAAA;CAAE,CAuEjD;AAED,yDAAyD;AACzD,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,cAAc,GAAG,cAAc,CAyBzE"}
|
|
@@ -0,0 +1,119 @@
|
|
|
1
|
+
import { DEFAULT_SHADOW_DAYS, isShadowActive } from "../settings.js";
|
|
2
|
+
/**
|
|
3
|
+
* Настройки локального ассистента (Спринт 30.7 `manage_local_ai`).
|
|
4
|
+
*
|
|
5
|
+
* Здесь только чистые функции: слияние патча с текущими настройками
|
|
6
|
+
* триажа, нормализация значений и человекочитаемая сводка. Никаких
|
|
7
|
+
* сетевых вызовов и записи на диск — их делают инструмент и GUI.
|
|
8
|
+
*/
|
|
9
|
+
export const LOCAL_AI_TIMEOUT_MIN = 1000;
|
|
10
|
+
export const LOCAL_AI_TIMEOUT_MAX = 120000;
|
|
11
|
+
export const LOCAL_AI_SELF_TEST_PROMPT = "Тест связи: задача завершилась ошибкой Quality Gate (2 упавших теста).";
|
|
12
|
+
function clamp(value, min, max, fallback) {
|
|
13
|
+
if (!Number.isFinite(value))
|
|
14
|
+
return fallback;
|
|
15
|
+
return Math.min(max, Math.max(min, Math.round(value)));
|
|
16
|
+
}
|
|
17
|
+
function trimUrl(value) {
|
|
18
|
+
return value.trim().replace(/\/+$/, "");
|
|
19
|
+
}
|
|
20
|
+
/** Протокол по базовому URL — то же правило, что в `classifyNotification`. */
|
|
21
|
+
export function protocolFor(baseUrl) {
|
|
22
|
+
const trimmed = trimUrl(baseUrl);
|
|
23
|
+
return /\/v1$/i.test(trimmed) ? "openai" : "ollama";
|
|
24
|
+
}
|
|
25
|
+
/**
|
|
26
|
+
* Сливает патч с текущими настройками. Возвращает новые настройки и
|
|
27
|
+
* список имён изменённых полей (для ответа инструмента и аудита).
|
|
28
|
+
*/
|
|
29
|
+
export function applyLocalAiPatch(current, patch) {
|
|
30
|
+
const next = { ...current, shadow: { ...current.shadow } };
|
|
31
|
+
const changed = [];
|
|
32
|
+
if (patch.mode !== undefined && patch.mode !== current.mode) {
|
|
33
|
+
next.mode = patch.mode;
|
|
34
|
+
changed.push("mode");
|
|
35
|
+
}
|
|
36
|
+
if (patch.baseUrl !== undefined) {
|
|
37
|
+
const baseUrl = trimUrl(patch.baseUrl);
|
|
38
|
+
if (baseUrl !== current.baseUrl) {
|
|
39
|
+
next.baseUrl = baseUrl;
|
|
40
|
+
changed.push("baseUrl");
|
|
41
|
+
}
|
|
42
|
+
}
|
|
43
|
+
if (patch.model !== undefined) {
|
|
44
|
+
const model = patch.model.trim().slice(0, 200);
|
|
45
|
+
if (model !== current.model) {
|
|
46
|
+
next.model = model;
|
|
47
|
+
changed.push("model");
|
|
48
|
+
}
|
|
49
|
+
}
|
|
50
|
+
if (patch.timeoutMs !== undefined) {
|
|
51
|
+
const timeoutMs = clamp(patch.timeoutMs, LOCAL_AI_TIMEOUT_MIN, LOCAL_AI_TIMEOUT_MAX, current.timeoutMs);
|
|
52
|
+
if (timeoutMs !== current.timeoutMs) {
|
|
53
|
+
next.timeoutMs = timeoutMs;
|
|
54
|
+
changed.push("timeoutMs");
|
|
55
|
+
}
|
|
56
|
+
}
|
|
57
|
+
if (patch.fallback !== undefined && patch.fallback !== current.fallback) {
|
|
58
|
+
next.fallback = patch.fallback;
|
|
59
|
+
changed.push("fallback");
|
|
60
|
+
}
|
|
61
|
+
if (patch.confidenceThreshold !== undefined) {
|
|
62
|
+
const threshold = clamp(patch.confidenceThreshold, 0, 1, current.confidenceThreshold);
|
|
63
|
+
if (threshold !== current.confidenceThreshold) {
|
|
64
|
+
next.confidenceThreshold = threshold;
|
|
65
|
+
changed.push("confidenceThreshold");
|
|
66
|
+
}
|
|
67
|
+
}
|
|
68
|
+
const shadow = next.shadow ?? {
|
|
69
|
+
enabled: false,
|
|
70
|
+
days: DEFAULT_SHADOW_DAYS,
|
|
71
|
+
startedAt: null,
|
|
72
|
+
};
|
|
73
|
+
const shadowPatch = patch.shadow;
|
|
74
|
+
if (shadowPatch && typeof shadowPatch === "object") {
|
|
75
|
+
if (shadowPatch.enabled !== undefined && Boolean(shadowPatch.enabled) !== shadow.enabled) {
|
|
76
|
+
shadow.enabled = Boolean(shadowPatch.enabled);
|
|
77
|
+
changed.push("shadow.enabled");
|
|
78
|
+
}
|
|
79
|
+
if (shadowPatch.days !== undefined) {
|
|
80
|
+
const days = clamp(shadowPatch.days, 1, 365, shadow.days);
|
|
81
|
+
if (days !== shadow.days) {
|
|
82
|
+
shadow.days = days;
|
|
83
|
+
changed.push("shadow.days");
|
|
84
|
+
}
|
|
85
|
+
}
|
|
86
|
+
if (shadowPatch.startedAt !== undefined && shadowPatch.startedAt !== shadow.startedAt) {
|
|
87
|
+
shadow.startedAt = shadowPatch.startedAt;
|
|
88
|
+
changed.push("shadow.startedAt");
|
|
89
|
+
}
|
|
90
|
+
}
|
|
91
|
+
next.shadow = shadow;
|
|
92
|
+
return { settings: next, changed };
|
|
93
|
+
}
|
|
94
|
+
/** Компактная сводка настроек для ответа инструмента. */
|
|
95
|
+
export function summarizeLocalAi(settings) {
|
|
96
|
+
const shadow = settings.shadow ?? {
|
|
97
|
+
enabled: false,
|
|
98
|
+
days: DEFAULT_SHADOW_DAYS,
|
|
99
|
+
startedAt: null,
|
|
100
|
+
};
|
|
101
|
+
const baseUrl = settings.baseUrl ?? "";
|
|
102
|
+
const model = settings.model ?? "";
|
|
103
|
+
return {
|
|
104
|
+
mode: settings.mode,
|
|
105
|
+
baseUrl,
|
|
106
|
+
model,
|
|
107
|
+
timeoutMs: settings.timeoutMs,
|
|
108
|
+
fallback: settings.fallback,
|
|
109
|
+
confidenceThreshold: settings.confidenceThreshold,
|
|
110
|
+
rules: Array.isArray(settings.rules) ? settings.rules.length : null,
|
|
111
|
+
shadow,
|
|
112
|
+
llmReady: settings.mode !== "off" &&
|
|
113
|
+
settings.mode !== "rules" &&
|
|
114
|
+
baseUrl.trim().length > 0 &&
|
|
115
|
+
model.trim().length > 0,
|
|
116
|
+
shadowActive: isShadowActive(shadow),
|
|
117
|
+
protocol: protocolFor(baseUrl),
|
|
118
|
+
};
|
|
119
|
+
}
|
package/dist/core/lock.d.ts
CHANGED
|
@@ -13,6 +13,8 @@ export declare class LockManager {
|
|
|
13
13
|
private lockFileName;
|
|
14
14
|
/** Полный путь к lock-файлу задачи. */
|
|
15
15
|
private lockFilePath;
|
|
16
|
+
/** Публичный путь к lock-файлу (для ожидания/вытеснения зависших lock). */
|
|
17
|
+
pathFor(taskName: string): string;
|
|
16
18
|
/**
|
|
17
19
|
* Инициализация директории блокировок и очистка зависших (старых) файлов.
|
|
18
20
|
* Вызывается при старте плагина.
|
|
@@ -40,4 +42,16 @@ export declare class LockManager {
|
|
|
40
42
|
* Гарантирует освобождение блокировки в finally (включая при ошибках).
|
|
41
43
|
*/
|
|
42
44
|
export declare function withLock<T>(lockManager: LockManager, taskName: string, fn: () => Promise<T>): Promise<T | null>;
|
|
45
|
+
/**
|
|
46
|
+
* Выполняет функцию с ожиданием освобождения файловой блокировки.
|
|
47
|
+
* В отличие от withLock не пропускает выполнение, а ждёт: критично для
|
|
48
|
+
* read-modify-write операций (crontab), где пропуск ломает состояние.
|
|
49
|
+
* Если lock удерживается дольше staleMs — считается осиротевшим и вытесняется
|
|
50
|
+
* атомарным rename (как в T-03), чтобы зависший процесс не блокировал навсегда.
|
|
51
|
+
*/
|
|
52
|
+
export declare function withLockWait<T>(lockManager: LockManager, taskName: string, fn: () => Promise<T>, options?: {
|
|
53
|
+
timeoutMs?: number;
|
|
54
|
+
retryDelayMs?: number;
|
|
55
|
+
staleMs?: number;
|
|
56
|
+
}): Promise<T>;
|
|
43
57
|
//# sourceMappingURL=lock.d.ts.map
|
package/dist/core/lock.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lock.d.ts","sourceRoot":"","sources":["../../src/core/lock.ts"],"names":[],"mappings":"AAIA;;;;;;;GAOG;AACH,qBAAa,WAAW;IACtB,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAS;gBAErB,OAAO,GAAE,MAAiB;IAItC,iCAAiC;IACjC,OAAO,CAAC,YAAY;IAIpB,uCAAuC;IACvC,OAAO,CAAC,YAAY;IAIpB;;;OAGG;IACG,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"lock.d.ts","sourceRoot":"","sources":["../../src/core/lock.ts"],"names":[],"mappings":"AAIA;;;;;;;GAOG;AACH,qBAAa,WAAW;IACtB,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAS;gBAErB,OAAO,GAAE,MAAiB;IAItC,iCAAiC;IACjC,OAAO,CAAC,YAAY;IAIpB,uCAAuC;IACvC,OAAO,CAAC,YAAY;IAIpB,2EAA2E;IAC3E,OAAO,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM;IAIjC;;;OAGG;IACG,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAiDjC;;;;OAIG;IACG,OAAO,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAgBjD;;;OAGG;IACG,OAAO,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAS9C;;OAEG;IACG,QAAQ,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;CAUnD;AAED;;;;GAIG;AACH,wBAAsB,QAAQ,CAAC,CAAC,EAC9B,WAAW,EAAE,WAAW,EACxB,QAAQ,EAAE,MAAM,EAChB,EAAE,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,GACnB,OAAO,CAAC,CAAC,GAAG,IAAI,CAAC,CAenB;AAED;;;;;;GAMG;AACH,wBAAsB,YAAY,CAAC,CAAC,EAClC,WAAW,EAAE,WAAW,EACxB,QAAQ,EAAE,MAAM,EAChB,EAAE,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,EACpB,OAAO,GAAE;IAAE,SAAS,CAAC,EAAE,MAAM,CAAC;IAAC,YAAY,CAAC,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,CAAA;CAAO,GAC5E,OAAO,CAAC,CAAC,CAAC,CA4CZ"}
|