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
package/dist/integrations.d.ts
CHANGED
|
@@ -7,6 +7,11 @@ export declare function timingSafeStringEqual(expected: string, provided: string
|
|
|
7
7
|
export declare function verifyHookToken(expected: string, provided: string | null): boolean;
|
|
8
8
|
/** Считает HMAC-SHA256 по сырому телу и возвращает значение в формате `sha256=<hex>`. */
|
|
9
9
|
export declare function signHookPayload(secret: string, body: Buffer | string): string;
|
|
10
|
+
/**
|
|
11
|
+
* HMAC с привязкой к timestamp: подписывается `<timestamp>.<сырое тело>`.
|
|
12
|
+
* Используется, когда защита от replay включена (toleranceSeconds > 0).
|
|
13
|
+
*/
|
|
14
|
+
export declare function signHookPayloadWithTimestamp(secret: string, timestamp: string, body: Buffer | string): string;
|
|
10
15
|
/** Достаёт подпись из поддерживаемых заголовков. */
|
|
11
16
|
export declare function extractHookSignature(headers: HeaderMap): string | null;
|
|
12
17
|
/** Достаёт токен из поддерживаемых заголовков (если нет query-параметра). */
|
|
@@ -14,8 +19,11 @@ export declare function extractHookToken(headers: HeaderMap): string | null;
|
|
|
14
19
|
/**
|
|
15
20
|
* Проверяет HMAC-подпись. Принимает `sha256=<hex>` и «голый» hex;
|
|
16
21
|
* алгоритмы кроме SHA-256 намеренно не поддерживаются.
|
|
22
|
+
*
|
|
23
|
+
* Если передан timestamp, подпись проверяется по схеме `<timestamp>.<body>`
|
|
24
|
+
* (защита от replay). Без timestamp — legacy-подпись по одному телу.
|
|
17
25
|
*/
|
|
18
|
-
export declare function verifyHookSignature(secret: string, body: Buffer | string, signature: string | null): boolean;
|
|
26
|
+
export declare function verifyHookSignature(secret: string, body: Buffer | string, signature: string | null, timestamp?: string | null): boolean;
|
|
19
27
|
/**
|
|
20
28
|
* Проверяет необязательный timestamp против текущего времени.
|
|
21
29
|
* 0 в настройках — проверка выключена. Без заголовка запрос разрешён.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"integrations.d.ts","sourceRoot":"","sources":["../src/integrations.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAClC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"integrations.d.ts","sourceRoot":"","sources":["../src/integrations.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAClC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAiClD,KAAK,SAAS,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,SAAS,CAAC,CAAC;AAQ/D,gEAAgE;AAChE,wBAAgB,qBAAqB,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAOjF;AAED,wDAAwD;AACxD,wBAAgB,eAAe,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,IAAI,GAAG,OAAO,CAElF;AAED,yFAAyF;AACzF,wBAAgB,eAAe,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,CAI7E;AAED;;;GAGG;AACH,wBAAgB,4BAA4B,CAC1C,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,MAAM,EACjB,IAAI,EAAE,MAAM,GAAG,MAAM,GACpB,MAAM,CAIR;AAED,oDAAoD;AACpD,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,SAAS,GAAG,MAAM,GAAG,IAAI,CAMtE;AAED,6EAA6E;AAC7E,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,SAAS,GAAG,MAAM,GAAG,IAAI,CAMlE;AAED;;;;;;GAMG;AACH,wBAAgB,mBAAmB,CACjC,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,MAAM,GAAG,MAAM,EACrB,SAAS,EAAE,MAAM,GAAG,IAAI,EACxB,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,GACxB,OAAO,CAYT;AAED;;;GAGG;AACH,wBAAgB,mBAAmB,CACjC,KAAK,EAAE,MAAM,GAAG,IAAI,EACpB,gBAAgB,EAAE,MAAM,EACxB,KAAK,SAAa,GACjB;IAAE,EAAE,EAAE,OAAO,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE,CAoBlC;AAED,MAAM,WAAW,aAAa;IAC5B,QAAQ,EAAE,YAAY,CAAC;IACvB,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,qEAAqE;IACrE,IAAI,EAAE,MAAM,CAAC;IACb,kCAAkC;IAClC,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,cAAc;IAC7B,EAAE,EAAE,OAAO,CAAC;IACZ,+CAA+C;IAC/C,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED;;;GAGG;AACH,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,aAAa,GAAG,cAAc,CA6D5E;AAED,MAAM,MAAM,cAAc,GACtB;IAAE,EAAE,EAAE,IAAI,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,GAC1B;IAAE,EAAE,EAAE,KAAK,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC;AAEjD;;;;;GAKG;AACH,wBAAgB,eAAe,CAC7B,GAAG,EAAE,IAAI,CAAC,eAAe,EACzB,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,cAAc,CAAC,CA6CzB"}
|
package/dist/integrations.js
CHANGED
|
@@ -4,8 +4,14 @@ import crypto from "node:crypto";
|
|
|
4
4
|
*
|
|
5
5
|
* Контракт:
|
|
6
6
|
* POST /api/hooks/<task>?token=<token>
|
|
7
|
-
* X-Scheduler-Signature: sha256=<hex hmac
|
|
8
|
-
* X-Scheduler-Timestamp: <unix seconds|milliseconds>
|
|
7
|
+
* X-Scheduler-Signature: sha256=<hex hmac>
|
|
8
|
+
* X-Scheduler-Timestamp: <unix seconds|milliseconds>
|
|
9
|
+
*
|
|
10
|
+
* При включённой подписи и ненулевом timestampToleranceSeconds заголовок
|
|
11
|
+
* X-Scheduler-Timestamp обязателен и входит в HMAC: подписывается строка
|
|
12
|
+
* `<timestamp>.<сырое тело>`. Так перехваченный запрос нельзя переиграть,
|
|
13
|
+
* подставив свежий timestamp. При toleranceSeconds = 0 (проверка времени
|
|
14
|
+
* отключена явно) подпись считается по одному телу — legacy-режим.
|
|
9
15
|
*
|
|
10
16
|
* Для совместимости с GitHub Actions принимается также `X-Hub-Signature-256`,
|
|
11
17
|
* для GitLab — `X-Gitlab-Token` вместо query-параметра.
|
|
@@ -48,6 +54,15 @@ export function signHookPayload(secret, body) {
|
|
|
48
54
|
const digest = crypto.createHmac("sha256", secret).update(payload).digest("hex");
|
|
49
55
|
return `sha256=${digest}`;
|
|
50
56
|
}
|
|
57
|
+
/**
|
|
58
|
+
* HMAC с привязкой к timestamp: подписывается `<timestamp>.<сырое тело>`.
|
|
59
|
+
* Используется, когда защита от replay включена (toleranceSeconds > 0).
|
|
60
|
+
*/
|
|
61
|
+
export function signHookPayloadWithTimestamp(secret, timestamp, body) {
|
|
62
|
+
const payload = Buffer.isBuffer(body) ? body : Buffer.from(body, "utf8");
|
|
63
|
+
const prefixed = Buffer.concat([Buffer.from(`${timestamp}.`, "utf8"), payload]);
|
|
64
|
+
return signHookPayload(secret, prefixed);
|
|
65
|
+
}
|
|
51
66
|
/** Достаёт подпись из поддерживаемых заголовков. */
|
|
52
67
|
export function extractHookSignature(headers) {
|
|
53
68
|
for (const name of SIGNATURE_HEADERS) {
|
|
@@ -69,8 +84,11 @@ export function extractHookToken(headers) {
|
|
|
69
84
|
/**
|
|
70
85
|
* Проверяет HMAC-подпись. Принимает `sha256=<hex>` и «голый» hex;
|
|
71
86
|
* алгоритмы кроме SHA-256 намеренно не поддерживаются.
|
|
87
|
+
*
|
|
88
|
+
* Если передан timestamp, подпись проверяется по схеме `<timestamp>.<body>`
|
|
89
|
+
* (защита от replay). Без timestamp — legacy-подпись по одному телу.
|
|
72
90
|
*/
|
|
73
|
-
export function verifyHookSignature(secret, body, signature) {
|
|
91
|
+
export function verifyHookSignature(secret, body, signature, timestamp) {
|
|
74
92
|
if (!secret || !signature)
|
|
75
93
|
return false;
|
|
76
94
|
const normalized = signature.trim();
|
|
@@ -80,7 +98,7 @@ export function verifyHookSignature(secret, body, signature) {
|
|
|
80
98
|
const provided = normalized.replace(/^sha256=/i, "").trim().toLowerCase();
|
|
81
99
|
if (!/^[a-f0-9]{64}$/.test(provided))
|
|
82
100
|
return false;
|
|
83
|
-
const expected = signHookPayload(secret, body).replace(/^sha256=/, "");
|
|
101
|
+
const expected = (timestamp ? signHookPayloadWithTimestamp(secret, timestamp, body) : signHookPayload(secret, body)).replace(/^sha256=/, "");
|
|
84
102
|
return timingSafeStringEqual(expected, provided);
|
|
85
103
|
}
|
|
86
104
|
/**
|
|
@@ -128,6 +146,9 @@ export function authenticateHookRequest(input) {
|
|
|
128
146
|
if (!verifyHookToken(settings.token, input.token)) {
|
|
129
147
|
return { ok: false, status: 401, error: "Неверный token." };
|
|
130
148
|
}
|
|
149
|
+
const timestampValue = input.timestamp?.trim() || null;
|
|
150
|
+
// Защита от replay включается только вместе с подписью и ненулевым окном.
|
|
151
|
+
const needsSignedTimestamp = settings.requireSignature && settings.timestampToleranceSeconds > 0;
|
|
131
152
|
if (settings.requireSignature) {
|
|
132
153
|
if (!settings.secret) {
|
|
133
154
|
return {
|
|
@@ -143,11 +164,18 @@ export function authenticateHookRequest(input) {
|
|
|
143
164
|
error: "Не передана HMAC-подпись (X-Scheduler-Signature).",
|
|
144
165
|
};
|
|
145
166
|
}
|
|
146
|
-
if (
|
|
167
|
+
if (needsSignedTimestamp && !timestampValue) {
|
|
168
|
+
return {
|
|
169
|
+
ok: false,
|
|
170
|
+
status: 401,
|
|
171
|
+
error: "Не передан X-Scheduler-Timestamp: при включённой подписи он обязателен.",
|
|
172
|
+
};
|
|
173
|
+
}
|
|
174
|
+
if (!verifyHookSignature(settings.secret, input.body, input.signature, needsSignedTimestamp ? timestampValue : null)) {
|
|
147
175
|
return { ok: false, status: 401, error: "Неверная HMAC-подпись." };
|
|
148
176
|
}
|
|
149
177
|
}
|
|
150
|
-
const timestamp = verifyHookTimestamp(
|
|
178
|
+
const timestamp = verifyHookTimestamp(timestampValue, settings.timestampToleranceSeconds, input.nowMs);
|
|
151
179
|
if (!timestamp.ok) {
|
|
152
180
|
return { ok: false, status: 401, error: timestamp.reason };
|
|
153
181
|
}
|
package/dist/notifications.d.ts
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
|
-
import { type DigestFrequency, type DigestSettings, type NotificationFilters, type NotificationTemplates } from "./settings.js";
|
|
1
|
+
import { type DigestFrequency, type DigestSettings, type NotificationFilters, type NotificationTemplates, type TriageSettings } from "./settings.js";
|
|
2
2
|
import { type AnalyticsRecord, type ErrorAnalyticsRow } from "./core/analytics.js";
|
|
3
|
+
import type { TriageInput } from "./core/triage.js";
|
|
3
4
|
/** Статус завершения задачи, который приходит из record-history. */
|
|
4
5
|
export type NotificationStatus = "success" | "error" | "timeout" | string;
|
|
5
6
|
/** Содержимое уведомления. */
|
|
@@ -13,6 +14,17 @@ export interface NotificationPayload {
|
|
|
13
14
|
/** Стоимость запуска в USD, если известна. */
|
|
14
15
|
costUsd?: number | null;
|
|
15
16
|
}
|
|
17
|
+
/** Настройки асинхронного триажа (Спринт 31.7). */
|
|
18
|
+
export interface NotifyTaskOptions {
|
|
19
|
+
/**
|
|
20
|
+
* Для `llm`/`auto`: доставить уведомление сразу, а вердикт посчитать
|
|
21
|
+
* в отдельном процессе. Тесты и прямые вызовы без опции сохраняют
|
|
22
|
+
* синхронное поведение.
|
|
23
|
+
*/
|
|
24
|
+
asyncTriage?: boolean;
|
|
25
|
+
/** Для тестов: подменить запуск фонового процесса. */
|
|
26
|
+
scheduleTriage?: (input: TriageInput, triage: TriageSettings) => unknown;
|
|
27
|
+
}
|
|
16
28
|
/** Человекочитаемая длительность: 2300 мс → «2.3s». */
|
|
17
29
|
export declare function formatDuration(durationMs: number): string;
|
|
18
30
|
/**
|
|
@@ -86,7 +98,23 @@ export declare function isQuietHours(now: Date, quiet?: {
|
|
|
86
98
|
* - фильтры include/exclude отсекают задачи по имени;
|
|
87
99
|
* - ошибки отправки только логируются, наружу не выбрасываются.
|
|
88
100
|
*/
|
|
89
|
-
|
|
101
|
+
/**
|
|
102
|
+
* Дедуп уведомлений (Спринт 31.2): группирует повторяющиеся уведомления о
|
|
103
|
+
* задаче в окне времени, считает повторы и не подавляет важные статусы.
|
|
104
|
+
*
|
|
105
|
+
* Ключ группировки: taskName + status. Запись хранится в SQLite, поэтому
|
|
106
|
+
* счётчик сохраняется между короткоживущими процессами record-history.
|
|
107
|
+
*/
|
|
108
|
+
export interface DedupRecord {
|
|
109
|
+
key: string;
|
|
110
|
+
taskName: string;
|
|
111
|
+
status: string;
|
|
112
|
+
count: number;
|
|
113
|
+
firstAt: string;
|
|
114
|
+
lastAt: string;
|
|
115
|
+
windowMinutes: number;
|
|
116
|
+
}
|
|
117
|
+
export declare function notifyTaskCompletion(taskName: string, status: NotificationStatus, durationMs: number, error?: string | null, tokens?: number | null, costUsd?: number | null, options?: NotifyTaskOptions): Promise<void>;
|
|
90
118
|
/**
|
|
91
119
|
* Уведомляет о завершении матрицы (Спринт 20).
|
|
92
120
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"notifications.d.ts","sourceRoot":"","sources":["../src/notifications.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,eAAe,EACpB,KAAK,cAAc,EACnB,KAAK,mBAAmB,EAExB,KAAK,qBAAqB,
|
|
1
|
+
{"version":3,"file":"notifications.d.ts","sourceRoot":"","sources":["../src/notifications.ts"],"names":[],"mappings":"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"}
|
package/dist/notifications.js
CHANGED
|
@@ -1,8 +1,13 @@
|
|
|
1
|
-
import { loadSettings, saveSettings, } from "./settings.js";
|
|
1
|
+
import { loadSettings, saveSettings, isShadowActive, } from "./settings.js";
|
|
2
2
|
import { buildAnalytics, } from "./core/analytics.js";
|
|
3
3
|
import { getHistory } from "./db/history-repo.js";
|
|
4
|
+
import { getDb, withTransaction } from "./db/index.js";
|
|
4
5
|
import { sendTelegramMessage } from "./core/telegram.js";
|
|
5
6
|
import { sendNativeNotification } from "./core/native-notify.js";
|
|
7
|
+
import { decideTriage } from "./core/triage-chain.js";
|
|
8
|
+
import { recordTriageOutcome } from "./core/triage-shadow.js";
|
|
9
|
+
import { scheduleTriageJob } from "./core/triage-worker.js";
|
|
10
|
+
import { summarizeNotification, summaryProviderFromTriage, } from "./core/summary.js";
|
|
6
11
|
import { t } from "./i18n.js";
|
|
7
12
|
/** Таймаут HTTP-запроса по умолчанию: уведомление не должно подвешивать задачу. */
|
|
8
13
|
const REQUEST_TIMEOUT_MS = 10000;
|
|
@@ -333,16 +338,209 @@ async function deliver(config, message) {
|
|
|
333
338
|
const results = await deliverDetailed(config, message);
|
|
334
339
|
return results.some((item) => item.ok);
|
|
335
340
|
}
|
|
341
|
+
/** Ключ дедупа: комбинация задачи и статуса. */
|
|
342
|
+
function dedupKey(taskName, status) {
|
|
343
|
+
return (taskName + '|' + status).toLowerCase();
|
|
344
|
+
}
|
|
345
|
+
/** Читает или создаёт запись дедупа. Возвращает { record, isDuplicate }.
|
|
346
|
+
* Если записи нет или окно истекло — создаёт новую с count=1.
|
|
347
|
+
* Если есть и окно ещё активно — увеличивает count и возвращает isDuplicate=true.
|
|
348
|
+
*/
|
|
349
|
+
function dedupReadOrCreate(db, key, taskName, status, dedup) {
|
|
350
|
+
const now = new Date().toISOString();
|
|
351
|
+
const row = db
|
|
352
|
+
.prepare("SELECT * FROM notification_dedup WHERE key = ?")
|
|
353
|
+
.get(key);
|
|
354
|
+
if (!row) {
|
|
355
|
+
db.prepare("INSERT INTO notification_dedup (key, task_name, status, count, first_at, last_at, window_minutes) VALUES (?, ?, ?, 1, ?, ?, ?)").run(key, taskName, status, now, now, dedup.windowMinutes);
|
|
356
|
+
return {
|
|
357
|
+
record: {
|
|
358
|
+
key,
|
|
359
|
+
taskName,
|
|
360
|
+
status,
|
|
361
|
+
count: 1,
|
|
362
|
+
firstAt: now,
|
|
363
|
+
lastAt: now,
|
|
364
|
+
windowMinutes: dedup.windowMinutes,
|
|
365
|
+
},
|
|
366
|
+
isDuplicate: false,
|
|
367
|
+
};
|
|
368
|
+
}
|
|
369
|
+
const last = new Date(row.last_at).getTime();
|
|
370
|
+
const nowMs = new Date(now).getTime();
|
|
371
|
+
const windowMs = (row.window_minutes ?? dedup.windowMinutes) * 60 * 1000;
|
|
372
|
+
if (nowMs - last > windowMs) {
|
|
373
|
+
// Окно истекло — начинаем заново.
|
|
374
|
+
db.prepare("UPDATE notification_dedup SET count = 1, first_at = ?, last_at = ?, window_minutes = ? WHERE key = ?").run(now, now, dedup.windowMinutes, key);
|
|
375
|
+
return {
|
|
376
|
+
record: {
|
|
377
|
+
key,
|
|
378
|
+
taskName,
|
|
379
|
+
status,
|
|
380
|
+
count: 1,
|
|
381
|
+
firstAt: now,
|
|
382
|
+
lastAt: now,
|
|
383
|
+
windowMinutes: dedup.windowMinutes,
|
|
384
|
+
},
|
|
385
|
+
isDuplicate: false,
|
|
386
|
+
};
|
|
387
|
+
}
|
|
388
|
+
const count = Math.min(Number(row.count) + 1, dedup.maxCount);
|
|
389
|
+
db.prepare("UPDATE notification_dedup SET count = ?, last_at = ? WHERE key = ?").run(count, now, key);
|
|
390
|
+
return {
|
|
391
|
+
record: {
|
|
392
|
+
key,
|
|
393
|
+
taskName,
|
|
394
|
+
status,
|
|
395
|
+
count,
|
|
396
|
+
firstAt: row.first_at,
|
|
397
|
+
lastAt: now,
|
|
398
|
+
windowMinutes: row.window_minutes ?? dedup.windowMinutes,
|
|
399
|
+
},
|
|
400
|
+
isDuplicate: true,
|
|
401
|
+
};
|
|
402
|
+
}
|
|
403
|
+
/** Подавлять ли уведомление по дедупу: только если не важный статус. */
|
|
404
|
+
function isDedupSuppressed(status, dedup) {
|
|
405
|
+
const important = dedup.importantStatuses.some((s) => s.toLowerCase() === status.toLowerCase());
|
|
406
|
+
return !important;
|
|
407
|
+
}
|
|
408
|
+
/** Добавляет счётчик повторов к сообщению, если это не первое уведомление. */
|
|
409
|
+
function messageWithDedupCount(message, count) {
|
|
410
|
+
if (count <= 1)
|
|
411
|
+
return message;
|
|
412
|
+
return message + ' ' + t("notify.dedup.count", { count });
|
|
413
|
+
}
|
|
414
|
+
/** Размерность вектора фиксирована: feature hashing, а не словарь сообщения. */
|
|
415
|
+
const EMBEDDING_DIMENSION = 512;
|
|
416
|
+
/** FNV-1a 32-bit — стабильный хеш токена между процессами и запусками. */
|
|
417
|
+
function fnv1a32(value) {
|
|
418
|
+
let hash = 0x811c9dc5;
|
|
419
|
+
for (let i = 0; i < value.length; i++) {
|
|
420
|
+
hash ^= value.charCodeAt(i);
|
|
421
|
+
hash = Math.imul(hash, 0x01000193);
|
|
422
|
+
}
|
|
423
|
+
return hash >>> 0;
|
|
424
|
+
}
|
|
425
|
+
function embeddingKey(taskName, status) {
|
|
426
|
+
return `emb:${(taskName + '|' + status).toLowerCase()}`;
|
|
427
|
+
}
|
|
428
|
+
/** Простой токенизатор: слова, цифры, нижний регистр. */
|
|
429
|
+
function tokenize(text) {
|
|
430
|
+
return text
|
|
431
|
+
.toLowerCase()
|
|
432
|
+
.replace(/[^a-zа-яё0-9\s]/g, " ")
|
|
433
|
+
.split(/\s+/)
|
|
434
|
+
.filter((t) => t.length > 0);
|
|
435
|
+
}
|
|
336
436
|
/**
|
|
337
|
-
*
|
|
437
|
+
* Вектор сообщения: feature hashing в фиксированную размерность.
|
|
338
438
|
*
|
|
339
|
-
*
|
|
340
|
-
*
|
|
341
|
-
*
|
|
342
|
-
*
|
|
343
|
-
*
|
|
439
|
+
* Раньше длина вектора равнялась числу уникальных слов, а индекс — порядку
|
|
440
|
+
* первого появления. Такие векторы нельзя сравнивать позиционно: один и тот
|
|
441
|
+
* же текст с другим порядком слов давал сходство < 1, а векторы разной длины
|
|
442
|
+
* вообще пропускались. Теперь каждый токен детерминированно проецируется
|
|
443
|
+
* в [0, EMBEDDING_DIMENSION), поэтому косинус корректен для любых двух текстов.
|
|
444
|
+
* Вес — 1 + log(tf), L2-нормализация; знак из старшего бита хеша снижает
|
|
445
|
+
* влияние коллизий.
|
|
446
|
+
*/
|
|
447
|
+
function textToVector(text) {
|
|
448
|
+
const tokens = tokenize(text);
|
|
449
|
+
const vec = new Array(EMBEDDING_DIMENSION).fill(0);
|
|
450
|
+
if (tokens.length === 0)
|
|
451
|
+
return vec;
|
|
452
|
+
const counts = new Map();
|
|
453
|
+
for (const tok of tokens)
|
|
454
|
+
counts.set(tok, (counts.get(tok) ?? 0) + 1);
|
|
455
|
+
for (const [tok, count] of counts) {
|
|
456
|
+
const hash = fnv1a32(tok);
|
|
457
|
+
const idx = hash % EMBEDDING_DIMENSION;
|
|
458
|
+
const sign = (hash & 0x80000000) !== 0 ? -1 : 1;
|
|
459
|
+
vec[idx] += sign * (1 + Math.log(count));
|
|
460
|
+
}
|
|
461
|
+
let norm = 0;
|
|
462
|
+
for (const v of vec)
|
|
463
|
+
norm += v * v;
|
|
464
|
+
norm = Math.sqrt(norm);
|
|
465
|
+
if (norm > 0) {
|
|
466
|
+
for (let i = 0; i < vec.length; i++)
|
|
467
|
+
vec[i] /= norm;
|
|
468
|
+
}
|
|
469
|
+
return vec;
|
|
470
|
+
}
|
|
471
|
+
function cosineSimilarity(a, b) {
|
|
472
|
+
// Векторы разных размерностей несравнимы: это разные пространства признаков.
|
|
473
|
+
if (a.length !== b.length || a.length === 0)
|
|
474
|
+
return 0;
|
|
475
|
+
let dot = 0;
|
|
476
|
+
let na = 0;
|
|
477
|
+
let nb = 0;
|
|
478
|
+
for (let i = 0; i < a.length; i++) {
|
|
479
|
+
dot += a[i] * b[i];
|
|
480
|
+
na += a[i] * a[i];
|
|
481
|
+
nb += b[i] * b[i];
|
|
482
|
+
}
|
|
483
|
+
const denom = Math.sqrt(na) * Math.sqrt(nb);
|
|
484
|
+
if (denom === 0)
|
|
485
|
+
return 0;
|
|
486
|
+
return dot / denom;
|
|
487
|
+
}
|
|
488
|
+
/**
|
|
489
|
+
* Проверяет, есть ли в БД вектор, достаточно похожий на text.
|
|
490
|
+
* Сравниваются только векторы той же задачи и того же статуса: иначе успех
|
|
491
|
+
* одной задачи «заражал» бы ошибки другой. Берём последние LIMIT векторов окна.
|
|
492
|
+
*/
|
|
493
|
+
function embeddingExists(db, taskName, status, message, threshold, windowMinutes) {
|
|
494
|
+
const since = new Date(Date.now() - windowMinutes * 60000).toISOString();
|
|
495
|
+
const rows = db
|
|
496
|
+
.prepare("SELECT key, embedding_json FROM notification_embeddings " +
|
|
497
|
+
"WHERE task_name = ? AND status = ? AND created_at >= ? " +
|
|
498
|
+
"ORDER BY created_at DESC LIMIT 500")
|
|
499
|
+
.all(taskName, status, since);
|
|
500
|
+
const vec = textToVector(message);
|
|
501
|
+
let bestKey = "";
|
|
502
|
+
let bestSim = 0;
|
|
503
|
+
for (const row of rows) {
|
|
504
|
+
try {
|
|
505
|
+
const emb = JSON.parse(row.embedding_json);
|
|
506
|
+
if (!Array.isArray(emb) || emb.length !== vec.length)
|
|
507
|
+
continue;
|
|
508
|
+
const sim = cosineSimilarity(vec, emb);
|
|
509
|
+
if (sim > bestSim) {
|
|
510
|
+
bestSim = sim;
|
|
511
|
+
bestKey = row.key;
|
|
512
|
+
}
|
|
513
|
+
}
|
|
514
|
+
catch {
|
|
515
|
+
// пропускаем битую запись
|
|
516
|
+
}
|
|
517
|
+
}
|
|
518
|
+
if (bestSim >= threshold)
|
|
519
|
+
return { found: true, key: bestKey };
|
|
520
|
+
return null;
|
|
521
|
+
}
|
|
522
|
+
/**
|
|
523
|
+
* Сохраняет вектор сообщения в БД.
|
|
524
|
+
* Ключ уникален для каждого сообщения (а не task|status): храним историю,
|
|
525
|
+
* иначе INSERT OR REPLACE оставлял бы только последний вектор и дедуп
|
|
526
|
+
* сравнивал бы новое сообщение само с собой.
|
|
344
527
|
*/
|
|
345
|
-
|
|
528
|
+
function storeEmbedding(db, taskName, status, message, vector, windowMinutes) {
|
|
529
|
+
const now = new Date().toISOString();
|
|
530
|
+
const key = embeddingKey(taskName, status) +
|
|
531
|
+
`:${Date.now().toString(36)}:${Math.random().toString(36).slice(2, 8)}`;
|
|
532
|
+
db.prepare("INSERT INTO notification_embeddings (key, task_name, status, message_text, embedding_json, dimension, created_at, window_minutes) VALUES (?, ?, ?, ?, ?, ?, ?, ?)").run(key, taskName, status, message, JSON.stringify(vector), vector.length, now, windowMinutes);
|
|
533
|
+
}
|
|
534
|
+
/** Очищает старые векторы вне окна и лишние сверх maxVectors. */
|
|
535
|
+
function cleanupEmbeddings(db, windowMinutes, maxVectors) {
|
|
536
|
+
const since = new Date(Date.now() - windowMinutes * 60000).toISOString();
|
|
537
|
+
db.prepare("DELETE FROM notification_embeddings WHERE created_at < ?").run(since);
|
|
538
|
+
if (maxVectors && maxVectors > 0) {
|
|
539
|
+
db.prepare("DELETE FROM notification_embeddings WHERE key NOT IN (" +
|
|
540
|
+
"SELECT key FROM notification_embeddings ORDER BY created_at DESC LIMIT ?)").run(maxVectors);
|
|
541
|
+
}
|
|
542
|
+
}
|
|
543
|
+
export async function notifyTaskCompletion(taskName, status, durationMs, error, tokens, costUsd, options = {}) {
|
|
346
544
|
try {
|
|
347
545
|
const settings = await loadSettings();
|
|
348
546
|
const config = settings.notifications;
|
|
@@ -358,8 +556,89 @@ export async function notifyTaskCompletion(taskName, status, durationMs, error,
|
|
|
358
556
|
status !== "timeout") {
|
|
359
557
|
return;
|
|
360
558
|
}
|
|
361
|
-
|
|
362
|
-
|
|
559
|
+
// Триаж (31.7): в llm/auto уведомление не ждёт локальную модель.
|
|
560
|
+
// Вердикт считается фоновым процессом и пишется в persistent-аудит.
|
|
561
|
+
// В rules правила остаются синхронными, потому что только они подавляют.
|
|
562
|
+
// В shadow-режиме решение фиксируется, но уведомление не подавляется.
|
|
563
|
+
const triageInput = { taskName, status, error, durationMs, tokens, costUsd };
|
|
564
|
+
const triageSettings = config.triage;
|
|
565
|
+
const mode = triageSettings?.mode ?? "off";
|
|
566
|
+
const shadowActive = isShadowActive(triageSettings?.shadow);
|
|
567
|
+
if (triageSettings && (mode === "llm" || mode === "auto") && options.asyncTriage) {
|
|
568
|
+
try {
|
|
569
|
+
const job = (options.scheduleTriage ?? scheduleTriageJob)(triageInput, triageSettings);
|
|
570
|
+
// Injected scheduler может быть асинхронным — не оставляем rejection.
|
|
571
|
+
if (job && typeof job.then === "function") {
|
|
572
|
+
void Promise.resolve(job).catch((err) => {
|
|
573
|
+
console.error(`[windows-scheduler] Ошибка фонового триажа: ${err instanceof Error ? err.message : String(err)}`);
|
|
574
|
+
});
|
|
575
|
+
}
|
|
576
|
+
}
|
|
577
|
+
catch (err) {
|
|
578
|
+
console.error(`[windows-scheduler] Не удалось запустить фоновый триаж: ${err instanceof Error ? err.message : String(err)}`);
|
|
579
|
+
}
|
|
580
|
+
}
|
|
581
|
+
else if (mode !== "off") {
|
|
582
|
+
const triage = await decideTriage(triageInput, triageSettings);
|
|
583
|
+
const suppressed = !shadowActive && triage.action === "skip";
|
|
584
|
+
recordTriageOutcome(triageInput, triage, { shadowActive, suppressed });
|
|
585
|
+
if (suppressed)
|
|
586
|
+
return;
|
|
587
|
+
}
|
|
588
|
+
// Дедуп (31.2): группирует похожие уведомления в окне времени,
|
|
589
|
+
// считает повторы, но не подавляет важные статусы.
|
|
590
|
+
let dedupCount = 1;
|
|
591
|
+
if (config.dedup?.enabled && config.dedup.suppressDuplicates) {
|
|
592
|
+
const dedup = config.dedup;
|
|
593
|
+
const db = getDb();
|
|
594
|
+
const key = dedupKey(taskName, status);
|
|
595
|
+
// Читать-изменять-записать нужно атомарно: иначе два процесса
|
|
596
|
+
// (задача + дашборд) теряют инкременты счётчика повторов.
|
|
597
|
+
const { record, isDuplicate } = withTransaction(() => dedupReadOrCreate(db, key, taskName, status, dedup));
|
|
598
|
+
dedupCount = record.count;
|
|
599
|
+
if (isDuplicate && isDedupSuppressed(status, dedup)) {
|
|
600
|
+
return;
|
|
601
|
+
}
|
|
602
|
+
}
|
|
603
|
+
const baseMessage = messageWithDedupCount(formatNotificationMessage({ taskName, status, durationMs, error, tokens, costUsd }, config.templates), dedupCount);
|
|
604
|
+
// Эмбеддинг-дедуп (31.1): семантическое подавление похожих сообщений.
|
|
605
|
+
// Проверяется после rule-based дедупа: если вектор совпадает с существующим
|
|
606
|
+
// на пороге threshold, уведомление подавляется (если не важный статус).
|
|
607
|
+
if (config.embedding?.enabled && config.embedding.suppressDuplicates) {
|
|
608
|
+
const db = getDb();
|
|
609
|
+
const message = baseMessage;
|
|
610
|
+
const hit = embeddingExists(db, taskName, status, message, config.embedding.threshold, config.embedding.windowMinutes ?? 60);
|
|
611
|
+
if (hit &&
|
|
612
|
+
isDedupSuppressed(status, config.dedup ?? {
|
|
613
|
+
enabled: false,
|
|
614
|
+
windowMinutes: 60,
|
|
615
|
+
suppressDuplicates: false,
|
|
616
|
+
importantStatuses: ["error", "timeout"],
|
|
617
|
+
maxCount: 999,
|
|
618
|
+
})) {
|
|
619
|
+
return;
|
|
620
|
+
}
|
|
621
|
+
const vec = textToVector(message);
|
|
622
|
+
storeEmbedding(db, taskName, status, message, vec, config.embedding.windowMinutes ?? 60);
|
|
623
|
+
cleanupEmbeddings(db, config.embedding.windowMinutes ?? 60, config.embedding.maxVectors);
|
|
624
|
+
}
|
|
625
|
+
// Саммари (31.3): в режиме summary используем три строки от модели,
|
|
626
|
+
// при любом отказе остаётся детерминированное усечение или базовое сообщение.
|
|
627
|
+
let finalMessage = baseMessage;
|
|
628
|
+
if (config.summary?.enabled) {
|
|
629
|
+
const summary = await summarizeNotification({
|
|
630
|
+
taskName,
|
|
631
|
+
status,
|
|
632
|
+
error: error ?? undefined,
|
|
633
|
+
durationMs,
|
|
634
|
+
tokens: tokens ?? undefined,
|
|
635
|
+
costUsd: costUsd ?? undefined,
|
|
636
|
+
}, config.summary, summaryProviderFromTriage(config.triage), {});
|
|
637
|
+
if (summary.lines.length) {
|
|
638
|
+
finalMessage = messageWithDedupCount(`${taskName} — ${status}\n${summary.lines.join("\n")}`, dedupCount);
|
|
639
|
+
}
|
|
640
|
+
}
|
|
641
|
+
await deliver(config, finalMessage);
|
|
363
642
|
}
|
|
364
643
|
catch (err) {
|
|
365
644
|
// Уведомление не должно ломать запись истории и саму задачу.
|
package/dist/profiles.d.ts
CHANGED
|
@@ -49,7 +49,7 @@ export declare function listProfiles(): ProfileInfo[];
|
|
|
49
49
|
*/
|
|
50
50
|
export declare function createProfile(name: string, port?: number): ProfileMeta;
|
|
51
51
|
/** Удаляет профиль (кроме default). Возвращает true, если директория удалена. */
|
|
52
|
-
export declare function deleteProfile(name: string): boolean
|
|
52
|
+
export declare function deleteProfile(name: string): Promise<boolean>;
|
|
53
53
|
/**
|
|
54
54
|
* Переключает активный профиль через файл-маркер. Изменение подхватится при
|
|
55
55
|
* следующем запуске OpenCode (директории вычисляются при загрузке модуля).
|
package/dist/profiles.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"profiles.d.ts","sourceRoot":"","sources":["../src/profiles.ts"],"names":[],"mappings":"AAIA;;;;;GAKG;AAEH,eAAO,MAAM,eAAe,YAAY,CAAC;AAKzC,+CAA+C;AAC/C,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;CACd;AAED,oCAAoC;AACpC,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB,SAAS,EAAE,OAAO,CAAC;IACnB,MAAM,EAAE,OAAO,CAAC;CACjB;AAED;;;;;;;GAOG;AACH,wBAAgB,gBAAgB,IAAI,MAAM,CAWzC;AAED,kEAAkE;AAClE,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,GAAG,MAAM,CAQ5E;AAED,kFAAkF;AAClF,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAOhE;AAYD;;GAEG;AACH,wBAAgB,cAAc,IAAI,MAAM,CAIvC;AAED,iFAAiF;AACjF,wBAAgB,aAAa,CAAC,IAAI,GAAE,MAAyB,GAAG,MAAM,CAKrE;AAOD,uEAAuE;AACvE,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,WAAW,GAAG,IAAI,CAahE;AAED,mFAAmF;AACnF,wBAAgB,cAAc,CAAC,IAAI,GAAE,MAAyB,GAAG,MAAM,GAAG,IAAI,CAQ7E;AAED,4DAA4D;AAC5D,wBAAgB,YAAY,IAAI,WAAW,EAAE,CA6B5C;AAcD;;;GAGG;AACH,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,WAAW,CAkBtE;AAED,iFAAiF;AACjF,
|
|
1
|
+
{"version":3,"file":"profiles.d.ts","sourceRoot":"","sources":["../src/profiles.ts"],"names":[],"mappings":"AAIA;;;;;GAKG;AAEH,eAAO,MAAM,eAAe,YAAY,CAAC;AAKzC,+CAA+C;AAC/C,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;CACd;AAED,oCAAoC;AACpC,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB,SAAS,EAAE,OAAO,CAAC;IACnB,MAAM,EAAE,OAAO,CAAC;CACjB;AAED;;;;;;;GAOG;AACH,wBAAgB,gBAAgB,IAAI,MAAM,CAWzC;AAED,kEAAkE;AAClE,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,GAAG,MAAM,CAQ5E;AAED,kFAAkF;AAClF,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAOhE;AAYD;;GAEG;AACH,wBAAgB,cAAc,IAAI,MAAM,CAIvC;AAED,iFAAiF;AACjF,wBAAgB,aAAa,CAAC,IAAI,GAAE,MAAyB,GAAG,MAAM,CAKrE;AAOD,uEAAuE;AACvE,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,WAAW,GAAG,IAAI,CAahE;AAED,mFAAmF;AACnF,wBAAgB,cAAc,CAAC,IAAI,GAAE,MAAyB,GAAG,MAAM,GAAG,IAAI,CAQ7E;AAED,4DAA4D;AAC5D,wBAAgB,YAAY,IAAI,WAAW,EAAE,CA6B5C;AAcD;;;GAGG;AACH,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,WAAW,CAkBtE;AAED,iFAAiF;AACjF,wBAAsB,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAiClE;AAED;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAQnD;AAED,iFAAiF;AACjF,wBAAgB,oBAAoB,IAAI,OAAO,CAE9C"}
|
package/dist/profiles.js
CHANGED
|
@@ -174,14 +174,32 @@ export function createProfile(name, port) {
|
|
|
174
174
|
return meta;
|
|
175
175
|
}
|
|
176
176
|
/** Удаляет профиль (кроме default). Возвращает true, если директория удалена. */
|
|
177
|
-
export function deleteProfile(name) {
|
|
178
|
-
|
|
179
|
-
if (normalized === DEFAULT_PROFILE) {
|
|
177
|
+
export async function deleteProfile(name) {
|
|
178
|
+
if (name === DEFAULT_PROFILE) {
|
|
180
179
|
throw new Error("Профиль default удалить нельзя.");
|
|
181
180
|
}
|
|
181
|
+
const normalized = sanitizeProfileName(name);
|
|
182
|
+
// Имя, которое санитизировалось в default (например, кириллица или пустая строка),
|
|
183
|
+
// не соответствует существующему не-default профилю — такого профиля нет.
|
|
184
|
+
if (normalized === DEFAULT_PROFILE)
|
|
185
|
+
return false;
|
|
182
186
|
const dir = getProfileDir(normalized);
|
|
183
187
|
if (!fs.existsSync(dir))
|
|
184
188
|
return false;
|
|
189
|
+
// T-05: перед удалением директории профиля снимаем ЕГО задачи ОС,
|
|
190
|
+
// иначе после удаления профиля остаются «сироты» в schtasks/crontab/launchd.
|
|
191
|
+
// Бэкенд создаётся в пространстве имён удаляемого профиля (не активного!),
|
|
192
|
+
// и удаление задач дожидается завершения до fs.rmSync.
|
|
193
|
+
// Динамический import — чтобы не создавать циклическую зависимость
|
|
194
|
+
// profiles.ts → scheduler/index.ts → types.ts (TASK_FOLDER_NAME IIFE).
|
|
195
|
+
// Ошибки снятия не фатальны — директорию всё равно чистим.
|
|
196
|
+
try {
|
|
197
|
+
const { removeScheduledTasksForProfile } = await import("./core/scheduler/index.js");
|
|
198
|
+
await removeScheduledTasksForProfile(normalized);
|
|
199
|
+
}
|
|
200
|
+
catch {
|
|
201
|
+
// Планировщик недоступен (нет schtasks/launchd/crontab) — не прерываем удаление.
|
|
202
|
+
}
|
|
185
203
|
fs.rmSync(dir, { recursive: true, force: true });
|
|
186
204
|
// Если удалили активный профиль — возвращаем маркер на default.
|
|
187
205
|
const base = getBasePluginDir();
|