agent-steward 0.0.4 → 0.0.6
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 +309 -2
- package/CROSS_PLATFORM.md +19 -0
- package/README.md +55 -8
- package/ROADMAP-STRATEGY.md +22 -19
- package/ROADMAP.md +230 -159
- package/dist/cli.d.ts +3 -0
- package/dist/cli.d.ts.map +1 -0
- package/dist/cli.js +356 -0
- package/dist/core/analytics.d.ts +6 -0
- package/dist/core/analytics.d.ts.map +1 -1
- package/dist/core/analytics.js +20 -3
- package/dist/core/audit.d.ts +6 -0
- package/dist/core/audit.d.ts.map +1 -1
- package/dist/core/audit.js +24 -0
- package/dist/core/budget.d.ts +118 -0
- package/dist/core/budget.d.ts.map +1 -0
- package/dist/core/budget.js +206 -0
- package/dist/core/cron-to-schtasks.d.ts.map +1 -1
- package/dist/core/cron-to-schtasks.js +38 -0
- package/dist/core/dry-run.d.ts +26 -1
- package/dist/core/dry-run.d.ts.map +1 -1
- package/dist/core/dry-run.js +199 -8
- package/dist/core/execution.d.ts +203 -0
- package/dist/core/execution.d.ts.map +1 -0
- package/dist/core/execution.js +309 -0
- package/dist/core/feedback.d.ts +192 -0
- package/dist/core/feedback.d.ts.map +1 -0
- package/dist/core/feedback.js +426 -0
- package/dist/core/gate-integrity.d.ts +71 -0
- package/dist/core/gate-integrity.d.ts.map +1 -0
- package/dist/core/gate-integrity.js +275 -0
- package/dist/core/git-trigger.d.ts.map +1 -1
- package/dist/core/git-trigger.js +14 -2
- package/dist/core/guard-run.d.ts +4 -0
- package/dist/core/guard-run.d.ts.map +1 -0
- package/dist/core/guard-run.js +101 -0
- package/dist/core/guard.d.ts +52 -0
- package/dist/core/guard.d.ts.map +1 -0
- package/dist/core/guard.js +362 -0
- package/dist/core/local-ai.d.ts.map +1 -1
- package/dist/core/local-ai.js +7 -3
- package/dist/core/lock.d.ts +41 -0
- package/dist/core/lock.d.ts.map +1 -1
- package/dist/core/lock.js +141 -29
- package/dist/core/matrix.d.ts +8 -0
- package/dist/core/matrix.d.ts.map +1 -1
- package/dist/core/matrix.js +132 -17
- package/dist/core/mission.d.ts +103 -0
- package/dist/core/mission.d.ts.map +1 -0
- package/dist/core/mission.js +374 -0
- package/dist/core/opencode-models.d.ts +2 -2
- package/dist/core/opencode-models.d.ts.map +1 -1
- package/dist/core/opencode-models.js +28 -21
- package/dist/core/opencode-usage.d.ts +35 -0
- package/dist/core/opencode-usage.d.ts.map +1 -0
- package/dist/core/opencode-usage.js +132 -0
- package/dist/core/pipeline-apply.d.ts +38 -0
- package/dist/core/pipeline-apply.d.ts.map +1 -0
- package/dist/core/pipeline-apply.js +117 -0
- package/dist/core/pipeline-io.d.ts +13 -0
- package/dist/core/pipeline-io.d.ts.map +1 -0
- package/dist/core/pipeline-io.js +78 -0
- package/dist/core/pipeline-map.d.ts +52 -0
- package/dist/core/pipeline-map.d.ts.map +1 -0
- package/dist/core/pipeline-map.js +208 -0
- package/dist/core/pipeline-spec.d.ts +109 -0
- package/dist/core/pipeline-spec.d.ts.map +1 -0
- package/dist/core/pipeline-spec.js +554 -0
- package/dist/core/ps-wrapper.d.ts +27 -2
- package/dist/core/ps-wrapper.d.ts.map +1 -1
- package/dist/core/ps-wrapper.js +424 -65
- package/dist/core/record-history.d.ts.map +1 -1
- package/dist/core/record-history.js +206 -33
- package/dist/core/router/rules.d.ts.map +1 -1
- package/dist/core/router/rules.js +6 -0
- package/dist/core/run-mode.d.ts +12 -0
- package/dist/core/run-mode.d.ts.map +1 -0
- package/dist/core/run-mode.js +17 -0
- package/dist/core/scheduler/linux.d.ts +8 -1
- package/dist/core/scheduler/linux.d.ts.map +1 -1
- package/dist/core/scheduler/linux.js +34 -9
- package/dist/core/scheduler/logs.d.ts +4 -0
- package/dist/core/scheduler/logs.d.ts.map +1 -1
- package/dist/core/scheduler/logs.js +25 -1
- package/dist/core/scheduler/mac.d.ts +44 -2
- package/dist/core/scheduler/mac.d.ts.map +1 -1
- package/dist/core/scheduler/mac.js +126 -15
- package/dist/core/scheduler/windows.d.ts.map +1 -1
- package/dist/core/scheduler/windows.js +15 -12
- package/dist/core/secrets.d.ts.map +1 -1
- package/dist/core/secrets.js +18 -8
- package/dist/core/self-analysis.d.ts +32 -2
- package/dist/core/self-analysis.d.ts.map +1 -1
- package/dist/core/self-analysis.js +38 -27
- package/dist/core/shutdown.d.ts +33 -2
- package/dist/core/shutdown.d.ts.map +1 -1
- package/dist/core/shutdown.js +58 -2
- package/dist/core/structured-log.d.ts +37 -1
- package/dist/core/structured-log.d.ts.map +1 -1
- package/dist/core/structured-log.js +37 -0
- package/dist/core/usage-surface.d.ts +25 -0
- package/dist/core/usage-surface.d.ts.map +1 -0
- package/dist/core/usage-surface.js +41 -0
- package/dist/core/worktree-run.d.ts +4 -0
- package/dist/core/worktree-run.d.ts.map +1 -0
- package/dist/core/worktree-run.js +164 -0
- package/dist/core/worktree.d.ts +115 -0
- package/dist/core/worktree.d.ts.map +1 -0
- package/dist/core/worktree.js +462 -0
- package/dist/core/wrappers/bash.d.ts +19 -0
- package/dist/core/wrappers/bash.d.ts.map +1 -1
- package/dist/core/wrappers/bash.js +230 -27
- package/dist/db/capability-repo.d.ts +43 -2
- package/dist/db/capability-repo.d.ts.map +1 -1
- package/dist/db/capability-repo.js +96 -11
- package/dist/db/history-repo.d.ts +70 -5
- package/dist/db/history-repo.d.ts.map +1 -1
- package/dist/db/history-repo.js +170 -29
- package/dist/db/metrics-repo.d.ts +20 -2
- package/dist/db/metrics-repo.d.ts.map +1 -1
- package/dist/db/metrics-repo.js +35 -13
- package/dist/db/migrate.d.ts.map +1 -1
- package/dist/db/migrate.js +37 -17
- package/dist/db/recovery.d.ts +3 -1
- package/dist/db/recovery.d.ts.map +1 -1
- package/dist/db/recovery.js +11 -5
- package/dist/db/run-journal.d.ts +33 -5
- package/dist/db/run-journal.d.ts.map +1 -1
- package/dist/db/run-journal.js +78 -14
- package/dist/db/run-resume.d.ts +5 -0
- package/dist/db/run-resume.d.ts.map +1 -1
- package/dist/db/run-resume.js +9 -2
- package/dist/db/runs-repo.d.ts +19 -2
- package/dist/db/runs-repo.d.ts.map +1 -1
- package/dist/db/runs-repo.js +91 -60
- package/dist/db/schema.d.ts +2 -2
- package/dist/db/schema.d.ts.map +1 -1
- package/dist/db/schema.js +132 -2
- package/dist/db/templates-repo.d.ts +2 -2
- package/dist/db/templates-repo.d.ts.map +1 -1
- package/dist/db/templates-repo.js +5 -3
- package/dist/history.d.ts +7 -2
- package/dist/history.d.ts.map +1 -1
- package/dist/history.js +4 -2
- package/dist/hook-output.d.ts +2 -0
- package/dist/hook-output.d.ts.map +1 -0
- package/dist/hook-output.js +31 -0
- package/dist/i18n.d.ts +5 -0
- package/dist/i18n.d.ts.map +1 -1
- package/dist/i18n.js +11 -4
- package/dist/index.d.ts +375 -47
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +1344 -192
- package/dist/notifications.d.ts +53 -2
- package/dist/notifications.d.ts.map +1 -1
- package/dist/notifications.js +168 -21
- package/dist/profiles.d.ts.map +1 -1
- package/dist/profiles.js +82 -10
- package/dist/rpc.d.ts +354 -0
- package/dist/rpc.d.ts.map +1 -1
- package/dist/rpc.js +145 -0
- package/dist/server.d.ts +32 -2
- package/dist/server.d.ts.map +1 -1
- package/dist/server.js +154 -30
- package/dist/settings.d.ts +44 -2
- package/dist/settings.d.ts.map +1 -1
- package/dist/settings.js +85 -3
- package/dist/shared/jobs-view.d.ts +1 -1
- package/dist/shared/jobs-view.d.ts.map +1 -1
- package/dist/shared/jobs-view.js +2 -0
- package/dist/task-transfer.d.ts +21 -0
- package/dist/task-transfer.d.ts.map +1 -1
- package/dist/task-transfer.js +64 -3
- package/dist/templates.d.ts +2 -2
- package/dist/templates.d.ts.map +1 -1
- package/dist/templates.js +3 -3
- package/dist/types.d.ts +22 -2
- package/dist/types.d.ts.map +1 -1
- package/dist/workspaces.d.ts.map +1 -1
- package/dist/workspaces.js +34 -11
- package/docs/ARCHITECTURE.md +319 -66
- package/docs/COMPATIBILITY.md +2 -2
- package/docs/CONCEPT.md +18 -4
- package/docs/CROSS_PLATFORM.ru.md +20 -0
- package/docs/CROSS_PLATFORM.zh.md +18 -0
- package/docs/EXECUTION-LOOP.md +28 -10
- package/docs/FEATURES.md +129 -7
- package/docs/FEATURES.zh.md +97 -6
- package/docs/MIGRATION.md +2 -2
- package/docs/PIPELINE.md +293 -0
- package/docs/QA-A2-GUI-TUI.md +205 -0
- package/docs/README.ru.md +43 -4
- package/docs/README.zh.md +44 -4
- package/docs/SAFETY.md +23 -3
- package/gui-experimental.cjs +9 -8
- package/locales/en.json +58 -3
- package/locales/ru.json +58 -3
- package/locales/zh.json +58 -3
- package/opencode.pipeline.yaml +35 -0
- package/package.json +36 -4
- package/scripts/check-eslint-baseline.mjs +139 -0
- package/scripts/gen-test-plan-counters.mjs +117 -0
- package/scripts/github-ci-fetch.ps1 +37 -0
- package/scripts/pl-commit.ps1 +112 -0
- package/scripts/qa-a2-commit.ps1 +104 -0
- package/scripts/test-home.mjs +107 -0
- package/skills/scheduled-job-best-practices/SKILL.md +95 -1
- package/skills/scheduled-job-best-practices/references/recipes.md +139 -0
- package/src/cli.ts +417 -0
- package/src/core/analytics.ts +27 -4
- package/src/core/audit.ts +25 -0
- package/src/core/budget.ts +340 -0
- package/src/core/cron-to-schtasks.ts +42 -0
- package/src/core/dry-run.ts +235 -12
- package/src/core/execution.ts +538 -0
- package/src/core/feedback.ts +582 -0
- package/src/core/file-watcher.ts +2 -2
- package/src/core/gate-integrity.ts +330 -0
- package/src/core/git-trigger.ts +18 -5
- package/src/core/guard-run.ts +119 -0
- package/src/core/guard.ts +431 -0
- package/src/core/local-ai.ts +7 -3
- package/src/core/lock.ts +178 -37
- package/src/core/matrix.ts +158 -52
- package/src/core/mission.ts +531 -0
- package/src/core/native-notify.ts +1 -1
- package/src/core/opencode-models.ts +30 -21
- package/src/core/opencode-usage.ts +182 -0
- package/src/core/pipeline-apply.ts +158 -0
- package/src/core/pipeline-io.ts +96 -0
- package/src/core/pipeline-map.ts +283 -0
- package/src/core/pipeline-spec.ts +775 -0
- package/src/core/ps-wrapper.ts +435 -66
- package/src/core/record-history.ts +258 -81
- package/src/core/router/rules.ts +6 -0
- package/src/core/run-mode.ts +19 -0
- package/src/core/schedule-gate.ts +1 -1
- package/src/core/scheduler/at-fallback.ts +1 -1
- package/src/core/scheduler/linux.ts +40 -11
- package/src/core/scheduler/logs.ts +34 -3
- package/src/core/scheduler/mac.ts +174 -14
- package/src/core/scheduler/registry.ts +2 -2
- package/src/core/scheduler/windows.ts +19 -15
- package/src/core/secrets.ts +26 -19
- package/src/core/self-analysis.ts +75 -29
- package/src/core/shutdown.ts +90 -4
- package/src/core/structured-log.ts +89 -5
- package/src/core/telegram.ts +2 -2
- package/src/core/triage-worker.ts +7 -7
- package/src/core/triage.ts +2 -2
- package/src/core/usage-surface.ts +70 -0
- package/src/core/worktree-run.ts +199 -0
- package/src/core/worktree.ts +600 -0
- package/src/core/wrappers/bash.ts +248 -26
- package/src/db/capability-repo.ts +127 -10
- package/src/db/history-repo.ts +281 -40
- package/src/db/metrics-repo.ts +40 -13
- package/src/db/migrate.ts +57 -32
- package/src/db/recovery.ts +12 -5
- package/src/db/run-journal.ts +100 -13
- package/src/db/run-resume.ts +17 -1
- package/src/db/runs-repo.ts +147 -65
- package/src/db/schema.ts +134 -2
- package/src/db/templates-repo.ts +5 -3
- package/src/gui.tsx +438 -18
- package/src/history.ts +11 -4
- package/src/hook-output.ts +39 -0
- package/src/i18n.ts +12 -4
- package/src/index.ts +1902 -320
- package/src/notifications.ts +227 -47
- package/src/profiles.ts +88 -10
- package/src/rpc.ts +158 -0
- package/src/server.ts +201 -41
- package/src/settings.ts +125 -5
- package/src/shared/jobs-view.ts +3 -1
- package/src/task-transfer.ts +90 -6
- package/src/templates.ts +3 -3
- package/src/types.ts +23 -2
- package/src/workspaces.ts +37 -14
|
@@ -0,0 +1,374 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* AB-8: ad-hoc миссия (`run_mission`) — полоса B execution model.
|
|
3
|
+
*
|
|
4
|
+
* Миссия проходит тот же путь, что и зарегистрированная задача:
|
|
5
|
+
* `createRun → план → маршрут → исполнение → GATE → ledger`. Отличие только
|
|
6
|
+
* в источнике входа: задача не создаётся и не регистрируется в планировщике
|
|
7
|
+
* ОС. Исполнение идёт через обёртку (lock, таймаут, политика прав, Quality
|
|
8
|
+
* Gate, запись истории), но без `schtasks`/`crontab`/`launchd`.
|
|
9
|
+
*/
|
|
10
|
+
import { spawn } from "node:child_process";
|
|
11
|
+
import crypto from "node:crypto";
|
|
12
|
+
import fs from "node:fs/promises";
|
|
13
|
+
import { createRequire } from "node:module";
|
|
14
|
+
import path from "node:path";
|
|
15
|
+
import { LOG_DIR, sanitizeName } from "../types.js";
|
|
16
|
+
import { buildExecutionPlan, createAdHocRunContext, describeExecutionPlan, executeExecutionPlan, } from "./execution.js";
|
|
17
|
+
import { buildOpencodeConfig } from "./permissions.js";
|
|
18
|
+
import { ensureWrapper, lockFilePath, writePromptFile, writeWrapperCmd, } from "./ps-wrapper.js";
|
|
19
|
+
import { generateSessionId, normalizeSessionMode, sessionStatePath, writeSessionStateFile, } from "./session.js";
|
|
20
|
+
import { writeBashWrapper } from "./wrappers/bash.js";
|
|
21
|
+
/**
|
|
22
|
+
* Маркер начала прогона в логе задачи/миссии.
|
|
23
|
+
*
|
|
24
|
+
* Лог НЕ очищается перед запуском: при падении до первого вывода обёртки он
|
|
25
|
+
* остался бы пустым и диагностировать причину было бы невозможно. Маркер
|
|
26
|
+
* разделяет прогоны в общем файле и подтверждает, что запуск действительно
|
|
27
|
+
* дошёл до подготовки обёртки.
|
|
28
|
+
*/
|
|
29
|
+
export function formatLogRunMarker(kind, taskName, now = new Date()) {
|
|
30
|
+
// "prepare" — задача только что создана/подготовлена, но ещё НЕ запускалась.
|
|
31
|
+
// ВАЖНО: не называть этот маркер "Run started", иначе в логе задачи
|
|
32
|
+
// появляется ложная запись о запуске при create/update/dry-run, хотя
|
|
33
|
+
// реального прогона не было (finding QA #8).
|
|
34
|
+
if (kind === "prepare") {
|
|
35
|
+
return `[agent-steward] === Task prepared ${now.toISOString()} (${taskName}) ===\n`;
|
|
36
|
+
}
|
|
37
|
+
const label = kind === "run" ? "Run" : "Mission";
|
|
38
|
+
return `[agent-steward] === ${label} started ${now.toISOString()} (${taskName}) ===\n`;
|
|
39
|
+
}
|
|
40
|
+
/**
|
|
41
|
+
* Возвращает часть лога, относящуюся только к последнему запуску.
|
|
42
|
+
*
|
|
43
|
+
* Лог намеренно дописывается, а не очищается (иначе при падении до первого
|
|
44
|
+
* вывода обёртки диагностировать причину было бы невозможно). Маркеры
|
|
45
|
+
* `Run started`/`Mission started` разделяют прогоны: потребителям лога
|
|
46
|
+
* нужно показывать и разбирать только последний сегмент. `Task prepared`
|
|
47
|
+
* маркером запуска НЕ считается — он пишется при создании/редактировании
|
|
48
|
+
* задачи, когда реального прогона ещё не было.
|
|
49
|
+
*/
|
|
50
|
+
export function extractLastRunLog(content) {
|
|
51
|
+
const lines = content.replace(/^\uFEFF/, "").split(/\r?\n/);
|
|
52
|
+
let start = 0;
|
|
53
|
+
for (let i = 0; i < lines.length; i += 1) {
|
|
54
|
+
if (/^\[agent-steward\] === (Run|Mission) started /.test(lines[i])) {
|
|
55
|
+
start = i;
|
|
56
|
+
}
|
|
57
|
+
}
|
|
58
|
+
return lines.slice(start).join("\n");
|
|
59
|
+
}
|
|
60
|
+
const DEFAULT_TIMEOUT_SECONDS = 3600;
|
|
61
|
+
const MAX_TIMEOUT_SECONDS = 24 * 60 * 60;
|
|
62
|
+
/** Активные ad-hoc миссии по workspace — защита от двух миссий в одном репо. */
|
|
63
|
+
const activeWorkspaces = new Map();
|
|
64
|
+
const requireFromCore = createRequire(import.meta.url);
|
|
65
|
+
/** Путь к скомпилированному record-history.js (как в index.ts). */
|
|
66
|
+
function recorderPath() {
|
|
67
|
+
const resolved = requireFromCore.resolve("./record-history.js");
|
|
68
|
+
if (!resolved.endsWith(".ts"))
|
|
69
|
+
return resolved;
|
|
70
|
+
return resolved
|
|
71
|
+
.replace(/([\\/])src([\\/])/, "$1dist$2")
|
|
72
|
+
.replace(/\.ts$/, ".js");
|
|
73
|
+
}
|
|
74
|
+
function assertNonEmpty(value, label) {
|
|
75
|
+
if (typeof value !== "string" || value.trim() === "") {
|
|
76
|
+
throw new Error(`Пустое поле миссии: ${label}.`);
|
|
77
|
+
}
|
|
78
|
+
return value.trim();
|
|
79
|
+
}
|
|
80
|
+
function positiveInt(value, label, fallback) {
|
|
81
|
+
if (value === undefined || value === null)
|
|
82
|
+
return fallback;
|
|
83
|
+
if (typeof value !== "number" || !Number.isInteger(value) || value <= 0) {
|
|
84
|
+
throw new Error(`Поле миссии "${label}" должно быть целым положительным числом.`);
|
|
85
|
+
}
|
|
86
|
+
return Math.min(value, MAX_TIMEOUT_SECONDS);
|
|
87
|
+
}
|
|
88
|
+
function normalizeTools(value, label) {
|
|
89
|
+
if (value === undefined)
|
|
90
|
+
return undefined;
|
|
91
|
+
if (!Array.isArray(value)) {
|
|
92
|
+
throw new Error(`Поле миссии "${label}" должно быть массивом строк.`);
|
|
93
|
+
}
|
|
94
|
+
const list = value
|
|
95
|
+
.filter((item) => typeof item === "string")
|
|
96
|
+
.map((item) => item.trim())
|
|
97
|
+
.filter(Boolean);
|
|
98
|
+
return list.length > 0 ? list : undefined;
|
|
99
|
+
}
|
|
100
|
+
function newMissionName() {
|
|
101
|
+
const stamp = Date.now().toString(36);
|
|
102
|
+
const random = crypto.randomBytes(4).toString("hex");
|
|
103
|
+
return `ad-hoc-${stamp}-${random}`;
|
|
104
|
+
}
|
|
105
|
+
/**
|
|
106
|
+
* AB-8.1: валидирует и нормализует вход. Возвращает безопасную копию спеки,
|
|
107
|
+
* чтобы CLI/RPC/GUI не могли передать нестроковые поля в обёртку.
|
|
108
|
+
*/
|
|
109
|
+
export function normalizeMissionSpec(input) {
|
|
110
|
+
if (!input || typeof input !== "object") {
|
|
111
|
+
throw new Error("Спецификация миссии должна быть объектом.");
|
|
112
|
+
}
|
|
113
|
+
const prompt = assertNonEmpty(input.prompt, "prompt");
|
|
114
|
+
const cwd = input.cwd?.trim() ? path.resolve(input.cwd.trim()) : process.cwd();
|
|
115
|
+
const taskName = input.taskName?.trim() ? input.taskName.trim() : undefined;
|
|
116
|
+
if (taskName && taskName.length > 200) {
|
|
117
|
+
throw new Error("Имя миссии длиннее 200 символов.");
|
|
118
|
+
}
|
|
119
|
+
const session = normalizeSessionMode(input.session);
|
|
120
|
+
if (!session) {
|
|
121
|
+
throw new Error('Поле "session" должно быть new, reuse или last.');
|
|
122
|
+
}
|
|
123
|
+
if (session === "reuse" && input.sessionId !== undefined && !/^ses_[A-Za-z0-9]{10,64}$/.test(input.sessionId)) {
|
|
124
|
+
throw new Error('Поле "sessionId" должно иметь формат ses_<id>.');
|
|
125
|
+
}
|
|
126
|
+
const policy = input.policy ?? "hybrid";
|
|
127
|
+
if (policy !== "hybrid" && policy !== "secure" && policy !== "legacy") {
|
|
128
|
+
throw new Error('Поле "policy" должно быть hybrid, secure или legacy.');
|
|
129
|
+
}
|
|
130
|
+
const allowedTools = normalizeTools(input.allowedTools, "allowedTools");
|
|
131
|
+
const deniedTools = normalizeTools(input.deniedTools, "deniedTools");
|
|
132
|
+
const denied = new Set((deniedTools ?? []).map((tool) => tool.toLowerCase()));
|
|
133
|
+
const conflict = (allowedTools ?? []).find((tool) => denied.has(tool.toLowerCase()));
|
|
134
|
+
if (conflict) {
|
|
135
|
+
throw new Error(`Инструмент "${conflict}" одновременно разрешён и запрещён.`);
|
|
136
|
+
}
|
|
137
|
+
return {
|
|
138
|
+
prompt,
|
|
139
|
+
cwd,
|
|
140
|
+
taskName,
|
|
141
|
+
taskType: input.taskType?.trim() || undefined,
|
|
142
|
+
model: input.model?.trim() || undefined,
|
|
143
|
+
session,
|
|
144
|
+
sessionId: input.sessionId?.trim() || undefined,
|
|
145
|
+
timeoutSeconds: positiveInt(input.timeoutSeconds, "timeoutSeconds", DEFAULT_TIMEOUT_SECONDS),
|
|
146
|
+
gate: input.gate?.trim() || undefined,
|
|
147
|
+
gateTimeoutSeconds: input.gateTimeoutSeconds === undefined
|
|
148
|
+
? undefined
|
|
149
|
+
: positiveInt(input.gateTimeoutSeconds, "gateTimeoutSeconds", 300),
|
|
150
|
+
policy,
|
|
151
|
+
allowedTools,
|
|
152
|
+
deniedTools,
|
|
153
|
+
dryRun: input.dryRun === true,
|
|
154
|
+
};
|
|
155
|
+
}
|
|
156
|
+
/** Создаёт RunContext ad-hoc миссии (без task definition). */
|
|
157
|
+
export function createMissionContext(spec) {
|
|
158
|
+
return createAdHocRunContext(spec.prompt, {
|
|
159
|
+
cwd: spec.cwd,
|
|
160
|
+
taskName: spec.taskName,
|
|
161
|
+
taskType: spec.taskType ?? "mission",
|
|
162
|
+
policy: spec.policy ?? "hybrid",
|
|
163
|
+
profile: {
|
|
164
|
+
model: spec.model,
|
|
165
|
+
session: spec.session ?? "new",
|
|
166
|
+
sessionId: spec.sessionId,
|
|
167
|
+
},
|
|
168
|
+
safety: {
|
|
169
|
+
policy: spec.policy ?? "hybrid",
|
|
170
|
+
allowedTools: spec.allowedTools,
|
|
171
|
+
deniedTools: spec.deniedTools,
|
|
172
|
+
},
|
|
173
|
+
metadata: {
|
|
174
|
+
mission: true,
|
|
175
|
+
gate: spec.gate ?? null,
|
|
176
|
+
timeoutSeconds: spec.timeoutSeconds ?? DEFAULT_TIMEOUT_SECONDS,
|
|
177
|
+
},
|
|
178
|
+
});
|
|
179
|
+
}
|
|
180
|
+
/** Готовит обёртку с lock/таймаутом/политикой/Quality Gate, но без ОС. */
|
|
181
|
+
async function prepareWrapper(spec, context, taskName) {
|
|
182
|
+
const sanitized = sanitizeName(taskName);
|
|
183
|
+
const logFile = path.join(LOG_DIR, `${sanitized}.log`);
|
|
184
|
+
const promptFile = await writePromptFile(taskName, spec.prompt);
|
|
185
|
+
await fs.mkdir(LOG_DIR, { recursive: true });
|
|
186
|
+
try {
|
|
187
|
+
// Не очищаем лог: при раннем падении до вывода обёртки он остался бы пустым.
|
|
188
|
+
// Дописываем маркер начала прогона — он же разделяет запуски в общем файле.
|
|
189
|
+
await fs.appendFile(logFile, formatLogRunMarker("mission", taskName), "utf8");
|
|
190
|
+
}
|
|
191
|
+
catch (error) {
|
|
192
|
+
// Обёртки пишут лог через >> и создают файл сами: маркер нужен только для
|
|
193
|
+
// диагностики. Не срываем миссию из-за прав доступа к каталогу логов.
|
|
194
|
+
console.warn(`[agent-steward] Не удалось записать маркер в лог миссии (${logFile}): ${error instanceof Error ? error.message : String(error)}`);
|
|
195
|
+
}
|
|
196
|
+
const lockFile = lockFilePath(taskName);
|
|
197
|
+
const sessionMode = spec.session ?? "new";
|
|
198
|
+
let sessionId = spec.sessionId;
|
|
199
|
+
if (sessionMode === "reuse" && !sessionId) {
|
|
200
|
+
sessionId = generateSessionId();
|
|
201
|
+
}
|
|
202
|
+
if (sessionMode === "reuse") {
|
|
203
|
+
await writeSessionStateFile(taskName, sessionId);
|
|
204
|
+
}
|
|
205
|
+
const sessionFile = sessionMode === "reuse" ? sessionStatePath(taskName) : undefined;
|
|
206
|
+
const timeoutSeconds = spec.timeoutSeconds ?? DEFAULT_TIMEOUT_SECONDS;
|
|
207
|
+
if (process.platform === "win32") {
|
|
208
|
+
const permissionsConfig = buildOpencodeConfig({
|
|
209
|
+
policy: context.safety.policy,
|
|
210
|
+
allowedTools: spec.allowedTools,
|
|
211
|
+
deniedTools: spec.deniedTools,
|
|
212
|
+
});
|
|
213
|
+
await ensureWrapper();
|
|
214
|
+
const wrapperPath = await writeWrapperCmd(sanitized, taskName, promptFile, timeoutSeconds, lockFile, context.cwd, logFile, recorderPath(), spec.gate, spec.model, undefined, undefined, undefined, spec.allowedTools, spec.deniedTools, undefined, undefined, sessionMode, sessionId, spec.gateTimeoutSeconds, permissionsConfig, { policy: context.safety.policy, legacyShell: false }, sessionFile);
|
|
215
|
+
return { wrapperPath, logFile };
|
|
216
|
+
}
|
|
217
|
+
const wrapperPath = await writeBashWrapper({
|
|
218
|
+
sanitizedName: sanitized,
|
|
219
|
+
taskName,
|
|
220
|
+
promptFile,
|
|
221
|
+
timeoutSeconds,
|
|
222
|
+
lockFile,
|
|
223
|
+
workdir: context.cwd,
|
|
224
|
+
logFile,
|
|
225
|
+
recorderFile: recorderPath(),
|
|
226
|
+
qualityGate: spec.gate,
|
|
227
|
+
model: spec.model,
|
|
228
|
+
policy: context.safety.policy,
|
|
229
|
+
allowedTools: spec.allowedTools,
|
|
230
|
+
deniedTools: spec.deniedTools,
|
|
231
|
+
sessionMode,
|
|
232
|
+
sessionId,
|
|
233
|
+
sessionFile,
|
|
234
|
+
gateTimeoutSeconds: spec.gateTimeoutSeconds,
|
|
235
|
+
});
|
|
236
|
+
return { wrapperPath, logFile };
|
|
237
|
+
}
|
|
238
|
+
/** Прямой запуск обёртки: ОС-задача не создаётся, процесс ждём здесь. */
|
|
239
|
+
async function runWrapperProcess(wrapperPath, cwd, timeoutSeconds) {
|
|
240
|
+
const timeoutMs = (timeoutSeconds + 120) * 1000;
|
|
241
|
+
return new Promise((resolve) => {
|
|
242
|
+
const child = process.platform === "win32"
|
|
243
|
+
? spawn(process.env.ComSpec ?? "cmd.exe", ["/d", "/s", "/c", `"${wrapperPath}"`], {
|
|
244
|
+
cwd,
|
|
245
|
+
windowsHide: true,
|
|
246
|
+
env: process.env,
|
|
247
|
+
})
|
|
248
|
+
: spawn("bash", [wrapperPath], {
|
|
249
|
+
cwd,
|
|
250
|
+
windowsHide: true,
|
|
251
|
+
env: process.env,
|
|
252
|
+
});
|
|
253
|
+
let stdout = "";
|
|
254
|
+
let stderr = "";
|
|
255
|
+
let settled = false;
|
|
256
|
+
const append = (target, chunk) => {
|
|
257
|
+
const text = chunk.toString("utf8");
|
|
258
|
+
if (target === "out")
|
|
259
|
+
stdout = (stdout + text).slice(-200000);
|
|
260
|
+
else
|
|
261
|
+
stderr = (stderr + text).slice(-200000);
|
|
262
|
+
};
|
|
263
|
+
child.stdout?.on("data", (chunk) => append("out", chunk));
|
|
264
|
+
child.stderr?.on("data", (chunk) => append("err", chunk));
|
|
265
|
+
const timer = setTimeout(() => {
|
|
266
|
+
if (settled)
|
|
267
|
+
return;
|
|
268
|
+
settled = true;
|
|
269
|
+
child.kill("SIGKILL");
|
|
270
|
+
resolve({
|
|
271
|
+
output: stdout,
|
|
272
|
+
error: `Миссия превысила внешний таймаут ${timeoutSeconds + 120} с.`,
|
|
273
|
+
});
|
|
274
|
+
}, timeoutMs);
|
|
275
|
+
timer.unref?.();
|
|
276
|
+
const finish = (error) => {
|
|
277
|
+
if (settled)
|
|
278
|
+
return;
|
|
279
|
+
settled = true;
|
|
280
|
+
clearTimeout(timer);
|
|
281
|
+
resolve({ output: [stdout.trim(), stderr.trim()].filter(Boolean).join("\n"), error });
|
|
282
|
+
};
|
|
283
|
+
child.on("error", (error) => finish(error.message));
|
|
284
|
+
child.on("close", (code, signal) => {
|
|
285
|
+
if (code === 0) {
|
|
286
|
+
finish(null);
|
|
287
|
+
return;
|
|
288
|
+
}
|
|
289
|
+
finish(`Обёртка миссии завершилась с кодом ${code ?? "null"}${signal ? ` (сигнал ${signal})` : ""}.`);
|
|
290
|
+
});
|
|
291
|
+
});
|
|
292
|
+
}
|
|
293
|
+
function createWrapperExecutor(wrapperPath, spec) {
|
|
294
|
+
return {
|
|
295
|
+
id: "mission-wrapper",
|
|
296
|
+
supports: (route) => route.executor !== null,
|
|
297
|
+
async execute() {
|
|
298
|
+
const { output, error } = await runWrapperProcess(wrapperPath, spec.cwd ?? process.cwd(), spec.timeoutSeconds ?? DEFAULT_TIMEOUT_SECONDS);
|
|
299
|
+
return error ? { output, error } : { output };
|
|
300
|
+
},
|
|
301
|
+
};
|
|
302
|
+
}
|
|
303
|
+
/**
|
|
304
|
+
* AB-8: единая точка входа ad-hoc миссии для CLI, RPC и GUI.
|
|
305
|
+
*
|
|
306
|
+
* Инварианты EXECUTION-LOOP §2.1: нет записи в планировщике ОС, работают
|
|
307
|
+
* GATE, политика прав, ledger (`runs`/`run_steps`) и аудит; параллельные
|
|
308
|
+
* обычные миссии в одном workspace не допускаются.
|
|
309
|
+
*
|
|
310
|
+
* W-3 (контракт dryRun): `dryRun: true` строит план и описание, но не захватывает
|
|
311
|
+
* `activeWorkspaces` и не пишет ledger (`runs`/`run_steps`) — это контракт, а не
|
|
312
|
+
* утечка контекста. Поэтому несколько dry-run в одном `cwd` проходят параллельно.
|
|
313
|
+
*/
|
|
314
|
+
export async function runMission(input, dependencies = {}) {
|
|
315
|
+
const spec = normalizeMissionSpec(input);
|
|
316
|
+
const taskName = spec.taskName ?? newMissionName();
|
|
317
|
+
spec.taskName = taskName;
|
|
318
|
+
const context = createMissionContext(spec);
|
|
319
|
+
const plan = await buildExecutionPlan(context);
|
|
320
|
+
const description = describeExecutionPlan(plan);
|
|
321
|
+
if (spec.dryRun) {
|
|
322
|
+
dependencies.onPrepared?.({ taskName, cwd: context.cwd });
|
|
323
|
+
return {
|
|
324
|
+
success: true,
|
|
325
|
+
dryRun: true,
|
|
326
|
+
runId: null,
|
|
327
|
+
status: "planned",
|
|
328
|
+
plan,
|
|
329
|
+
description,
|
|
330
|
+
steps: [],
|
|
331
|
+
error: null,
|
|
332
|
+
logFile: null,
|
|
333
|
+
};
|
|
334
|
+
}
|
|
335
|
+
const workspaceKey = path.resolve(context.cwd);
|
|
336
|
+
const running = activeWorkspaces.get(workspaceKey);
|
|
337
|
+
if (running) {
|
|
338
|
+
throw new Error(`В workspace ${workspaceKey} уже выполняется миссия "${running}". Дождитесь её завершения.`);
|
|
339
|
+
}
|
|
340
|
+
activeWorkspaces.set(workspaceKey, taskName);
|
|
341
|
+
try {
|
|
342
|
+
let executor = dependencies.executor;
|
|
343
|
+
let logFile = null;
|
|
344
|
+
if (!executor) {
|
|
345
|
+
const prepared = await prepareWrapper(spec, context, taskName);
|
|
346
|
+
logFile = prepared.logFile;
|
|
347
|
+
executor = createWrapperExecutor(prepared.wrapperPath, spec);
|
|
348
|
+
}
|
|
349
|
+
dependencies.onPrepared?.({ taskName, cwd: context.cwd });
|
|
350
|
+
const result = await executeExecutionPlan(plan, {
|
|
351
|
+
executors: [executor],
|
|
352
|
+
stopOnError: true,
|
|
353
|
+
metadata: {
|
|
354
|
+
adHoc: true,
|
|
355
|
+
gate: spec.gate ?? null,
|
|
356
|
+
timeoutSeconds: spec.timeoutSeconds ?? DEFAULT_TIMEOUT_SECONDS,
|
|
357
|
+
},
|
|
358
|
+
});
|
|
359
|
+
return {
|
|
360
|
+
success: result.status === "passed",
|
|
361
|
+
dryRun: false,
|
|
362
|
+
runId: result.runId,
|
|
363
|
+
status: result.status,
|
|
364
|
+
plan,
|
|
365
|
+
description,
|
|
366
|
+
steps: result.steps,
|
|
367
|
+
error: result.error,
|
|
368
|
+
logFile,
|
|
369
|
+
};
|
|
370
|
+
}
|
|
371
|
+
finally {
|
|
372
|
+
activeWorkspaces.delete(workspaceKey);
|
|
373
|
+
}
|
|
374
|
+
}
|
|
@@ -36,7 +36,7 @@ export declare function getModelsCatalog(): Map<string, ModelCatalogEntry>;
|
|
|
36
36
|
/** Цена модели за 1M токенов по каталогу OpenCode (null — цены нет). */
|
|
37
37
|
export declare function catalogPricePerMillion(model: string | undefined): number | null;
|
|
38
38
|
/** Доступные пользователю модели (`opencode models`), кэш 10 минут. */
|
|
39
|
-
export declare function listAvailableModels(): string[]
|
|
39
|
+
export declare function listAvailableModels(): Promise<string[]>;
|
|
40
40
|
/** Откуда взялся список what-if моделей. */
|
|
41
41
|
export type WhatIfSource = "history" | "opencode" | "default";
|
|
42
42
|
export interface WhatIfSelection {
|
|
@@ -56,7 +56,7 @@ export interface WhatIfSelection {
|
|
|
56
56
|
*/
|
|
57
57
|
export declare function selectWhatIfModels(preferred: string[], available: string[], priceOf?: (model: string) => number | null): WhatIfSelection;
|
|
58
58
|
/** What-If по реальным источникам: история + `opencode models` + каталог цен. */
|
|
59
|
-
export declare function resolveWhatIfModels(preferred?: string[]): WhatIfSelection
|
|
59
|
+
export declare function resolveWhatIfModels(preferred?: string[]): Promise<WhatIfSelection>;
|
|
60
60
|
/** Сбрасывает кэши (нужно тестам). */
|
|
61
61
|
export declare function resetModelCaches(): void;
|
|
62
62
|
//# sourceMappingURL=opencode-models.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"opencode-models.d.ts","sourceRoot":"","sources":["../../src/core/opencode-models.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"opencode-models.d.ts","sourceRoot":"","sources":["../../src/core/opencode-models.ts"],"names":[],"mappings":"AAyBA,uDAAuD;AACvD,MAAM,WAAW,iBAAiB;IAChC,iCAAiC;IACjC,KAAK,EAAE,MAAM,CAAC;IACd,kCAAkC;IAClC,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,mDAAmD;AACnD,eAAO,MAAM,kBAAkB,IAAI,CAAC;AAEpC;;;GAGG;AACH,eAAO,MAAM,+BAA+B,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAQlE,CAAC;AAEF,0DAA0D;AAC1D,eAAO,MAAM,yBAAyB,IAAI,CAAC;AAE3C,kEAAkE;AAClE,eAAO,MAAM,sBAAsB,UAGlC,CAAC;AAgBF,4EAA4E;AAC5E,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,CAElE;AAED,oEAAoE;AACpE,wBAAgB,eAAe,IAAI,MAAM,GAAG,QAAQ,CAGnD;AAED,oEAAoE;AACpE,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC,MAAM,EAAE,iBAAiB,CAAC,CAyB9E;AAED,iEAAiE;AACjE,wBAAgB,cAAc,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAYvD;AAED,2EAA2E;AAC3E,wBAAgB,YAAY,CAAC,KAAK,EAAE,iBAAiB,GAAG,MAAM,CAE7D;AAED,+DAA+D;AAC/D,wBAAgB,mBAAmB,IAAI,MAAM,GAAG,IAAI,CAenD;AAoBD;;;GAGG;AACH,wBAAgB,gBAAgB,IAAI,GAAG,CAAC,MAAM,EAAE,iBAAiB,CAAC,CAuBjE;AAED,wEAAwE;AACxE,wBAAgB,sBAAsB,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,GAAG,IAAI,CAO/E;AAqBD,uEAAuE;AACvE,wBAAsB,mBAAmB,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC,CAa7D;AAED,4CAA4C;AAC5C,MAAM,MAAM,YAAY,GAAG,SAAS,GAAG,UAAU,GAAG,SAAS,CAAC;AAE9D,MAAM,WAAW,eAAe;IAC9B,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,MAAM,EAAE,YAAY,CAAC;CACtB;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,kBAAkB,CAChC,SAAS,EAAE,MAAM,EAAE,EACnB,SAAS,EAAE,MAAM,EAAE,EACnB,OAAO,GAAE,CAAC,KAAK,EAAE,MAAM,KAAK,MAAM,GAAG,IAA6B,GACjE,eAAe,CA4CjB;AAED,iFAAiF;AACjF,wBAAsB,mBAAmB,CACvC,SAAS,GAAE,MAAM,EAAO,GACvB,OAAO,CAAC,eAAe,CAAC,CAE1B;AAED,sCAAsC;AACtC,wBAAgB,gBAAgB,IAAI,IAAI,CAIvC"}
|
|
@@ -21,8 +21,7 @@
|
|
|
21
21
|
import fs from "node:fs";
|
|
22
22
|
import os from "node:os";
|
|
23
23
|
import path from "node:path";
|
|
24
|
-
import {
|
|
25
|
-
import { opencodeCommand } from "./opencode-cli.js";
|
|
24
|
+
import { runOpencode } from "./opencode-cli.js";
|
|
26
25
|
/** Сколько what-if моделей показывать максимум. */
|
|
27
26
|
export const MAX_WHAT_IF_MODELS = 5;
|
|
28
27
|
/**
|
|
@@ -182,31 +181,38 @@ export function catalogPricePerMillion(model) {
|
|
|
182
181
|
return isLocalProvider(key) || isKnownFreeModel(key) ? 0 : null;
|
|
183
182
|
}
|
|
184
183
|
let cliCache = null;
|
|
185
|
-
/**
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
184
|
+
/** Один общий запуск CLI: параллельные запросы дашборда не плодят процессы. */
|
|
185
|
+
let cliInflight = null;
|
|
186
|
+
/**
|
|
187
|
+
* Запускает `opencode models` асинхронно.
|
|
188
|
+
*
|
|
189
|
+
* Раньше здесь был `execFileSync`, и это вешало event loop сервера, внутри
|
|
190
|
+
* которого живёт плагин. CLI в этот момент опрашивал тот же сервер как
|
|
191
|
+
* background service, не получал ответа, запускал recovery и перезапускал
|
|
192
|
+
* сервис вместе с дашбордом — отсюда `ERR_CONNECTION_REFUSED` каждые ~10 с.
|
|
193
|
+
* Асинхронный запуск event loop не блокирует.
|
|
194
|
+
*/
|
|
195
|
+
async function runModelsCli() {
|
|
196
|
+
const result = await runOpencode(["models"], CLI_TIMEOUT_MS);
|
|
197
|
+
if (!result.ok)
|
|
198
198
|
return [];
|
|
199
|
-
|
|
199
|
+
return parseModelList(result.stdout);
|
|
200
200
|
}
|
|
201
201
|
/** Доступные пользователю модели (`opencode models`), кэш 10 минут. */
|
|
202
|
-
export function listAvailableModels() {
|
|
202
|
+
export async function listAvailableModels() {
|
|
203
203
|
if (modelSourceMode() === "static")
|
|
204
204
|
return [];
|
|
205
205
|
const now = Date.now();
|
|
206
206
|
if (cliCache && now - cliCache.at < CLI_TTL_MS)
|
|
207
207
|
return cliCache.models;
|
|
208
|
-
|
|
209
|
-
|
|
208
|
+
if (!cliInflight) {
|
|
209
|
+
cliInflight = runModelsCli().finally(() => {
|
|
210
|
+
cliInflight = null;
|
|
211
|
+
});
|
|
212
|
+
}
|
|
213
|
+
const models = await cliInflight;
|
|
214
|
+
// Пустой результат тоже кэшируем: иначе каждый запрос снова дёргает CLI.
|
|
215
|
+
cliCache = { at: Date.now(), models };
|
|
210
216
|
return models;
|
|
211
217
|
}
|
|
212
218
|
/**
|
|
@@ -267,11 +273,12 @@ export function selectWhatIfModels(preferred, available, priceOf = catalogPriceP
|
|
|
267
273
|
return { models: picked, source };
|
|
268
274
|
}
|
|
269
275
|
/** What-If по реальным источникам: история + `opencode models` + каталог цен. */
|
|
270
|
-
export function resolveWhatIfModels(preferred = []) {
|
|
271
|
-
return selectWhatIfModels(preferred, listAvailableModels());
|
|
276
|
+
export async function resolveWhatIfModels(preferred = []) {
|
|
277
|
+
return selectWhatIfModels(preferred, await listAvailableModels());
|
|
272
278
|
}
|
|
273
279
|
/** Сбрасывает кэши (нужно тестам). */
|
|
274
280
|
export function resetModelCaches() {
|
|
275
281
|
catalogCache = null;
|
|
276
282
|
cliCache = null;
|
|
283
|
+
cliInflight = null;
|
|
277
284
|
}
|
|
@@ -0,0 +1,35 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* PL-38 / QV-11.2: подсчёт токенов и стоимости из собственной БД OpenCode.
|
|
3
|
+
*
|
|
4
|
+
* Обёртки задач не печатают `Tokens:`/`Usage:` в лог — для провайдеров
|
|
5
|
+
* hy4-flash-free и ollama OpenCode вообще не выводит эту строку. Истина о
|
|
6
|
+
* расходе лежит в `opencode.db` (таблица `message`, поле `data` с JSON
|
|
7
|
+
* ассистентских сообщений). Читаем БД только на чтение и никогда не падаем,
|
|
8
|
+
* если файла нет, он занят или формат изменился.
|
|
9
|
+
*/
|
|
10
|
+
export interface OpenCodeUsage {
|
|
11
|
+
tokens: number;
|
|
12
|
+
costUsd: number;
|
|
13
|
+
messages: number;
|
|
14
|
+
providers: Record<string, number>;
|
|
15
|
+
}
|
|
16
|
+
export interface CollectOpenCodeUsageOptions {
|
|
17
|
+
/** Нижняя граница окна, epoch ms. */
|
|
18
|
+
since: number;
|
|
19
|
+
/** Верхняя граница окна, epoch ms. */
|
|
20
|
+
until: number;
|
|
21
|
+
/** Явный путь к БД (тесты и переменная OPENCODE_USAGE_DB). */
|
|
22
|
+
dbPath?: string;
|
|
23
|
+
/** Рабочая директория задачи — фильтр по `path.cwd` сообщения. */
|
|
24
|
+
cwd?: string;
|
|
25
|
+
env?: NodeJS.ProcessEnv;
|
|
26
|
+
platform?: NodeJS.Platform;
|
|
27
|
+
}
|
|
28
|
+
/** Кандидаты путей к БД OpenCode в порядке приоритета. */
|
|
29
|
+
export declare function findOpenCodeDb(env?: NodeJS.ProcessEnv, platform?: NodeJS.Platform): string | null;
|
|
30
|
+
/**
|
|
31
|
+
* Суммирует usage ассистентских сообщений за окно времени.
|
|
32
|
+
* Возвращает null, если БД недоступна (не искать токены в логах впустую).
|
|
33
|
+
*/
|
|
34
|
+
export declare function collectOpenCodeUsage(options: CollectOpenCodeUsageOptions): OpenCodeUsage | null;
|
|
35
|
+
//# sourceMappingURL=opencode-usage.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"opencode-usage.d.ts","sourceRoot":"","sources":["../../src/core/opencode-usage.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAOH,MAAM,WAAW,aAAa;IAC5B,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACnC;AAED,MAAM,WAAW,2BAA2B;IAC1C,qCAAqC;IACrC,KAAK,EAAE,MAAM,CAAC;IACd,sCAAsC;IACtC,KAAK,EAAE,MAAM,CAAC;IACd,8DAA8D;IAC9D,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,kEAAkE;IAClE,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC;IACxB,QAAQ,CAAC,EAAE,MAAM,CAAC,QAAQ,CAAC;CAC5B;AAoBD,0DAA0D;AAC1D,wBAAgB,cAAc,CAC5B,GAAG,GAAE,MAAM,CAAC,UAAwB,EACpC,QAAQ,GAAE,MAAM,CAAC,QAA2B,GAC3C,MAAM,GAAG,IAAI,CAmBf;AAqDD;;;GAGG;AACH,wBAAgB,oBAAoB,CAClC,OAAO,EAAE,2BAA2B,GACnC,aAAa,GAAG,IAAI,CA8CtB"}
|
|
@@ -0,0 +1,132 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* PL-38 / QV-11.2: подсчёт токенов и стоимости из собственной БД OpenCode.
|
|
3
|
+
*
|
|
4
|
+
* Обёртки задач не печатают `Tokens:`/`Usage:` в лог — для провайдеров
|
|
5
|
+
* hy4-flash-free и ollama OpenCode вообще не выводит эту строку. Истина о
|
|
6
|
+
* расходе лежит в `opencode.db` (таблица `message`, поле `data` с JSON
|
|
7
|
+
* ассистентских сообщений). Читаем БД только на чтение и никогда не падаем,
|
|
8
|
+
* если файла нет, он занят или формат изменился.
|
|
9
|
+
*/
|
|
10
|
+
import fs from "node:fs";
|
|
11
|
+
import os from "node:os";
|
|
12
|
+
import path from "node:path";
|
|
13
|
+
import { createRequire } from "node:module";
|
|
14
|
+
const nodeRequire = createRequire(import.meta.url);
|
|
15
|
+
function loadDatabaseSync() {
|
|
16
|
+
const mod = nodeRequire("node:sqlite");
|
|
17
|
+
return mod.DatabaseSync;
|
|
18
|
+
}
|
|
19
|
+
/** Кандидаты путей к БД OpenCode в порядке приоритета. */
|
|
20
|
+
export function findOpenCodeDb(env = process.env, platform = process.platform) {
|
|
21
|
+
const explicit = env.OPENCODE_USAGE_DB?.trim();
|
|
22
|
+
if (explicit)
|
|
23
|
+
return path.resolve(explicit);
|
|
24
|
+
// env имеют приоритет над os.homedir(): тот кэширует путь при старте Node,
|
|
25
|
+
// из-за чего тесты с изолированным HOME видели реальную БД пользователя.
|
|
26
|
+
const home = env.USERPROFILE?.trim() || env.HOME?.trim() || os.homedir();
|
|
27
|
+
const candidates = platform === "win32" && env.APPDATA
|
|
28
|
+
? [
|
|
29
|
+
path.join(env.APPDATA, "opencode", "opencode.db"),
|
|
30
|
+
path.join(home, ".local", "share", "opencode", "opencode.db"),
|
|
31
|
+
]
|
|
32
|
+
: [
|
|
33
|
+
path.join(home, ".local", "share", "opencode", "opencode.db"),
|
|
34
|
+
path.join(home, ".config", "opencode", "opencode.db"),
|
|
35
|
+
];
|
|
36
|
+
return candidates.find((candidate) => fs.existsSync(candidate)) ?? null;
|
|
37
|
+
}
|
|
38
|
+
function asFiniteNumber(value) {
|
|
39
|
+
const num = Number(value);
|
|
40
|
+
return Number.isFinite(num) ? num : 0;
|
|
41
|
+
}
|
|
42
|
+
function parseMessageData(raw) {
|
|
43
|
+
if (typeof raw !== "string")
|
|
44
|
+
return null;
|
|
45
|
+
let data;
|
|
46
|
+
try {
|
|
47
|
+
const parsed = JSON.parse(raw);
|
|
48
|
+
if (!parsed || typeof parsed !== "object" || Array.isArray(parsed))
|
|
49
|
+
return null;
|
|
50
|
+
data = parsed;
|
|
51
|
+
}
|
|
52
|
+
catch {
|
|
53
|
+
return null;
|
|
54
|
+
}
|
|
55
|
+
if (data.role !== "assistant")
|
|
56
|
+
return null;
|
|
57
|
+
const tokensRaw = data.tokens;
|
|
58
|
+
let tokens = 0;
|
|
59
|
+
if (tokensRaw && typeof tokensRaw === "object" && !Array.isArray(tokensRaw)) {
|
|
60
|
+
const tokensObj = tokensRaw;
|
|
61
|
+
// OpenCode иногда пишет только total, иногда input/output/reasoning.
|
|
62
|
+
const cache = tokensObj.cache && typeof tokensObj.cache === "object"
|
|
63
|
+
? tokensObj.cache
|
|
64
|
+
: {};
|
|
65
|
+
tokens =
|
|
66
|
+
asFiniteNumber(tokensObj.total) ||
|
|
67
|
+
asFiniteNumber(tokensObj.input) +
|
|
68
|
+
asFiniteNumber(tokensObj.output) +
|
|
69
|
+
asFiniteNumber(tokensObj.reasoning) +
|
|
70
|
+
asFiniteNumber(cache.read) +
|
|
71
|
+
asFiniteNumber(cache.write);
|
|
72
|
+
}
|
|
73
|
+
const messagePath = data.path && typeof data.path === "object" && !Array.isArray(data.path)
|
|
74
|
+
? data.path
|
|
75
|
+
: {};
|
|
76
|
+
return {
|
|
77
|
+
tokens,
|
|
78
|
+
costUsd: asFiniteNumber(data.cost),
|
|
79
|
+
provider: typeof data.providerID === "string" ? data.providerID : "unknown",
|
|
80
|
+
cwd: typeof messagePath.cwd === "string" ? messagePath.cwd : "",
|
|
81
|
+
};
|
|
82
|
+
}
|
|
83
|
+
/**
|
|
84
|
+
* Суммирует usage ассистентских сообщений за окно времени.
|
|
85
|
+
* Возвращает null, если БД недоступна (не искать токены в логах впустую).
|
|
86
|
+
*/
|
|
87
|
+
export function collectOpenCodeUsage(options) {
|
|
88
|
+
const dbPath = options.dbPath ?? findOpenCodeDb(options.env, options.platform);
|
|
89
|
+
if (!dbPath || !fs.existsSync(dbPath))
|
|
90
|
+
return null;
|
|
91
|
+
const since = Math.min(options.since, options.until);
|
|
92
|
+
const until = Math.max(options.since, options.until);
|
|
93
|
+
let db = null;
|
|
94
|
+
try {
|
|
95
|
+
const DatabaseSync = loadDatabaseSync();
|
|
96
|
+
db = new DatabaseSync(dbPath, { readOnly: true });
|
|
97
|
+
const rows = db
|
|
98
|
+
.prepare("SELECT data FROM message WHERE time_created >= ? AND time_created <= ? AND json_extract(data, '$.role') = 'assistant'")
|
|
99
|
+
.all(since, until);
|
|
100
|
+
const result = { tokens: 0, costUsd: 0, messages: 0, providers: {} };
|
|
101
|
+
const wantedCwd = options.cwd?.trim().toLowerCase();
|
|
102
|
+
for (const row of rows) {
|
|
103
|
+
const raw = row.data;
|
|
104
|
+
const message = parseMessageData(raw);
|
|
105
|
+
if (!message)
|
|
106
|
+
continue;
|
|
107
|
+
if (wantedCwd &&
|
|
108
|
+
message.cwd &&
|
|
109
|
+
message.cwd.replace(/\\/g, "/").toLowerCase() !== wantedCwd.replace(/\\/g, "/").toLowerCase()) {
|
|
110
|
+
continue;
|
|
111
|
+
}
|
|
112
|
+
result.tokens += message.tokens;
|
|
113
|
+
result.costUsd += message.costUsd;
|
|
114
|
+
result.messages += 1;
|
|
115
|
+
result.providers[message.provider] =
|
|
116
|
+
(result.providers[message.provider] ?? 0) + message.tokens;
|
|
117
|
+
}
|
|
118
|
+
return result;
|
|
119
|
+
}
|
|
120
|
+
catch {
|
|
121
|
+
// БД занята/заблокирована/старой схемы — это диагностика, не отказ задачи.
|
|
122
|
+
return null;
|
|
123
|
+
}
|
|
124
|
+
finally {
|
|
125
|
+
try {
|
|
126
|
+
db?.close();
|
|
127
|
+
}
|
|
128
|
+
catch {
|
|
129
|
+
// ignore
|
|
130
|
+
}
|
|
131
|
+
}
|
|
132
|
+
}
|