opencode-windows-scheduler 1.5.4 → 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 +65 -5
- package/CROSS_PLATFORM.md +107 -71
- package/README.md +72 -25
- package/ROADMAP-STRATEGY.md +6 -0
- package/ROADMAP.md +116 -85
- 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/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 -2
- package/dist/core/ps-wrapper.d.ts.map +1 -1
- package/dist/core/ps-wrapper.js +293 -96
- 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 +9 -3
- package/dist/core/triage-chain.d.ts.map +1 -1
- package/dist/core/triage-chain.js +15 -5
- 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.map +1 -1
- package/dist/core/triage-rules.js +22 -0
- package/dist/core/triage-shadow.d.ts +54 -10
- package/dist/core/triage-shadow.d.ts.map +1 -1
- package/dist/core/triage-shadow.js +138 -26
- 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.js +1 -1
- 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 +41 -3
- package/dist/index.d.ts +40 -4
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +345 -71
- 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 +287 -16
- 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 +145 -8
- package/dist/rpc.d.ts.map +1 -1
- package/dist/rpc.js +81 -6
- 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 +89 -5
- package/dist/settings.d.ts.map +1 -1
- package/dist/settings.js +143 -23
- 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 +40 -22
- 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 +125 -48
- package/docs/FEATURES.zh.md +655 -0
- package/docs/LOCAL-AI.md +114 -16
- package/docs/README.ru.md +18 -13
- 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/gui-experimental.cjs +8 -8
- package/locales/en.json +54 -1
- package/locales/ru.json +54 -1
- package/locales/zh.json +780 -0
- package/package.json +24 -7
- package/scripts/check-zh-locale.mjs +218 -0
- package/scripts/run-tests.mjs +236 -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 +1 -1
- 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/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 +300 -96
- 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 +15 -6
- package/src/core/triage-compare.ts +277 -0
- package/src/core/triage-rules.ts +23 -0
- package/src/core/triage-shadow.ts +176 -32
- package/src/core/triage-worker.ts +344 -0
- package/src/core/triage.ts +1 -1
- 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 +5070 -4761
- package/src/history.ts +7 -3
- package/src/i18n.ts +55 -4
- package/src/index.ts +432 -74
- package/src/integrations.ts +50 -6
- package/src/notifications.ts +465 -18
- package/src/profiles.ts +21 -3
- package/src/rpc.ts +86 -6
- package/src/server.ts +135 -16
- package/src/settings.ts +305 -46
- package/src/task-transfer.ts +10 -3
- package/src/types.ts +24 -5
- package/src/workspaces.ts +22 -0
- package/dist/gui-experimental.cjs +0 -1
package/dist/core/ps-wrapper.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import fs from "node:fs/promises";
|
|
2
2
|
import path from "node:path";
|
|
3
|
-
import { PLUGIN_DIR, LOCK_DIR, WRAPPER_DIR, sanitizeName } from "../types.js";
|
|
3
|
+
import { PLUGIN_DIR, LOCK_DIR, WRAPPER_DIR, STALE_LOCK_MAX_AGE_MS, sanitizeName } from "../types.js";
|
|
4
4
|
/**
|
|
5
5
|
* Путь к единому generic-обёртке PowerShell, которая реализует запуск opencode run
|
|
6
6
|
* с таймаутом и lock-логикой.
|
|
@@ -46,8 +46,13 @@ export const WRAPPER_SCRIPT = `param(
|
|
|
46
46
|
[string]$EnvFile,
|
|
47
47
|
[string]$SessionMode,
|
|
48
48
|
[string]$SessionId,
|
|
49
|
+
[string]$SessionFile,
|
|
49
50
|
[int]$RetryCount = 0,
|
|
50
|
-
[int]$RetryDelaySeconds = 0
|
|
51
|
+
[int]$RetryDelaySeconds = 0,
|
|
52
|
+
[int]$GateTimeoutSeconds = 300,
|
|
53
|
+
[int]$StaleLockMaxAgeMs = 86400000,
|
|
54
|
+
[string]$PermissionsB64 = "",
|
|
55
|
+
[string]$PolicyB64 = ""
|
|
51
56
|
)
|
|
52
57
|
|
|
53
58
|
[Console]::OutputEncoding = [System.Text.Encoding]::UTF8
|
|
@@ -67,6 +72,20 @@ function Write-Log {
|
|
|
67
72
|
Write-Host $line
|
|
68
73
|
}
|
|
69
74
|
|
|
75
|
+
|
|
76
|
+
# Проверяет, что процесс с указанным PID ещё существует. Нужно для stale-lock:
|
|
77
|
+
# возраст файла сам по себе не говорит, что владелец мёртв (задача может идти долго).
|
|
78
|
+
function Test-ProcessAlive {
|
|
79
|
+
param([int]$ProcessId)
|
|
80
|
+
if ($ProcessId -le 0) { return $false }
|
|
81
|
+
try {
|
|
82
|
+
$null = Get-Process -Id $ProcessId -ErrorAction Stop
|
|
83
|
+
return $true
|
|
84
|
+
} catch {
|
|
85
|
+
return $false
|
|
86
|
+
}
|
|
87
|
+
}
|
|
88
|
+
|
|
70
89
|
# Гарантируем существование папки для лога (на случай прямого вызова обёртки).
|
|
71
90
|
if ($LogFile) {
|
|
72
91
|
try {
|
|
@@ -103,27 +122,58 @@ if ($LockFile) {
|
|
|
103
122
|
}
|
|
104
123
|
$lockStream = [System.IO.File]::Open($LockFile, [System.IO.FileMode]::CreateNew, [System.IO.FileAccess]::Write, [System.IO.FileShare]::None)
|
|
105
124
|
try {
|
|
106
|
-
|
|
125
|
+
# Внутри lock храним время старта и PID владельца: по PID можно
|
|
126
|
+
# отличить живой долгий запуск от осиротевшего после kill -9.
|
|
127
|
+
$lockBytes = [System.Text.Encoding]::UTF8.GetBytes("$startedAtIso|$PID")
|
|
107
128
|
$lockStream.Write($lockBytes, 0, $lockBytes.Length)
|
|
108
129
|
} finally {
|
|
109
130
|
$lockStream.Dispose()
|
|
110
131
|
}
|
|
111
132
|
$script:lockAcquired = $true
|
|
112
133
|
} catch [System.IO.IOException] {
|
|
113
|
-
# Зависший lock
|
|
114
|
-
#
|
|
134
|
+
# Зависший lock снимаем только если владелец мёртв (или файл старше
|
|
135
|
+
# StaleLockMaxAgeMs и PID в нём отсутствует — lock от старой версии).
|
|
115
136
|
$stale = $false
|
|
137
|
+
$holderPid = 0
|
|
116
138
|
try {
|
|
117
|
-
$
|
|
118
|
-
|
|
139
|
+
$holderRaw = "$(Get-Content -LiteralPath $LockFile -Raw -ErrorAction Stop)".Trim()
|
|
140
|
+
$holderParts = $holderRaw.Split([char]124)
|
|
141
|
+
if ($holderParts.Count -ge 2) {
|
|
142
|
+
[void][int]::TryParse($holderParts[1], [ref]$holderPid)
|
|
143
|
+
}
|
|
119
144
|
} catch {}
|
|
145
|
+
if ($holderPid -gt 0) {
|
|
146
|
+
$stale = -not (Test-ProcessAlive -ProcessId $holderPid)
|
|
147
|
+
} else {
|
|
148
|
+
try {
|
|
149
|
+
$ageMs = ((Get-Date) - (Get-Item -LiteralPath $LockFile).LastWriteTime).TotalMilliseconds
|
|
150
|
+
if ($ageMs -gt $StaleLockMaxAgeMs) { $stale = $true }
|
|
151
|
+
} catch {}
|
|
152
|
+
}
|
|
120
153
|
if ($stale) {
|
|
121
|
-
|
|
154
|
+
# T-03: не удаляем lock напрямую. Remove-Item + CreateNew давал
|
|
155
|
+
# гонку: второй воркер мог снести lock, который первый только что
|
|
156
|
+
# создал, и запустить ту же задачу повторно. Атомарно уводим старый
|
|
157
|
+
# файл в уникальное имя; если rename не удался — чужой lock не трогаем.
|
|
158
|
+
$staleLockPath = "$LockFile.stale-$PID-$([DateTime]::UtcNow.Ticks)"
|
|
159
|
+
$staleMoved = $false
|
|
122
160
|
try {
|
|
123
|
-
|
|
124
|
-
$
|
|
125
|
-
$script:lockAcquired = $true
|
|
161
|
+
Move-Item -LiteralPath $LockFile -Destination $staleLockPath -Force -ErrorAction Stop
|
|
162
|
+
$staleMoved = $true
|
|
126
163
|
} catch {}
|
|
164
|
+
if ($staleMoved) {
|
|
165
|
+
try {
|
|
166
|
+
$lockStream = [System.IO.File]::Open($LockFile, [System.IO.FileMode]::CreateNew, [System.IO.FileAccess]::Write, [System.IO.FileShare]::None)
|
|
167
|
+
try {
|
|
168
|
+
$lockBytes = [System.Text.Encoding]::UTF8.GetBytes("$startedAtIso|$PID")
|
|
169
|
+
$lockStream.Write($lockBytes, 0, $lockBytes.Length)
|
|
170
|
+
} finally {
|
|
171
|
+
$lockStream.Dispose()
|
|
172
|
+
}
|
|
173
|
+
$script:lockAcquired = $true
|
|
174
|
+
} catch {}
|
|
175
|
+
try { Remove-Item -LiteralPath $staleLockPath -Force -ErrorAction SilentlyContinue } catch {}
|
|
176
|
+
}
|
|
127
177
|
}
|
|
128
178
|
if (-not $script:lockAcquired) {
|
|
129
179
|
Write-Log "[windows-scheduler] Запуск задачи '$TaskName' пропущен: удерживается активная блокировка."
|
|
@@ -149,14 +199,74 @@ if ($RecorderFile) {
|
|
|
149
199
|
}
|
|
150
200
|
|
|
151
201
|
# Выполняет команду оболочки и построчно пишет её вывод в лог.
|
|
202
|
+
# GateTimeoutSeconds ограничивает время хука: зависший pre-flight/Quality Gate
|
|
203
|
+
# раньше держал lock до истечения общего таймаута задачи (до 24 ч).
|
|
152
204
|
function Invoke-HookScript {
|
|
153
205
|
param([string]$Command)
|
|
154
|
-
$
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
206
|
+
$timeout = $GateTimeoutSeconds
|
|
207
|
+
|
|
208
|
+
if (-not $timeout -or $timeout -le 0) {
|
|
209
|
+
$output = & cmd.exe /c $Command 2>&1
|
|
210
|
+
$code = $LASTEXITCODE
|
|
211
|
+
foreach ($line in @($output)) {
|
|
212
|
+
Write-Log "[hook] $line"
|
|
213
|
+
}
|
|
214
|
+
return $code
|
|
215
|
+
}
|
|
216
|
+
|
|
217
|
+
# ВАЖНО: расширение должно быть .cmd. GetTempFileName() даёт .tmp, а
|
|
218
|
+
# запуск файла .tmp через cmd.exe /c может зависнуть вместо быстрого выполнения.
|
|
219
|
+
$hookFile = Join-Path ([System.IO.Path]::GetTempPath()) ("sched-hook-" + [guid]::NewGuid().ToString("N") + ".cmd")
|
|
220
|
+
try {
|
|
221
|
+
# Команду кладём в .cmd, чтобы кавычки/пайпы не ломали аргументы.
|
|
222
|
+
$lines = @('@echo off', 'chcp 65001 >nul', $Command)
|
|
223
|
+
Set-Content -LiteralPath $hookFile -Value $lines -Encoding Default
|
|
224
|
+
# Не используем Start-Process с -RedirectStandardOutput/-RedirectStandardError:
|
|
225
|
+
# в Windows PowerShell 5.1 такой вызов может зависнуть на закрытии потоков,
|
|
226
|
+
# даже если сам хук уже завершился. Запускаем процесс напрямую и читаем
|
|
227
|
+
# stdout/stderr асинхронно — это не блокирует WaitForExit(timeout).
|
|
228
|
+
$psi = New-Object System.Diagnostics.ProcessStartInfo
|
|
229
|
+
$psi.FileName = "cmd.exe"
|
|
230
|
+
$psi.Arguments = '/c "' + $hookFile + '"'
|
|
231
|
+
$psi.UseShellExecute = $false
|
|
232
|
+
$psi.RedirectStandardOutput = $true
|
|
233
|
+
$psi.RedirectStandardError = $true
|
|
234
|
+
$psi.CreateNoWindow = $true
|
|
235
|
+
$psi.StandardOutputEncoding = [System.Text.Encoding]::UTF8
|
|
236
|
+
$psi.StandardErrorEncoding = [System.Text.Encoding]::UTF8
|
|
237
|
+
$proc = New-Object System.Diagnostics.Process
|
|
238
|
+
$proc.StartInfo = $psi
|
|
239
|
+
$null = $proc.Start()
|
|
240
|
+
$outTask = $proc.StandardOutput.ReadToEndAsync()
|
|
241
|
+
$errTask = $proc.StandardError.ReadToEndAsync()
|
|
242
|
+
$finished = $proc.WaitForExit([int]($timeout * 1000))
|
|
243
|
+
if (-not $finished) {
|
|
244
|
+
try { & taskkill.exe /F /T /PID $proc.Id 2>$null | Out-Null } catch {}
|
|
245
|
+
try { $proc.WaitForExit(5000) | Out-Null } catch {}
|
|
246
|
+
$code = 124
|
|
247
|
+
Write-Log "[windows-scheduler] Таймаут хука ($timeout с): $Command"
|
|
248
|
+
} else {
|
|
249
|
+
try { $proc.WaitForExit() } catch {}
|
|
250
|
+
$code = $proc.ExitCode
|
|
251
|
+
}
|
|
252
|
+
$outText = ""
|
|
253
|
+
$errText = ""
|
|
254
|
+
if ($outTask.Wait(5000)) { try { $outText = $outTask.Result } catch {} }
|
|
255
|
+
if ($errTask.Wait(5000)) { try { $errText = $errTask.Result } catch {} }
|
|
256
|
+
foreach ($text in @($outText, $errText)) {
|
|
257
|
+
foreach ($line in @($text -split "\r?\n")) {
|
|
258
|
+
if ($line -ne "") {
|
|
259
|
+
Write-Log "[hook] $line"
|
|
260
|
+
}
|
|
261
|
+
}
|
|
262
|
+
}
|
|
263
|
+
return $code
|
|
264
|
+
} catch {
|
|
265
|
+
Write-Log "[windows-scheduler] Не удалось выполнить хук: $_"
|
|
266
|
+
return 1
|
|
267
|
+
} finally {
|
|
268
|
+
Remove-Item -LiteralPath $hookFile -Force -ErrorAction SilentlyContinue
|
|
158
269
|
}
|
|
159
|
-
return $code
|
|
160
270
|
}
|
|
161
271
|
|
|
162
272
|
# Hotfix 1.5.3.1: запуск opencode с реальным таймаутом.
|
|
@@ -203,29 +313,34 @@ function Invoke-OpenCodeOnce {
|
|
|
203
313
|
|
|
204
314
|
$script:timedOut = $false
|
|
205
315
|
$script:attemptExitCode = 0
|
|
316
|
+
# Состояние фильтра лога сбрасываем на каждой попытке: иначе незакрытый
|
|
317
|
+
# служебный блок из упавшего запуска «съедал» бы весь лог следующей попытки.
|
|
318
|
+
$script:inServiceBlock = $false
|
|
319
|
+
$script:inComment = $false
|
|
206
320
|
try {
|
|
321
|
+
# Живой стриминг: вывод opencode проходит через конвейер и пишется в лог
|
|
322
|
+
# (Out-File -Append) или консоль (Out-Host) построчно, по мере поступления.
|
|
323
|
+
# Раньше вывод сначала копился в $output и сбрасывался одним куском только
|
|
324
|
+
# после завершения процесса: дашборд/get_task_logs были слепы во время
|
|
325
|
+
# долгих запусков, росла память, а при kill обёртки лог терялся целиком.
|
|
326
|
+
# $LASTEXITCODE после конвейера сохраняет код последней нативной команды.
|
|
207
327
|
if ($LogFile) {
|
|
208
328
|
if ($CommandPath -like "*.ps1") {
|
|
209
|
-
& powershell.exe -ExecutionPolicy Bypass -NoProfile -File $CommandPath @Arguments *>&1 |
|
|
210
|
-
|
|
211
|
-
Out-File -FilePath $LogFile -Append -Encoding utf8
|
|
329
|
+
& powershell.exe -ExecutionPolicy Bypass -NoProfile -File $CommandPath @Arguments *>&1 | ForEach-Object { Format-LogLine $_ } | Out-File -FilePath $LogFile -Append -Encoding utf8
|
|
330
|
+
$script:attemptExitCode = $LASTEXITCODE
|
|
212
331
|
} else {
|
|
213
|
-
& $CommandPath @Arguments *>&1 |
|
|
214
|
-
|
|
215
|
-
Out-File -FilePath $LogFile -Append -Encoding utf8
|
|
332
|
+
& $CommandPath @Arguments *>&1 | ForEach-Object { Format-LogLine $_ } | Out-File -FilePath $LogFile -Append -Encoding utf8
|
|
333
|
+
$script:attemptExitCode = $LASTEXITCODE
|
|
216
334
|
}
|
|
217
335
|
} else {
|
|
218
336
|
if ($CommandPath -like "*.ps1") {
|
|
219
|
-
& powershell.exe -ExecutionPolicy Bypass -NoProfile -File $CommandPath @Arguments *>&1 |
|
|
220
|
-
|
|
221
|
-
Out-Host
|
|
337
|
+
& powershell.exe -ExecutionPolicy Bypass -NoProfile -File $CommandPath @Arguments *>&1 | ForEach-Object { Format-LogLine $_ } | Out-Host
|
|
338
|
+
$script:attemptExitCode = $LASTEXITCODE
|
|
222
339
|
} else {
|
|
223
|
-
& $CommandPath @Arguments *>&1 |
|
|
224
|
-
|
|
225
|
-
Out-Host
|
|
340
|
+
& $CommandPath @Arguments *>&1 | ForEach-Object { Format-LogLine $_ } | Out-Host
|
|
341
|
+
$script:attemptExitCode = $LASTEXITCODE
|
|
226
342
|
}
|
|
227
343
|
}
|
|
228
|
-
$script:attemptExitCode = $LASTEXITCODE
|
|
229
344
|
} finally {
|
|
230
345
|
if ($timeoutMarker -and (Test-Path -LiteralPath $timeoutMarker)) {
|
|
231
346
|
$script:timedOut = $true
|
|
@@ -310,12 +425,10 @@ function Format-LogLine {
|
|
|
310
425
|
return $text
|
|
311
426
|
}
|
|
312
427
|
|
|
313
|
-
|
|
314
|
-
|
|
315
|
-
|
|
316
|
-
|
|
317
|
-
* чтобы recorder записал поля как отсутствующие.
|
|
318
|
-
*/
|
|
428
|
+
# Пытается вытащить из лога задачи информацию о расходе токенов и стоимости.
|
|
429
|
+
# OpenCode может печатать строки вида "Tokens: 1234", "Usage: 1234 tokens",
|
|
430
|
+
# "cost: $0.012" и т.п. Если данные не найдены — возвращает пустые строки,
|
|
431
|
+
# чтобы recorder записал поля как отсутствующие.
|
|
319
432
|
function Get-UsageFromLog {
|
|
320
433
|
param([string]$File)
|
|
321
434
|
|
|
@@ -330,18 +443,24 @@ function Get-UsageFromLog {
|
|
|
330
443
|
} catch { return $result }
|
|
331
444
|
if (-not $tail) { return $result }
|
|
332
445
|
|
|
446
|
+
# Шаблоны намеренно «якорные»: метка должна стоять в начале строки
|
|
447
|
+
# (допускается префикс времени лога). Раньше подходило любое "token=" или
|
|
448
|
+
# "cost:" внутри текста — конфиг-дампы и проза ИИ давали ложный расход.
|
|
449
|
+
$prefix = '^\\s*(?:\\[[^\\]]{4,40}\\]\\s*)?'
|
|
333
450
|
$tokenPatterns = @(
|
|
334
|
-
'(?i)tokens
|
|
335
|
-
'(?i)(?:input|output|total)\\s+tokens?\\s*[:=]?\\s*([0-9]
|
|
336
|
-
'(?i)usage[^\\r\\n]*?([0-9]+)\\s+tokens?'
|
|
451
|
+
($prefix + '(?i)(?:tokens?|token\\s+usage|usage)\\s*[:=]\\s*([0-9][0-9.,]*)\\s*([kKmM])?\\b'),
|
|
452
|
+
($prefix + '(?i)(?:input|output|total)\\s+tokens?\\s*[:=]?\\s*([0-9][0-9.,]*)\\s*([kKmM])?\\b')
|
|
337
453
|
)
|
|
338
454
|
$costPatterns = @(
|
|
339
|
-
'(?i)(?:cost|
|
|
340
|
-
'(?i)(?:cost|
|
|
455
|
+
($prefix + '(?i)(?:cost|total\\s+cost)\\s*[:=]?\\s*\\$\\s*([0-9]+(?:[.,][0-9]+)?)'),
|
|
456
|
+
($prefix + '(?i)(?:cost|total\\s+cost)\\s*[:=]\\s*([0-9]+(?:[.,][0-9]+)?)\\s*(?:usd|\\$)')
|
|
341
457
|
)
|
|
342
458
|
|
|
343
|
-
|
|
344
|
-
|
|
459
|
+
# Идём с конца: OpenCode печатает итог последним, а более ранние строки
|
|
460
|
+
# могут быть эхом промпта или промежуточной статистикой.
|
|
461
|
+
for ($i = $tail.Count - 1; $i -ge 0; $i--) {
|
|
462
|
+
$text = "$($tail[$i])"
|
|
463
|
+
if ($text -match '(?i)opencode\\.json|OPENCODE_CONFIG') { continue }
|
|
345
464
|
|
|
346
465
|
if (-not $result.Tokens) {
|
|
347
466
|
foreach ($pattern in $tokenPatterns) {
|
|
@@ -370,6 +489,8 @@ function Get-UsageFromLog {
|
|
|
370
489
|
}
|
|
371
490
|
}
|
|
372
491
|
}
|
|
492
|
+
|
|
493
|
+
if ($result.Tokens -and $result.Cost) { break }
|
|
373
494
|
}
|
|
374
495
|
|
|
375
496
|
return $result
|
|
@@ -395,53 +516,84 @@ try {
|
|
|
395
516
|
Write-Log "[workspace] name=$WorkspaceName, cwd=$Workdir, branch=$gitBranch, remote=$gitRemote"
|
|
396
517
|
}
|
|
397
518
|
|
|
398
|
-
# Спринт
|
|
399
|
-
#
|
|
400
|
-
#
|
|
519
|
+
# Спринт 32 / релиз 1.6: политика прав вычисляется в TypeScript
|
|
520
|
+
# (src/core/permissions.ts) и передаётся готовым JSON в base64.
|
|
521
|
+
# Старые .cmd, созданные до 1.6, параметр не передают — для них остаётся
|
|
522
|
+
# прежнее поведение «разрешено всё» (fallback ниже).
|
|
401
523
|
$toolToAction = @{
|
|
402
524
|
"read" = "read"; "write" = "edit"; "edit" = "edit"; "apply_patch" = "edit"; "remove" = "edit"
|
|
403
525
|
"bash" = "shell"; "shell" = "shell"; "glob" = "glob"; "grep" = "grep"
|
|
404
526
|
"webfetch" = "webfetch"; "websearch" = "websearch"; "question" = "question"
|
|
405
527
|
"subagent" = "subagent"; "skill" = "skill"
|
|
406
528
|
}
|
|
407
|
-
$
|
|
408
|
-
|
|
409
|
-
|
|
410
|
-
|
|
411
|
-
|
|
412
|
-
|
|
413
|
-
|
|
414
|
-
|
|
415
|
-
|
|
416
|
-
|
|
417
|
-
|
|
418
|
-
)
|
|
419
|
-
|
|
420
|
-
|
|
421
|
-
|
|
422
|
-
|
|
423
|
-
|
|
424
|
-
$
|
|
425
|
-
|
|
426
|
-
|
|
427
|
-
|
|
529
|
+
if ($PermissionsB64) {
|
|
530
|
+
try {
|
|
531
|
+
$decoded = [Text.Encoding]::UTF8.GetString([Convert]::FromBase64String($PermissionsB64))
|
|
532
|
+
$config = $decoded | ConvertFrom-Json
|
|
533
|
+
$env:OPENCODE_CONFIG_CONTENT = ($config | ConvertTo-Json -Depth 5 -Compress)
|
|
534
|
+
Write-Log "[role-scoped] opencode config passed via OPENCODE_CONFIG_CONTENT"
|
|
535
|
+
} catch {
|
|
536
|
+
Write-Log "[policy] ERROR: cannot decode PermissionsB64 ($($_.Exception.Message)); falling back to legacy permissions"
|
|
537
|
+
$PermissionsB64 = ""
|
|
538
|
+
}
|
|
539
|
+
}
|
|
540
|
+
if ($PolicyB64) {
|
|
541
|
+
try {
|
|
542
|
+
$policyJson = [Text.Encoding]::UTF8.GetString([Convert]::FromBase64String($PolicyB64)) | ConvertFrom-Json
|
|
543
|
+
$legacyFlag = ""
|
|
544
|
+
if ($policyJson.legacyShell) { $legacyFlag = ", legacyShell=true" }
|
|
545
|
+
Write-Log "[policy] policy=$($policyJson.policy)$legacyFlag"
|
|
546
|
+
foreach ($denied in @($policyJson.denied)) {
|
|
547
|
+
if ($denied.action) {
|
|
548
|
+
Write-Log "[policy] deny $($denied.action): $($denied.hint)"
|
|
549
|
+
}
|
|
428
550
|
}
|
|
551
|
+
} catch {
|
|
552
|
+
Write-Log "[policy] WARN: cannot decode PolicyB64 ($($_.Exception.Message))"
|
|
429
553
|
}
|
|
430
554
|
}
|
|
431
|
-
if ($
|
|
432
|
-
|
|
433
|
-
|
|
434
|
-
|
|
435
|
-
|
|
436
|
-
|
|
555
|
+
if (-not $PermissionsB64) {
|
|
556
|
+
# Legacy fallback для обёрток, созданных до 1.6: все action разрешены,
|
|
557
|
+
# DeniedTools/AllowedTools применяются как раньше.
|
|
558
|
+
$defaultPermissions = @(
|
|
559
|
+
@{ action = "read"; resource = "*"; effect = "allow" },
|
|
560
|
+
@{ action = "edit"; resource = "*"; effect = "allow" },
|
|
561
|
+
@{ action = "glob"; resource = "*"; effect = "allow" },
|
|
562
|
+
@{ action = "grep"; resource = "*"; effect = "allow" },
|
|
563
|
+
@{ action = "shell"; resource = "*"; effect = "allow" },
|
|
564
|
+
@{ action = "subagent"; resource = "*"; effect = "allow" },
|
|
565
|
+
@{ action = "skill"; resource = "*"; effect = "allow" },
|
|
566
|
+
@{ action = "question"; resource = "*"; effect = "allow" },
|
|
567
|
+
@{ action = "webfetch"; resource = "*"; effect = "allow" },
|
|
568
|
+
@{ action = "websearch"; resource = "*"; effect = "allow" }
|
|
569
|
+
)
|
|
570
|
+
$permissions = @()
|
|
571
|
+
foreach ($p in $defaultPermissions) { $permissions += $p }
|
|
572
|
+
if ($DeniedTools) {
|
|
573
|
+
$deniedList = @($DeniedTools -split ',' | ForEach-Object { $_.Trim().ToLower() } | Where-Object { $_ })
|
|
574
|
+
foreach ($tool in $deniedList) {
|
|
575
|
+
$action = $toolToAction[$tool]
|
|
576
|
+
if ($action) {
|
|
577
|
+
$idx = $permissions | Where-Object { $_.action -eq $action }
|
|
578
|
+
if ($idx) { $idx.effect = "deny" }
|
|
579
|
+
}
|
|
580
|
+
}
|
|
437
581
|
}
|
|
438
|
-
|
|
439
|
-
|
|
582
|
+
if ($AllowedTools) {
|
|
583
|
+
$allowedList = @($AllowedTools -split ',' | ForEach-Object { $_.Trim().ToLower() } | Where-Object { $_ })
|
|
584
|
+
$allowedActions = @{}
|
|
585
|
+
foreach ($tool in $allowedList) {
|
|
586
|
+
$action = $toolToAction[$tool]
|
|
587
|
+
if ($action) { $allowedActions[$action] = $true }
|
|
588
|
+
}
|
|
589
|
+
foreach ($p in $permissions) {
|
|
590
|
+
if (-not $allowedActions.ContainsKey($p.action)) { $p.effect = "deny" }
|
|
591
|
+
}
|
|
440
592
|
}
|
|
593
|
+
$config = @{ "$schema" = "https://opencode.ai/config.json"; "permissions" = $permissions }
|
|
594
|
+
$env:OPENCODE_CONFIG_CONTENT = ($config | ConvertTo-Json -Depth 3 -Compress)
|
|
595
|
+
Write-Log "[role-scoped] opencode config passed via OPENCODE_CONFIG_CONTENT (legacy fallback)"
|
|
441
596
|
}
|
|
442
|
-
$config = @{ "$schema" = "https://opencode.ai/config.json"; "permissions" = $permissions }
|
|
443
|
-
$env:OPENCODE_CONFIG_CONTENT = ($config | ConvertTo-Json -Depth 3 -Compress)
|
|
444
|
-
Write-Log "[role-scoped] opencode config passed via OPENCODE_CONFIG_CONTENT"
|
|
445
597
|
|
|
446
598
|
# Pre-flight: выполняется ДО основной задачи. Ненулевой код отменяет запуск.
|
|
447
599
|
if ($BeforeScript) {
|
|
@@ -462,6 +614,13 @@ try {
|
|
|
462
614
|
if (-not $script:skipMainTask) {
|
|
463
615
|
$prompt = Get-Content -Path $PromptFile -Raw -Encoding UTF8
|
|
464
616
|
|
|
617
|
+
# CreateProcess ограничивает командную строку 32767 символами, а промпт
|
|
618
|
+
# передаётся opencode аргументом ($opencodeArgs += $prompt). Явная ошибка
|
|
619
|
+
# понятнее, чем обрезанный/отвергнутый запуск. Основная валидация — в schedule_task.
|
|
620
|
+
if ($prompt -and $prompt.Length -gt 30000) {
|
|
621
|
+
throw "Промпт слишком длинный для командной строки Windows: $($prompt.Length) символов (максимум 30000). Сократите промпт."
|
|
622
|
+
}
|
|
623
|
+
|
|
465
624
|
# Спринт 21: env-переменные workspace. Файл пишет плагин, значения не логируются.
|
|
466
625
|
if ($EnvFile -and (Test-Path -LiteralPath $EnvFile)) {
|
|
467
626
|
try {
|
|
@@ -487,8 +646,21 @@ try {
|
|
|
487
646
|
if ($Model) {
|
|
488
647
|
$opencodeArgs += @("--model", $Model)
|
|
489
648
|
}
|
|
490
|
-
if ($SessionMode -eq 'reuse'
|
|
491
|
-
|
|
649
|
+
if ($SessionMode -eq 'reuse') {
|
|
650
|
+
# Спринт 24: актуальный id читаем из sidecar-файла — ротация сессии
|
|
651
|
+
# обновляет файл, и обёртку не нужно пересоздавать.
|
|
652
|
+
$effectiveSessionId = $SessionId
|
|
653
|
+
if ($SessionFile -and (Test-Path -LiteralPath $SessionFile)) {
|
|
654
|
+
try {
|
|
655
|
+
$fromFile = (Get-Content -LiteralPath $SessionFile -Raw -ErrorAction Stop).Trim()
|
|
656
|
+
if ($fromFile) { $effectiveSessionId = $fromFile }
|
|
657
|
+
} catch {
|
|
658
|
+
Write-Log "[windows-scheduler] Не удалось прочитать файл сессии: $($_.Exception.Message)"
|
|
659
|
+
}
|
|
660
|
+
}
|
|
661
|
+
if ($effectiveSessionId) {
|
|
662
|
+
$opencodeArgs += @("--session", $effectiveSessionId)
|
|
663
|
+
}
|
|
492
664
|
} elseif ($SessionMode -eq 'last') {
|
|
493
665
|
$opencodeArgs += @("--continue")
|
|
494
666
|
}
|
|
@@ -524,18 +696,14 @@ try {
|
|
|
524
696
|
# завершения opencode run. Если ИИ упал — шлюз не запускаем.
|
|
525
697
|
if ($QualityGate -and $script:exitCode -eq 0) {
|
|
526
698
|
Write-Log "[windows-scheduler] Запуск Quality Gate: $QualityGate"
|
|
527
|
-
|
|
528
|
-
$gateCode = $
|
|
529
|
-
|
|
530
|
-
if ($LogFile) {
|
|
531
|
-
try {
|
|
532
|
-
$gateOutput | ForEach-Object { Add-Content -Path $LogFile -Value "$_" -Encoding utf8 }
|
|
533
|
-
} catch {}
|
|
534
|
-
} else {
|
|
535
|
-
$gateOutput | Out-Host
|
|
536
|
-
}
|
|
699
|
+
# Тот же таймаут, что у хуков: зависший gate не должен держать lock.
|
|
700
|
+
$gateCode = Invoke-HookScript -Command $QualityGate
|
|
537
701
|
|
|
538
|
-
if ($gateCode -
|
|
702
|
+
if ($gateCode -eq 124) {
|
|
703
|
+
Write-Log "[windows-scheduler] ОШИБКА: Quality Gate превысил таймаут $GateTimeoutSeconds с и был остановлен."
|
|
704
|
+
$script:errorMessage = "Quality Gate: превышен таймаут $GateTimeoutSeconds с"
|
|
705
|
+
$script:exitCode = 1
|
|
706
|
+
} elseif ($gateCode -ne 0) {
|
|
539
707
|
Write-Log "[windows-scheduler] ОШИБКА: Quality Gate провален. Код возврата: $gateCode"
|
|
540
708
|
$script:errorMessage = "Quality Gate провален. Код возврата: $gateCode"
|
|
541
709
|
$script:exitCode = 1
|
|
@@ -598,11 +766,11 @@ try {
|
|
|
598
766
|
if ($RecorderFile) {
|
|
599
767
|
try {
|
|
600
768
|
if ($script:runId) {
|
|
601
|
-
& node "$RecorderFile" --finish "$script:runId" "$TaskName" "$status" $durationMs "$errorArg" $tokensArg $costArg "$modelArg" "$script:preFlightStatus" "$script:postFlightStatus"
|
|
769
|
+
& node "$RecorderFile" --finish "$script:runId" "$TaskName" "$status" $durationMs "$errorArg" $tokensArg $costArg "$modelArg" "$script:preFlightStatus" "$script:postFlightStatus" "$LogFile"
|
|
602
770
|
} else {
|
|
603
771
|
# Fallback: --start не удался (например, старая установка) —
|
|
604
772
|
# пишем завершённую запись старым способом, без потери истории.
|
|
605
|
-
& node "$RecorderFile" "$TaskName" "$status" "$startedAtIso" $durationMs "$errorArg" $tokensArg $costArg "$modelArg" "$script:preFlightStatus" "$script:postFlightStatus"
|
|
773
|
+
& node "$RecorderFile" "$TaskName" "$status" "$startedAtIso" $durationMs "$errorArg" $tokensArg $costArg "$modelArg" "$script:preFlightStatus" "$script:postFlightStatus" "$LogFile"
|
|
606
774
|
}
|
|
607
775
|
} catch {}
|
|
608
776
|
}
|
|
@@ -632,11 +800,15 @@ export async function ensureWrapper() {
|
|
|
632
800
|
}
|
|
633
801
|
/**
|
|
634
802
|
* Записывает промпт задачи во временный файл и возвращает его путь.
|
|
803
|
+
*
|
|
804
|
+
* Имя санитизируется внутри функции, а не только у вызывающей стороны:
|
|
805
|
+
* defence-in-depth против path traversal, если taskName когда-либо придёт
|
|
806
|
+
* из недоверенного источника (импорт, шаблон, RPC).
|
|
635
807
|
*/
|
|
636
808
|
export async function writePromptFile(taskName, prompt) {
|
|
637
809
|
const promptDir = path.join(PLUGIN_DIR, "prompts");
|
|
638
810
|
await fs.mkdir(promptDir, { recursive: true });
|
|
639
|
-
const promptPath = path.join(promptDir, `${taskName}.txt`);
|
|
811
|
+
const promptPath = path.join(promptDir, `${sanitizeName(taskName)}.txt`);
|
|
640
812
|
// BOM помогает Windows PowerShell 5.1 правильно прочитать кириллицу.
|
|
641
813
|
// На POSIX BOM попал бы в промпт как мусорный символ — не пишем его.
|
|
642
814
|
const content = process.platform === "win32" ? "\uFEFF" + prompt : prompt;
|
|
@@ -645,9 +817,12 @@ export async function writePromptFile(taskName, prompt) {
|
|
|
645
817
|
}
|
|
646
818
|
/**
|
|
647
819
|
* Возвращает путь к lock-файлу задачи.
|
|
820
|
+
*
|
|
821
|
+
* Как и writePromptFile, санитизирует имя внутри: без этого значение с `../`
|
|
822
|
+
* могло бы создать lock вне каталога locks.
|
|
648
823
|
*/
|
|
649
824
|
export function lockFilePath(taskName) {
|
|
650
|
-
return path.join(PLUGIN_DIR, "locks", `${taskName}.lock`);
|
|
825
|
+
return path.join(PLUGIN_DIR, "locks", `${sanitizeName(taskName)}.lock`);
|
|
651
826
|
}
|
|
652
827
|
/**
|
|
653
828
|
* Генерирует per-task .cmd-обёртку, которую schtasks вызывает через /tr.
|
|
@@ -692,7 +867,7 @@ async function writeHookFile(sanitizedName, kind, command) {
|
|
|
692
867
|
await fs.writeFile(file, `@echo off\r\nchcp 65001 >nul\r\n${command}\r\n`, "utf8");
|
|
693
868
|
return file;
|
|
694
869
|
}
|
|
695
|
-
export async function writeWrapperCmd(sanitizedName, taskName, promptFile, timeoutSeconds, lockFile, workdir, logFile, recorderFile, qualityGate, model, beforeScript, afterScript, workspaceName, allowedTools, deniedTools, scheduleGate, envFile, sessionMode, sessionId, retryCount, retryDelaySeconds) {
|
|
870
|
+
export async function writeWrapperCmd(sanitizedName, taskName, promptFile, timeoutSeconds, lockFile, workdir, logFile, recorderFile, qualityGate, model, beforeScript, afterScript, workspaceName, allowedTools, deniedTools, scheduleGate, envFile, sessionMode, sessionId, retryCount, retryDelaySeconds, gateTimeoutSeconds, permissionsConfig, policyMeta, sessionFile) {
|
|
696
871
|
await fs.mkdir(WRAPPER_DIR, { recursive: true });
|
|
697
872
|
const cmdPath = path.join(WRAPPER_DIR, `run-${sanitizedName}.cmd`);
|
|
698
873
|
const ps1Path = path.join(WRAPPER_DIR, WRAPPER_FILENAME);
|
|
@@ -706,7 +881,13 @@ export async function writeWrapperCmd(sanitizedName, taskName, promptFile, timeo
|
|
|
706
881
|
`-PromptFile "${promptFile}"`,
|
|
707
882
|
`-TimeoutSeconds ${timeoutSeconds}`,
|
|
708
883
|
`-LockFile "${lockFile}"`,
|
|
884
|
+
`-StaleLockMaxAgeMs ${STALE_LOCK_MAX_AGE_MS}`,
|
|
709
885
|
];
|
|
886
|
+
// Таймаут хуков/Quality Gate: 300 с по умолчанию, 0 — без ограничения.
|
|
887
|
+
const safeGateTimeout = typeof gateTimeoutSeconds === "number" && Number.isFinite(gateTimeoutSeconds)
|
|
888
|
+
? Math.max(0, Math.floor(gateTimeoutSeconds))
|
|
889
|
+
: 300;
|
|
890
|
+
psArgs.push(`-GateTimeoutSeconds ${safeGateTimeout}`);
|
|
710
891
|
// Hotfix 1.5.3.1: ретраи. Параметр не передаём при 0 — обёртка по умолчанию
|
|
711
892
|
// делает ровно одну попытку, как раньше.
|
|
712
893
|
const safeRetryCount = Math.max(0, Math.floor(retryCount ?? 0));
|
|
@@ -752,6 +933,16 @@ export async function writeWrapperCmd(sanitizedName, taskName, promptFile, timeo
|
|
|
752
933
|
psArgs.push(`${flag} "${safe}"`);
|
|
753
934
|
}
|
|
754
935
|
}
|
|
936
|
+
// Спринт 32: готовый JSON политики и метаданные для лога — в base64.
|
|
937
|
+
// Base64 не содержит кавычек и переводов строк, поэтому безопасен для .cmd.
|
|
938
|
+
if (permissionsConfig) {
|
|
939
|
+
const b64 = Buffer.from(permissionsConfig, "utf8").toString("base64");
|
|
940
|
+
psArgs.push(`-PermissionsB64 "${b64}"`);
|
|
941
|
+
}
|
|
942
|
+
if (policyMeta) {
|
|
943
|
+
const b64 = Buffer.from(JSON.stringify(policyMeta), "utf8").toString("base64");
|
|
944
|
+
psArgs.push(`-PolicyB64 "${b64}"`);
|
|
945
|
+
}
|
|
755
946
|
// Hotfix 1.5.3.1: хуки — в отдельные .cmd-файлы (см. writeHookFile).
|
|
756
947
|
// Раньше кавычки заменялись на апострофы, из-за чего хуки с путями в кавычках
|
|
757
948
|
// (например, "C:\Program Files\...") падали.
|
|
@@ -780,6 +971,12 @@ export async function writeWrapperCmd(sanitizedName, taskName, promptFile, timeo
|
|
|
780
971
|
if (safeSessionId) {
|
|
781
972
|
psArgs.push(`-SessionId "${safeSessionId}"`);
|
|
782
973
|
}
|
|
974
|
+
if (sessionFile?.trim()) {
|
|
975
|
+
const safeSessionFile = sessionFile.replace(/[\r\n"]+/g, "").trim();
|
|
976
|
+
if (safeSessionFile) {
|
|
977
|
+
psArgs.push(`-SessionFile "${safeSessionFile}"`);
|
|
978
|
+
}
|
|
979
|
+
}
|
|
783
980
|
}
|
|
784
981
|
}
|
|
785
982
|
const lines = ["@echo off", "chcp 65001 >nul"];
|
|
@@ -844,7 +1041,7 @@ export const FORCE_FILE_TTL_MS = 2 * 60 * 1000;
|
|
|
844
1041
|
* поэтому обёртка (--force-file) и агент указывают на один и тот же файл.
|
|
845
1042
|
*/
|
|
846
1043
|
export function forceFilePath(taskName) {
|
|
847
|
-
return `${lockFilePath(
|
|
1044
|
+
return `${lockFilePath(taskName)}.force`;
|
|
848
1045
|
}
|
|
849
1046
|
/**
|
|
850
1047
|
* Создаёт маркер «запустить сейчас» перед вызовом планировщика ОС.
|
|
@@ -1,5 +1,16 @@
|
|
|
1
1
|
import type { TaskDefinition } from "../task-transfer.js";
|
|
2
2
|
import type { HistoryRecord } from "../history.js";
|
|
3
|
+
export interface UsageInfo {
|
|
4
|
+
tokens?: number;
|
|
5
|
+
costUsd?: number;
|
|
6
|
+
}
|
|
7
|
+
/**
|
|
8
|
+
* Извлекает информацию о расходе токенов и стоимости из хвоста лога задачи.
|
|
9
|
+
* Шаблоны «якорные»: метка должна стоять в начале строки (допускается префикс
|
|
10
|
+
* времени лога), чтобы не ловить конфиг-дампы и прочую прозу ИИ.
|
|
11
|
+
* Идёт с конца: OpenCode печатает итог последним.
|
|
12
|
+
*/
|
|
13
|
+
export declare function parseUsageFromLog(logFile: string): UsageInfo;
|
|
3
14
|
/**
|
|
4
15
|
* Возвращает имена задач из БД, которые пора запустить после успешного
|
|
5
16
|
* завершения `completedTask` (DAG-зависимости).
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"record-history.d.ts","sourceRoot":"","sources":["../../src/core/record-history.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"record-history.d.ts","sourceRoot":"","sources":["../../src/core/record-history.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAC1D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AA4BnD,MAAM,WAAW,SAAS;IACxB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAwBD;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,MAAM,GAAG,SAAS,CAmC5D;AAgID;;;;;;;;;GASG;AACH,wBAAgB,yBAAyB,CACvC,aAAa,EAAE,MAAM,EACrB,WAAW,EAAE,cAAc,EAAE,EAC7B,OAAO,EAAE,aAAa,EAAE,GACvB,MAAM,EAAE,CA0EV"}
|