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
package/src/settings.ts
CHANGED
|
@@ -49,6 +49,97 @@ export interface MatrixNotificationSettings {
|
|
|
49
49
|
/** Периодичность дайджеста. */
|
|
50
50
|
export type DigestFrequency = "daily" | "weekly";
|
|
51
51
|
|
|
52
|
+
/** Режим локального триажа уведомлений. */
|
|
53
|
+
export type TriageMode = "off" | "rules" | "llm" | "auto";
|
|
54
|
+
|
|
55
|
+
/** Что делать, если LLM-триаж недоступен или не уверен. */
|
|
56
|
+
export type TriageFallback = "rules" | "skip";
|
|
57
|
+
|
|
58
|
+
/** Поле уведомления, по которому проверяется правило. */
|
|
59
|
+
export type TriageRuleField = "status" | "task" | "error" | "cost";
|
|
60
|
+
|
|
61
|
+
/** Оператор сравнения правила. */
|
|
62
|
+
export type TriageRuleOperator =
|
|
63
|
+
| "equals"
|
|
64
|
+
| "contains"
|
|
65
|
+
| "regex"
|
|
66
|
+
| "gt"
|
|
67
|
+
| "lt"
|
|
68
|
+
| "gte"
|
|
69
|
+
| "lte";
|
|
70
|
+
|
|
71
|
+
/** Что делать с уведомлением при совпадении правила. */
|
|
72
|
+
export type TriageRuleAction = "notify" | "skip";
|
|
73
|
+
|
|
74
|
+
/** Категория и серьёзность, которые выставляет правило. */
|
|
75
|
+
export type TriageRuleCategory =
|
|
76
|
+
| "quality"
|
|
77
|
+
| "timeout"
|
|
78
|
+
| "permission"
|
|
79
|
+
| "network"
|
|
80
|
+
| "unknown";
|
|
81
|
+
export type TriageRuleSeverity = "low" | "medium" | "high";
|
|
82
|
+
|
|
83
|
+
/**
|
|
84
|
+
* Правило триажа (Спринт 30.4).
|
|
85
|
+
*
|
|
86
|
+
* Правила проверяются по убыванию `priority`; при равном приоритете —
|
|
87
|
+
* в порядке массива. Срабатывает только первое совпавшее правило.
|
|
88
|
+
*/
|
|
89
|
+
export interface TriageRule {
|
|
90
|
+
/** Стабильный идентификатор для логов и отчётов. */
|
|
91
|
+
id?: string;
|
|
92
|
+
field: TriageRuleField;
|
|
93
|
+
operator: TriageRuleOperator;
|
|
94
|
+
/** Строка для status/task/error, число для cost. */
|
|
95
|
+
value: string | number;
|
|
96
|
+
category?: TriageRuleCategory;
|
|
97
|
+
severity?: TriageRuleSeverity;
|
|
98
|
+
/** Уверенность правила (0..1), по умолчанию 0.8. */
|
|
99
|
+
confidence?: number;
|
|
100
|
+
action?: TriageRuleAction;
|
|
101
|
+
/** Человекочитаемая причина; иначе собирается из id и условия. */
|
|
102
|
+
reason?: string;
|
|
103
|
+
/** Чем больше, тем раньше проверяется. По умолчанию 0. */
|
|
104
|
+
priority?: number;
|
|
105
|
+
}
|
|
106
|
+
|
|
107
|
+
/** Настройки локального триажа уведомлений (Спринт 30). */
|
|
108
|
+
export interface TriageSettings {
|
|
109
|
+
/** off — триаж выключен; rules — только правила; llm — только модель; auto — модель, затем правила. */
|
|
110
|
+
mode: TriageMode;
|
|
111
|
+
/** База Ollama/OpenAI-совместимого API; по умолчанию локальная Ollama. */
|
|
112
|
+
baseUrl: string;
|
|
113
|
+
/** Идентификатор модели, например qwen3:4b. */
|
|
114
|
+
model: string;
|
|
115
|
+
/** Таймаут запроса к модели в мс (1000..120000). */
|
|
116
|
+
timeoutMs: number;
|
|
117
|
+
/** Поведение при отказе модели: правила или пропустить триаж (fail-open). */
|
|
118
|
+
fallback: TriageFallback;
|
|
119
|
+
/** Минимальная уверенность модели (0..1); ниже порога срабатывает fallback. */
|
|
120
|
+
confidenceThreshold: number;
|
|
121
|
+
/**
|
|
122
|
+
* Пользовательские правила. `undefined` — встроенный набор,
|
|
123
|
+
* пустой массив — правил нет.
|
|
124
|
+
*/
|
|
125
|
+
rules?: TriageRule[];
|
|
126
|
+
/** Shadow-режим триажа (Спринт 30.6): решения логируются, но не подавляются. */
|
|
127
|
+
shadow?: TriageShadowSettings;
|
|
128
|
+
}
|
|
129
|
+
|
|
130
|
+
/** Shadow-режим триажа (Спринт 30.6). */
|
|
131
|
+
export interface TriageShadowSettings {
|
|
132
|
+
/** Включён ли shadow-режим. По умолчанию true. */
|
|
133
|
+
enabled: boolean;
|
|
134
|
+
/** Сколько дней длится shadow-период. По умолчанию 14. */
|
|
135
|
+
days: number;
|
|
136
|
+
/** Момент начала shadow-периода (ISO). null — ещё не Started. */
|
|
137
|
+
startedAt: string | null;
|
|
138
|
+
}
|
|
139
|
+
|
|
140
|
+
/** Дни shadow-периода по умолчанию. */
|
|
141
|
+
export const DEFAULT_SHADOW_DAYS = 14;
|
|
142
|
+
|
|
52
143
|
/** Дайджест по истории запусков (Спринт 20). */
|
|
53
144
|
export interface DigestSettings {
|
|
54
145
|
/** Включён ли дайджест. */
|
|
@@ -131,6 +222,8 @@ export interface NotificationSettings {
|
|
|
131
222
|
matrix?: MatrixNotificationSettings;
|
|
132
223
|
/** Периодический дайджест. */
|
|
133
224
|
digest?: DigestSettings;
|
|
225
|
+
/** Локальный триаж уведомлений. */
|
|
226
|
+
triage?: TriageSettings;
|
|
134
227
|
}
|
|
135
228
|
|
|
136
229
|
/**
|
|
@@ -373,6 +466,19 @@ export function defaultNotifications(): NotificationSettings {
|
|
|
373
466
|
time: "09:00",
|
|
374
467
|
lastSentAt: null,
|
|
375
468
|
},
|
|
469
|
+
triage: {
|
|
470
|
+
mode: "off",
|
|
471
|
+
baseUrl: "http://127.0.0.1:11434",
|
|
472
|
+
model: "qwen3:4b",
|
|
473
|
+
timeoutMs: 45_000,
|
|
474
|
+
fallback: "rules",
|
|
475
|
+
confidenceThreshold: 0.6,
|
|
476
|
+
shadow: {
|
|
477
|
+
enabled: true,
|
|
478
|
+
days: DEFAULT_SHADOW_DAYS,
|
|
479
|
+
startedAt: null,
|
|
480
|
+
},
|
|
481
|
+
},
|
|
376
482
|
};
|
|
377
483
|
}
|
|
378
484
|
|
|
@@ -468,6 +574,168 @@ function localizedTemplate(
|
|
|
468
574
|
return builtin ? t(key) : raw;
|
|
469
575
|
}
|
|
470
576
|
|
|
577
|
+
/** Приводит режим триажа к допустимому значению. */
|
|
578
|
+
function normalizeTriageMode(value: unknown, fallback: TriageMode): TriageMode {
|
|
579
|
+
return value === "off" || value === "rules" || value === "llm" || value === "auto"
|
|
580
|
+
? value
|
|
581
|
+
: fallback;
|
|
582
|
+
}
|
|
583
|
+
|
|
584
|
+
/** Приводит fallback триажа к допустимому значению. */
|
|
585
|
+
function normalizeTriageFallback(value: unknown, fallback: TriageFallback): TriageFallback {
|
|
586
|
+
return value === "rules" || value === "skip" ? value : fallback;
|
|
587
|
+
}
|
|
588
|
+
|
|
589
|
+
/** Приводит порог уверенности к диапазону 0..1. */
|
|
590
|
+
function normalizeConfidence(value: unknown, fallback: number): number {
|
|
591
|
+
const n = Number(value);
|
|
592
|
+
if (!Number.isFinite(n)) return fallback;
|
|
593
|
+
return Math.min(1, Math.max(0, n));
|
|
594
|
+
}
|
|
595
|
+
|
|
596
|
+
const TRIAGE_RULE_FIELDS: readonly TriageRuleField[] = ["status", "task", "error", "cost"];
|
|
597
|
+
const TRIAGE_RULE_OPERATORS: readonly TriageRuleOperator[] = [
|
|
598
|
+
"equals",
|
|
599
|
+
"contains",
|
|
600
|
+
"regex",
|
|
601
|
+
"gt",
|
|
602
|
+
"lt",
|
|
603
|
+
"gte",
|
|
604
|
+
"lte",
|
|
605
|
+
];
|
|
606
|
+
const TRIAGE_RULE_CATEGORIES: readonly TriageRuleCategory[] = [
|
|
607
|
+
"quality",
|
|
608
|
+
"timeout",
|
|
609
|
+
"permission",
|
|
610
|
+
"network",
|
|
611
|
+
"unknown",
|
|
612
|
+
];
|
|
613
|
+
const TRIAGE_RULE_SEVERITIES: readonly TriageRuleSeverity[] = ["low", "medium", "high"];
|
|
614
|
+
|
|
615
|
+
/** Допустимые операторы для поля: текст сравнивается строками, cost — числами. */
|
|
616
|
+
function ruleOperatorAllowed(field: TriageRuleField, operator: TriageRuleOperator): boolean {
|
|
617
|
+
return field === "cost"
|
|
618
|
+
? operator !== "contains" && operator !== "regex"
|
|
619
|
+
: operator === "equals" || operator === "contains" || operator === "regex";
|
|
620
|
+
}
|
|
621
|
+
|
|
622
|
+
/** Нормализует одно правило; невалидное возвращает null (правило отбрасывается). */
|
|
623
|
+
function normalizeTriageRule(value: unknown): TriageRule | null {
|
|
624
|
+
const raw = asRecord(value);
|
|
625
|
+
if (!raw) return null;
|
|
626
|
+
|
|
627
|
+
const field = TRIAGE_RULE_FIELDS.includes(raw.field as TriageRuleField)
|
|
628
|
+
? (raw.field as TriageRuleField)
|
|
629
|
+
: null;
|
|
630
|
+
const operator = TRIAGE_RULE_OPERATORS.includes(raw.operator as TriageRuleOperator)
|
|
631
|
+
? (raw.operator as TriageRuleOperator)
|
|
632
|
+
: null;
|
|
633
|
+
if (!field || !operator || !ruleOperatorAllowed(field, operator)) return null;
|
|
634
|
+
|
|
635
|
+
let ruleValue: string | number;
|
|
636
|
+
if (field === "cost") {
|
|
637
|
+
const n = Number(raw.value);
|
|
638
|
+
if (!Number.isFinite(n) || n < 0) return null;
|
|
639
|
+
ruleValue = n;
|
|
640
|
+
} else {
|
|
641
|
+
if (typeof raw.value !== "string" || !raw.value.trim()) return null;
|
|
642
|
+
ruleValue = raw.value.trim().slice(0, 500);
|
|
643
|
+
}
|
|
644
|
+
|
|
645
|
+
if (operator === "regex") {
|
|
646
|
+
try {
|
|
647
|
+
new RegExp(String(ruleValue), "i");
|
|
648
|
+
} catch {
|
|
649
|
+
return null;
|
|
650
|
+
}
|
|
651
|
+
}
|
|
652
|
+
|
|
653
|
+
const rule: TriageRule = { field, operator, value: ruleValue };
|
|
654
|
+
if (typeof raw.id === "string" && raw.id.trim()) rule.id = raw.id.trim().slice(0, 64);
|
|
655
|
+
if (TRIAGE_RULE_CATEGORIES.includes(raw.category as TriageRuleCategory)) {
|
|
656
|
+
rule.category = raw.category as TriageRuleCategory;
|
|
657
|
+
}
|
|
658
|
+
if (TRIAGE_RULE_SEVERITIES.includes(raw.severity as TriageRuleSeverity)) {
|
|
659
|
+
rule.severity = raw.severity as TriageRuleSeverity;
|
|
660
|
+
}
|
|
661
|
+
if (raw.confidence !== undefined) rule.confidence = normalizeConfidence(raw.confidence, 0.8);
|
|
662
|
+
if (raw.action === "notify" || raw.action === "skip") rule.action = raw.action;
|
|
663
|
+
if (typeof raw.reason === "string" && raw.reason.trim()) {
|
|
664
|
+
rule.reason = raw.reason.trim().slice(0, 300);
|
|
665
|
+
}
|
|
666
|
+
const priority = Number(raw.priority);
|
|
667
|
+
rule.priority = Number.isFinite(priority)
|
|
668
|
+
? Math.min(10_000, Math.max(-10_000, Math.trunc(priority)))
|
|
669
|
+
: 0;
|
|
670
|
+
return rule;
|
|
671
|
+
}
|
|
672
|
+
|
|
673
|
+
/** Нормализует массив правил; undefined сохраняет встроенный набор. */
|
|
674
|
+
function normalizeTriageRules(
|
|
675
|
+
value: unknown,
|
|
676
|
+
fallback: TriageRule[] | undefined
|
|
677
|
+
): TriageRule[] | undefined {
|
|
678
|
+
if (value === undefined) return fallback?.map((rule) => ({ ...rule }));
|
|
679
|
+
if (!Array.isArray(value)) return fallback?.map((rule) => ({ ...rule }));
|
|
680
|
+
return value
|
|
681
|
+
.slice(0, 200)
|
|
682
|
+
.map(normalizeTriageRule)
|
|
683
|
+
.filter((rule): rule is TriageRule => rule !== null);
|
|
684
|
+
}
|
|
685
|
+
|
|
686
|
+
/** Нормализует настройки shadow-режима триажа. */
|
|
687
|
+
function normalizeTriageShadow(
|
|
688
|
+
value: unknown,
|
|
689
|
+
fallback: TriageShadowSettings
|
|
690
|
+
): TriageShadowSettings {
|
|
691
|
+
if (!value || typeof value !== "object" || Array.isArray(value)) {
|
|
692
|
+
return { ...fallback };
|
|
693
|
+
}
|
|
694
|
+
const raw = value as Partial<TriageShadowSettings>;
|
|
695
|
+
return {
|
|
696
|
+
enabled: typeof raw.enabled === "boolean" ? raw.enabled : fallback.enabled,
|
|
697
|
+
days: normalizeIntInRange(raw.days, fallback.days, 1, 365),
|
|
698
|
+
startedAt:
|
|
699
|
+
typeof raw.startedAt === "string" && raw.startedAt.trim()
|
|
700
|
+
? raw.startedAt.trim()
|
|
701
|
+
: null,
|
|
702
|
+
};
|
|
703
|
+
}
|
|
704
|
+
|
|
705
|
+
/** Текущий shadow-период ещё активен? (ничего не меняет, только читает). */
|
|
706
|
+
export function isShadowActive(shadow: TriageShadowSettings | undefined): boolean {
|
|
707
|
+
if (!shadow || !shadow.enabled || !shadow.startedAt) return false;
|
|
708
|
+
const started = new Date(shadow.startedAt).getTime();
|
|
709
|
+
if (!Number.isFinite(started)) return false;
|
|
710
|
+
const now = Date.now();
|
|
711
|
+
const days = Number.isFinite(shadow.days) && shadow.days > 0 ? shadow.days : DEFAULT_SHADOW_DAYS;
|
|
712
|
+
return now - started < days * 24 * 60 * 60 * 1000;
|
|
713
|
+
}
|
|
714
|
+
|
|
715
|
+
/** Начать shadow-период, если ещё не Started. Возвращает нормализованные настройки shadow. */
|
|
716
|
+
export function startShadow(shadow: TriageShadowSettings | undefined): TriageShadowSettings {
|
|
717
|
+
const nowIso = new Date().toISOString();
|
|
718
|
+
if (!shadow) {
|
|
719
|
+
return { enabled: true, days: DEFAULT_SHADOW_DAYS, startedAt: nowIso };
|
|
720
|
+
}
|
|
721
|
+
if (!shadow.startedAt) {
|
|
722
|
+
return { ...shadow, startedAt: nowIso };
|
|
723
|
+
}
|
|
724
|
+
return { ...shadow };
|
|
725
|
+
}
|
|
726
|
+
|
|
727
|
+
/**
|
|
728
|
+
* Настройки shadow после сохранения: включённый режим без даты старта
|
|
729
|
+
* получает текущий момент, выключенный — сбрасывает дату.
|
|
730
|
+
*/
|
|
731
|
+
export function settleShadowOnSave(
|
|
732
|
+
shadow: TriageShadowSettings | undefined
|
|
733
|
+
): TriageShadowSettings {
|
|
734
|
+
if (!shadow) return startShadow(undefined);
|
|
735
|
+
if (!shadow.enabled) return { ...shadow, startedAt: null };
|
|
736
|
+
return startShadow(shadow);
|
|
737
|
+
}
|
|
738
|
+
|
|
471
739
|
/** Приводит настройки уведомлений к безопасному виду. */
|
|
472
740
|
function normalizeNotifications(
|
|
473
741
|
value: unknown,
|
|
@@ -481,6 +749,8 @@ function normalizeNotifications(
|
|
|
481
749
|
const fallbackTelegram = fallback.telegram ?? defaultNotifications().telegram!;
|
|
482
750
|
const fallbackNative = fallback.native ?? defaultNotifications().native!;
|
|
483
751
|
const fallbackQuiet = fallback.quietHours ?? defaultNotifications().quietHours!;
|
|
752
|
+
const fallbackTriage = fallback.triage ?? defaultNotifications().triage!;
|
|
753
|
+
const fallbackShadow = fallbackTriage.shadow ?? defaultNotifications().triage!.shadow!;
|
|
484
754
|
|
|
485
755
|
const raw = asRecord(value);
|
|
486
756
|
if (!raw) {
|
|
@@ -497,6 +767,11 @@ function normalizeNotifications(
|
|
|
497
767
|
telegram: { ...fallbackTelegram },
|
|
498
768
|
native: { ...fallbackNative },
|
|
499
769
|
quietHours: { ...fallbackQuiet },
|
|
770
|
+
triage: {
|
|
771
|
+
...fallbackTriage,
|
|
772
|
+
rules: fallbackTriage.rules?.map((rule) => ({ ...rule })),
|
|
773
|
+
shadow: { ...fallbackShadow },
|
|
774
|
+
},
|
|
500
775
|
dashboardUrl: fallback.dashboardUrl ?? "",
|
|
501
776
|
};
|
|
502
777
|
}
|
|
@@ -509,6 +784,7 @@ function normalizeNotifications(
|
|
|
509
784
|
const rawTelegram = asRecord(raw.telegram);
|
|
510
785
|
const rawNative = asRecord(raw.native);
|
|
511
786
|
const rawQuiet = asRecord(raw.quietHours);
|
|
787
|
+
const rawTriage = asRecord(raw.triage);
|
|
512
788
|
|
|
513
789
|
const frequency: DigestFrequency =
|
|
514
790
|
rawDigest?.frequency === "weekly" || rawDigest?.frequency === "daily"
|
|
@@ -520,6 +796,14 @@ function normalizeNotifications(
|
|
|
520
796
|
? rawDigest.lastSentAt.trim()
|
|
521
797
|
: null;
|
|
522
798
|
|
|
799
|
+
// `rules` отсутствует, если используется встроенный набор. Ключ с явным
|
|
800
|
+
// `undefined` нельзя отдавать по RPC: JSON-схема превращает неописанные
|
|
801
|
+
// поля в Schema.Json, которая отвергает undefined ("Expected JSON value").
|
|
802
|
+
const triageRules = normalizeTriageRules(
|
|
803
|
+
rawTriage?.rules,
|
|
804
|
+
fallbackTriage.rules
|
|
805
|
+
);
|
|
806
|
+
|
|
523
807
|
return {
|
|
524
808
|
enabled: typeof raw.enabled === "boolean" ? raw.enabled : fallback.enabled,
|
|
525
809
|
onlyOnError:
|
|
@@ -652,6 +936,33 @@ function normalizeNotifications(
|
|
|
652
936
|
time: normalizeDailyTime(rawDigest?.time, fallbackDigest.time),
|
|
653
937
|
lastSentAt,
|
|
654
938
|
},
|
|
939
|
+
triage: {
|
|
940
|
+
mode: normalizeTriageMode(rawTriage?.mode, fallbackTriage.mode),
|
|
941
|
+
baseUrl: normalizeHttpBase(rawTriage?.baseUrl, fallbackTriage.baseUrl),
|
|
942
|
+
model:
|
|
943
|
+
typeof rawTriage?.model === "string" && rawTriage.model.trim()
|
|
944
|
+
? rawTriage.model.trim().slice(0, 200)
|
|
945
|
+
: fallbackTriage.model,
|
|
946
|
+
timeoutMs: normalizeIntInRange(
|
|
947
|
+
rawTriage?.timeoutMs,
|
|
948
|
+
fallbackTriage.timeoutMs,
|
|
949
|
+
1_000,
|
|
950
|
+
120_000
|
|
951
|
+
),
|
|
952
|
+
fallback: normalizeTriageFallback(
|
|
953
|
+
rawTriage?.fallback,
|
|
954
|
+
fallbackTriage.fallback
|
|
955
|
+
),
|
|
956
|
+
confidenceThreshold: normalizeConfidence(
|
|
957
|
+
rawTriage?.confidenceThreshold,
|
|
958
|
+
fallbackTriage.confidenceThreshold
|
|
959
|
+
),
|
|
960
|
+
...(triageRules !== undefined ? { rules: triageRules } : {}),
|
|
961
|
+
shadow: normalizeTriageShadow(
|
|
962
|
+
rawTriage?.shadow,
|
|
963
|
+
fallbackShadow
|
|
964
|
+
),
|
|
965
|
+
},
|
|
655
966
|
};
|
|
656
967
|
}
|
|
657
968
|
|
|
@@ -786,6 +1097,13 @@ export async function saveSettings(
|
|
|
786
1097
|
}
|
|
787
1098
|
}
|
|
788
1099
|
|
|
1100
|
+
// Удобство: включённый shadow-режим без даты старта стартует при первом сохранении.
|
|
1101
|
+
// Иначе shadow не логировал бы решения, а триаж реально подавлял бы уведомления.
|
|
1102
|
+
const triage = next.notifications.triage;
|
|
1103
|
+
if (triage) {
|
|
1104
|
+
triage.shadow = settleShadowOnSave(triage.shadow);
|
|
1105
|
+
}
|
|
1106
|
+
|
|
789
1107
|
await fs.mkdir(PLUGIN_DIR, { recursive: true });
|
|
790
1108
|
await fs.writeFile(SETTINGS_FILE, JSON.stringify(next, null, 2), "utf8");
|
|
791
1109
|
return next;
|
package/src/workspaces.ts
CHANGED
|
@@ -139,13 +139,16 @@ export function readWorkspaceEnvFile(envFile?: string): Record<string, string> {
|
|
|
139
139
|
* зашифрованного хранилища (Спринт 26); отсутствующий секрет даёт пустую
|
|
140
140
|
* строку и предупреждение с именем — без значения. Никогда не бросает.
|
|
141
141
|
*/
|
|
142
|
-
export function resolveWorkspaceEnv(
|
|
142
|
+
export function resolveWorkspaceEnv(
|
|
143
|
+
workspace: Workspace | undefined,
|
|
144
|
+
allowedSecretNames?: string[]
|
|
145
|
+
): Record<string, string> {
|
|
143
146
|
if (!workspace) return {};
|
|
144
147
|
const merged = {
|
|
145
148
|
...readWorkspaceEnvFile(workspace.envFile),
|
|
146
149
|
...(workspace.env ?? {}),
|
|
147
150
|
};
|
|
148
|
-
const resolved = resolveSecretRefs(merged);
|
|
151
|
+
const resolved = resolveSecretRefs(merged, allowedSecretNames);
|
|
149
152
|
if (resolved.missing.length > 0) {
|
|
150
153
|
console.warn(
|
|
151
154
|
`[workspace] "${workspace.name}": не найдены секреты: ${resolved.missing.join(", ")}`
|
|
@@ -196,10 +199,12 @@ export function workspaceEnvDir(pluginDir: string): string {
|
|
|
196
199
|
export function writeWorkspaceEnvFile(
|
|
197
200
|
workspace: Workspace | undefined,
|
|
198
201
|
pluginDir: string,
|
|
199
|
-
sanitizedName: string
|
|
202
|
+
sanitizedName: string,
|
|
203
|
+
allowedSecretNames?: string[]
|
|
200
204
|
): string | undefined {
|
|
205
|
+
if (!workspace) return undefined;
|
|
201
206
|
const file = join(workspaceEnvDir(pluginDir), `${sanitizedName}.env`);
|
|
202
|
-
const env = resolveWorkspaceEnv(workspace);
|
|
207
|
+
const env = resolveWorkspaceEnv(workspace, allowedSecretNames);
|
|
203
208
|
const keys = Object.keys(env);
|
|
204
209
|
if (!keys.length) {
|
|
205
210
|
try {
|