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
|
@@ -3,6 +3,12 @@ import path from "node:path";
|
|
|
3
3
|
import { WRAPPER_DIR } from "../../types.js";
|
|
4
4
|
import { shellQuote } from "../scheduler/posix.js";
|
|
5
5
|
import type { ScheduleGateSpec } from "../schedule-v2.js";
|
|
6
|
+
import {
|
|
7
|
+
buildOpencodeConfig as buildPermissionsConfig,
|
|
8
|
+
formatPolicyLog,
|
|
9
|
+
resolvePermissions,
|
|
10
|
+
type PermissionPolicy,
|
|
11
|
+
} from "../permissions.js";
|
|
6
12
|
|
|
7
13
|
/** Параметры генерации bash-обёртки. */
|
|
8
14
|
export interface BashWrapperOptions {
|
|
@@ -20,10 +26,14 @@ export interface BashWrapperOptions {
|
|
|
20
26
|
workdir?: string;
|
|
21
27
|
/** Имя multi-repo workspace (для git-контекста в логе). */
|
|
22
28
|
workspaceName?: string;
|
|
23
|
-
/** Разрешённые инструменты (спринт 14,
|
|
29
|
+
/** Разрешённые инструменты (спринт 14, enforced через OPENCODE_CONFIG_CONTENT). */
|
|
24
30
|
allowedTools?: string[];
|
|
25
|
-
/** Запрещённые инструменты (спринт 14,
|
|
31
|
+
/** Запрещённые инструменты (спринт 14, enforced через OPENCODE_CONFIG_CONTENT). */
|
|
26
32
|
deniedTools?: string[];
|
|
33
|
+
/** Политика прав по умолчанию (Спринт 32, релиз 1.6). */
|
|
34
|
+
policy?: PermissionPolicy;
|
|
35
|
+
/** Переходный флаг: вернуть shell в гибридной политике. */
|
|
36
|
+
legacyShell?: boolean;
|
|
27
37
|
/** Путь к файлу лога. */
|
|
28
38
|
logFile?: string;
|
|
29
39
|
/** Путь к скомпилированному record-history.js. */
|
|
@@ -36,6 +46,8 @@ export interface BashWrapperOptions {
|
|
|
36
46
|
sessionMode?: import("../session.js").SessionMode;
|
|
37
47
|
/** Спринт 24: id сессии для режима "reuse". */
|
|
38
48
|
sessionId?: string;
|
|
49
|
+
/** Спринт 24: sidecar-файл с актуальным id сессии (перекрывает sessionId). */
|
|
50
|
+
sessionFile?: string;
|
|
39
51
|
/** Pre-flight команда: ненулевой код отменяет запуск задачи. */
|
|
40
52
|
beforeScript?: string;
|
|
41
53
|
/** Post-flight команда: выполняется даже при ошибке основной задачи. */
|
|
@@ -59,6 +71,11 @@ export interface BashWrapperOptions {
|
|
|
59
71
|
* подгружаются перед запуском opencode и никогда не пишутся в лог.
|
|
60
72
|
*/
|
|
61
73
|
envFile?: string;
|
|
74
|
+
/**
|
|
75
|
+
* Таймаут pre-flight/Quality Gate/post-flight в секундах (по умолчанию 300).
|
|
76
|
+
* 0 — без таймаута. Зависший хук не должен держать lock.
|
|
77
|
+
*/
|
|
78
|
+
gateTimeoutSeconds?: number;
|
|
62
79
|
}
|
|
63
80
|
|
|
64
81
|
/**
|
|
@@ -93,13 +110,23 @@ export function buildBashWrapperScript(options: BashWrapperOptions): string {
|
|
|
93
110
|
afterScript,
|
|
94
111
|
sessionMode,
|
|
95
112
|
sessionId,
|
|
113
|
+
sessionFile,
|
|
96
114
|
oneShotCleanupCommand,
|
|
97
115
|
allowedTools,
|
|
98
116
|
deniedTools,
|
|
117
|
+
policy,
|
|
118
|
+
legacyShell,
|
|
99
119
|
scheduleGate,
|
|
100
120
|
envFile,
|
|
121
|
+
gateTimeoutSeconds,
|
|
101
122
|
} = options;
|
|
102
123
|
|
|
124
|
+
const effectivePermissions = resolvePermissions({
|
|
125
|
+
policy,
|
|
126
|
+
legacyShell,
|
|
127
|
+
allowedTools,
|
|
128
|
+
deniedTools,
|
|
129
|
+
});
|
|
103
130
|
const lines: string[] = [
|
|
104
131
|
"#!/usr/bin/env bash",
|
|
105
132
|
"# Сгенерировано opencode-windows-scheduler. Не редактируйте вручную:",
|
|
@@ -107,7 +134,7 @@ export function buildBashWrapperScript(options: BashWrapperOptions): string {
|
|
|
107
134
|
"set -u",
|
|
108
135
|
"",
|
|
109
136
|
`TASK_NAME=${shellQuote(taskName)}`,
|
|
110
|
-
`PROMPT_FILE=${shellQuote(promptFile)}`,
|
|
137
|
+
`PROMPT_FILE=${shellQuote(promptFile ?? "")}`,
|
|
111
138
|
`LOG_FILE=${shellQuote(logFile ?? path.join(WRAPPER_DIR, "task.log"))}`,
|
|
112
139
|
`LOCK_FILE=${shellQuote(lockFile)}`,
|
|
113
140
|
`WORKDIR=${shellQuote(workdir || process.cwd())}`,
|
|
@@ -119,6 +146,7 @@ export function buildBashWrapperScript(options: BashWrapperOptions): string {
|
|
|
119
146
|
// Спринт 24: режим сессии — "new" (по умолчанию), "reuse" (--session <id>), "last" (--continue).
|
|
120
147
|
`SESSION_MODE=${shellQuote(sessionMode ?? "new")}`,
|
|
121
148
|
`SESSION_ID=${shellQuote(sessionId ?? "")}`,
|
|
149
|
+
`SESSION_FILE=${shellQuote(sessionFile ?? "")}`,
|
|
122
150
|
`BEFORE_SCRIPT=${shellQuote(beforeScript ?? "")}`,
|
|
123
151
|
`AFTER_SCRIPT=${shellQuote(afterScript ?? "")}`,
|
|
124
152
|
`ALLOWED_TOOLS=${shellQuote((allowedTools ?? []).join(","))}`,
|
|
@@ -133,21 +161,61 @@ export function buildBashWrapperScript(options: BashWrapperOptions): string {
|
|
|
133
161
|
`SCHEDULE_DEFER_FILE=${shellQuote(scheduleGate?.deferFile ?? "")}`,
|
|
134
162
|
`SCHEDULE_FORCE_FILE=${shellQuote(scheduleGate?.forceFile ?? "")}`,
|
|
135
163
|
`ENV_FILE=${shellQuote(envFile ?? "")}`,
|
|
136
|
-
// Спринт 29.2: права задачи передаются в opencode через переменную
|
|
137
|
-
//
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
164
|
+
// Спринт 29.2 / 32: права задачи передаются в opencode через переменную
|
|
165
|
+
// окружения. Единый резолвер политики — src/core/permissions.ts.
|
|
166
|
+
`export OPENCODE_CONFIG_CONTENT=${shellQuote(
|
|
167
|
+
buildPermissionsConfig({
|
|
168
|
+
allowedTools,
|
|
169
|
+
deniedTools,
|
|
170
|
+
policy,
|
|
171
|
+
legacyShell,
|
|
172
|
+
})
|
|
173
|
+
)}`,
|
|
141
174
|
'',
|
|
142
175
|
"# cron запускает задачи с минимальным PATH — добавляем типовые каталоги.",
|
|
143
176
|
'export PATH="/opt/homebrew/bin:/usr/local/bin:$HOME/.local/bin:$HOME/.bun/bin:$PATH"',
|
|
144
177
|
"",
|
|
145
178
|
'mkdir -p "$(dirname "$LOG_FILE")" 2>/dev/null || true',
|
|
179
|
+
// Каталог locks/ на свежей установке может отсутствовать: без него
|
|
180
|
+
// `mkdir "$LOCK_FILE.d"` падает с ENOENT, и обёртка уходила в ветку
|
|
181
|
+
// «уже выполняется» (exit 0), молча не запустив задачу.
|
|
182
|
+
'mkdir -p "$(dirname "$LOCK_FILE")" 2>/dev/null || true',
|
|
146
183
|
"",
|
|
147
184
|
"log() {",
|
|
148
185
|
' printf \'[%s] %s\\n\' "$(date \'+%Y-%m-%d %H:%M:%S\')" "$*" >> "$LOG_FILE" 2>/dev/null || true',
|
|
149
186
|
"}",
|
|
150
187
|
"",
|
|
188
|
+
'log "[role-scoped] opencode config passed via OPENCODE_CONFIG_CONTENT"',
|
|
189
|
+
`log ${shellQuote(`[policy] ${formatPolicyLog(effectivePermissions)}`)}`,
|
|
190
|
+
...effectivePermissions.deniedByPolicy.map(
|
|
191
|
+
(entry) =>
|
|
192
|
+
`log ${shellQuote(`[policy] deny ${entry.action}: ${entry.hint}`)}`
|
|
193
|
+
),
|
|
194
|
+
"",
|
|
195
|
+
"# Таймаут для gate/хуков: зависший скрипт не должен держать lock до истечения",
|
|
196
|
+
"# STALE_LOCK_MAX_AGE_MS. 0 — без таймаута (не рекомендуется).",
|
|
197
|
+
`GATE_TIMEOUT_SECONDS=${Math.max(0, Math.floor(gateTimeoutSeconds ?? 300))}`,
|
|
198
|
+
'run_with_timeout() {',
|
|
199
|
+
' GATE_LIMIT="$1"; shift',
|
|
200
|
+
' if [ "$GATE_LIMIT" -le 0 ] 2>/dev/null; then',
|
|
201
|
+
' "$@"',
|
|
202
|
+
' return $?',
|
|
203
|
+
' fi',
|
|
204
|
+
' # T-10: потомок получает собственную группу процессов (job control), чтобы',
|
|
205
|
+
' # watchdog убивал всё дерево (bash -c и его детей), а не только прямого ребёнка.',
|
|
206
|
+
' set -m 2>/dev/null || true',
|
|
207
|
+
' "$@" &',
|
|
208
|
+
' GATE_CHILD=$!',
|
|
209
|
+
' set +m 2>/dev/null || true',
|
|
210
|
+
' ( sleep "$GATE_LIMIT"; kill -TERM -- "-$GATE_CHILD" 2>/dev/null || kill -TERM "$GATE_CHILD" 2>/dev/null; sleep 5; kill -KILL -- "-$GATE_CHILD" 2>/dev/null || kill -KILL "$GATE_CHILD" 2>/dev/null ) >/dev/null 2>&1 &',
|
|
211
|
+
' GATE_WATCHDOG=$!',
|
|
212
|
+
' wait "$GATE_CHILD"',
|
|
213
|
+
' GATE_CODE=$?',
|
|
214
|
+
' kill "$GATE_WATCHDOG" 2>/dev/null || true',
|
|
215
|
+
' wait "$GATE_WATCHDOG" 2>/dev/null || true',
|
|
216
|
+
' return "$GATE_CODE"',
|
|
217
|
+
"}",
|
|
218
|
+
"",
|
|
151
219
|
"# Спринт 19: гейт расписания — до lock, чтобы ожидание окна не держало блокировку.",
|
|
152
220
|
'if [ -n "$SCHEDULE_GATE_FILE" ]; then',
|
|
153
221
|
' SCHED_GATE_ARGS=()',
|
|
@@ -162,7 +230,7 @@ export function buildBashWrapperScript(options: BashWrapperOptions): string {
|
|
|
162
230
|
' if ! command -v node >/dev/null 2>&1; then',
|
|
163
231
|
' log "[scheduler] Гейт расписания пропущен: node не найден в PATH."',
|
|
164
232
|
" else",
|
|
165
|
-
' node "$SCHEDULE_GATE_FILE" "${SCHED_GATE_ARGS[@]}" >> "$LOG_FILE" 2>&1',
|
|
233
|
+
' run_with_timeout "$GATE_TIMEOUT_SECONDS" node "$SCHEDULE_GATE_FILE" ${SCHED_GATE_ARGS[@]+"${SCHED_GATE_ARGS[@]}"} >> "$LOG_FILE" 2>&1',
|
|
166
234
|
" SCHED_GATE_CODE=$?",
|
|
167
235
|
' if [ "$SCHED_GATE_CODE" -eq 3 ]; then',
|
|
168
236
|
' log "[scheduler] Гейт расписания: запуск не требуется (cron/окно). Перенос или пропуск тика."',
|
|
@@ -172,10 +240,41 @@ export function buildBashWrapperScript(options: BashWrapperOptions): string {
|
|
|
172
240
|
"fi",
|
|
173
241
|
"",
|
|
174
242
|
"# Атомарная блокировка: mkdir завершается ошибкой, если каталог уже есть.",
|
|
243
|
+
"# В каталог пишем PID: после kill -9 осиротевший lock снимается, а не",
|
|
244
|
+
"# блокирует задачу до истечения STALE_LOCK_MAX_AGE_MS.",
|
|
175
245
|
'if ! mkdir "$LOCK_FILE.d" 2>/dev/null; then',
|
|
176
|
-
'
|
|
177
|
-
"
|
|
246
|
+
' if [ ! -d "$LOCK_FILE.d" ]; then',
|
|
247
|
+
' log "[scheduler] Не удалось создать lock \'$LOCK_FILE.d\' — запуск отменён."',
|
|
248
|
+
" exit 1",
|
|
249
|
+
" fi",
|
|
250
|
+
' LOCK_PID=""',
|
|
251
|
+
' if [ -f "$LOCK_FILE.d/pid" ]; then',
|
|
252
|
+
' LOCK_PID="$(cat "$LOCK_FILE.d/pid" 2>/dev/null || true)"',
|
|
253
|
+
" fi",
|
|
254
|
+
' LOCK_ALIVE=1',
|
|
255
|
+
' if [ -n "$LOCK_PID" ]; then',
|
|
256
|
+
' if kill -0 "$LOCK_PID" 2>/dev/null; then LOCK_ALIVE=1; else LOCK_ALIVE=0; fi',
|
|
257
|
+
' fi',
|
|
258
|
+
' if [ "$LOCK_ALIVE" -eq 1 ]; then',
|
|
259
|
+
' log "[scheduler] Задача \'$TASK_NAME\' уже выполняется (pid ${LOCK_PID:-неизвестен}) — пропуск запуска."',
|
|
260
|
+
" exit 0",
|
|
261
|
+
" fi",
|
|
262
|
+
' log "[scheduler] Вытесняю осиротевший lock \'$LOCK_FILE.d\' (pid ${LOCK_PID:-неизвестен})."',
|
|
263
|
+
' # T-03: атомарно уводим каталог в уникальное имя вместо rm -rf, чтобы не',
|
|
264
|
+
' # удалить свежий lock, созданный другим воркером после нашей проверки.',
|
|
265
|
+
' STALE_LOCK_DIR="$LOCK_FILE.d.stale-$$"',
|
|
266
|
+
' if mv "$LOCK_FILE.d" "$STALE_LOCK_DIR" 2>/dev/null; then',
|
|
267
|
+
' rm -rf "$STALE_LOCK_DIR" 2>/dev/null || true',
|
|
268
|
+
' else',
|
|
269
|
+
' log "[scheduler] Не удалось вытеснить осиротевший lock — пропуск запуска."',
|
|
270
|
+
' exit 0',
|
|
271
|
+
' fi',
|
|
272
|
+
' if ! mkdir "$LOCK_FILE.d" 2>/dev/null; then',
|
|
273
|
+
' log "[scheduler] Не удалось взять lock \'$LOCK_FILE.d\' — пропуск запуска."',
|
|
274
|
+
" exit 0",
|
|
275
|
+
" fi",
|
|
178
276
|
"fi",
|
|
277
|
+
'printf \'%s\\n\' "$$" > "$LOCK_FILE.d/pid" 2>/dev/null || true',
|
|
179
278
|
'cleanup() { rmdir "$LOCK_FILE.d" 2>/dev/null || rm -rf "$LOCK_FILE.d" 2>/dev/null; }',
|
|
180
279
|
"trap cleanup EXIT INT TERM",
|
|
181
280
|
"",
|
|
@@ -205,16 +304,10 @@ export function buildBashWrapperScript(options: BashWrapperOptions): string {
|
|
|
205
304
|
' log "[workspace] name=$WORKSPACE_NAME, cwd=$WORKDIR, branch=$GIT_BRANCH, remote=$GIT_REMOTE"',
|
|
206
305
|
"fi",
|
|
207
306
|
"",
|
|
208
|
-
"# Role-scoped tools:
|
|
209
|
-
"#
|
|
210
|
-
"# логируем и предупреждаем, но не блокируем.",
|
|
307
|
+
"# Role-scoped tools: права переданы в opencode через OPENCODE_CONFIG_CONTENT",
|
|
308
|
+
"# (реальные allow/deny permissions, не metadata-only). Здесь только лог.",
|
|
211
309
|
'if [ -n "$ALLOWED_TOOLS" ] || [ -n "$DENIED_TOOLS" ]; then',
|
|
212
310
|
' log "[role-scoped] allowed=[$ALLOWED_TOOLS], denied=[$DENIED_TOOLS]"',
|
|
213
|
-
' case ",$DENIED_TOOLS," in',
|
|
214
|
-
' *",write,"*|*",edit,"*|*",bash,"*|*",apply_patch,"*|*",remove,"*)',
|
|
215
|
-
' log "[role-scoped] ВНИМАНИЕ: deniedTools содержит опасные инструменты ($DENIED_TOOLS). Запрет не может быть применён автоматически (metadata-only), проверьте промпт задачи."',
|
|
216
|
-
" ;;",
|
|
217
|
-
" esac",
|
|
218
311
|
"fi",
|
|
219
312
|
"",
|
|
220
313
|
'if ! command -v opencode >/dev/null 2>&1; then',
|
|
@@ -223,6 +316,13 @@ export function buildBashWrapperScript(options: BashWrapperOptions): string {
|
|
|
223
316
|
"fi",
|
|
224
317
|
"",
|
|
225
318
|
'PROMPT="$(cat "$PROMPT_FILE" 2>/dev/null || true)"',
|
|
319
|
+
"# T-09: backstop размера промпта на POSIX (argv ограничен MAX_ARG_STRLEN",
|
|
320
|
+
"# 128 КиБ на аргумент в Linux). Считаем байты, а не символы.",
|
|
321
|
+
'PROMPT_BYTES="$(printf %s "$PROMPT" | wc -c | tr -d \' \')"',
|
|
322
|
+
'if [ "$PROMPT_BYTES" -gt 131072 ] 2>/dev/null; then',
|
|
323
|
+
' log "[scheduler] ОШИБКА: промпт слишком длинный для argv POSIX: ${PROMPT_BYTES} байт (максимум 131072)."',
|
|
324
|
+
' exit 1',
|
|
325
|
+
'fi',
|
|
226
326
|
'START_EPOCH="$(date +%s)"',
|
|
227
327
|
'STARTED_AT="$(date -u \'+%Y-%m-%dT%H:%M:%SZ\')"',
|
|
228
328
|
'EXIT_CODE=0',
|
|
@@ -243,7 +343,7 @@ export function buildBashWrapperScript(options: BashWrapperOptions): string {
|
|
|
243
343
|
"# Pre-flight: выполняется до основной задачи. Ненулевой код отменяет запуск.",
|
|
244
344
|
'if [ -n "$BEFORE_SCRIPT" ]; then',
|
|
245
345
|
' log "[scheduler] Pre-flight: $BEFORE_SCRIPT"',
|
|
246
|
-
' bash -
|
|
346
|
+
' run_with_timeout "$GATE_TIMEOUT_SECONDS" bash -c "$BEFORE_SCRIPT" >> "$LOG_FILE" 2>&1',
|
|
247
347
|
" PRE_CODE=$?",
|
|
248
348
|
' if [ "$PRE_CODE" -ne 0 ]; then',
|
|
249
349
|
' log "[scheduler] ОШИБКА: Pre-flight script failed (код $PRE_CODE)."',
|
|
@@ -260,39 +360,61 @@ export function buildBashWrapperScript(options: BashWrapperOptions): string {
|
|
|
260
360
|
'if [ "$SKIP_MAIN" -eq 0 ]; then',
|
|
261
361
|
"",
|
|
262
362
|
"# Модель указывается только если задана — иначе OpenCode берёт свою по умолчанию.",
|
|
363
|
+
"# exec важен: в фоновом режиме он заменяет подоболочку процессом opencode,",
|
|
364
|
+
"# поэтому $! — это PID самого opencode, и watchdog убивает именно его.",
|
|
365
|
+
"# Ветвление вместо массива: bash 3.2 (macOS) с set -u падает на пустом",
|
|
366
|
+
'# "${ARR[@]}".',
|
|
263
367
|
"run_opencode() {",
|
|
264
|
-
'
|
|
265
|
-
'
|
|
266
|
-
'
|
|
267
|
-
|
|
268
|
-
'
|
|
269
|
-
'
|
|
270
|
-
'
|
|
271
|
-
|
|
272
|
-
'
|
|
273
|
-
|
|
274
|
-
|
|
275
|
-
'
|
|
276
|
-
'
|
|
277
|
-
|
|
278
|
-
'
|
|
368
|
+
' if [ "$SESSION_MODE" = "reuse" ]; then',
|
|
369
|
+
' if [ -n "$SESSION_FILE" ] && [ -f "$SESSION_FILE" ]; then',
|
|
370
|
+
' SESSION_ID="$(head -n 1 "$SESSION_FILE" 2>/dev/null | tr -d "\\r")"',
|
|
371
|
+
" fi",
|
|
372
|
+
' if [ -n "$SESSION_ID" ]; then',
|
|
373
|
+
' if [ -n "$MODEL" ]; then',
|
|
374
|
+
' exec opencode run --auto --session "$SESSION_ID" --model "$MODEL" "$PROMPT"',
|
|
375
|
+
" else",
|
|
376
|
+
' exec opencode run --auto --session "$SESSION_ID" "$PROMPT"',
|
|
377
|
+
" fi",
|
|
378
|
+
" else",
|
|
379
|
+
' if [ -n "$MODEL" ]; then',
|
|
380
|
+
' exec opencode run --auto --model "$MODEL" "$PROMPT"',
|
|
381
|
+
" else",
|
|
382
|
+
' exec opencode run --auto "$PROMPT"',
|
|
383
|
+
" fi",
|
|
384
|
+
" fi",
|
|
385
|
+
' elif [ "$SESSION_MODE" = "last" ]; then',
|
|
386
|
+
' if [ -n "$MODEL" ]; then',
|
|
387
|
+
' exec opencode run --auto --continue --model "$MODEL" "$PROMPT"',
|
|
388
|
+
" else",
|
|
389
|
+
' exec opencode run --auto --continue "$PROMPT"',
|
|
390
|
+
" fi",
|
|
279
391
|
" else",
|
|
280
|
-
'
|
|
392
|
+
' if [ -n "$MODEL" ]; then',
|
|
393
|
+
' exec opencode run --auto --model "$MODEL" "$PROMPT"',
|
|
394
|
+
" else",
|
|
395
|
+
' exec opencode run --auto "$PROMPT"',
|
|
396
|
+
" fi",
|
|
281
397
|
" fi",
|
|
282
398
|
"}",
|
|
283
399
|
"",
|
|
400
|
+
"# Всегда запускаем в фоне, чтобы watchdog мог завершить процесс по таймауту.",
|
|
401
|
+
"# TIMEOUT_SECONDS=0 — ждём без watchdog.",
|
|
402
|
+
"# T-10: как и в run_with_timeout, opencode запускается в собственной группе",
|
|
403
|
+
"# процессов (exec внутри run_opencode сохраняет лидера группы), поэтому",
|
|
404
|
+
"# watchdog убивает всё дерево, а внуки не переживают таймаут.",
|
|
405
|
+
'set -m 2>/dev/null || true',
|
|
406
|
+
'run_opencode >> "$LOG_FILE" 2>&1 &',
|
|
407
|
+
"CHILD=$!",
|
|
408
|
+
'set +m 2>/dev/null || true',
|
|
284
409
|
'if [ "$TIMEOUT_SECONDS" -gt 0 ] 2>/dev/null; then',
|
|
285
|
-
'
|
|
286
|
-
" CHILD=$!",
|
|
287
|
-
' ( sleep "$TIMEOUT_SECONDS"; kill -TERM "$CHILD" 2>/dev/null; sleep 5; kill -KILL "$CHILD" 2>/dev/null ) &',
|
|
410
|
+
' ( sleep "$TIMEOUT_SECONDS"; kill -TERM -- "-$CHILD" 2>/dev/null || kill -TERM "$CHILD" 2>/dev/null; sleep 5; kill -KILL -- "-$CHILD" 2>/dev/null || kill -KILL "$CHILD" 2>/dev/null ) &',
|
|
288
411
|
" WATCHDOG=$!",
|
|
289
|
-
|
|
290
|
-
"
|
|
412
|
+
"fi",
|
|
413
|
+
'wait "$CHILD"',
|
|
414
|
+
"EXIT_CODE=$?",
|
|
415
|
+
'if [ -n "${WATCHDOG:-}" ]; then',
|
|
291
416
|
' kill "$WATCHDOG" 2>/dev/null || true',
|
|
292
417
|
' wait "$WATCHDOG" 2>/dev/null || true',
|
|
293
|
-
"else",
|
|
294
|
-
' opencode run --auto "${SESSION_ARGS[@]}" "$PROMPT"',
|
|
295
|
-
" EXIT_CODE=$?",
|
|
296
418
|
"fi",
|
|
297
419
|
'',
|
|
298
420
|
'# Конфиг прав живёт только в переменной окружения — файл не создаётся.',
|
|
@@ -306,7 +428,7 @@ export function buildBashWrapperScript(options: BashWrapperOptions): string {
|
|
|
306
428
|
"",
|
|
307
429
|
'if [ -n "$QUALITY_GATE" ] && [ "$EXIT_CODE" -eq 0 ]; then',
|
|
308
430
|
' log "[scheduler] Запуск Quality Gate: $QUALITY_GATE"',
|
|
309
|
-
' bash -
|
|
431
|
+
' run_with_timeout "$GATE_TIMEOUT_SECONDS" bash -c "$QUALITY_GATE" >> "$LOG_FILE" 2>&1',
|
|
310
432
|
" GATE_CODE=$?",
|
|
311
433
|
' if [ "$GATE_CODE" -ne 0 ]; then',
|
|
312
434
|
' log "[scheduler] ОШИБКА: Quality Gate провален. Код возврата: $GATE_CODE"',
|
|
@@ -322,7 +444,7 @@ export function buildBashWrapperScript(options: BashWrapperOptions): string {
|
|
|
322
444
|
"# Post-flight: выполняется ВСЕГДА, даже если основная задача упала.",
|
|
323
445
|
'if [ -n "$AFTER_SCRIPT" ]; then',
|
|
324
446
|
' log "[scheduler] Post-flight: $AFTER_SCRIPT"',
|
|
325
|
-
' bash -
|
|
447
|
+
' run_with_timeout "$GATE_TIMEOUT_SECONDS" bash -c "$AFTER_SCRIPT" >> "$LOG_FILE" 2>&1',
|
|
326
448
|
" POST_CODE=$?",
|
|
327
449
|
' if [ "$POST_CODE" -ne 0 ]; then',
|
|
328
450
|
' log "[scheduler] ОШИБКА: Post-flight script failed (код $POST_CODE)."',
|
|
@@ -344,9 +466,9 @@ export function buildBashWrapperScript(options: BashWrapperOptions): string {
|
|
|
344
466
|
"",
|
|
345
467
|
'if [ -n "$RECORDER_FILE" ] && command -v node >/dev/null 2>&1; then',
|
|
346
468
|
' if [ -n "$RUN_ID" ]; then',
|
|
347
|
-
' node "$RECORDER_FILE" --finish "$RUN_ID" "$TASK_NAME" "$STATUS" "$DURATION_MS" "$ERROR_MESSAGE" "-" "-" "$MODEL" "$PRE_FLIGHT_STATUS" "$POST_FLIGHT_STATUS" >> "$LOG_FILE" 2>&1 || true',
|
|
469
|
+
' node "$RECORDER_FILE" --finish "$RUN_ID" "$TASK_NAME" "$STATUS" "$DURATION_MS" "$ERROR_MESSAGE" "-" "-" "$MODEL" "$PRE_FLIGHT_STATUS" "$POST_FLIGHT_STATUS" "$LOG_FILE" >> "$LOG_FILE" 2>&1 || true',
|
|
348
470
|
" else",
|
|
349
|
-
' node "$RECORDER_FILE" "$TASK_NAME" "$STATUS" "$STARTED_AT" "$DURATION_MS" "$ERROR_MESSAGE" "-" "-" "$MODEL" "$PRE_FLIGHT_STATUS" "$POST_FLIGHT_STATUS" >> "$LOG_FILE" 2>&1 || true',
|
|
471
|
+
' node "$RECORDER_FILE" "$TASK_NAME" "$STATUS" "$STARTED_AT" "$DURATION_MS" "$ERROR_MESSAGE" "-" "-" "$MODEL" "$PRE_FLIGHT_STATUS" "$POST_FLIGHT_STATUS" "$LOG_FILE" >> "$LOG_FILE" 2>&1 || true',
|
|
350
472
|
" fi",
|
|
351
473
|
"fi",
|
|
352
474
|
"",
|
|
@@ -373,6 +495,8 @@ export async function writeBashWrapper(
|
|
|
373
495
|
options: BashWrapperOptions
|
|
374
496
|
): Promise<string> {
|
|
375
497
|
await fs.mkdir(WRAPPER_DIR, { recursive: true });
|
|
498
|
+
// locks/ нужен до первого запуска: обёртка берёт lock через mkdir.
|
|
499
|
+
await fs.mkdir(path.dirname(options.lockFile), { recursive: true });
|
|
376
500
|
const scriptPath = path.join(
|
|
377
501
|
WRAPPER_DIR,
|
|
378
502
|
`run-${options.sanitizedName}.sh`
|
|
@@ -388,102 +512,21 @@ export function bashWrapperPath(sanitizedName: string): string {
|
|
|
388
512
|
return path.join(WRAPPER_DIR, `run-${sanitizedName}.sh`);
|
|
389
513
|
}
|
|
390
514
|
|
|
391
|
-
// Спринт 29.2
|
|
392
|
-
// opencode run CLI (v2.2.3) не поддерживает --allow-tool/--deny-tool, поэтому
|
|
393
|
-
// права задаются через временный opencode.jsonc в WORKDIR.
|
|
515
|
+
// Спринт 29.2 / 32: политика прав задачи.
|
|
394
516
|
//
|
|
395
517
|
// Actions OpenCode v2: read, edit, glob, grep, shell, subagent, skill, question,
|
|
396
518
|
// webfetch, websearch. deny для shell покрывает bash/Shell, deny для edit покрывает
|
|
397
519
|
// write/edit/apply_patch/remove.
|
|
398
520
|
//
|
|
399
|
-
//
|
|
400
|
-
//
|
|
401
|
-
//
|
|
521
|
+
// Базовая политика задаётся SchedulerSettings.permissions.defaultPolicy
|
|
522
|
+
// (hybrid по умолчанию: shell и question запрещены), deniedTools выигрывает,
|
|
523
|
+
// непустой allowedTools работает как allowlist и может вернуть действие.
|
|
524
|
+
// Единый резолвер — src/core/permissions.ts.
|
|
402
525
|
export function buildOpencodeConfig(
|
|
403
526
|
allowedTools?: string[],
|
|
404
|
-
deniedTools?: string[]
|
|
527
|
+
deniedTools?: string[],
|
|
528
|
+
policy?: PermissionPolicy,
|
|
529
|
+
legacyShell?: boolean
|
|
405
530
|
): string {
|
|
406
|
-
|
|
407
|
-
{ action: "read", effect: "allow" },
|
|
408
|
-
{ action: "edit", effect: "allow" },
|
|
409
|
-
{ action: "glob", effect: "allow" },
|
|
410
|
-
{ action: "grep", effect: "allow" },
|
|
411
|
-
{ action: "shell", effect: "allow" },
|
|
412
|
-
{ action: "subagent", effect: "allow" },
|
|
413
|
-
{ action: "skill", effect: "allow" },
|
|
414
|
-
{ action: "question", effect: "allow" },
|
|
415
|
-
{ action: "webfetch", effect: "allow" },
|
|
416
|
-
{ action: "websearch", effect: "allow" },
|
|
417
|
-
];
|
|
418
|
-
|
|
419
|
-
const deniedSet = new Set(
|
|
420
|
-
(deniedTools ?? [])
|
|
421
|
-
.map((t) => t.trim().toLowerCase())
|
|
422
|
-
.filter(Boolean)
|
|
423
|
-
);
|
|
424
|
-
const allowedSet = new Set(
|
|
425
|
-
(allowedTools ?? [])
|
|
426
|
-
.map((t) => t.trim().toLowerCase())
|
|
427
|
-
.filter(Boolean)
|
|
428
|
-
);
|
|
429
|
-
|
|
430
|
-
const toolToAction = new Map<string, string>([
|
|
431
|
-
["read", "read"],
|
|
432
|
-
["write", "edit"],
|
|
433
|
-
["edit", "edit"],
|
|
434
|
-
["apply_patch", "edit"],
|
|
435
|
-
["remove", "edit"],
|
|
436
|
-
["bash", "shell"],
|
|
437
|
-
["shell", "shell"],
|
|
438
|
-
["glob", "glob"],
|
|
439
|
-
["grep", "grep"],
|
|
440
|
-
["webfetch", "webfetch"],
|
|
441
|
-
["websearch", "websearch"],
|
|
442
|
-
["question", "question"],
|
|
443
|
-
["subagent", "subagent"],
|
|
444
|
-
["skill", "skill"],
|
|
445
|
-
["WebFetch", "webfetch"],
|
|
446
|
-
]);
|
|
447
|
-
|
|
448
|
-
// Применяем deniedTools.
|
|
449
|
-
for (const [tool, action] of toolToAction) {
|
|
450
|
-
if (deniedSet.has(tool)) {
|
|
451
|
-
const idx = actions.findIndex((a) => a.action === action);
|
|
452
|
-
if (idx >= 0) actions[idx].effect = "deny";
|
|
453
|
-
}
|
|
454
|
-
}
|
|
455
|
-
|
|
456
|
-
// Если задан allowedTools — всё, чего нет в списке, запрещаем.
|
|
457
|
-
// deniedTools имеет приоритет (последнее правило выигрывает в OpenCode),
|
|
458
|
-
// поэтому применяем allowedTools ПОСЛЕ deniedTools — denied не перебивается.
|
|
459
|
-
if (allowedSet.size > 0) {
|
|
460
|
-
for (const entry of actions) {
|
|
461
|
-
// Если действие уже запрещено deniedTools, оставляем deny.
|
|
462
|
-
if (entry.effect === "deny") continue;
|
|
463
|
-
const tool = [...toolToAction.entries()].find(
|
|
464
|
-
([, a]) => a === entry.action
|
|
465
|
-
)?.[0];
|
|
466
|
-
if (tool && !allowedSet.has(tool)) {
|
|
467
|
-
entry.effect = "deny";
|
|
468
|
-
}
|
|
469
|
-
}
|
|
470
|
-
}
|
|
471
|
-
|
|
472
|
-
// Убираем дубликаты actions (оставляем последний эффект).
|
|
473
|
-
const deduped = new Map<string, "allow" | "deny">();
|
|
474
|
-
for (const { action, effect } of actions) deduped.set(action, effect);
|
|
475
|
-
|
|
476
|
-
const permissions = [...deduped.entries()].map(
|
|
477
|
-
([action, effect]) =>
|
|
478
|
-
` { "action": "${action}", "resource": "*", "effect": "${effect}" }`
|
|
479
|
-
);
|
|
480
|
-
|
|
481
|
-
return JSON.stringify(
|
|
482
|
-
{
|
|
483
|
-
$schema: "https://opencode.ai/config.json",
|
|
484
|
-
permissions: permissions.map((p) => JSON.parse(p)),
|
|
485
|
-
},
|
|
486
|
-
null,
|
|
487
|
-
2
|
|
488
|
-
);
|
|
531
|
+
return buildPermissionsConfig({ allowedTools, deniedTools, policy, legacyShell });
|
|
489
532
|
}
|
package/src/db/history-repo.ts
CHANGED
|
@@ -290,26 +290,39 @@ export function recordRun(
|
|
|
290
290
|
/** История запусков (новые сверху). Без taskName — по всем задачам. */
|
|
291
291
|
export function getHistory(
|
|
292
292
|
taskName?: string | null,
|
|
293
|
-
limit = 200
|
|
293
|
+
limit = 200,
|
|
294
|
+
status?: string | null
|
|
294
295
|
): StoredHistoryRecord[] {
|
|
295
296
|
const safeLimit = Math.max(1, Math.min(100000, Math.floor(limit) || 1));
|
|
296
|
-
const
|
|
297
|
-
const
|
|
298
|
-
|
|
299
|
-
|
|
300
|
-
|
|
301
|
-
|
|
302
|
-
|
|
303
|
-
|
|
304
|
-
|
|
305
|
-
|
|
306
|
-
|
|
307
|
-
|
|
308
|
-
|
|
309
|
-
|
|
310
|
-
|
|
311
|
-
|
|
312
|
-
|
|
297
|
+
const clauses: string[] = [];
|
|
298
|
+
const params: any[] = [];
|
|
299
|
+
if (taskName) {
|
|
300
|
+
clauses.push("lower(task_name) = lower(?)");
|
|
301
|
+
params.push(taskName);
|
|
302
|
+
}
|
|
303
|
+
if (status) {
|
|
304
|
+
const normalizedStatus = status.trim().toLowerCase();
|
|
305
|
+
// loadHistory() отдаёт незавершённые записи (running) как error — сохраняем
|
|
306
|
+
// это поведение и при фильтрации на уровне SQLite.
|
|
307
|
+
if (normalizedStatus === "running") {
|
|
308
|
+
return [];
|
|
309
|
+
}
|
|
310
|
+
if (normalizedStatus === "error") {
|
|
311
|
+
clauses.push("lower(status) IN ('error', 'running')");
|
|
312
|
+
} else {
|
|
313
|
+
clauses.push("lower(status) = lower(?)");
|
|
314
|
+
params.push(normalizedStatus);
|
|
315
|
+
}
|
|
316
|
+
}
|
|
317
|
+
const where = clauses.length > 0 ? ` WHERE ${clauses.join(" AND ")}` : "";
|
|
318
|
+
params.push(safeLimit);
|
|
319
|
+
const rows = getDb()
|
|
320
|
+
.prepare(
|
|
321
|
+
`SELECT * FROM history${where}
|
|
322
|
+
ORDER BY started_at DESC, id DESC
|
|
323
|
+
LIMIT ?`
|
|
324
|
+
)
|
|
325
|
+
.all(...params) as any[];
|
|
313
326
|
return rows.map(rowToRecord);
|
|
314
327
|
}
|
|
315
328
|
|
package/src/db/schema.ts
CHANGED
|
@@ -90,6 +90,37 @@ CREATE TABLE IF NOT EXISTS git_state (
|
|
|
90
90
|
branch TEXT,
|
|
91
91
|
updated_at TEXT NOT NULL
|
|
92
92
|
);
|
|
93
|
+
|
|
94
|
+
-- Спринт 31.2: дедуп уведомлений (отслеживание повторов между процессами).
|
|
95
|
+
CREATE TABLE IF NOT EXISTS notification_dedup (
|
|
96
|
+
key TEXT PRIMARY KEY,
|
|
97
|
+
task_name TEXT NOT NULL,
|
|
98
|
+
status TEXT NOT NULL,
|
|
99
|
+
count INTEGER NOT NULL DEFAULT 1,
|
|
100
|
+
first_at TEXT NOT NULL,
|
|
101
|
+
last_at TEXT NOT NULL,
|
|
102
|
+
window_minutes INTEGER NOT NULL DEFAULT 60
|
|
103
|
+
);
|
|
104
|
+
|
|
105
|
+
CREATE INDEX IF NOT EXISTS idx_notification_dedup_key ON notification_dedup(key);
|
|
106
|
+
CREATE INDEX IF NOT EXISTS idx_notification_dedup_last_at ON notification_dedup(last_at);
|
|
107
|
+
|
|
108
|
+
-- Векторы сообщений для семантического дедупа (Спринт 31.1).
|
|
109
|
+
-- Хранятся нормализованные эмбеддинги (JSON-массив чисел) и текст сообщения.
|
|
110
|
+
-- Сравнение по косинусу брутфорсом по всем векторам в окне.
|
|
111
|
+
CREATE TABLE IF NOT EXISTS notification_embeddings (
|
|
112
|
+
key TEXT PRIMARY KEY,
|
|
113
|
+
task_name TEXT NOT NULL,
|
|
114
|
+
status TEXT NOT NULL,
|
|
115
|
+
message_text TEXT NOT NULL,
|
|
116
|
+
embedding_json TEXT NOT NULL,
|
|
117
|
+
dimension INTEGER NOT NULL,
|
|
118
|
+
created_at TEXT NOT NULL,
|
|
119
|
+
window_minutes INTEGER NOT NULL DEFAULT 60
|
|
120
|
+
);
|
|
121
|
+
|
|
122
|
+
CREATE INDEX IF NOT EXISTS idx_notification_embeddings_task ON notification_embeddings(task_name, created_at DESC);
|
|
123
|
+
CREATE INDEX IF NOT EXISTS idx_notification_embeddings_created ON notification_embeddings(created_at DESC);
|
|
93
124
|
`;
|
|
94
125
|
|
|
95
126
|
interface SchemaDb {
|