opencode-windows-scheduler 1.5.1 → 1.5.4
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 +56 -1
- package/LICENSE +21 -21
- package/README.md +3 -2
- package/ROADMAP-STRATEGY.md +5 -4
- package/ROADMAP.md +502 -103
- package/dist/core/audit.d.ts +27 -0
- package/dist/core/audit.d.ts.map +1 -1
- package/dist/core/audit.js +60 -0
- 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/ps-wrapper.d.ts +2 -30
- package/dist/core/ps-wrapper.d.ts.map +1 -1
- package/dist/core/ps-wrapper.js +258 -49
- package/dist/core/secrets.d.ts +10 -3
- package/dist/core/secrets.d.ts.map +1 -1
- package/dist/core/secrets.js +28 -4
- package/dist/core/triage-chain.d.ts +34 -0
- package/dist/core/triage-chain.d.ts.map +1 -0
- package/dist/core/triage-chain.js +70 -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 +174 -0
- package/dist/core/triage-shadow.d.ts +47 -0
- package/dist/core/triage-shadow.d.ts.map +1 -0
- package/dist/core/triage-shadow.js +48 -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/wrappers/bash.d.ts +1 -0
- package/dist/core/wrappers/bash.d.ts.map +1 -1
- package/dist/core/wrappers/bash.js +91 -5
- package/dist/gui-experimental.cjs +1 -0
- package/dist/i18n.d.ts.map +1 -1
- package/dist/i18n.js +34 -7
- package/dist/index.d.ts +27 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +194 -6
- package/dist/notifications.d.ts.map +1 -1
- package/dist/notifications.js +9 -1
- package/dist/rpc.d.ts +259 -0
- package/dist/rpc.d.ts.map +1 -1
- package/dist/rpc.js +58 -0
- package/dist/settings.d.ts +80 -0
- package/dist/settings.d.ts.map +1 -1
- package/dist/settings.js +199 -0
- package/dist/workspaces.d.ts +2 -2
- package/dist/workspaces.d.ts.map +1 -1
- package/dist/workspaces.js +6 -4
- package/docs/ARCHITECTURE.md +69 -10
- package/docs/FEATURES.md +37 -7
- package/docs/LOCAL-AI.md +202 -0
- package/docs/MIGRATION.md +17 -0
- package/docs/README.ru.md +5 -4
- 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 +32 -0
- package/locales/ru.json +32 -0
- package/package.json +9 -2
- package/scripts/bench-local.mjs +321 -0
- package/scripts/spike-local-structured.mjs +182 -0
- package/skills/scheduled-job-best-practices/references/recipes.md +40 -0
- package/src/core/audit.ts +89 -0
- package/src/core/local-ai.ts +173 -0
- package/src/core/ps-wrapper.ts +265 -48
- package/src/core/secrets.ts +34 -10
- package/src/core/triage-chain.ts +116 -0
- package/src/core/triage-rules.ts +215 -0
- package/src/core/triage-shadow.ts +96 -0
- package/src/core/triage.ts +366 -0
- package/src/core/wrappers/bash.ts +112 -5
- package/src/gui.tsx +4761 -4533
- package/src/i18n.ts +32 -9
- package/src/index.ts +239 -4
- package/src/notifications.ts +16 -0
- package/src/rpc.ts +58 -0
- package/src/settings.ts +318 -0
- package/src/workspaces.ts +9 -4
|
@@ -53,7 +53,12 @@ export function buildBashWrapperScript(options) {
|
|
|
53
53
|
`SCHEDULE_DEFER_FILE=${shellQuote(scheduleGate?.deferFile ?? "")}`,
|
|
54
54
|
`SCHEDULE_FORCE_FILE=${shellQuote(scheduleGate?.forceFile ?? "")}`,
|
|
55
55
|
`ENV_FILE=${shellQuote(envFile ?? "")}`,
|
|
56
|
-
|
|
56
|
+
// Спринт 29.2: права задачи передаются в opencode через переменную окружения.
|
|
57
|
+
// opencode run CLI не поддерживает --allow-tool/--deny-tool, а файл
|
|
58
|
+
// opencode.jsonc в Workdir мог бы перезаписать проектный конфиг.
|
|
59
|
+
`export OPENCODE_CONFIG_CONTENT=${shellQuote(buildOpencodeConfig(allowedTools, deniedTools))}`,
|
|
60
|
+
'log "[role-scoped] opencode config passed via OPENCODE_CONFIG_CONTENT"',
|
|
61
|
+
'',
|
|
57
62
|
"# cron запускает задачи с минимальным PATH — добавляем типовые каталоги.",
|
|
58
63
|
'export PATH="/opt/homebrew/bin:/usr/local/bin:$HOME/.local/bin:$HOME/.bun/bin:$PATH"',
|
|
59
64
|
"",
|
|
@@ -190,9 +195,9 @@ export function buildBashWrapperScript(options) {
|
|
|
190
195
|
' ;;',
|
|
191
196
|
' esac',
|
|
192
197
|
' if [ -n "$MODEL" ]; then',
|
|
193
|
-
' opencode run "${SESSION_ARGS[@]}" --model "$MODEL" "$PROMPT"',
|
|
198
|
+
' opencode run --auto "${SESSION_ARGS[@]}" --model "$MODEL" "$PROMPT"',
|
|
194
199
|
" else",
|
|
195
|
-
' opencode run "${SESSION_ARGS[@]}" "$PROMPT"',
|
|
200
|
+
' opencode run --auto "${SESSION_ARGS[@]}" "$PROMPT"',
|
|
196
201
|
" fi",
|
|
197
202
|
"}",
|
|
198
203
|
"",
|
|
@@ -206,10 +211,12 @@ export function buildBashWrapperScript(options) {
|
|
|
206
211
|
' kill "$WATCHDOG" 2>/dev/null || true',
|
|
207
212
|
' wait "$WATCHDOG" 2>/dev/null || true',
|
|
208
213
|
"else",
|
|
209
|
-
'
|
|
214
|
+
' opencode run --auto "${SESSION_ARGS[@]}" "$PROMPT"',
|
|
210
215
|
" EXIT_CODE=$?",
|
|
211
216
|
"fi",
|
|
212
|
-
|
|
217
|
+
'',
|
|
218
|
+
'# Конфиг прав живёт только в переменной окружения — файл не создаётся.',
|
|
219
|
+
'',
|
|
213
220
|
'if [ "$EXIT_CODE" -ne 0 ]; then',
|
|
214
221
|
' log "[scheduler] Задача \'$TASK_NAME\' завершилась с кодом $EXIT_CODE."',
|
|
215
222
|
' ERROR_MESSAGE="Код возврата $EXIT_CODE"',
|
|
@@ -292,3 +299,82 @@ export async function writeBashWrapper(options) {
|
|
|
292
299
|
export function bashWrapperPath(sanitizedName) {
|
|
293
300
|
return path.join(WRAPPER_DIR, `run-${sanitizedName}.sh`);
|
|
294
301
|
}
|
|
302
|
+
// Спринт 29.2: генерация содержимого opencode.jsonc с правами для задачи.
|
|
303
|
+
// opencode run CLI (v2.2.3) не поддерживает --allow-tool/--deny-tool, поэтому
|
|
304
|
+
// права задаются через временный opencode.jsonc в WORKDIR.
|
|
305
|
+
//
|
|
306
|
+
// Actions OpenCode v2: read, edit, glob, grep, shell, subagent, skill, question,
|
|
307
|
+
// webfetch, websearch. deny для shell покрывает bash/Shell, deny для edit покрывает
|
|
308
|
+
// write/edit/apply_patch/remove.
|
|
309
|
+
//
|
|
310
|
+
// Политика: всё разрешено по умолчанию (как в OpenCode), deniedTools добавляют
|
|
311
|
+
// deny-правила, allowedTools (если задан) запрещает всё, чего нет в списке.
|
|
312
|
+
// Задаёт только допустимые/actions из известного набора — неизвестные игнорируются.
|
|
313
|
+
export function buildOpencodeConfig(allowedTools, deniedTools) {
|
|
314
|
+
const actions = [
|
|
315
|
+
{ action: "read", effect: "allow" },
|
|
316
|
+
{ action: "edit", effect: "allow" },
|
|
317
|
+
{ action: "glob", effect: "allow" },
|
|
318
|
+
{ action: "grep", effect: "allow" },
|
|
319
|
+
{ action: "shell", effect: "allow" },
|
|
320
|
+
{ action: "subagent", effect: "allow" },
|
|
321
|
+
{ action: "skill", effect: "allow" },
|
|
322
|
+
{ action: "question", effect: "allow" },
|
|
323
|
+
{ action: "webfetch", effect: "allow" },
|
|
324
|
+
{ action: "websearch", effect: "allow" },
|
|
325
|
+
];
|
|
326
|
+
const deniedSet = new Set((deniedTools ?? [])
|
|
327
|
+
.map((t) => t.trim().toLowerCase())
|
|
328
|
+
.filter(Boolean));
|
|
329
|
+
const allowedSet = new Set((allowedTools ?? [])
|
|
330
|
+
.map((t) => t.trim().toLowerCase())
|
|
331
|
+
.filter(Boolean));
|
|
332
|
+
const toolToAction = new Map([
|
|
333
|
+
["read", "read"],
|
|
334
|
+
["write", "edit"],
|
|
335
|
+
["edit", "edit"],
|
|
336
|
+
["apply_patch", "edit"],
|
|
337
|
+
["remove", "edit"],
|
|
338
|
+
["bash", "shell"],
|
|
339
|
+
["shell", "shell"],
|
|
340
|
+
["glob", "glob"],
|
|
341
|
+
["grep", "grep"],
|
|
342
|
+
["webfetch", "webfetch"],
|
|
343
|
+
["websearch", "websearch"],
|
|
344
|
+
["question", "question"],
|
|
345
|
+
["subagent", "subagent"],
|
|
346
|
+
["skill", "skill"],
|
|
347
|
+
["WebFetch", "webfetch"],
|
|
348
|
+
]);
|
|
349
|
+
// Применяем deniedTools.
|
|
350
|
+
for (const [tool, action] of toolToAction) {
|
|
351
|
+
if (deniedSet.has(tool)) {
|
|
352
|
+
const idx = actions.findIndex((a) => a.action === action);
|
|
353
|
+
if (idx >= 0)
|
|
354
|
+
actions[idx].effect = "deny";
|
|
355
|
+
}
|
|
356
|
+
}
|
|
357
|
+
// Если задан allowedTools — всё, чего нет в списке, запрещаем.
|
|
358
|
+
// deniedTools имеет приоритет (последнее правило выигрывает в OpenCode),
|
|
359
|
+
// поэтому применяем allowedTools ПОСЛЕ deniedTools — denied не перебивается.
|
|
360
|
+
if (allowedSet.size > 0) {
|
|
361
|
+
for (const entry of actions) {
|
|
362
|
+
// Если действие уже запрещено deniedTools, оставляем deny.
|
|
363
|
+
if (entry.effect === "deny")
|
|
364
|
+
continue;
|
|
365
|
+
const tool = [...toolToAction.entries()].find(([, a]) => a === entry.action)?.[0];
|
|
366
|
+
if (tool && !allowedSet.has(tool)) {
|
|
367
|
+
entry.effect = "deny";
|
|
368
|
+
}
|
|
369
|
+
}
|
|
370
|
+
}
|
|
371
|
+
// Убираем дубликаты actions (оставляем последний эффект).
|
|
372
|
+
const deduped = new Map();
|
|
373
|
+
for (const { action, effect } of actions)
|
|
374
|
+
deduped.set(action, effect);
|
|
375
|
+
const permissions = [...deduped.entries()].map(([action, effect]) => ` { "action": "${action}", "resource": "*", "effect": "${effect}" }`);
|
|
376
|
+
return JSON.stringify({
|
|
377
|
+
$schema: "https://opencode.ai/config.json",
|
|
378
|
+
permissions: permissions.map((p) => JSON.parse(p)),
|
|
379
|
+
}, null, 2);
|
|
380
|
+
}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const e=require("solid-js/web"),m=require("solid-js"),a=require("@opencode/plugin/gui");function p(r){switch(r){case"running":return"●";case"error":return"✗";case"success":return"✓";default:return"?"}}async function _(r){return[]}var $=e.template("<div style=padding:8px><h4>Планировщик Windows"),g=e.template("<p>Задач пока нет"),v=e.template("<ul>"),f=e.template("<li> ");const h=a.Plugin.define({setup(r){const[u,i]=m.createSignal([]);return _().then(i).catch(()=>i([])),r.add(a.Panel,{id:"scheduler-jobs",region:"side",list:()=>[{id:"jobs",title:"Планировщик",pinned:!0}],render:()=>(()=>{var s=$();return s.firstChild,e.insert(s,(()=>{var c=e.memo(()=>u().length===0);return()=>c()?g():(()=>{var l=v();return e.insert(l,()=>u().map(n=>(()=>{var t=f(),o=t.firstChild;return e.insert(t,()=>p(n.status),o),e.insert(t,()=>n.name,null),e.insert(t,(()=>{var d=e.memo(()=>!!n.nextRun);return()=>d()?` → ${n.nextRun}`:""})(),null),t})())),l})()})(),null),s})()})}});exports.default=h;
|
package/dist/i18n.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"i18n.d.ts","sourceRoot":"","sources":["../src/i18n.ts"],"names":[],"mappings":"AAsBA,MAAM,MAAM,MAAM,GAAG,IAAI,GAAG,IAAI,CAAC;AAEjC,6DAA6D;AAC7D,eAAO,MAAM,iBAAiB,EAAE,SAAS,MAAM,EAAiB,CAAC;AAEjE,sEAAsE;AACtE,eAAO,MAAM,cAAc,EAAE,MAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"i18n.d.ts","sourceRoot":"","sources":["../src/i18n.ts"],"names":[],"mappings":"AAsBA,MAAM,MAAM,MAAM,GAAG,IAAI,GAAG,IAAI,CAAC;AAEjC,6DAA6D;AAC7D,eAAO,MAAM,iBAAiB,EAAE,SAAS,MAAM,EAAiB,CAAC;AAEjE,sEAAsE;AACtE,eAAO,MAAM,cAAc,EAAE,MAAa,CAAC;AAiD3C,mDAAmD;AACnD,wBAAgB,QAAQ,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,MAAM,CAKxD;AAED,8DAA8D;AAC9D,wBAAgB,eAAe,CAC7B,KAAK,EAAE,OAAO,EACd,QAAQ,GAAE,MAAuB,GAChC,MAAM,CAER;AAED,+BAA+B;AAC/B,wBAAgB,SAAS,IAAI,MAAM,CAElC;AAED;;;GAGG;AACH,wBAAgB,SAAS,CAAC,MAAM,EAAE,OAAO,GAAG,MAAM,CAGjD;AAED,sDAAsD;AACtD,wBAAgB,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAUzD;AA8BD;;;;;;;GAOG;AACH,wBAAgB,eAAe,CAC7B,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAChC,IAAI,CAMN;AAED,gDAAgD;AAChD,wBAAgB,WAAW,CAAC,MAAM,GAAE,MAAsB,GAAG,MAAM,EAAE,CAEpE;AAED,wDAAwD;AACxD,wBAAgB,MAAM,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,GAAE,MAAsB,GAAG,OAAO,CAE3E;AAED,8EAA8E;AAC9E,wBAAgB,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAEzE;AAED;;;GAGG;AACH,wBAAgB,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAGpD;AAED,wEAAwE;AACxE,wBAAgB,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAGnD;AAED,uEAAuE;AACvE,wBAAgB,SAAS,IAAI,IAAI,CAIhC;AAuID,oEAAoE;AACpE,MAAM,MAAM,eAAe,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;AAEtD;;;GAGG;AACH,wBAAgB,CAAC,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,eAAe,GAAG,MAAM,CAY/D;AAED,6DAA6D;AAC7D,wBAAgB,gBAAgB,IAAI,MAAM,EAAE,CAE3C"}
|
package/dist/i18n.js
CHANGED
|
@@ -23,22 +23,49 @@ import { fileURLToPath } from "node:url";
|
|
|
23
23
|
export const SUPPORTED_LOCALES = ["ru", "en"];
|
|
24
24
|
/** Русский остаётся локалью по умолчанию (см. ROADMAP, спринт 28). */
|
|
25
25
|
export const DEFAULT_LOCALE = "ru";
|
|
26
|
-
/**
|
|
27
|
-
|
|
26
|
+
/**
|
|
27
|
+
* Каталог модуля: `src/` при запуске из исходников, `dist/` из сборки.
|
|
28
|
+
*
|
|
29
|
+
* В GUI-бандле (renderer Electron/webview) нет ни `import.meta.url` с реальным
|
|
30
|
+
* путём к пакету, ни `process`; любой бросок на этапе загрузки модуля валит
|
|
31
|
+
* весь плагин, поэтому путь вычисляется лениво и молча.
|
|
32
|
+
*/
|
|
33
|
+
function moduleDir() {
|
|
34
|
+
try {
|
|
35
|
+
return path.dirname(fileURLToPath(import.meta.url));
|
|
36
|
+
}
|
|
37
|
+
catch {
|
|
38
|
+
return null;
|
|
39
|
+
}
|
|
40
|
+
}
|
|
28
41
|
/** Каталоги, где может лежать `locales/` (оба варианта дают корень пакета). */
|
|
29
42
|
function candidateCatalogDirs() {
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
];
|
|
43
|
+
const dir = moduleDir();
|
|
44
|
+
if (!dir)
|
|
45
|
+
return [];
|
|
46
|
+
return [path.resolve(dir, "../locales"), path.resolve(dir, "locales")];
|
|
34
47
|
}
|
|
35
48
|
const catalogs = new Map();
|
|
36
49
|
const pluralRules = new Map();
|
|
37
50
|
/**
|
|
38
51
|
* Локаль запуска: `OPENCODE_SCHEDULER_LOCALE=en` позволяет прогнать набор
|
|
39
52
|
* тестов на английском без правки настроек. Не задана — русский.
|
|
53
|
+
*
|
|
54
|
+
* `process` отсутствует в GUI-бандле (renderer), поэтому обращение к нему
|
|
55
|
+
* защищено: иначе `ReferenceError: process is not defined` ломает загрузку
|
|
56
|
+
* всего плагина ещё до регистрации панели.
|
|
40
57
|
*/
|
|
41
|
-
|
|
58
|
+
function envLocale() {
|
|
59
|
+
try {
|
|
60
|
+
return typeof process !== "undefined" && process.env
|
|
61
|
+
? process.env.OPENCODE_SCHEDULER_LOCALE
|
|
62
|
+
: undefined;
|
|
63
|
+
}
|
|
64
|
+
catch {
|
|
65
|
+
return undefined;
|
|
66
|
+
}
|
|
67
|
+
}
|
|
68
|
+
const INITIAL_LOCALE = normalizeLocale(envLocale());
|
|
42
69
|
let currentLocale = INITIAL_LOCALE;
|
|
43
70
|
/** true, если значение — поддерживаемая локаль. */
|
|
44
71
|
export function isLocale(value) {
|
package/dist/index.d.ts
CHANGED
|
@@ -245,6 +245,33 @@ export declare const manageSettingsSchema: z.ZodObject<{
|
|
|
245
245
|
integrations: z.ZodOptional<z.ZodAny>;
|
|
246
246
|
audit: z.ZodOptional<z.ZodAny>;
|
|
247
247
|
}, z.core.$strip>;
|
|
248
|
+
/** manage_local_ai — настройки локального ассистента и триажа (Спринт 30.7). */
|
|
249
|
+
export declare const manageLocalAiSchema: z.ZodObject<{
|
|
250
|
+
action: z.ZodEnum<{
|
|
251
|
+
test: "test";
|
|
252
|
+
update: "update";
|
|
253
|
+
get: "get";
|
|
254
|
+
}>;
|
|
255
|
+
mode: z.ZodOptional<z.ZodEnum<{
|
|
256
|
+
off: "off";
|
|
257
|
+
rules: "rules";
|
|
258
|
+
llm: "llm";
|
|
259
|
+
auto: "auto";
|
|
260
|
+
}>>;
|
|
261
|
+
baseUrl: z.ZodOptional<z.ZodString>;
|
|
262
|
+
model: z.ZodOptional<z.ZodString>;
|
|
263
|
+
timeoutMs: z.ZodOptional<z.ZodNumber>;
|
|
264
|
+
fallback: z.ZodOptional<z.ZodEnum<{
|
|
265
|
+
skip: "skip";
|
|
266
|
+
rules: "rules";
|
|
267
|
+
}>>;
|
|
268
|
+
confidenceThreshold: z.ZodOptional<z.ZodNumber>;
|
|
269
|
+
shadow: z.ZodOptional<z.ZodObject<{
|
|
270
|
+
enabled: z.ZodOptional<z.ZodBoolean>;
|
|
271
|
+
days: z.ZodOptional<z.ZodNumber>;
|
|
272
|
+
startedAt: z.ZodOptional<z.ZodNullable<z.ZodString>>;
|
|
273
|
+
}, z.core.$strip>>;
|
|
274
|
+
}, z.core.$strip>;
|
|
248
275
|
/** manage_templates — пользовательские шаблоны задач. */
|
|
249
276
|
export declare const manageTemplatesSchema: z.ZodObject<{
|
|
250
277
|
action: z.ZodEnum<{
|
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAO,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAO,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAgLxB,6DAA6D;AAC7D,eAAO,MAAM,oBAAoB;;;;;;iBAM/B,CAAC;AAEH,sCAAsC;AACtC,eAAO,MAAM,YAAY;;;;;;;;;;;;;;;;;;;;;;;iBAwCvB,CAAC;AAEH,yCAAyC;AACzC,eAAO,MAAM,kBAAkB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;iBA2P7B,CAAC;AAYH,eAAO,MAAM,gBAAgB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;iBAsL3B,CAAC;AAsEH,eAAO,MAAM,mBAAmB;;;;;;;;;;;;;;;;;;;;;iBA0B9B,CAAC;AAEH,+CAA+C;AAC/C,eAAO,MAAM,gBAAgB,gCAAe,CAAC;AAE7C,2CAA2C;AAC3C,eAAO,MAAM,kBAAkB;;;iBAe7B,CAAC;AAEH,2DAA2D;AAC3D,eAAO,MAAM,oBAAoB;;;;;;;;;;;;;;;;;;iBA0C/B,CAAC;AAEH,gFAAgF;AAChF,eAAO,MAAM,mBAAmB;;;;;;;;;;;;;;;;;;;;;;;;;iBAuD9B,CAAC;AAEH,yDAAyD;AACzD,eAAO,MAAM,qBAAqB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;iBA+BhC,CAAC;AAEH,4DAA4D;AAC5D,eAAO,MAAM,oBAAoB;;;;;;;;;iBAM/B,CAAC;AAEH,+CAA+C;AAC/C,eAAO,MAAM,mBAAmB;;;;;;iBAG9B,CAAC;AAEH,2DAA2D;AAC3D,eAAO,MAAM,sBAAsB;;;;;;;;;;;iBAQjC,CAAC;AAEH,yDAAyD;AACzD,eAAO,MAAM,sBAAsB,gCAAe,CAAC;AAEnD,iDAAiD;AACjD,eAAO,MAAM,oBAAoB;;;iBAG/B,CAAC;AAEH,gDAAgD;AAChD,eAAO,MAAM,eAAe;;;iBAG1B,CAAC;AAEH,qEAAqE;AACrE,eAAO,MAAM,mBAAmB;;;;;;;;iBAS9B,CAAC;AAEH,mEAAmE;AACnE,eAAO,MAAM,iBAAiB;;;;;;;iBAU5B,CAAC;;AAktEH,wBA0iDG;AA8DH;;;GAGG;AACH;;;GAGG;AACH,MAAM,WAAW,aAAa;IAC5B,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;IACtB,YAAY,CAAC,EAAE,MAAM,GAAG,UAAU,GAAG,KAAK,CAAC;IAC3C,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;IACtB,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;IACvB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;IACrB,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB"}
|
package/dist/index.js
CHANGED
|
@@ -18,13 +18,16 @@ import { simulatePipeline } from "./core/dry-run.js";
|
|
|
18
18
|
import { aggregateMatrixResults, cancelPendingMatrixClones, expandMatrixTask, findOrphanedMatrixTasks, getMatrixDeletionGuard, matrixCompleteName, planMatrixFamilyDelete, removeMatrixChildren, runMatrix, syncMatrixFamily, } from "./core/matrix.js";
|
|
19
19
|
import { SchedulerRpc } from "./rpc.js";
|
|
20
20
|
import { latestHistoryByTask, loadHistory, loadMetrics } from "./history.js";
|
|
21
|
-
import { loadSettings, saveSettings } from "./settings.js";
|
|
21
|
+
import { defaultNotifications, loadSettings, saveSettings } from "./settings.js";
|
|
22
22
|
import { setLocale, t } from "./i18n.js";
|
|
23
23
|
import { runHistoryRetention, maybeRunHistoryRetention } from "./core/retention.js";
|
|
24
24
|
import { buildAnalytics } from "./core/analytics.js";
|
|
25
25
|
import { getHistory, listRunningRecords } from "./db/history-repo.js";
|
|
26
26
|
import { getAllMetrics } from "./db/metrics-repo.js";
|
|
27
27
|
import { findStuckMatrixClones, maybeSendDigest, notifyStuckMatrix, sendDigestNow, sendTestNotification, } from "./notifications.js";
|
|
28
|
+
import { shadowReport, resetShadowDecisions, } from "./core/triage-shadow.js";
|
|
29
|
+
import { applyLocalAiPatch, summarizeLocalAi } from "./core/local-ai.js";
|
|
30
|
+
import { classifyNotification } from "./core/triage.js";
|
|
28
31
|
import { loadTaskDefinitions, saveTaskDefinition, removeTaskDefinition, buildExportJson, parseImportJson, normalizePriority, } from "./task-transfer.js";
|
|
29
32
|
import { FileWatchManager } from "./core/file-watcher.js";
|
|
30
33
|
import { GitTriggerManager } from "./core/git-trigger.js";
|
|
@@ -36,8 +39,8 @@ import { migrateJsonToDb } from "./db/migrate.js";
|
|
|
36
39
|
import { checkJsonBackups, recoverInterruptedRuns } from "./db/recovery.js";
|
|
37
40
|
import { getTask, listMatrixClones, listTasks as listTaskDefinitions, saveTask } from "./db/tasks-repo.js";
|
|
38
41
|
import { addWorkspace, deleteWorkspace, getWorkspace, listWorkspaces, updateWorkspace, validateWorkspacePath, readGitBranch, writeWorkspaceEnvFile, maskEnvForLog, } from "./workspaces.js";
|
|
39
|
-
import { deleteSecret, hasSecret, listSecrets, setSecret, } from "./core/secrets.js";
|
|
40
|
-
import { readAuditLog, recordAudit, } from "./core/audit.js";
|
|
42
|
+
import { deleteSecret, collectSecretNames, hasSecret, listSecrets, setSecret, } from "./core/secrets.js";
|
|
43
|
+
import { readAuditLog, recordAudit, recordTaskToolBlocks, } from "./core/audit.js";
|
|
41
44
|
// Путь к вспомогательному node-скрипту записи истории/метрик (dist/core/record-history.js).
|
|
42
45
|
const require = createRequire(import.meta.url);
|
|
43
46
|
const resolvedRecorder = require.resolve("./core/record-history.js");
|
|
@@ -624,6 +627,55 @@ export const manageSettingsSchema = z.object({
|
|
|
624
627
|
.optional()
|
|
625
628
|
.describe("Audit log settings patch (enabled, retentionDays, maxRecords)."),
|
|
626
629
|
});
|
|
630
|
+
/** manage_local_ai — настройки локального ассистента и триажа (Спринт 30.7). */
|
|
631
|
+
export const manageLocalAiSchema = z.object({
|
|
632
|
+
action: z
|
|
633
|
+
.enum(["get", "update", "test"])
|
|
634
|
+
.describe("get — current triage settings and shadow state; update — merge fields and save; test — one classification request against the configured model."),
|
|
635
|
+
mode: z
|
|
636
|
+
.enum(["off", "rules", "llm", "auto"])
|
|
637
|
+
.optional()
|
|
638
|
+
.describe("off — no triage; rules — built-in rules only; llm — model only; auto — model, then rules (default)."),
|
|
639
|
+
baseUrl: z
|
|
640
|
+
.string()
|
|
641
|
+
.max(500)
|
|
642
|
+
.optional()
|
|
643
|
+
.describe("Ollama or OpenAI-compatible base URL, for example http://127.0.0.1:11434. A URL ending with /v1 switches to the OpenAI protocol."),
|
|
644
|
+
model: z
|
|
645
|
+
.string()
|
|
646
|
+
.max(200)
|
|
647
|
+
.optional()
|
|
648
|
+
.describe("Model id, for example qwen3:4b."),
|
|
649
|
+
timeoutMs: z
|
|
650
|
+
.number()
|
|
651
|
+
.int()
|
|
652
|
+
.min(1000)
|
|
653
|
+
.max(120000)
|
|
654
|
+
.optional()
|
|
655
|
+
.describe("Request timeout in milliseconds (1000..120000)."),
|
|
656
|
+
fallback: z
|
|
657
|
+
.enum(["rules", "skip"])
|
|
658
|
+
.optional()
|
|
659
|
+
.describe("When the model fails or is unsure: rules — apply rules (fail-open, default); skip — no rules, the notification is delivered."),
|
|
660
|
+
confidenceThreshold: z
|
|
661
|
+
.number()
|
|
662
|
+
.min(0)
|
|
663
|
+
.max(1)
|
|
664
|
+
.optional()
|
|
665
|
+
.describe("Minimum model confidence (0..1); below it the fallback applies."),
|
|
666
|
+
shadow: z
|
|
667
|
+
.object({
|
|
668
|
+
enabled: z.boolean().optional().describe("Log decisions without suppressing notifications."),
|
|
669
|
+
days: z.number().int().min(1).max(365).optional().describe("Shadow period length in days."),
|
|
670
|
+
startedAt: z
|
|
671
|
+
.string()
|
|
672
|
+
.nullable()
|
|
673
|
+
.optional()
|
|
674
|
+
.describe("ISO start of the shadow period; null restarts it on the next save."),
|
|
675
|
+
})
|
|
676
|
+
.optional()
|
|
677
|
+
.describe("Shadow mode patch."),
|
|
678
|
+
});
|
|
627
679
|
/** manage_templates — пользовательские шаблоны задач. */
|
|
628
680
|
export const manageTemplatesSchema = z.object({
|
|
629
681
|
action: z
|
|
@@ -1999,6 +2051,95 @@ const manageSettingsExecute = wrapExecute(async (args) => {
|
|
|
1999
2051
|
setLocale(settings.locale);
|
|
2000
2052
|
return { content: JSON.stringify({ success: true, settings }) };
|
|
2001
2053
|
});
|
|
2054
|
+
/** Настройки триажа: сохранённые или дефолт для незаполненного конфига. */
|
|
2055
|
+
function triageOrDefault(settings) {
|
|
2056
|
+
const saved = settings.notifications.triage;
|
|
2057
|
+
if (saved)
|
|
2058
|
+
return saved;
|
|
2059
|
+
const fallback = defaultNotifications().triage;
|
|
2060
|
+
return (fallback ?? {
|
|
2061
|
+
mode: "off",
|
|
2062
|
+
baseUrl: "http://127.0.0.1:11434",
|
|
2063
|
+
model: "",
|
|
2064
|
+
timeoutMs: 45000,
|
|
2065
|
+
fallback: "rules",
|
|
2066
|
+
confidenceThreshold: 0.6,
|
|
2067
|
+
});
|
|
2068
|
+
}
|
|
2069
|
+
/** Синтетическое уведомление для проверки связи с моделью. */
|
|
2070
|
+
const LOCAL_AI_SELF_TEST = {
|
|
2071
|
+
taskName: "scheduler-self-test",
|
|
2072
|
+
status: "error",
|
|
2073
|
+
error: "Quality Gate failed: 2 tests broke the build",
|
|
2074
|
+
durationMs: 12000,
|
|
2075
|
+
};
|
|
2076
|
+
/** Один классификационный запрос — общий путь для инструмента и GUI. */
|
|
2077
|
+
async function runLocalAiTest(patch = {}) {
|
|
2078
|
+
const settings = await loadSettings();
|
|
2079
|
+
const { settings: candidate } = applyLocalAiPatch(triageOrDefault(settings), patch);
|
|
2080
|
+
const result = await classifyNotification(LOCAL_AI_SELF_TEST, candidate, { retries: 0 });
|
|
2081
|
+
return {
|
|
2082
|
+
success: result.ok,
|
|
2083
|
+
localAi: summarizeLocalAi(candidate),
|
|
2084
|
+
result: {
|
|
2085
|
+
ok: result.ok,
|
|
2086
|
+
failure: result.failure ?? null,
|
|
2087
|
+
error: result.error ?? null,
|
|
2088
|
+
latencyMs: result.latencyMs,
|
|
2089
|
+
attempts: result.attempts,
|
|
2090
|
+
model: result.model,
|
|
2091
|
+
protocol: result.protocol,
|
|
2092
|
+
verdict: result.verdict ?? null,
|
|
2093
|
+
},
|
|
2094
|
+
};
|
|
2095
|
+
}
|
|
2096
|
+
/** manage_local_ai — настройки триажа и проверка связи с моделью. */
|
|
2097
|
+
const manageLocalAiExecute = wrapExecute(async (args) => {
|
|
2098
|
+
const settings = await loadSettings();
|
|
2099
|
+
const current = triageOrDefault(settings);
|
|
2100
|
+
if (args.action === "get") {
|
|
2101
|
+
return {
|
|
2102
|
+
content: JSON.stringify({ success: true, localAi: summarizeLocalAi(current) }),
|
|
2103
|
+
};
|
|
2104
|
+
}
|
|
2105
|
+
const patch = {
|
|
2106
|
+
mode: args.mode,
|
|
2107
|
+
baseUrl: args.baseUrl,
|
|
2108
|
+
model: args.model,
|
|
2109
|
+
timeoutMs: args.timeoutMs,
|
|
2110
|
+
fallback: args.fallback,
|
|
2111
|
+
confidenceThreshold: args.confidenceThreshold,
|
|
2112
|
+
shadow: args.shadow,
|
|
2113
|
+
};
|
|
2114
|
+
if (args.action === "test") {
|
|
2115
|
+
// Проверка не меняет конфиг: патч применяется только в памяти.
|
|
2116
|
+
return { content: JSON.stringify(await runLocalAiTest(patch)) };
|
|
2117
|
+
}
|
|
2118
|
+
if (!Object.values(patch).some((value) => value !== undefined)) {
|
|
2119
|
+
return {
|
|
2120
|
+
content: JSON.stringify({
|
|
2121
|
+
success: false,
|
|
2122
|
+
error: t("tool.localAi.updateFields"),
|
|
2123
|
+
localAi: summarizeLocalAi(current),
|
|
2124
|
+
}),
|
|
2125
|
+
};
|
|
2126
|
+
}
|
|
2127
|
+
const { settings: merged, changed } = applyLocalAiPatch(current, patch);
|
|
2128
|
+
const saved = await saveSettings({
|
|
2129
|
+
notifications: { ...settings.notifications, triage: merged },
|
|
2130
|
+
});
|
|
2131
|
+
const localAi = summarizeLocalAi(triageOrDefault(saved));
|
|
2132
|
+
return {
|
|
2133
|
+
content: JSON.stringify({
|
|
2134
|
+
success: true,
|
|
2135
|
+
changed,
|
|
2136
|
+
message: changed.length > 0
|
|
2137
|
+
? t("tool.localAi.updated", { fields: changed.join(", ") })
|
|
2138
|
+
: t("tool.localAi.unchanged"),
|
|
2139
|
+
localAi,
|
|
2140
|
+
}),
|
|
2141
|
+
};
|
|
2142
|
+
});
|
|
2002
2143
|
/** manage_templates — список, сохранение и удаление шаблонов задач. */
|
|
2003
2144
|
const manageTemplatesExecute = wrapExecute(async (args) => {
|
|
2004
2145
|
if (args.action === "list") {
|
|
@@ -2725,6 +2866,17 @@ export default Plugin.define({
|
|
|
2725
2866
|
? { action: "settings.update", targetType: "settings", target: "global" }
|
|
2726
2867
|
: null, manageSettingsExecute),
|
|
2727
2868
|
});
|
|
2869
|
+
editor.add({
|
|
2870
|
+
name: "manage_local_ai",
|
|
2871
|
+
input: manageLocalAiSchema,
|
|
2872
|
+
description: "Reads, updates or tests the local assistant for notification triage: mode (off, rules, llm, auto), Ollama/OpenAI baseUrl, model, timeout, fallback, confidence threshold and shadow mode. " +
|
|
2873
|
+
"action=test sends one synthetic notification to the model and reports latency, protocol and verdict without saving anything. " +
|
|
2874
|
+
"Without a model the scheduler keeps working through rules: notifications are never blocked by a missing model.",
|
|
2875
|
+
options: { codemode: true },
|
|
2876
|
+
execute: withAudit("manage_local_ai", (args) => args.action === "update"
|
|
2877
|
+
? { action: "localAi.update", targetType: "settings", target: "triage" }
|
|
2878
|
+
: null, manageLocalAiExecute),
|
|
2879
|
+
});
|
|
2728
2880
|
editor.add({
|
|
2729
2881
|
name: "manage_templates",
|
|
2730
2882
|
input: manageTemplatesSchema,
|
|
@@ -3408,6 +3560,37 @@ export default Plugin.define({
|
|
|
3408
3560
|
// Ручная отправка не сдвигает плановое расписание дайджеста.
|
|
3409
3561
|
return await sendDigestNow({ updateLastSentAt: false });
|
|
3410
3562
|
},
|
|
3563
|
+
// --- Спринт 30.6: shadow-режим триажа ---------------------------------
|
|
3564
|
+
get_shadow_report: async () => {
|
|
3565
|
+
const settings = await loadSettings();
|
|
3566
|
+
const shadow = shadowReport(settings.notifications.triage?.shadow);
|
|
3567
|
+
return {
|
|
3568
|
+
success: true,
|
|
3569
|
+
active: shadow.active,
|
|
3570
|
+
startedAt: shadow.startedAt,
|
|
3571
|
+
days: shadow.days,
|
|
3572
|
+
total: shadow.total,
|
|
3573
|
+
skips: shadow.skips,
|
|
3574
|
+
wouldSuppress: shadow.wouldSuppress,
|
|
3575
|
+
bySource: shadow.bySource,
|
|
3576
|
+
};
|
|
3577
|
+
},
|
|
3578
|
+
reset_shadow_report: async () => {
|
|
3579
|
+
resetShadowDecisions();
|
|
3580
|
+
return { success: true };
|
|
3581
|
+
},
|
|
3582
|
+
test_local_ai: async (input) => {
|
|
3583
|
+
// Проверка связи: патч применяется только в памяти, конфиг не меняется.
|
|
3584
|
+
const patch = (input ?? {});
|
|
3585
|
+
return await runLocalAiTest({
|
|
3586
|
+
mode: patch.mode,
|
|
3587
|
+
baseUrl: patch.baseUrl,
|
|
3588
|
+
model: patch.model,
|
|
3589
|
+
timeoutMs: patch.timeoutMs,
|
|
3590
|
+
fallback: patch.fallback,
|
|
3591
|
+
confidenceThreshold: patch.confidenceThreshold,
|
|
3592
|
+
});
|
|
3593
|
+
},
|
|
3411
3594
|
// --- Спринт 26: секреты и аудит -------------------------------------
|
|
3412
3595
|
list_secrets: async () => {
|
|
3413
3596
|
return { success: true, secrets: listSecrets() };
|
|
@@ -3928,8 +4111,9 @@ paused) {
|
|
|
3928
4111
|
}
|
|
3929
4112
|
const effectiveWorkingDirectory = workspace?.path || workingDirectory?.trim() || projectDirectory || process.cwd();
|
|
3930
4113
|
// Спринт 21: env-переменные workspace → отдельный файл, который читает обёртка.
|
|
3931
|
-
//
|
|
3932
|
-
const
|
|
4114
|
+
// Спринт 29.3: инжектит в env только реально используемые секреты (scoped-инъекция).
|
|
4115
|
+
const usedSecretNames = collectSecretNames(prompt, beforeScript, afterScript, qualityGate);
|
|
4116
|
+
const taskEnvFile = writeWorkspaceEnvFile(workspace, PLUGIN_DIR, sanitized, usedSecretNames);
|
|
3933
4117
|
if (taskEnvFile) {
|
|
3934
4118
|
console.log(`[workspace] Задача "${name}": env-переменные workspace подключены.`);
|
|
3935
4119
|
}
|
|
@@ -3951,7 +4135,7 @@ paused) {
|
|
|
3951
4135
|
try {
|
|
3952
4136
|
if (scheduler.platform === "win32") {
|
|
3953
4137
|
await ensureWrapper();
|
|
3954
|
-
wrapperPath = await writeWrapperCmd(sanitized, name, promptFile, timeoutSeconds ?? 3600, lockFile, effectiveWorkingDirectory, logFile, recorderPath, qualityGate, normalizedModel, normalizedBefore, normalizedAfter, workspace?.name, normalizedAllowedTools, normalizedDeniedTools, wrapperGate, taskEnvFile, effectiveSession, effectiveSessionId);
|
|
4138
|
+
wrapperPath = await writeWrapperCmd(sanitized, name, promptFile, timeoutSeconds ?? 3600, lockFile, effectiveWorkingDirectory, logFile, recorderPath, qualityGate, normalizedModel, normalizedBefore, normalizedAfter, workspace?.name, normalizedAllowedTools, normalizedDeniedTools, wrapperGate, taskEnvFile, effectiveSession, effectiveSessionId, retryCount, retryDelay);
|
|
3955
4139
|
}
|
|
3956
4140
|
else {
|
|
3957
4141
|
wrapperPath = await writeBashWrapper({
|
|
@@ -4116,6 +4300,8 @@ paused) {
|
|
|
4116
4300
|
};
|
|
4117
4301
|
try {
|
|
4118
4302
|
await saveTaskDefinition(taskDefinition);
|
|
4303
|
+
// Аудит политики прав: фиксируем, какие инструменты задача блокирует.
|
|
4304
|
+
recordTaskToolBlocks(name, normalizedAllowedTools, normalizedDeniedTools);
|
|
4119
4305
|
}
|
|
4120
4306
|
catch {
|
|
4121
4307
|
// Не критично — основная задача уже создана.
|
|
@@ -4440,6 +4626,8 @@ async function collectTasksView() {
|
|
|
4440
4626
|
return {
|
|
4441
4627
|
name,
|
|
4442
4628
|
schedule: def?.schedule ?? "",
|
|
4629
|
+
/** Hotfix 1.5.3.1: лимит времени задачи (раньше не был виден агенту). */
|
|
4630
|
+
timeoutSeconds: def?.timeoutSeconds ?? null,
|
|
4443
4631
|
status,
|
|
4444
4632
|
orphaned,
|
|
4445
4633
|
// Спринт 24 (фикс): явный признак паузы. Раньше GUI пытался вывести его
|
|
@@ -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,9 @@
|
|
|
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
4
|
import { sendTelegramMessage } from "./core/telegram.js";
|
|
5
5
|
import { sendNativeNotification } from "./core/native-notify.js";
|
|
6
|
+
import { decideTriage, recordShadow } from "./core/triage-chain.js";
|
|
6
7
|
import { t } from "./i18n.js";
|
|
7
8
|
/** Таймаут HTTP-запроса по умолчанию: уведомление не должно подвешивать задачу. */
|
|
8
9
|
const REQUEST_TIMEOUT_MS = 10000;
|
|
@@ -358,6 +359,13 @@ export async function notifyTaskCompletion(taskName, status, durationMs, error,
|
|
|
358
359
|
status !== "timeout") {
|
|
359
360
|
return;
|
|
360
361
|
}
|
|
362
|
+
// Триаж может подавить уведомление (LLM → правила → fail-open).
|
|
363
|
+
// В shadow-режиме решение фиксируется, но уведомление не подавляется.
|
|
364
|
+
const shadow = config.triage?.shadow;
|
|
365
|
+
const triage = await decideTriage({ taskName, status, error, durationMs, tokens, costUsd }, config.triage);
|
|
366
|
+
recordShadow({ taskName, status, error, durationMs, tokens, costUsd }, triage, shadow);
|
|
367
|
+
if (!isShadowActive(shadow) && triage.action === "skip")
|
|
368
|
+
return;
|
|
361
369
|
const message = formatNotificationMessage({ taskName, status, durationMs, error, tokens, costUsd }, config.templates);
|
|
362
370
|
await deliver(config, message);
|
|
363
371
|
}
|