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/core/lock.js
CHANGED
|
@@ -21,6 +21,10 @@ export class LockManager {
|
|
|
21
21
|
lockFilePath(taskName) {
|
|
22
22
|
return path.join(this.lockDir, this.lockFileName(taskName));
|
|
23
23
|
}
|
|
24
|
+
/** Публичный путь к lock-файлу (для ожидания/вытеснения зависших lock). */
|
|
25
|
+
pathFor(taskName) {
|
|
26
|
+
return this.lockFilePath(taskName);
|
|
27
|
+
}
|
|
24
28
|
/**
|
|
25
29
|
* Инициализация директории блокировок и очистка зависших (старых) файлов.
|
|
26
30
|
* Вызывается при старте плагина.
|
|
@@ -30,16 +34,39 @@ export class LockManager {
|
|
|
30
34
|
const files = await fs.readdir(this.lockDir).catch(() => []);
|
|
31
35
|
const now = Date.now();
|
|
32
36
|
for (const file of files) {
|
|
33
|
-
if (!file.endsWith(".lock"))
|
|
34
|
-
continue;
|
|
35
37
|
const fullPath = path.join(this.lockDir, file);
|
|
38
|
+
// Каталог <task>.lock.d держит POSIX-обёртка (mkdir-блокировка).
|
|
39
|
+
// После kill -9 он остаётся навсегда, поэтому чистим его так же, как .lock.
|
|
40
|
+
const isLockFile = file.endsWith(".lock");
|
|
41
|
+
const isLockDir = file.endsWith(".lock.d");
|
|
42
|
+
const isStaleArtifact = /\.lock(\.d)?\.stale-/.test(file);
|
|
43
|
+
if (!isLockFile && !isLockDir && !isStaleArtifact)
|
|
44
|
+
continue;
|
|
36
45
|
try {
|
|
46
|
+
// Артефакт предыдущего вытеснения валидным lock быть не может,
|
|
47
|
+
// поэтому убираем его независимо от возраста.
|
|
48
|
+
if (isStaleArtifact) {
|
|
49
|
+
await fs.rm(fullPath, { recursive: true, force: true }).catch(() => { });
|
|
50
|
+
continue;
|
|
51
|
+
}
|
|
37
52
|
const stat = await fs.stat(fullPath);
|
|
38
53
|
const age = now - stat.mtimeMs;
|
|
39
54
|
if (age > STALE_LOCK_MAX_AGE_MS) {
|
|
40
|
-
|
|
55
|
+
// T-03: не удаляем lock напрямую. Два воркера могли одновременно
|
|
56
|
+
// снести один и тот же файл, после чего один из них удалял свежий
|
|
57
|
+
// lock, созданный другим, и задача запускалась повторно. Атомарный
|
|
58
|
+
// rename в уникальное имя выигрывает только один процесс; второй
|
|
59
|
+
// получает ENOENT и не трогает чужой lock.
|
|
60
|
+
const stalePath = `${fullPath}.stale-${process.pid}-${Date.now()}`;
|
|
61
|
+
try {
|
|
62
|
+
await fs.rename(fullPath, stalePath);
|
|
63
|
+
}
|
|
64
|
+
catch {
|
|
65
|
+
continue;
|
|
66
|
+
}
|
|
67
|
+
await fs.rm(stalePath, { recursive: true, force: true }).catch(() => { });
|
|
41
68
|
// eslint-disable-next-line no-console
|
|
42
|
-
console.log(`[windows-scheduler]
|
|
69
|
+
console.log(`[windows-scheduler] Вытеснен зависший lock: ${file} (возраст ${Math.round(age / 1000)} с)`);
|
|
43
70
|
}
|
|
44
71
|
}
|
|
45
72
|
catch {
|
|
@@ -116,3 +143,53 @@ export async function withLock(lockManager, taskName, fn) {
|
|
|
116
143
|
await lockManager.release(taskName);
|
|
117
144
|
}
|
|
118
145
|
}
|
|
146
|
+
/**
|
|
147
|
+
* Выполняет функцию с ожиданием освобождения файловой блокировки.
|
|
148
|
+
* В отличие от withLock не пропускает выполнение, а ждёт: критично для
|
|
149
|
+
* read-modify-write операций (crontab), где пропуск ломает состояние.
|
|
150
|
+
* Если lock удерживается дольше staleMs — считается осиротевшим и вытесняется
|
|
151
|
+
* атомарным rename (как в T-03), чтобы зависший процесс не блокировал навсегда.
|
|
152
|
+
*/
|
|
153
|
+
export async function withLockWait(lockManager, taskName, fn, options = {}) {
|
|
154
|
+
const timeoutMs = options.timeoutMs ?? 15000;
|
|
155
|
+
const retryDelayMs = options.retryDelayMs ?? 50;
|
|
156
|
+
const staleMs = options.staleMs ?? 60000;
|
|
157
|
+
const deadline = Date.now() + timeoutMs;
|
|
158
|
+
const lockPath = lockManager.pathFor(taskName);
|
|
159
|
+
for (;;) {
|
|
160
|
+
if (await lockManager.acquire(taskName))
|
|
161
|
+
break;
|
|
162
|
+
// Осиротевший lock: короткая операция не может длиться дольше staleMs.
|
|
163
|
+
if (staleMs > 0) {
|
|
164
|
+
try {
|
|
165
|
+
const stat = await fs.stat(lockPath);
|
|
166
|
+
if (Date.now() - stat.mtimeMs > staleMs) {
|
|
167
|
+
// T-03-совместимое вытеснение: атомарный rename выигрывает ровно
|
|
168
|
+
// один процесс, остальные получают ENOENT и повторяют попытку.
|
|
169
|
+
const stalePath = `${lockPath}.stale-${process.pid}-${Date.now()}`;
|
|
170
|
+
try {
|
|
171
|
+
await fs.rename(lockPath, stalePath);
|
|
172
|
+
await fs.rm(stalePath, { force: true }).catch(() => { });
|
|
173
|
+
}
|
|
174
|
+
catch {
|
|
175
|
+
// Кто-то успел раньше — просто повторяем acquire.
|
|
176
|
+
}
|
|
177
|
+
continue;
|
|
178
|
+
}
|
|
179
|
+
}
|
|
180
|
+
catch {
|
|
181
|
+
// lock исчез — сразу пробуем acquire снова.
|
|
182
|
+
}
|
|
183
|
+
}
|
|
184
|
+
if (Date.now() >= deadline) {
|
|
185
|
+
throw new Error(`Не удалось получить блокировку "${taskName}" за ${timeoutMs} мс.`);
|
|
186
|
+
}
|
|
187
|
+
await new Promise((resolve) => setTimeout(resolve, retryDelayMs));
|
|
188
|
+
}
|
|
189
|
+
try {
|
|
190
|
+
return await fn();
|
|
191
|
+
}
|
|
192
|
+
finally {
|
|
193
|
+
await lockManager.release(taskName);
|
|
194
|
+
}
|
|
195
|
+
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"matrix.d.ts","sourceRoot":"","sources":["../../src/core/matrix.ts"],"names":[],"mappings":"AAYA,OAAO,KAAK,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAaxE,kEAAkE;AAClE,eAAO,MAAM,sBAAsB,qBAAqB,CAAC;AAEzD,gDAAgD;AAChD,wBAAgB,eAAe,CAAC,UAAU,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,GAAG,MAAM,CASjF;AAED,+CAA+C;AAC/C,wBAAgB,kBAAkB,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,CAE7D;AAED,sDAAsD;AACtD,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAE1D;AAED;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,cAAc,GAAG,cAAc,EAAE,
|
|
1
|
+
{"version":3,"file":"matrix.d.ts","sourceRoot":"","sources":["../../src/core/matrix.ts"],"names":[],"mappings":"AAYA,OAAO,KAAK,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAaxE,kEAAkE;AAClE,eAAO,MAAM,sBAAsB,qBAAqB,CAAC;AAEzD,gDAAgD;AAChD,wBAAgB,eAAe,CAAC,UAAU,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,GAAG,MAAM,CASjF;AAED,+CAA+C;AAC/C,wBAAgB,kBAAkB,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,CAE7D;AAED,sDAAsD;AACtD,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAE1D;AAED;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,cAAc,GAAG,cAAc,EAAE,CA2EvE;AAkBD,MAAM,WAAW,iBAAiB;IAChC,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;CAC3B;AAED,MAAM,WAAW,eAAe;IAC9B,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;IACrB,0CAA0C;IAC1C,MAAM,EAAE,SAAS,GAAG,OAAO,GAAG,SAAS,GAAG,SAAS,GAAG,OAAO,CAAC;IAC9D,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,iBAAiB,EAAE,CAAC;CAC7B;AAED,oEAAoE;AACpE,wBAAgB,sBAAsB,CAAC,QAAQ,EAAE,MAAM,GAAG,eAAe,CAyExE;AAED,MAAM,WAAW,eAAe;IAC9B,OAAO,EAAE,OAAO,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,UAAU,GAAG,YAAY,CAAC;IACpC,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,kFAAkF;IAClF,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,MAAM,EAAE,MAAM,EAAE,CAAC;CAClB;AAED,kEAAkE;AAClE,wBAAgB,wBAAwB,CACtC,MAAM,EAAE,YAAY,GAAG,SAAS,EAChC,WAAW,EAAE,MAAM,GAClB,MAAM,CAYR;AAED;;;;;;GAMG;AACH,wBAAsB,SAAS,CAAC,IAAI,EAAE,cAAc,GAAG,OAAO,CAAC,eAAe,CAAC,CA6E9E;AAED;;;;GAIG;AACH,wBAAsB,uBAAuB,CAC3C,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAyC7B;AAED;;;;;;GAMG;AACH,wBAAsB,uBAAuB,CAC3C,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,MAAM,EAAE,CAAC,CA4DnB;AAED;;;;GAIG;AACH,wBAAgB,wBAAwB,CAAC,MAAM,EAAE,cAAc,GAAG,cAAc,GAAG,SAAS,CAoC3F;AAED,yEAAyE;AACzE,wBAAgB,oBAAoB,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,EAAE,CAYjE;AAoBD,kEAAkE;AAClE,MAAM,WAAW,cAAc;IAC7B,MAAM,EAAE,cAAc,CAAC;IACvB,wDAAwD;IACxD,OAAO,EAAE,cAAc,EAAE,CAAC;IAC1B,MAAM,EAAE,cAAc,EAAE,CAAC;IACzB,MAAM,EAAE,cAAc,EAAE,CAAC;IACzB,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,0DAA0D;IAC1D,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,QAAQ,EAAE,MAAM,EAAE,CAAC;CACpB;AAED;;;GAGG;AACH,wBAAgB,cAAc,CAAC,MAAM,EAAE,cAAc,GAAG,cAAc,CAsDrE;AAED,2EAA2E;AAC3E,MAAM,WAAW,eAAe;IAC9B,WAAW,CAAC,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;IACjD,WAAW,CAAC,CAAC,UAAU,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;IAC/D,WAAW,CAAC,CAAC,UAAU,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;IAC/D,4EAA4E;IAC5E,cAAc,CAAC,CAAC,MAAM,EAAE,cAAc,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,GAAG,MAAM,GAAG,SAAS,CAAC;CAC3F;AAED,MAAM,WAAW,gBAAgB;IAC/B,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED;;;GAGG;AACH,wBAAsB,gBAAgB,CACpC,MAAM,EAAE,cAAc,EACtB,KAAK,GAAE,eAAoB,GAC1B,OAAO,CAAC,gBAAgB,CAAC,CAuB3B;AAED,qEAAqE;AACrE,wBAAgB,0BAA0B,CACxC,QAAQ,EAAE,MAAM,GACf,MAAM,GAAG,SAAS,CAKpB;AAED;;;GAGG;AACH,MAAM,WAAW,gBAAgB;IAC/B,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,EAAE,CAAC;CACpB;AAED,wBAAgB,sBAAsB,CACpC,QAAQ,EAAE,MAAM,GACf,gBAAgB,GAAG,SAAS,CAO9B;AAED;;;;;GAKG;AACH,wBAAgB,sBAAsB,CACpC,QAAQ,EAAE,MAAM,GACf,MAAM,GAAG,SAAS,CAQpB;AAED;;;;GAIG;AACH,wBAAgB,uBAAuB,IAAI,MAAM,EAAE,CAoBlD;AAED,8CAA8C;AAC9C,MAAM,WAAW,kBAAkB;IACjC,MAAM,EAAE,MAAM,CAAC;IACf,0DAA0D;IAC1D,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,2EAA2E;IAC3E,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,2DAA2D;IAC3D,eAAe,EAAE,MAAM,EAAE,CAAC;IAC1B,SAAS,EAAE,eAAe,CAAC;CAC5B;AAED;;;;;GAKG;AACH,wBAAsB,yBAAyB,CAC7C,UAAU,EAAE,MAAM,EAClB,MAAM,SAAmC,GACxC,OAAO,CAAC,kBAAkB,CAAC,CAyE7B;AAED,8DAA8D;AAC9D,wBAAgB,YAAY,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,CAEtD;AAED;;;;GAIG;AACH,wBAAsB,wBAAwB,CAC5C,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,eAAe,GAAG,SAAS,CAAC,CAmFtC"}
|
package/dist/core/matrix.js
CHANGED
|
@@ -57,8 +57,9 @@ export function expandMatrixTask(task) {
|
|
|
57
57
|
}));
|
|
58
58
|
}
|
|
59
59
|
const name = matrixCloneName(task.name, workspace.name);
|
|
60
|
-
if (usedNames.has(name.toLowerCase()))
|
|
61
|
-
|
|
60
|
+
if (usedNames.has(name.toLowerCase())) {
|
|
61
|
+
throw new Error(t("matrix.error.duplicateCloneName", { task: task.name, name }));
|
|
62
|
+
}
|
|
62
63
|
usedNames.add(name.toLowerCase());
|
|
63
64
|
// Клон наследует промпт, модель, хуки, Quality Gate, role-scoped tools.
|
|
64
65
|
// Поля матрицы/родителя не наследуются: клон — обычная задача.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"native-notify.d.ts","sourceRoot":"","sources":["../../src/core/native-notify.ts"],"names":[],"mappings":"AAgBA,MAAM,WAAW,yBAAyB;IACxC,oDAAoD;IACpD,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,yBAAyB;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,8CAA8C;IAC9C,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB;AAED,2DAA2D;AAC3D,MAAM,WAAW,aAAa;IAC5B,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC9B;AAkBD;;;GAGG;AACH,wBAAgB,8BAA8B,CAC5C,QAAQ,EAAE,MAAM,CAAC,QAAQ,EACzB,OAAO,EAAE,yBAAyB,GACjC,aAAa,
|
|
1
|
+
{"version":3,"file":"native-notify.d.ts","sourceRoot":"","sources":["../../src/core/native-notify.ts"],"names":[],"mappings":"AAgBA,MAAM,WAAW,yBAAyB;IACxC,oDAAoD;IACpD,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,yBAAyB;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,8CAA8C;IAC9C,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB;AAED,2DAA2D;AAC3D,MAAM,WAAW,aAAa;IAC5B,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC9B;AAkBD;;;GAGG;AACH,wBAAgB,8BAA8B,CAC5C,QAAQ,EAAE,MAAM,CAAC,QAAQ,EACzB,OAAO,EAAE,yBAAyB,GACjC,aAAa,CAuDf;AAED,MAAM,WAAW,iBAAiB;IAChC,oCAAoC;IACpC,QAAQ,CAAC,EAAE,MAAM,CAAC,QAAQ,CAAC;IAC3B,2CAA2C;IAC3C,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,GAAG,EAAE,MAAM,CAAC,UAAU,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAClF,6BAA6B;IAC7B,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,gBAAgB;IAC/B,OAAO,EAAE,OAAO,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED;;GAEG;AACH,wBAAsB,sBAAsB,CAC1C,OAAO,EAAE,yBAAyB,EAClC,OAAO,GAAE,iBAAsB,GAC9B,OAAO,CAAC,gBAAgB,CAAC,CAwB3B"}
|
|
@@ -74,6 +74,9 @@ export function buildNativeNotificationCommand(platform, message) {
|
|
|
74
74
|
"normal",
|
|
75
75
|
"-i",
|
|
76
76
|
"dialog-information",
|
|
77
|
+
// `--` завершает разбор опций: текст уведомления может начинаться с "-"
|
|
78
|
+
// и без разделителя был бы принят за флаг notify-send.
|
|
79
|
+
"--",
|
|
77
80
|
title,
|
|
78
81
|
body,
|
|
79
82
|
],
|
package/dist/core/one-shot.d.ts
CHANGED
|
@@ -58,5 +58,11 @@ export declare function buildLaunchdCalendar(runAt: string): {
|
|
|
58
58
|
Minute: number;
|
|
59
59
|
};
|
|
60
60
|
/** Команда самоочистки launchd-агента после единственного запуска. */
|
|
61
|
-
export declare function buildLaunchdOneShotCleanup(sanitizedName: string): string;
|
|
61
|
+
export declare function buildLaunchdOneShotCleanup(sanitizedName: string, profile?: string): string;
|
|
62
|
+
/**
|
|
63
|
+
* label launchd-агента задачи. Для default сохраняется историческое имя
|
|
64
|
+
* `com.opencode.scheduler.<name>`; у не-default профиля свой префикс, чтобы
|
|
65
|
+
* одноимённые задачи разных профилей не затирали plist друг друга.
|
|
66
|
+
*/
|
|
67
|
+
export declare function launchdLabel(sanitizedName: string, profile?: string): string;
|
|
62
68
|
//# sourceMappingURL=one-shot.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"one-shot.d.ts","sourceRoot":"","sources":["../../src/core/one-shot.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,yEAAyE;AACzE,eAAO,MAAM,yBAAyB,QAAyB,CAAC;AAEhE,wCAAwC;AACxC,eAAO,MAAM,yBAAyB,IAAI,CAAC;AAE3C,MAAM,WAAW,YAAY;IAC3B,2CAA2C;IAC3C,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,+CAA+C;IAC/C,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB;AAED,MAAM,MAAM,oBAAoB,GAC5B;IACE,EAAE,EAAE,IAAI,CAAC;IACT,yDAAyD;IACzD,KAAK,EAAE,MAAM,CAAC;IACd,+CAA+C;IAC/C,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB,GACD;IAAE,EAAE,EAAE,KAAK,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC;AAYjC;;;;;;GAMG;AACH,wBAAgB,qBAAqB,CACnC,KAAK,EAAE,YAAY,EACnB,KAAK,GAAE,MAAmB,GACzB,oBAAoB,CAoDtB;AAMD;;;;;;GAMG;AACH,wBAAgB,wBAAwB,CACtC,KAAK,EAAE,MAAM,GACZ,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,CAAC,CAU/C;AAED,gEAAgE;AAChE,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAStD;AAED;;;GAGG;AACH,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,MAAM,GAAG;IACnD,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;CAChB,CAQA;AAED,sEAAsE;AACtE,wBAAgB,0BAA0B,CAAC,aAAa,EAAE,MAAM,GAAG,MAAM,
|
|
1
|
+
{"version":3,"file":"one-shot.d.ts","sourceRoot":"","sources":["../../src/core/one-shot.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,yEAAyE;AACzE,eAAO,MAAM,yBAAyB,QAAyB,CAAC;AAEhE,wCAAwC;AACxC,eAAO,MAAM,yBAAyB,IAAI,CAAC;AAE3C,MAAM,WAAW,YAAY;IAC3B,2CAA2C;IAC3C,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,+CAA+C;IAC/C,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB;AAED,MAAM,MAAM,oBAAoB,GAC5B;IACE,EAAE,EAAE,IAAI,CAAC;IACT,yDAAyD;IACzD,KAAK,EAAE,MAAM,CAAC;IACd,+CAA+C;IAC/C,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB,GACD;IAAE,EAAE,EAAE,KAAK,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC;AAYjC;;;;;;GAMG;AACH,wBAAgB,qBAAqB,CACnC,KAAK,EAAE,YAAY,EACnB,KAAK,GAAE,MAAmB,GACzB,oBAAoB,CAoDtB;AAMD;;;;;;GAMG;AACH,wBAAgB,wBAAwB,CACtC,KAAK,EAAE,MAAM,GACZ,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,CAAC,CAU/C;AAED,gEAAgE;AAChE,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAStD;AAED;;;GAGG;AACH,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,MAAM,GAAG;IACnD,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;CAChB,CAQA;AAED,sEAAsE;AACtE,wBAAgB,0BAA0B,CACxC,aAAa,EAAE,MAAM,EACrB,OAAO,GAAE,MAAkB,GAC1B,MAAM,CAOR;AAED;;;;GAIG;AACH,wBAAgB,YAAY,CAAC,aAAa,EAAE,MAAM,EAAE,OAAO,GAAE,MAAkB,GAAG,MAAM,CAKvF"}
|
package/dist/core/one-shot.js
CHANGED
|
@@ -119,8 +119,21 @@ export function buildLaunchdCalendar(runAt) {
|
|
|
119
119
|
};
|
|
120
120
|
}
|
|
121
121
|
/** Команда самоочистки launchd-агента после единственного запуска. */
|
|
122
|
-
export function buildLaunchdOneShotCleanup(sanitizedName) {
|
|
122
|
+
export function buildLaunchdOneShotCleanup(sanitizedName, profile = "default") {
|
|
123
|
+
const label = launchdLabel(sanitizedName, profile);
|
|
123
124
|
return (`launchctl bootout "gui/$(id -u)" ` +
|
|
124
|
-
`"$HOME/Library/LaunchAgents
|
|
125
|
+
`"$HOME/Library/LaunchAgents/${label}.plist" ` +
|
|
125
126
|
`>/dev/null 2>&1 || true`);
|
|
126
127
|
}
|
|
128
|
+
/**
|
|
129
|
+
* label launchd-агента задачи. Для default сохраняется историческое имя
|
|
130
|
+
* `com.opencode.scheduler.<name>`; у не-default профиля свой префикс, чтобы
|
|
131
|
+
* одноимённые задачи разных профилей не затирали plist друг друга.
|
|
132
|
+
*/
|
|
133
|
+
export function launchdLabel(sanitizedName, profile = "default") {
|
|
134
|
+
const base = `com.opencode.scheduler.${sanitizedName}`;
|
|
135
|
+
if (profile === "default")
|
|
136
|
+
return base;
|
|
137
|
+
const scope = profile.replace(/[^A-Za-z0-9_.-]/g, "-");
|
|
138
|
+
return `com.opencode.scheduler.profile-${scope}.${sanitizedName}`;
|
|
139
|
+
}
|
|
@@ -0,0 +1,69 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Политика прав фоновых задач (Спринт 32 / релиз 1.6).
|
|
3
|
+
*
|
|
4
|
+
* OpenCode запускается с `--auto`, поэтому единственный барьер между
|
|
5
|
+
* автономной задачей и файловой системой/шеллом — сгенерированный
|
|
6
|
+
* OPENCODE_CONFIG_CONTENT. Здесь находится единый источник истины для
|
|
7
|
+
* PowerShell- и bash-обёрток, чтобы они не расходились в трактовке
|
|
8
|
+
* allowedTools/deniedTools.
|
|
9
|
+
*
|
|
10
|
+
* Важно: это политика на момент СОЗДАНИЯ/ОБНОВЛЕНИЯ задачи. Отдельный
|
|
11
|
+
* процесс обёртки не имеет доступа к SQLite, поэтому аудит фиксирует
|
|
12
|
+
* сгенерированную политику, а не попытки вызова инструментов.
|
|
13
|
+
*/
|
|
14
|
+
/** Действия OpenCode v2, которые понимает permissions. */
|
|
15
|
+
export declare const PERMISSION_ACTIONS: readonly ["read", "edit", "glob", "grep", "shell", "subagent", "skill", "question", "webfetch", "websearch"];
|
|
16
|
+
export type PermissionAction = (typeof PERMISSION_ACTIONS)[number];
|
|
17
|
+
/** Имена инструментов, которые OpenCode отображает на действия. */
|
|
18
|
+
export declare const ACTION_ALIASES: Record<PermissionAction, readonly string[]>;
|
|
19
|
+
export declare const PERMISSION_POLICIES: readonly ["hybrid", "secure", "legacy"];
|
|
20
|
+
export type PermissionPolicy = (typeof PERMISSION_POLICIES)[number];
|
|
21
|
+
export declare const DEFAULT_PERMISSION_POLICY: PermissionPolicy;
|
|
22
|
+
export interface PermissionInput {
|
|
23
|
+
/** Глобальная политика из SchedulerSettings.permissions.defaultPolicy. */
|
|
24
|
+
policy?: PermissionPolicy | string | null;
|
|
25
|
+
/** Переходный флаг задачи: вернуть shell в гибридной политике. */
|
|
26
|
+
legacyShell?: boolean;
|
|
27
|
+
/** Явный allowlist задачи (уже нормализованный или сырой). */
|
|
28
|
+
allowedTools?: readonly string[] | null;
|
|
29
|
+
/** Явный denylist задачи. */
|
|
30
|
+
deniedTools?: readonly string[] | null;
|
|
31
|
+
}
|
|
32
|
+
export interface EffectivePermission {
|
|
33
|
+
action: PermissionAction;
|
|
34
|
+
resource: "*";
|
|
35
|
+
effect: "allow" | "deny";
|
|
36
|
+
}
|
|
37
|
+
export interface DeniedByPolicy {
|
|
38
|
+
action: PermissionAction;
|
|
39
|
+
hint: string;
|
|
40
|
+
}
|
|
41
|
+
export interface EffectivePermissions {
|
|
42
|
+
policy: PermissionPolicy;
|
|
43
|
+
legacyShell: boolean;
|
|
44
|
+
permissions: EffectivePermission[];
|
|
45
|
+
/**
|
|
46
|
+
* Действия, запрещённые именно политикой по умолчанию (а не списками
|
|
47
|
+
* задачи). Используется для аудита и подсказок в логе.
|
|
48
|
+
*/
|
|
49
|
+
deniedByPolicy: DeniedByPolicy[];
|
|
50
|
+
}
|
|
51
|
+
/** Приводит произвольное значение к известной политике. */
|
|
52
|
+
export declare function normalizePolicy(value: unknown, fallback?: PermissionPolicy): PermissionPolicy;
|
|
53
|
+
/** Нормализует список инструментов: trim, lower-case, без пустых и дублей. */
|
|
54
|
+
export declare function normalizeToolList(value: readonly string[] | null | undefined): string[];
|
|
55
|
+
/**
|
|
56
|
+
* Вычисляет эффективные права задачи.
|
|
57
|
+
*
|
|
58
|
+
* Порядок:
|
|
59
|
+
* 1. базовая политика (hybrid/secure/legacy), legacyShell возвращает shell;
|
|
60
|
+
* 2. deniedTools переводит действие в deny (выигрывает всегда);
|
|
61
|
+
* 3. непустой allowedTools превращается в allowlist и может явно вернуть
|
|
62
|
+
* действие, запрещённое политикой (кроме явно запрещённых deniedTools).
|
|
63
|
+
*/
|
|
64
|
+
export declare function resolvePermissions(input?: PermissionInput): EffectivePermissions;
|
|
65
|
+
/** Готовый OPENCODE_CONFIG_CONTENT для обёрток. */
|
|
66
|
+
export declare function buildOpencodeConfig(input?: PermissionInput): string;
|
|
67
|
+
/** Краткое описание политики для лога задачи. */
|
|
68
|
+
export declare function formatPolicyLog(effective: EffectivePermissions): string;
|
|
69
|
+
//# sourceMappingURL=permissions.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"permissions.d.ts","sourceRoot":"","sources":["../../src/core/permissions.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAEH,0DAA0D;AAC1D,eAAO,MAAM,kBAAkB,8GAWrB,CAAC;AAEX,MAAM,MAAM,gBAAgB,GAAG,CAAC,OAAO,kBAAkB,CAAC,CAAC,MAAM,CAAC,CAAC;AAEnE,mEAAmE;AACnE,eAAO,MAAM,cAAc,EAAE,MAAM,CAAC,gBAAgB,EAAE,SAAS,MAAM,EAAE,CAWtE,CAAC;AAEF,eAAO,MAAM,mBAAmB,yCAA0C,CAAC;AAC3E,MAAM,MAAM,gBAAgB,GAAG,CAAC,OAAO,mBAAmB,CAAC,CAAC,MAAM,CAAC,CAAC;AACpE,eAAO,MAAM,yBAAyB,EAAE,gBAA2B,CAAC;AAapE,MAAM,WAAW,eAAe;IAC9B,0EAA0E;IAC1E,MAAM,CAAC,EAAE,gBAAgB,GAAG,MAAM,GAAG,IAAI,CAAC;IAC1C,kEAAkE;IAClE,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,8DAA8D;IAC9D,YAAY,CAAC,EAAE,SAAS,MAAM,EAAE,GAAG,IAAI,CAAC;IACxC,6BAA6B;IAC7B,WAAW,CAAC,EAAE,SAAS,MAAM,EAAE,GAAG,IAAI,CAAC;CACxC;AAED,MAAM,WAAW,mBAAmB;IAClC,MAAM,EAAE,gBAAgB,CAAC;IACzB,QAAQ,EAAE,GAAG,CAAC;IACd,MAAM,EAAE,OAAO,GAAG,MAAM,CAAC;CAC1B;AAED,MAAM,WAAW,cAAc;IAC7B,MAAM,EAAE,gBAAgB,CAAC;IACzB,IAAI,EAAE,MAAM,CAAC;CACd;AAED,MAAM,WAAW,oBAAoB;IACnC,MAAM,EAAE,gBAAgB,CAAC;IACzB,WAAW,EAAE,OAAO,CAAC;IACrB,WAAW,EAAE,mBAAmB,EAAE,CAAC;IACnC;;;OAGG;IACH,cAAc,EAAE,cAAc,EAAE,CAAC;CAClC;AAED,2DAA2D;AAC3D,wBAAgB,eAAe,CAC7B,KAAK,EAAE,OAAO,EACd,QAAQ,GAAE,gBAA4C,GACrD,gBAAgB,CAKlB;AAED,8EAA8E;AAC9E,wBAAgB,iBAAiB,CAC/B,KAAK,EAAE,SAAS,MAAM,EAAE,GAAG,IAAI,GAAG,SAAS,GAC1C,MAAM,EAAE,CAQV;AAyBD;;;;;;;;GAQG;AACH,wBAAgB,kBAAkB,CAAC,KAAK,GAAE,eAAoB,GAAG,oBAAoB,CA6BpF;AAED,mDAAmD;AACnD,wBAAgB,mBAAmB,CAAC,KAAK,GAAE,eAAoB,GAAG,MAAM,CAUvE;AAED,iDAAiD;AACjD,wBAAgB,eAAe,CAAC,SAAS,EAAE,oBAAoB,GAAG,MAAM,CAMvE"}
|
|
@@ -0,0 +1,143 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Политика прав фоновых задач (Спринт 32 / релиз 1.6).
|
|
3
|
+
*
|
|
4
|
+
* OpenCode запускается с `--auto`, поэтому единственный барьер между
|
|
5
|
+
* автономной задачей и файловой системой/шеллом — сгенерированный
|
|
6
|
+
* OPENCODE_CONFIG_CONTENT. Здесь находится единый источник истины для
|
|
7
|
+
* PowerShell- и bash-обёрток, чтобы они не расходились в трактовке
|
|
8
|
+
* allowedTools/deniedTools.
|
|
9
|
+
*
|
|
10
|
+
* Важно: это политика на момент СОЗДАНИЯ/ОБНОВЛЕНИЯ задачи. Отдельный
|
|
11
|
+
* процесс обёртки не имеет доступа к SQLite, поэтому аудит фиксирует
|
|
12
|
+
* сгенерированную политику, а не попытки вызова инструментов.
|
|
13
|
+
*/
|
|
14
|
+
/** Действия OpenCode v2, которые понимает permissions. */
|
|
15
|
+
export const PERMISSION_ACTIONS = [
|
|
16
|
+
"read",
|
|
17
|
+
"edit",
|
|
18
|
+
"glob",
|
|
19
|
+
"grep",
|
|
20
|
+
"shell",
|
|
21
|
+
"subagent",
|
|
22
|
+
"skill",
|
|
23
|
+
"question",
|
|
24
|
+
"webfetch",
|
|
25
|
+
"websearch",
|
|
26
|
+
];
|
|
27
|
+
/** Имена инструментов, которые OpenCode отображает на действия. */
|
|
28
|
+
export const ACTION_ALIASES = {
|
|
29
|
+
read: ["read"],
|
|
30
|
+
edit: ["write", "edit", "apply_patch", "remove"],
|
|
31
|
+
glob: ["glob"],
|
|
32
|
+
grep: ["grep"],
|
|
33
|
+
shell: ["bash", "shell"],
|
|
34
|
+
subagent: ["subagent"],
|
|
35
|
+
skill: ["skill"],
|
|
36
|
+
question: ["question"],
|
|
37
|
+
webfetch: ["webfetch"],
|
|
38
|
+
websearch: ["websearch"],
|
|
39
|
+
};
|
|
40
|
+
export const PERMISSION_POLICIES = ["hybrid", "secure", "legacy"];
|
|
41
|
+
export const DEFAULT_PERMISSION_POLICY = "hybrid";
|
|
42
|
+
/** Базовые политики: какие действия разрешены без учёта списков задачи. */
|
|
43
|
+
const POLICY_BASE = {
|
|
44
|
+
// Гибрид: агенту можно менять файлы, но не выполнять команды и не задавать
|
|
45
|
+
// вопросы (автономная задача всё равно некому на них ответить).
|
|
46
|
+
hybrid: ["read", "edit", "glob", "grep", "subagent", "skill", "webfetch", "websearch"],
|
|
47
|
+
// Строгий режим: только чтение и анализ исходников.
|
|
48
|
+
secure: ["read", "glob", "grep", "skill"],
|
|
49
|
+
// Прежнее поведение 1.5.x: разрешено всё.
|
|
50
|
+
legacy: [...PERMISSION_ACTIONS],
|
|
51
|
+
};
|
|
52
|
+
/** Приводит произвольное значение к известной политике. */
|
|
53
|
+
export function normalizePolicy(value, fallback = DEFAULT_PERMISSION_POLICY) {
|
|
54
|
+
return typeof value === "string" &&
|
|
55
|
+
PERMISSION_POLICIES.includes(value)
|
|
56
|
+
? value
|
|
57
|
+
: fallback;
|
|
58
|
+
}
|
|
59
|
+
/** Нормализует список инструментов: trim, lower-case, без пустых и дублей. */
|
|
60
|
+
export function normalizeToolList(value) {
|
|
61
|
+
return Array.from(new Set((value ?? [])
|
|
62
|
+
.map((tool) => String(tool).trim().toLowerCase())
|
|
63
|
+
.filter(Boolean)));
|
|
64
|
+
}
|
|
65
|
+
function actionsForTools(tools) {
|
|
66
|
+
const result = new Set();
|
|
67
|
+
for (const tool of tools) {
|
|
68
|
+
for (const action of PERMISSION_ACTIONS) {
|
|
69
|
+
if (ACTION_ALIASES[action].includes(tool))
|
|
70
|
+
result.add(action);
|
|
71
|
+
}
|
|
72
|
+
}
|
|
73
|
+
return result;
|
|
74
|
+
}
|
|
75
|
+
function hintFor(action) {
|
|
76
|
+
switch (action) {
|
|
77
|
+
case "shell":
|
|
78
|
+
return "shell запрещён политикой: добавьте shell в allowedTools задачи либо вынесите команду в qualityGate/afterScript.";
|
|
79
|
+
case "question":
|
|
80
|
+
return "question запрещён политикой: автономная задача не может ответить на вопрос; уберите интерактивный шаг или добавьте question в allowedTools.";
|
|
81
|
+
case "edit":
|
|
82
|
+
return "edit запрещён политикой secure: добавьте edit/write в allowedTools или выберите политику hybrid/legacy.";
|
|
83
|
+
default:
|
|
84
|
+
return `${action} запрещён политикой secure: добавьте ${action} в allowedTools или выберите политику hybrid/legacy.`;
|
|
85
|
+
}
|
|
86
|
+
}
|
|
87
|
+
/**
|
|
88
|
+
* Вычисляет эффективные права задачи.
|
|
89
|
+
*
|
|
90
|
+
* Порядок:
|
|
91
|
+
* 1. базовая политика (hybrid/secure/legacy), legacyShell возвращает shell;
|
|
92
|
+
* 2. deniedTools переводит действие в deny (выигрывает всегда);
|
|
93
|
+
* 3. непустой allowedTools превращается в allowlist и может явно вернуть
|
|
94
|
+
* действие, запрещённое политикой (кроме явно запрещённых deniedTools).
|
|
95
|
+
*/
|
|
96
|
+
export function resolvePermissions(input = {}) {
|
|
97
|
+
const policy = normalizePolicy(input.policy);
|
|
98
|
+
const legacyShell = input.legacyShell === true;
|
|
99
|
+
const allowed = actionsForTools(normalizeToolList(input.allowedTools));
|
|
100
|
+
const denied = actionsForTools(normalizeToolList(input.deniedTools));
|
|
101
|
+
const base = new Set(POLICY_BASE[policy]);
|
|
102
|
+
if (policy === "hybrid" && legacyShell)
|
|
103
|
+
base.add("shell");
|
|
104
|
+
const permissions = PERMISSION_ACTIONS.map((action) => {
|
|
105
|
+
let effect = base.has(action) ? "allow" : "deny";
|
|
106
|
+
if (denied.has(action))
|
|
107
|
+
effect = "deny";
|
|
108
|
+
else if (allowed.size > 0)
|
|
109
|
+
effect = allowed.has(action) ? "allow" : "deny";
|
|
110
|
+
return { action, resource: "*", effect };
|
|
111
|
+
});
|
|
112
|
+
const deniedByPolicy = [];
|
|
113
|
+
for (const entry of permissions) {
|
|
114
|
+
if (entry.effect !== "deny")
|
|
115
|
+
continue;
|
|
116
|
+
if (denied.has(entry.action))
|
|
117
|
+
continue;
|
|
118
|
+
// Если список allowedTools непустой, запрет мог быть вызван им.
|
|
119
|
+
if (allowed.size > 0)
|
|
120
|
+
continue;
|
|
121
|
+
deniedByPolicy.push({
|
|
122
|
+
action: entry.action,
|
|
123
|
+
hint: hintFor(entry.action),
|
|
124
|
+
});
|
|
125
|
+
}
|
|
126
|
+
return { policy, legacyShell, permissions, deniedByPolicy };
|
|
127
|
+
}
|
|
128
|
+
/** Готовый OPENCODE_CONFIG_CONTENT для обёрток. */
|
|
129
|
+
export function buildOpencodeConfig(input = {}) {
|
|
130
|
+
const effective = resolvePermissions(input);
|
|
131
|
+
return JSON.stringify({
|
|
132
|
+
$schema: "https://opencode.ai/config.json",
|
|
133
|
+
permissions: effective.permissions,
|
|
134
|
+
}, null, 2);
|
|
135
|
+
}
|
|
136
|
+
/** Краткое описание политики для лога задачи. */
|
|
137
|
+
export function formatPolicyLog(effective) {
|
|
138
|
+
const denied = effective.permissions
|
|
139
|
+
.filter((p) => p.effect === "deny")
|
|
140
|
+
.map((p) => p.action);
|
|
141
|
+
const legacyShell = effective.legacyShell ? ", legacyShell=true" : "";
|
|
142
|
+
return `policy=${effective.policy}${legacyShell}, denied=${denied.length > 0 ? denied.join(",") : "none"}`;
|
|
143
|
+
}
|