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
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { spawn } from "node:child_process";
|
|
2
|
+
import fs from "node:fs";
|
|
2
3
|
import { pathToFileURL } from "node:url";
|
|
3
4
|
import { createSchedulerBackend } from "./scheduler/index.js";
|
|
4
5
|
import { notifyTaskCompletion } from "../notifications.js";
|
|
@@ -17,6 +18,94 @@ type Status = "success" | "error" | "timeout";
|
|
|
17
18
|
|
|
18
19
|
const RETRY_STATE_KEY = "retry_state";
|
|
19
20
|
|
|
21
|
+
/** Сколько последних строк лога сканировать при поиске токенов/стоимости. */
|
|
22
|
+
const LOG_TAIL_LINES = 500;
|
|
23
|
+
|
|
24
|
+
/**
|
|
25
|
+
* Читает последние `maxLines` строк текстового файла.
|
|
26
|
+
* Возвращает пустой массив, если файл недоступен.
|
|
27
|
+
*/
|
|
28
|
+
function readLogTail(filePath: string, maxLines: number): string[] {
|
|
29
|
+
try {
|
|
30
|
+
const content = fs.readFileSync(filePath, "utf8");
|
|
31
|
+
const lines = content.split(/\r?\n/);
|
|
32
|
+
if (lines.length > 0 && lines[lines.length - 1] === "") lines.pop();
|
|
33
|
+
return lines.slice(-maxLines);
|
|
34
|
+
} catch {
|
|
35
|
+
return [];
|
|
36
|
+
}
|
|
37
|
+
}
|
|
38
|
+
|
|
39
|
+
export interface UsageInfo {
|
|
40
|
+
tokens?: number;
|
|
41
|
+
costUsd?: number;
|
|
42
|
+
}
|
|
43
|
+
|
|
44
|
+
const USAGE_PREFIX = '^\\s*(?:\\[.*?\\]\\s*)?';
|
|
45
|
+
const TOKEN_PATTERNS: RegExp[] = [
|
|
46
|
+
new RegExp(USAGE_PREFIX + '(?:tokens?|token\\s+usage|usage)\\s*[:=]\\s*([0-9][0-9.,]*)\\s*([kKmM])?\\b', 'i'),
|
|
47
|
+
new RegExp(USAGE_PREFIX + '(?:input|output|total)\\s+tokens?\\s*[:=]?\\s*([0-9][0-9.,]*)\\s*([kKmM])?\\b', 'i'),
|
|
48
|
+
];
|
|
49
|
+
const COST_PATTERNS: RegExp[] = [
|
|
50
|
+
new RegExp(USAGE_PREFIX + '(?:cost|total\\s+cost)\\s*[:=]?\\s*\\$\\s*([0-9]+(?:[.,][0-9]+)?)', 'i'),
|
|
51
|
+
new RegExp(USAGE_PREFIX + '(?:cost|total\\s+cost)\\s*[:=]\\s*([0-9]+(?:[.,][0-9]+)?)\\s*(?:usd|\\$)', 'i'),
|
|
52
|
+
];
|
|
53
|
+
|
|
54
|
+
function parseUsageValue(raw: string, suffix?: string): number | undefined {
|
|
55
|
+
const value = parseFloat(raw.replace(',', '.'));
|
|
56
|
+
if (!Number.isFinite(value)) return undefined;
|
|
57
|
+
let mult = 1;
|
|
58
|
+
if (suffix) {
|
|
59
|
+
const s = suffix.toLowerCase();
|
|
60
|
+
if (s === 'k') mult = 1000;
|
|
61
|
+
else if (s === 'm') mult = 1000000;
|
|
62
|
+
}
|
|
63
|
+
return Math.round(value * mult);
|
|
64
|
+
}
|
|
65
|
+
|
|
66
|
+
/**
|
|
67
|
+
* Извлекает информацию о расходе токенов и стоимости из хвоста лога задачи.
|
|
68
|
+
* Шаблоны «якорные»: метка должна стоять в начале строки (допускается префикс
|
|
69
|
+
* времени лога), чтобы не ловить конфиг-дампы и прочую прозу ИИ.
|
|
70
|
+
* Идёт с конца: OpenCode печатает итог последним.
|
|
71
|
+
*/
|
|
72
|
+
export function parseUsageFromLog(logFile: string): UsageInfo {
|
|
73
|
+
const result: UsageInfo = {};
|
|
74
|
+
if (!logFile) return result;
|
|
75
|
+
|
|
76
|
+
const lines = readLogTail(logFile, LOG_TAIL_LINES);
|
|
77
|
+
if (!lines.length) return result;
|
|
78
|
+
|
|
79
|
+
for (let i = lines.length - 1; i >= 0; i--) {
|
|
80
|
+
const text = lines[i];
|
|
81
|
+
if (/opencode\.json|OPENCODE_CONFIG/i.test(text)) continue;
|
|
82
|
+
|
|
83
|
+
if (result.tokens === undefined) {
|
|
84
|
+
for (const pattern of TOKEN_PATTERNS) {
|
|
85
|
+
const m = text.match(pattern);
|
|
86
|
+
if (m) {
|
|
87
|
+
const v = parseUsageValue(m[1], m[2]);
|
|
88
|
+
if (v !== undefined) { result.tokens = v; break; }
|
|
89
|
+
}
|
|
90
|
+
}
|
|
91
|
+
}
|
|
92
|
+
|
|
93
|
+
if (result.costUsd === undefined) {
|
|
94
|
+
for (const pattern of COST_PATTERNS) {
|
|
95
|
+
const m = text.match(pattern);
|
|
96
|
+
if (m) {
|
|
97
|
+
result.costUsd = parseFloat(m[1].replace(',', '.'));
|
|
98
|
+
break;
|
|
99
|
+
}
|
|
100
|
+
}
|
|
101
|
+
}
|
|
102
|
+
|
|
103
|
+
if (result.tokens !== undefined && result.costUsd !== undefined) break;
|
|
104
|
+
}
|
|
105
|
+
|
|
106
|
+
return result;
|
|
107
|
+
}
|
|
108
|
+
|
|
20
109
|
/**
|
|
21
110
|
* Ищет настройку повторов задачи в БД.
|
|
22
111
|
* Возвращает 0, если повторы не настроены.
|
|
@@ -248,6 +337,7 @@ async function main() {
|
|
|
248
337
|
ninth,
|
|
249
338
|
tenth,
|
|
250
339
|
eleventh,
|
|
340
|
+
twelfth,
|
|
251
341
|
] = process.argv;
|
|
252
342
|
|
|
253
343
|
// Режим повтора: node record-history.js --retry "<task>" <delaySec>
|
|
@@ -304,8 +394,23 @@ async function main() {
|
|
|
304
394
|
}
|
|
305
395
|
const durationMs = Number(fifth) || 0;
|
|
306
396
|
const error = sixth !== undefined ? sixth : null;
|
|
397
|
+
// 12-й аргумент — путь к лог-файлу задачи (добавлен в T-08 / D-08).
|
|
398
|
+
const logFile = twelfth;
|
|
307
399
|
const tokens = parseOptionalNumber(seventh);
|
|
308
400
|
const costUsd = parseOptionalNumber(eighth);
|
|
401
|
+
// Если обёртка не передала токены/стоимость ("-"), пробуем распарсить из лога.
|
|
402
|
+
// Это даёт одинаковое поведение для Windows (ps-wrapper) и POSIX (bash).
|
|
403
|
+
let tokensResolved = tokens;
|
|
404
|
+
let costResolved = costUsd;
|
|
405
|
+
if ((tokensResolved === undefined || costResolved === undefined) && logFile) {
|
|
406
|
+
const usage = parseUsageFromLog(logFile);
|
|
407
|
+
if (tokensResolved === undefined && usage.tokens !== undefined) {
|
|
408
|
+
tokensResolved = usage.tokens;
|
|
409
|
+
}
|
|
410
|
+
if (costResolved === undefined && usage.costUsd !== undefined) {
|
|
411
|
+
costResolved = usage.costUsd;
|
|
412
|
+
}
|
|
413
|
+
}
|
|
309
414
|
const model = ninth && ninth !== "-" ? ninth.trim() || undefined : undefined;
|
|
310
415
|
const preFlightStatus = parseHookStatus(tenth);
|
|
311
416
|
const postFlightStatus = parseHookStatus(eleventh);
|
|
@@ -324,8 +429,8 @@ async function main() {
|
|
|
324
429
|
durationMs,
|
|
325
430
|
error,
|
|
326
431
|
chainTarget,
|
|
327
|
-
|
|
328
|
-
|
|
432
|
+
tokensResolved,
|
|
433
|
+
costResolved,
|
|
329
434
|
model,
|
|
330
435
|
preFlightStatus,
|
|
331
436
|
postFlightStatus
|
|
@@ -337,7 +442,7 @@ async function main() {
|
|
|
337
442
|
return;
|
|
338
443
|
}
|
|
339
444
|
|
|
340
|
-
await handleCompletion(taskName, st, chainTarget, error, durationMs,
|
|
445
|
+
await handleCompletion(taskName, st, chainTarget, error, durationMs, tokensResolved, costResolved);
|
|
341
446
|
return;
|
|
342
447
|
}
|
|
343
448
|
|
|
@@ -407,7 +512,9 @@ async function handleCompletion(
|
|
|
407
512
|
): Promise<void> {
|
|
408
513
|
// Уведомление о завершении (webhook). Ошибки отправки логируются внутри
|
|
409
514
|
// и не влияют на историю, цепочки и повторы.
|
|
410
|
-
await notifyTaskCompletion(taskName, st, durationMs, error, tokens, costUsd
|
|
515
|
+
await notifyTaskCompletion(taskName, st, durationMs, error, tokens, costUsd, {
|
|
516
|
+
asyncTriage: true,
|
|
517
|
+
});
|
|
411
518
|
|
|
412
519
|
// Matrix (Спринт 15): клон завершился — двигаем sequential-цепочку или
|
|
413
520
|
// очередь concurrency-лимита (Спринт 17), а когда все клоны готовы —
|
|
@@ -0,0 +1,150 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Счётчик «сэкономлено $» (Спринт 31.6).
|
|
3
|
+
*
|
|
4
|
+
* Метод — контрфактика по истории: запуски, которые потратили токены, но не
|
|
5
|
+
* записали стоимость (локальная модель, подписка, неизвестная цена), считаются
|
|
6
|
+
* так, как если бы те же токены обрабатывались по эталонной облачной цене.
|
|
7
|
+
* Это ОЦЕНКА, а не бухгалтерия: она не видит кеш, повторные запросы и скидки.
|
|
8
|
+
*
|
|
9
|
+
* Модуль чистый (без БД и HTTP), поэтому методику легко проверить тестом на
|
|
10
|
+
* фиксированных данных.
|
|
11
|
+
*/
|
|
12
|
+
|
|
13
|
+
/** Эталонная облачная цена за 1k токенов (вход+выход, смешанно), USD. */
|
|
14
|
+
export const CLOUD_REFERENCE_COST_PER_1K_TOKENS_USD = 0.01;
|
|
15
|
+
|
|
16
|
+
/** Ссылка на методику — её показывают GUI и дашборд рядом с оценкой. */
|
|
17
|
+
export const SAVINGS_METHODOLOGY_URL =
|
|
18
|
+
"https://github.com/DeadSno/opencode-windows-scheduler/blob/main/docs/SAVINGS.md#methodology";
|
|
19
|
+
|
|
20
|
+
/** Минимальный вид записи истории, нужный счётчику экономии. */
|
|
21
|
+
export interface SavingsRecord {
|
|
22
|
+
taskName: string;
|
|
23
|
+
status: string;
|
|
24
|
+
startedAt: string;
|
|
25
|
+
tokens?: number | null;
|
|
26
|
+
costUsd?: number | null;
|
|
27
|
+
model?: string | null;
|
|
28
|
+
}
|
|
29
|
+
|
|
30
|
+
/** Экономия по одной задаче. */
|
|
31
|
+
export interface SavingsTaskRow {
|
|
32
|
+
taskName: string;
|
|
33
|
+
/** Сколько запусков попало в контрфактику. */
|
|
34
|
+
runs: number;
|
|
35
|
+
/** Сколько токенов эти запуски потратили. */
|
|
36
|
+
tokens: number;
|
|
37
|
+
/** Оценка экономии, USD. */
|
|
38
|
+
savedUsd: number;
|
|
39
|
+
}
|
|
40
|
+
|
|
41
|
+
export interface SavingsReport {
|
|
42
|
+
/** Всегда "estimate": счётчик показывает оценку, а не факт. */
|
|
43
|
+
kind: "estimate";
|
|
44
|
+
/** Эталонная цена, на которой построена оценка. */
|
|
45
|
+
referenceCostPer1kTokensUsd: number;
|
|
46
|
+
/** Ссылка на описание методики. */
|
|
47
|
+
methodologyUrl: string;
|
|
48
|
+
/** Запусков, попавших в контрфактику (токены есть, стоимость не записана). */
|
|
49
|
+
runs: number;
|
|
50
|
+
/** Токенов в этих запусках. */
|
|
51
|
+
tokens: number;
|
|
52
|
+
/** Оценка экономии, USD. */
|
|
53
|
+
savedUsd: number;
|
|
54
|
+
/** Фактически записанная стоимость этих же запусков (обычно 0). */
|
|
55
|
+
actualCostUsd: number;
|
|
56
|
+
/** Полная записанная стоимость всех запусков окна — для контекста. */
|
|
57
|
+
totalCostUsd: number;
|
|
58
|
+
/** Разбивка по задачам, самые экономные сверху. */
|
|
59
|
+
byTask: SavingsTaskRow[];
|
|
60
|
+
}
|
|
61
|
+
|
|
62
|
+
export interface ComputeSavingsOptions {
|
|
63
|
+
/** Эталонная цена за 1k токенов; по умолчанию 0.01 USD. */
|
|
64
|
+
referenceCostPer1kTokensUsd?: number;
|
|
65
|
+
/** Сколько строк оставить в разбивке по задачам (по умолчанию 10). */
|
|
66
|
+
topLimit?: number;
|
|
67
|
+
}
|
|
68
|
+
|
|
69
|
+
function positiveNumber(value: unknown): number {
|
|
70
|
+
const n = Number(value);
|
|
71
|
+
return Number.isFinite(n) && n > 0 ? n : 0;
|
|
72
|
+
}
|
|
73
|
+
|
|
74
|
+
function roundUsd(value: number): number {
|
|
75
|
+
return Math.round(value * 10_000) / 10_000;
|
|
76
|
+
}
|
|
77
|
+
|
|
78
|
+
/**
|
|
79
|
+
* Считает оценку экономии по записям истории.
|
|
80
|
+
*
|
|
81
|
+
* Запуск попадает в контрфактику, если он потратил токены и при этом не
|
|
82
|
+
* записал стоимость (`costUsd` пустой или 0). Такие запуски обычно означают
|
|
83
|
+
* локальную модель или уже оплаченную подписку — деньги за токены не списаны,
|
|
84
|
+
* но при облачном провайдере они бы стоили `tokens / 1000 * reference`.
|
|
85
|
+
*/
|
|
86
|
+
export function computeSavings(
|
|
87
|
+
records: SavingsRecord[],
|
|
88
|
+
options: ComputeSavingsOptions = {}
|
|
89
|
+
): SavingsReport {
|
|
90
|
+
const reference = positiveNumber(options.referenceCostPer1kTokensUsd)
|
|
91
|
+
|| CLOUD_REFERENCE_COST_PER_1K_TOKENS_USD;
|
|
92
|
+
const topLimit = Math.max(1, Math.floor(options.topLimit ?? 10));
|
|
93
|
+
|
|
94
|
+
let runs = 0;
|
|
95
|
+
let tokens = 0;
|
|
96
|
+
let savedUsd = 0;
|
|
97
|
+
let actualCostUsd = 0;
|
|
98
|
+
let totalCostUsd = 0;
|
|
99
|
+
const byTask = new Map<string, SavingsTaskRow>();
|
|
100
|
+
|
|
101
|
+
for (const record of records) {
|
|
102
|
+
const recordTokens = positiveNumber(record.tokens);
|
|
103
|
+
const recordCost = positiveNumber(record.costUsd);
|
|
104
|
+
totalCostUsd += recordCost;
|
|
105
|
+
|
|
106
|
+
// Незавершённые запуски не оцениваем: их стоимость ещё не финальна.
|
|
107
|
+
if (String(record.status ?? "") === "running") continue;
|
|
108
|
+
if (recordTokens <= 0 || recordCost > 0) continue;
|
|
109
|
+
|
|
110
|
+
const saved = (recordTokens / 1000) * reference;
|
|
111
|
+
runs += 1;
|
|
112
|
+
tokens += recordTokens;
|
|
113
|
+
savedUsd += saved;
|
|
114
|
+
actualCostUsd += recordCost;
|
|
115
|
+
|
|
116
|
+
const key = record.taskName || "(без имени)";
|
|
117
|
+
const row = byTask.get(key) ?? {
|
|
118
|
+
taskName: key,
|
|
119
|
+
runs: 0,
|
|
120
|
+
tokens: 0,
|
|
121
|
+
savedUsd: 0,
|
|
122
|
+
};
|
|
123
|
+
row.runs += 1;
|
|
124
|
+
row.tokens += recordTokens;
|
|
125
|
+
row.savedUsd += saved;
|
|
126
|
+
byTask.set(key, row);
|
|
127
|
+
}
|
|
128
|
+
|
|
129
|
+
const rows = [...byTask.values()]
|
|
130
|
+
.sort((a, b) => b.savedUsd - a.savedUsd || a.taskName.localeCompare(b.taskName))
|
|
131
|
+
.slice(0, topLimit)
|
|
132
|
+
.map((row) => ({
|
|
133
|
+
taskName: row.taskName,
|
|
134
|
+
runs: row.runs,
|
|
135
|
+
tokens: row.tokens,
|
|
136
|
+
savedUsd: roundUsd(row.savedUsd),
|
|
137
|
+
}));
|
|
138
|
+
|
|
139
|
+
return {
|
|
140
|
+
kind: "estimate",
|
|
141
|
+
referenceCostPer1kTokensUsd: reference,
|
|
142
|
+
methodologyUrl: SAVINGS_METHODOLOGY_URL,
|
|
143
|
+
runs,
|
|
144
|
+
tokens,
|
|
145
|
+
savedUsd: roundUsd(savedUsd),
|
|
146
|
+
actualCostUsd: roundUsd(actualCostUsd),
|
|
147
|
+
totalCostUsd: roundUsd(totalCostUsd),
|
|
148
|
+
byTask: rows,
|
|
149
|
+
};
|
|
150
|
+
}
|
|
@@ -187,9 +187,15 @@ async function main(): Promise<number> {
|
|
|
187
187
|
return 3;
|
|
188
188
|
}
|
|
189
189
|
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
190
|
+
if (!state.nextOpenAt) {
|
|
191
|
+
// Окно закрыто, но время его открытия неизвестно (например, окно
|
|
192
|
+
// выходит за горизонт поиска). Разрешать запуск в этом случае нельзя.
|
|
193
|
+
console.error(
|
|
194
|
+
`[schedule-gate] ${state.reason ?? "вне окна"} — время открытия окна неизвестно, запуск пропущен.`
|
|
195
|
+
);
|
|
196
|
+
return 3;
|
|
197
|
+
}
|
|
198
|
+
const wait = Math.max(0, state.nextOpenAt.getTime() - now.getTime());
|
|
193
199
|
if (wait <= 0) return 0;
|
|
194
200
|
if (wait > MAX_POSTPONE_MS) {
|
|
195
201
|
console.error(
|
package/src/core/schedule-v2.ts
CHANGED
|
@@ -346,7 +346,7 @@ function candidatesOnDay(
|
|
|
346
346
|
const result: Array<{ hour: number; minute: number }> = [];
|
|
347
347
|
for (const hour of hours) {
|
|
348
348
|
for (const minute of minutes) {
|
|
349
|
-
if (notBefore
|
|
349
|
+
if (notBefore) {
|
|
350
350
|
if (hour < notBefore.hour || (hour === notBefore.hour && minute < notBefore.minute)) continue;
|
|
351
351
|
}
|
|
352
352
|
if (notAfter) {
|
|
@@ -23,11 +23,49 @@ export type { RegistryEntry } from "./registry.js";
|
|
|
23
23
|
* - linux (и прочие POSIX) → LinuxScheduler (crontab).
|
|
24
24
|
*/
|
|
25
25
|
export function createSchedulerBackend(
|
|
26
|
+
platform: NodeJS.Platform = process.platform,
|
|
27
|
+
profile?: string
|
|
28
|
+
): SchedulerBackend {
|
|
29
|
+
if (platform === "win32") return new WindowsScheduler(profile);
|
|
30
|
+
if (platform === "darwin") return new MacScheduler(profile);
|
|
31
|
+
return new LinuxScheduler(profile);
|
|
32
|
+
}
|
|
33
|
+
|
|
34
|
+
/**
|
|
35
|
+
* Бэкенд планировщика в пространстве имён конкретного профиля — в том числе
|
|
36
|
+
* неактивного. Нужен, чтобы удаление профиля снимало ЕГО задачи, а не задачи
|
|
37
|
+
* активного профиля (T-05).
|
|
38
|
+
*/
|
|
39
|
+
export function createSchedulerBackendForProfile(
|
|
40
|
+
profile: string,
|
|
26
41
|
platform: NodeJS.Platform = process.platform
|
|
27
42
|
): SchedulerBackend {
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
43
|
+
return createSchedulerBackend(platform, profile);
|
|
44
|
+
}
|
|
45
|
+
|
|
46
|
+
/**
|
|
47
|
+
* Снимает все задачи профиля из планировщика ОС перед удалением его файлов.
|
|
48
|
+
* Ошибки по отдельным задачам игнорируются; бросает только если сам список
|
|
49
|
+
* задач получить не удалось.
|
|
50
|
+
*/
|
|
51
|
+
export async function removeScheduledTasksForProfile(
|
|
52
|
+
profile: string,
|
|
53
|
+
platform: NodeJS.Platform = process.platform
|
|
54
|
+
): Promise<number> {
|
|
55
|
+
const scheduler = createSchedulerBackendForProfile(profile, platform);
|
|
56
|
+
const tasks = await scheduler.listTasks();
|
|
57
|
+
let removed = 0;
|
|
58
|
+
for (const task of tasks) {
|
|
59
|
+
const name = task.taskName ?? "";
|
|
60
|
+
if (!name) continue;
|
|
61
|
+
try {
|
|
62
|
+
await scheduler.deleteTask(name);
|
|
63
|
+
removed++;
|
|
64
|
+
} catch {
|
|
65
|
+
// Задача уже удалена или недоступна — продолжаем чистить остальные.
|
|
66
|
+
}
|
|
67
|
+
}
|
|
68
|
+
return removed;
|
|
31
69
|
}
|
|
32
70
|
|
|
33
71
|
let cached: SchedulerBackend | null = null;
|
|
@@ -1,14 +1,16 @@
|
|
|
1
1
|
import { execFile, spawn } from "node:child_process";
|
|
2
|
+
import path from "node:path";
|
|
2
3
|
import { promisify } from "node:util";
|
|
3
4
|
import { buildAtTimestamp } from "../one-shot.js";
|
|
5
|
+
import { needsPollMode } from "../schedule-v2.js";
|
|
6
|
+
import { LockManager, withLockWait } from "../lock.js";
|
|
7
|
+
import { getBasePluginDir, getProfileName } from "../../profiles.js";
|
|
8
|
+
import { taskFolderNameForProfile } from "../../types.js";
|
|
4
9
|
import { PosixSchedulerBase, shellQuote } from "./posix.js";
|
|
5
10
|
import type { RegistryEntry } from "./registry.js";
|
|
6
11
|
|
|
7
12
|
const execFileAsync = promisify(execFile);
|
|
8
13
|
|
|
9
|
-
const BLOCK_BEGIN = "# >>> opencode-scheduler >>>";
|
|
10
|
-
const BLOCK_END = "# <<< opencode-scheduler <<<";
|
|
11
|
-
|
|
12
14
|
/**
|
|
13
15
|
* Бэкенд планировщика Linux на основе пользовательского crontab.
|
|
14
16
|
*
|
|
@@ -24,8 +26,16 @@ export class LinuxScheduler extends PosixSchedulerBase {
|
|
|
24
26
|
readonly platform: NodeJS.Platform = "linux";
|
|
25
27
|
readonly title = "OpenCode Scheduler";
|
|
26
28
|
|
|
27
|
-
|
|
28
|
-
|
|
29
|
+
private readonly blockBegin: string;
|
|
30
|
+
private readonly blockEnd: string;
|
|
31
|
+
private readonly ownsLegacyBlock: boolean;
|
|
32
|
+
|
|
33
|
+
constructor(profile: string = getProfileName()) {
|
|
34
|
+
super("linux", profile);
|
|
35
|
+
const folderName = taskFolderNameForProfile(profile);
|
|
36
|
+
this.blockBegin = `# >>> opencode-scheduler:${folderName} >>>`;
|
|
37
|
+
this.blockEnd = `# <<< opencode-scheduler:${folderName} <<<`;
|
|
38
|
+
this.ownsLegacyBlock = folderName === "windows-scheduler";
|
|
29
39
|
}
|
|
30
40
|
|
|
31
41
|
private cronLine(entry: RegistryEntry): string {
|
|
@@ -35,18 +45,22 @@ export class LinuxScheduler extends PosixSchedulerBase {
|
|
|
35
45
|
}
|
|
36
46
|
const log = entry.logFile ? ` >> ${shellQuote(entry.logFile)} 2>&1` : "";
|
|
37
47
|
const cmd = `/bin/bash ${shellQuote(entry.command)}${log}`;
|
|
38
|
-
|
|
48
|
+
// crontab понимает только 5-полевой cron. Расширенные выражения (L, #,
|
|
49
|
+
// списки, @daily и т.п.) нельзя писать в crontab как есть — опрашиваем
|
|
50
|
+
// каждую минуту, а решение о запуске принимает gate во враппере.
|
|
51
|
+
const schedule = needsPollMode(entry.schedule) ? "* * * * *" : entry.schedule;
|
|
52
|
+
return `${schedule} ${cmd}`;
|
|
39
53
|
}
|
|
40
54
|
|
|
41
55
|
private renderBlock(entries: RegistryEntry[]): string {
|
|
42
|
-
const lines: string[] = [
|
|
56
|
+
const lines: string[] = [this.blockBegin];
|
|
43
57
|
for (const entry of entries) {
|
|
44
58
|
const line = this.cronLine(entry);
|
|
45
59
|
if (!line) continue;
|
|
46
60
|
lines.push(`# task: ${entry.name}`);
|
|
47
61
|
lines.push(entry.paused ? `# PAUSED: ${line}` : line);
|
|
48
62
|
}
|
|
49
|
-
lines.push(
|
|
63
|
+
lines.push(this.blockEnd);
|
|
50
64
|
return lines.join("\n");
|
|
51
65
|
}
|
|
52
66
|
|
|
@@ -57,23 +71,38 @@ export class LinuxScheduler extends PosixSchedulerBase {
|
|
|
57
71
|
maxBuffer: 10 * 1024 * 1024,
|
|
58
72
|
});
|
|
59
73
|
return stdout;
|
|
60
|
-
} catch {
|
|
61
|
-
|
|
62
|
-
|
|
74
|
+
} catch (err: any) {
|
|
75
|
+
const stderr = String(err?.stderr ?? "");
|
|
76
|
+
// "no crontab for user" — это нормальное состояние. Любую другую ошибку
|
|
77
|
+
// (нет доступа, сбой crontab) нельзя превращать в пустой crontab: иначе
|
|
78
|
+
// последующая запись затрёт пользовательские задания.
|
|
79
|
+
if (/no crontab/i.test(stderr) || /no crontab/i.test(String(err?.message ?? ""))) {
|
|
80
|
+
return "";
|
|
81
|
+
}
|
|
82
|
+
throw new Error(`Не удалось прочитать crontab: ${stderr.trim() || err?.message || err}`);
|
|
63
83
|
}
|
|
64
84
|
}
|
|
65
85
|
|
|
66
86
|
/** Убирает управляемый блок плагина из текста crontab. */
|
|
67
87
|
private stripBlock(content: string): string {
|
|
88
|
+
// Совместимость: до появления профилей блок назывался без суффикса.
|
|
89
|
+
// Он принадлежит профилю default; другие профили его не трогают.
|
|
90
|
+
const legacyBegin = "# >>> opencode-scheduler >>>";
|
|
91
|
+
const legacyEnd = "# <<< opencode-scheduler <<<";
|
|
92
|
+
const ownsLegacy = this.ownsLegacyBlock;
|
|
93
|
+
const isBegin = (line: string) =>
|
|
94
|
+
line === this.blockBegin || (ownsLegacy && line === legacyBegin);
|
|
95
|
+
const isEnd = (line: string) =>
|
|
96
|
+
line === this.blockEnd || (ownsLegacy && line === legacyEnd);
|
|
68
97
|
const lines = content.split(/\r?\n/);
|
|
69
98
|
const result: string[] = [];
|
|
70
99
|
let inside = false;
|
|
71
100
|
for (const line of lines) {
|
|
72
|
-
if (line.trim()
|
|
101
|
+
if (isBegin(line.trim())) {
|
|
73
102
|
inside = true;
|
|
74
103
|
continue;
|
|
75
104
|
}
|
|
76
|
-
if (line.trim()
|
|
105
|
+
if (isEnd(line.trim())) {
|
|
77
106
|
inside = false;
|
|
78
107
|
continue;
|
|
79
108
|
}
|
|
@@ -101,15 +130,31 @@ export class LinuxScheduler extends PosixSchedulerBase {
|
|
|
101
130
|
|
|
102
131
|
/** Перегенерирует блок плагина из реестра. */
|
|
103
132
|
private async rebuildCrontab(): Promise<void> {
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
133
|
+
// T-17: crontab общий для всех профилей пользователя, а read-modify-write
|
|
134
|
+
// не атомарен — параллельные операции разных профилей могли затирать блоки
|
|
135
|
+
// друг друга. Кросс-процессный замок живёт в базовой директории плагина
|
|
136
|
+
// (общей для всех профилей) и ждёт освобождения вместо пропуска.
|
|
137
|
+
const crontabLock = new LockManager(
|
|
138
|
+
path.join(getBasePluginDir(), "locks")
|
|
139
|
+
);
|
|
140
|
+
await withLockWait(
|
|
141
|
+
crontabLock,
|
|
142
|
+
"crontab",
|
|
143
|
+
async () => {
|
|
144
|
+
const entries = await this.registry.load();
|
|
145
|
+
const current = await this.readCrontab();
|
|
146
|
+
const base = this.stripBlock(current);
|
|
147
|
+
const block = this.renderBlock(entries);
|
|
148
|
+
|
|
149
|
+
// Пустой блок (нет задач) не пишем, чтобы не оставлять мусор в crontab.
|
|
150
|
+
const hasTasks = block
|
|
151
|
+
.split("\n")
|
|
152
|
+
.some((line) => line.trim().startsWith("# task:"));
|
|
153
|
+
const next = [base, hasTasks ? block : ""].filter(Boolean).join("\n");
|
|
154
|
+
await this.writeCrontab(next);
|
|
155
|
+
},
|
|
156
|
+
{ timeoutMs: 15000, staleMs: 60000 }
|
|
157
|
+
);
|
|
113
158
|
}
|
|
114
159
|
|
|
115
160
|
/** Строка команды one-shot для stdin `at`. */
|
|
@@ -1,10 +1,12 @@
|
|
|
1
1
|
import { execFile } from "node:child_process";
|
|
2
|
+
import fsSync from "node:fs";
|
|
2
3
|
import fs from "node:fs/promises";
|
|
3
4
|
import os from "node:os";
|
|
4
5
|
import path from "node:path";
|
|
5
6
|
import { promisify } from "node:util";
|
|
6
7
|
import { sanitizeName } from "../../types.js";
|
|
7
|
-
import {
|
|
8
|
+
import { getProfileDir, getProfileName } from "../../profiles.js";
|
|
9
|
+
import { buildLaunchdCalendar, launchdLabel } from "../one-shot.js";
|
|
8
10
|
import { PosixSchedulerBase } from "./posix.js";
|
|
9
11
|
import type { RegistryEntry } from "./registry.js";
|
|
10
12
|
|
|
@@ -13,9 +15,6 @@ const execFileAsync = promisify(execFile);
|
|
|
13
15
|
/** Папка пользовательских LaunchAgents. */
|
|
14
16
|
const LAUNCH_AGENTS_DIR = path.join(os.homedir(), "Library", "LaunchAgents");
|
|
15
17
|
|
|
16
|
-
/** Префикс label/файлов плагина. */
|
|
17
|
-
const LABEL_PREFIX = "com.opencode.scheduler";
|
|
18
|
-
|
|
19
18
|
/** Экранирует текст для XML. */
|
|
20
19
|
function xmlEscape(value: string): string {
|
|
21
20
|
return value
|
|
@@ -207,12 +206,30 @@ export class MacScheduler extends PosixSchedulerBase {
|
|
|
207
206
|
readonly platform: NodeJS.Platform = "darwin";
|
|
208
207
|
readonly title = "OpenCode Scheduler";
|
|
209
208
|
|
|
210
|
-
constructor() {
|
|
211
|
-
super("mac");
|
|
209
|
+
constructor(profile: string = getProfileName()) {
|
|
210
|
+
super("mac", profile);
|
|
211
|
+
this.profile = profile;
|
|
212
212
|
}
|
|
213
213
|
|
|
214
|
+
private readonly profile: string;
|
|
215
|
+
|
|
214
216
|
private label(name: string): string {
|
|
215
|
-
|
|
217
|
+
const sanitized = sanitizeName(name);
|
|
218
|
+
// Совместимость: до 1.5.6 plist не-default профилей назывался без scope.
|
|
219
|
+
// Используем старое имя, только если plist реально принадлежит этому
|
|
220
|
+
// профилю (в его команде есть директория профиля), иначе можно удалить
|
|
221
|
+
// одноимённый plist активного профиля.
|
|
222
|
+
if (this.profile !== "default") {
|
|
223
|
+
const legacy = launchdLabel(sanitized, "default");
|
|
224
|
+
const legacyPath = path.join(LAUNCH_AGENTS_DIR, `${legacy}.plist`);
|
|
225
|
+
try {
|
|
226
|
+
const text = fsSync.readFileSync(legacyPath, "utf8");
|
|
227
|
+
if (text.includes(getProfileDir(this.profile))) return legacy;
|
|
228
|
+
} catch {
|
|
229
|
+
// Старого plist нет — используем профильное имя.
|
|
230
|
+
}
|
|
231
|
+
}
|
|
232
|
+
return launchdLabel(sanitized, this.profile);
|
|
216
233
|
}
|
|
217
234
|
|
|
218
235
|
private plistPath(name: string): string {
|
|
@@ -21,8 +21,8 @@ export abstract class PosixSchedulerBase implements SchedulerBackend {
|
|
|
21
21
|
|
|
22
22
|
protected readonly registry: TaskRegistry;
|
|
23
23
|
|
|
24
|
-
constructor(backendId: string) {
|
|
25
|
-
this.registry = new TaskRegistry(backendId);
|
|
24
|
+
constructor(backendId: string, profile?: string) {
|
|
25
|
+
this.registry = new TaskRegistry(backendId, profile);
|
|
26
26
|
}
|
|
27
27
|
|
|
28
28
|
/** Регистрирует запись в планировщике ОС (crontab-строка или plist). */
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import fs from "node:fs/promises";
|
|
2
2
|
import path from "node:path";
|
|
3
|
-
import {
|
|
3
|
+
import { getProfileDir, getProfileName } from "../../profiles.js";
|
|
4
4
|
import type { TriggerType } from "./types.js";
|
|
5
5
|
|
|
6
6
|
/**
|
|
@@ -29,12 +29,14 @@ export interface RegistryEntry {
|
|
|
29
29
|
priority?: number;
|
|
30
30
|
}
|
|
31
31
|
|
|
32
|
-
/** Реестр задач конкретного бэкенда:
|
|
32
|
+
/** Реестр задач конкретного бэкенда: <pluginDir>/scheduler-<backend>.json. */
|
|
33
33
|
export class TaskRegistry {
|
|
34
34
|
private readonly file: string;
|
|
35
|
+
private readonly dir: string;
|
|
35
36
|
|
|
36
|
-
constructor(backendId: string) {
|
|
37
|
-
this.
|
|
37
|
+
constructor(backendId: string, profile: string = getProfileName()) {
|
|
38
|
+
this.dir = getProfileDir(profile);
|
|
39
|
+
this.file = path.join(this.dir, `scheduler-${backendId}.json`);
|
|
38
40
|
}
|
|
39
41
|
|
|
40
42
|
/** Путь к файлу реестра (для диагностики). */
|
|
@@ -57,7 +59,7 @@ export class TaskRegistry {
|
|
|
57
59
|
}
|
|
58
60
|
|
|
59
61
|
async save(entries: RegistryEntry[]): Promise<void> {
|
|
60
|
-
await fs.mkdir(
|
|
62
|
+
await fs.mkdir(this.dir, { recursive: true });
|
|
61
63
|
const tmp = `${this.file}.tmp`;
|
|
62
64
|
await fs.writeFile(tmp, JSON.stringify(entries, null, 2), "utf8");
|
|
63
65
|
await fs.rename(tmp, this.file);
|