agent-steward 0.0.2 → 0.0.4
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 +45 -2
- package/CROSS_PLATFORM.md +11 -9
- package/README.md +11 -10
- package/ROADMAP-STRATEGY.md +93 -44
- package/ROADMAP.md +148 -1017
- package/dist/core/cron-to-schtasks.d.ts +0 -8
- package/dist/core/cron-to-schtasks.d.ts.map +1 -1
- package/dist/core/cron-to-schtasks.js +11 -86
- package/dist/core/dlq-api.d.ts +44 -0
- package/dist/core/dlq-api.d.ts.map +1 -0
- package/dist/core/dlq-api.js +68 -0
- package/dist/core/dry-run.d.ts.map +1 -1
- package/dist/core/dry-run.js +19 -2
- package/dist/core/file-watcher.js +9 -9
- package/dist/core/git-trigger.js +4 -4
- package/dist/core/lock.d.ts +20 -4
- package/dist/core/lock.d.ts.map +1 -1
- package/dist/core/lock.js +99 -26
- package/dist/core/one-shot.d.ts +31 -5
- package/dist/core/one-shot.d.ts.map +1 -1
- package/dist/core/one-shot.js +78 -10
- package/dist/core/opencode-cli.d.ts +28 -0
- package/dist/core/opencode-cli.d.ts.map +1 -0
- package/dist/core/opencode-cli.js +74 -0
- package/dist/core/opencode-models.d.ts +62 -0
- package/dist/core/opencode-models.d.ts.map +1 -0
- package/dist/core/opencode-models.js +277 -0
- package/dist/core/otel.js +2 -2
- package/dist/core/ps-wrapper.d.ts +1 -1
- package/dist/core/ps-wrapper.d.ts.map +1 -1
- package/dist/core/ps-wrapper.js +66 -36
- package/dist/core/record-history.d.ts +15 -0
- package/dist/core/record-history.d.ts.map +1 -1
- package/dist/core/record-history.js +78 -54
- package/dist/core/router/dispatch.d.ts +36 -0
- package/dist/core/router/dispatch.d.ts.map +1 -0
- package/dist/core/router/dispatch.js +59 -0
- package/dist/core/router/escalation.d.ts +47 -0
- package/dist/core/router/escalation.d.ts.map +1 -0
- package/dist/core/router/escalation.js +87 -0
- package/dist/core/router/planner.d.ts +53 -0
- package/dist/core/router/planner.d.ts.map +1 -0
- package/dist/core/router/planner.js +113 -0
- package/dist/core/router/rules.d.ts +46 -0
- package/dist/core/router/rules.d.ts.map +1 -0
- package/dist/core/router/rules.js +85 -0
- package/dist/core/run-panel-api.d.ts +94 -0
- package/dist/core/run-panel-api.d.ts.map +1 -0
- package/dist/core/run-panel-api.js +169 -0
- package/dist/core/schedule-gate.js +5 -1
- package/dist/core/schedule-v2.d.ts +36 -2
- package/dist/core/schedule-v2.d.ts.map +1 -1
- package/dist/core/schedule-v2.js +98 -12
- package/dist/core/scheduler/at-fallback.d.ts +95 -0
- package/dist/core/scheduler/at-fallback.d.ts.map +1 -0
- package/dist/core/scheduler/at-fallback.js +200 -0
- package/dist/core/scheduler/linux.d.ts +13 -2
- package/dist/core/scheduler/linux.d.ts.map +1 -1
- package/dist/core/scheduler/linux.js +67 -13
- package/dist/core/scheduler/mac.d.ts +14 -8
- package/dist/core/scheduler/mac.d.ts.map +1 -1
- package/dist/core/scheduler/mac.js +71 -22
- package/dist/core/scheduler/posix.d.ts.map +1 -1
- package/dist/core/scheduler/posix.js +37 -2
- package/dist/core/scheduler/registry.d.ts +13 -0
- package/dist/core/scheduler/registry.d.ts.map +1 -1
- package/dist/core/scheduler/registry.js +83 -21
- package/dist/core/scheduler/run-now.d.ts +16 -0
- package/dist/core/scheduler/run-now.d.ts.map +1 -0
- package/dist/core/scheduler/run-now.js +28 -0
- package/dist/core/scheduler/windows.d.ts +16 -3
- package/dist/core/scheduler/windows.d.ts.map +1 -1
- package/dist/core/scheduler/windows.js +249 -96
- package/dist/core/secrets.d.ts.map +1 -1
- package/dist/core/secrets.js +127 -30
- package/dist/core/self-analysis.js +55 -55
- package/dist/core/session.d.ts.map +1 -1
- package/dist/core/session.js +18 -11
- package/dist/core/summary.js +1 -1
- package/dist/core/task-name.d.ts +24 -0
- package/dist/core/task-name.d.ts.map +1 -0
- package/dist/core/task-name.js +40 -0
- package/dist/core/triage-chain.js +1 -1
- package/dist/core/triage-worker.js +2 -2
- package/dist/core/triage.js +1 -1
- package/dist/core/wrappers/bash.d.ts.map +1 -1
- package/dist/core/wrappers/bash.js +82 -37
- package/dist/db/capability-repo.d.ts +83 -0
- package/dist/db/capability-repo.d.ts.map +1 -0
- package/dist/db/capability-repo.js +182 -0
- package/dist/db/history-repo.d.ts +8 -0
- package/dist/db/history-repo.d.ts.map +1 -1
- package/dist/db/history-repo.js +19 -0
- package/dist/db/index.d.ts +6 -0
- package/dist/db/index.d.ts.map +1 -1
- package/dist/db/index.js +48 -2
- package/dist/db/migrate.d.ts.map +1 -1
- package/dist/db/migrate.js +3 -1
- package/dist/db/run-context.d.ts +103 -0
- package/dist/db/run-context.d.ts.map +1 -0
- package/dist/db/run-context.js +224 -0
- package/dist/db/run-dlq.d.ts +100 -0
- package/dist/db/run-dlq.d.ts.map +1 -0
- package/dist/db/run-dlq.js +191 -0
- package/dist/db/run-journal.d.ts +60 -0
- package/dist/db/run-journal.d.ts.map +1 -0
- package/dist/db/run-journal.js +143 -0
- package/dist/db/run-resume.d.ts +51 -0
- package/dist/db/run-resume.d.ts.map +1 -0
- package/dist/db/run-resume.js +156 -0
- package/dist/db/runs-repo.d.ts +128 -0
- package/dist/db/runs-repo.d.ts.map +1 -0
- package/dist/db/runs-repo.js +342 -0
- package/dist/db/schema.d.ts +16 -2
- package/dist/db/schema.d.ts.map +1 -1
- package/dist/db/schema.js +342 -35
- package/dist/db/settings-repo.d.ts +11 -0
- package/dist/db/settings-repo.d.ts.map +1 -1
- package/dist/db/settings-repo.js +25 -0
- package/dist/db/step-idempotency.d.ts +51 -0
- package/dist/db/step-idempotency.d.ts.map +1 -0
- package/dist/db/step-idempotency.js +136 -0
- package/dist/index.d.ts +5 -5
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +168 -40
- package/dist/notifications.js +18 -18
- package/dist/profiles.d.ts +7 -3
- package/dist/profiles.d.ts.map +1 -1
- package/dist/profiles.js +85 -7
- package/dist/rpc.d.ts +787 -0
- package/dist/rpc.d.ts.map +1 -1
- package/dist/rpc.js +324 -0
- package/dist/server.d.ts +33 -2
- package/dist/server.d.ts.map +1 -1
- package/dist/server.js +115 -54
- package/dist/shared/jobs-view.d.ts.map +1 -1
- package/dist/skill.js +1 -1
- package/dist/task-transfer.d.ts +1 -1
- package/dist/task-transfer.d.ts.map +1 -1
- package/dist/task-transfer.js +14 -10
- package/dist/types.d.ts +20 -4
- package/dist/types.d.ts.map +1 -1
- package/dist/types.js +44 -9
- package/dist/workspaces.d.ts +25 -3
- package/dist/workspaces.d.ts.map +1 -1
- package/dist/workspaces.js +44 -9
- package/docs/ARCHITECTURE.md +335 -9
- package/docs/COMPATIBILITY.md +10 -6
- package/docs/CONCEPT.md +183 -91
- package/docs/CROSS_PLATFORM.ru.md +11 -9
- package/docs/CROSS_PLATFORM.zh.md +11 -9
- package/docs/EXECUTION-LOOP.md +196 -0
- package/docs/FAQ.md +2 -2
- package/docs/FAQ.ru.md +2 -2
- package/docs/FAQ.zh.md +2 -2
- package/docs/FEATURES.md +5 -4
- package/docs/FEATURES.zh.md +5 -4
- package/docs/MIGRATION.md +34 -26
- package/docs/README.ru.md +27 -8
- package/docs/README.zh.md +11 -10
- package/docs/SAFETY.md +122 -0
- package/docs/SAVINGS.md +29 -0
- package/docs/SAVINGS.ru.md +29 -0
- package/docs/SAVINGS.zh.md +18 -0
- package/docs/V1-V2-COMPATIBILITY-PLAN.md +6 -6
- package/gui-experimental.cjs +8 -8
- package/index.js +1 -0
- package/locales/en.json +68 -0
- package/locales/ru.json +68 -0
- package/locales/zh.json +68 -0
- package/package.json +57 -11
- package/scripts/audit-bundle.mjs +215 -0
- package/src/core/analytics.ts +2 -2
- package/src/core/audit.ts +17 -17
- package/src/core/cron-to-schtasks.ts +14 -93
- package/src/core/dlq-api.ts +98 -0
- package/src/core/dry-run.ts +51 -27
- package/src/core/file-watcher.ts +17 -17
- package/src/core/git-trigger.ts +9 -9
- package/src/core/glob.ts +1 -1
- package/src/core/local-ai.ts +2 -2
- package/src/core/lock.ts +104 -31
- package/src/core/matrix.ts +31 -31
- package/src/core/native-notify.ts +2 -2
- package/src/core/one-shot.ts +91 -13
- package/src/core/opencode-cli.ts +103 -0
- package/src/core/opencode-models.ts +315 -0
- package/src/core/otel.ts +4 -4
- package/src/core/permissions.ts +5 -5
- package/src/core/prometheus.ts +17 -17
- package/src/core/ps-wrapper.ts +68 -38
- package/src/core/record-history.ts +114 -76
- package/src/core/retention.ts +3 -3
- package/src/core/router/dispatch.ts +94 -0
- package/src/core/router/escalation.ts +129 -0
- package/src/core/router/planner.ts +166 -0
- package/src/core/router/rules.ts +109 -0
- package/src/core/run-panel-api.ts +262 -0
- package/src/core/savings.ts +1 -1
- package/src/core/schedule-gate.ts +17 -13
- package/src/core/schedule-v2.ts +138 -29
- package/src/core/scheduler/at-fallback.ts +298 -0
- package/src/core/scheduler/index.ts +3 -3
- package/src/core/scheduler/linux.ts +92 -19
- package/src/core/scheduler/logs.ts +1 -1
- package/src/core/scheduler/mac.ts +112 -60
- package/src/core/scheduler/posix.ts +35 -2
- package/src/core/scheduler/registry.ts +109 -26
- package/src/core/scheduler/run-now.ts +32 -0
- package/src/core/scheduler/windows.ts +295 -125
- package/src/core/secrets.ts +139 -39
- package/src/core/self-analysis.ts +61 -61
- package/src/core/session.ts +26 -13
- package/src/core/structured-log.ts +3 -3
- package/src/core/summary.ts +25 -25
- package/src/core/task-name.ts +67 -0
- package/src/core/telegram.ts +16 -16
- package/src/core/triage-chain.ts +4 -4
- package/src/core/triage-compare.ts +8 -8
- package/src/core/triage-rules.ts +4 -4
- package/src/core/triage-shadow.ts +7 -7
- package/src/core/triage-worker.ts +6 -6
- package/src/core/triage.ts +23 -23
- package/src/core/watch-paths.ts +1 -1
- package/src/core/wrappers/bash.ts +90 -45
- package/src/db/capability-repo.ts +285 -0
- package/src/db/git-state-repo.ts +1 -1
- package/src/db/history-repo.ts +44 -22
- package/src/db/index.ts +53 -7
- package/src/db/metrics-repo.ts +10 -10
- package/src/db/migrate.ts +13 -11
- package/src/db/recovery.ts +3 -3
- package/src/db/run-context.ts +370 -0
- package/src/db/run-dlq.ts +310 -0
- package/src/db/run-journal.ts +212 -0
- package/src/db/run-resume.ts +256 -0
- package/src/db/runs-repo.ts +504 -0
- package/src/db/schema.ts +357 -44
- package/src/db/settings-repo.ts +33 -2
- package/src/db/step-idempotency.ts +185 -0
- package/src/db/tasks-repo.ts +10 -10
- package/src/db/templates-repo.ts +7 -7
- package/src/gui.tsx +516 -1
- package/src/history.ts +4 -4
- package/src/i18n.ts +7 -7
- package/src/index.ts +465 -308
- package/src/integrations.ts +6 -6
- package/src/notifications.ts +76 -76
- package/src/profiles.ts +98 -7
- package/src/rpc.ts +347 -1
- package/src/schtasks.ts +2 -2
- package/src/server.ts +155 -78
- package/src/settings.ts +44 -44
- package/src/shared/jobs-view.ts +60 -60
- package/src/skill.ts +1 -1
- package/src/task-transfer.ts +58 -56
- package/src/templates.ts +1 -1
- package/src/types.ts +54 -10
- package/src/workspaces.ts +73 -24
- package/dist/core/self-analysis.test.d.ts +0 -2
- package/dist/core/self-analysis.test.d.ts.map +0 -1
- package/dist/core/self-analysis.test.js +0 -219
- package/dist/gui-experimental.cjs +0 -1
package/dist/core/secrets.js
CHANGED
|
@@ -4,6 +4,7 @@ import os from "node:os";
|
|
|
4
4
|
import path from "node:path";
|
|
5
5
|
import { spawnSync } from "node:child_process";
|
|
6
6
|
import { PLUGIN_DIR } from "../types.js";
|
|
7
|
+
import { isProcessAlive } from "./lock.js";
|
|
7
8
|
/**
|
|
8
9
|
* Зашифрованное хранилище секретов (Спринт 26).
|
|
9
10
|
*
|
|
@@ -23,6 +24,82 @@ export const SECRETS_KEY_FILE = path.join(PLUGIN_DIR, "secrets.key");
|
|
|
23
24
|
export const SECRET_REF_RE = /\$\{secret:([A-Za-z0-9_.-]{1,64})\}/g;
|
|
24
25
|
const SECRET_NAME_RE = /^[A-Za-z0-9_.-]{1,64}$/;
|
|
25
26
|
const KEY_BYTES = 32;
|
|
27
|
+
/**
|
|
28
|
+
* P2-20: межпроцессная блокировка записи секретов.
|
|
29
|
+
*
|
|
30
|
+
* setSecret/deleteSecret — это read-modify-write одного JSON. Каждое завершение
|
|
31
|
+
* задачи может быть отдельным процессом, поэтому без лока параллельные записи
|
|
32
|
+
* теряли секреты. Лок синхронный: API setSecret/deleteSecret синхронный и
|
|
33
|
+
* используется из CLI/GUI/плагина, переписывать его на async нельзя.
|
|
34
|
+
*/
|
|
35
|
+
const SECRETS_LOCK_FILE = `${SECRETS_FILE}.lock`;
|
|
36
|
+
const SECRETS_LOCK_STALE_MS = 10000;
|
|
37
|
+
const SECRETS_LOCK_TIMEOUT_MS = 5000;
|
|
38
|
+
let secretsLockDepth = 0;
|
|
39
|
+
function sleepSync(ms) {
|
|
40
|
+
Atomics.wait(new Int32Array(new SharedArrayBuffer(4)), 0, 0, ms);
|
|
41
|
+
}
|
|
42
|
+
function withSecretsLock(fn) {
|
|
43
|
+
// Реентерабельность: loadKey()/readFileSafe() вызываются внутри setSecret.
|
|
44
|
+
if (secretsLockDepth > 0) {
|
|
45
|
+
secretsLockDepth += 1;
|
|
46
|
+
try {
|
|
47
|
+
return fn();
|
|
48
|
+
}
|
|
49
|
+
finally {
|
|
50
|
+
secretsLockDepth -= 1;
|
|
51
|
+
}
|
|
52
|
+
}
|
|
53
|
+
ensureDir();
|
|
54
|
+
const deadline = Date.now() + SECRETS_LOCK_TIMEOUT_MS;
|
|
55
|
+
for (;;) {
|
|
56
|
+
try {
|
|
57
|
+
const fd = fs.openSync(SECRETS_LOCK_FILE, "wx");
|
|
58
|
+
try {
|
|
59
|
+
fs.writeFileSync(fd, String(process.pid));
|
|
60
|
+
}
|
|
61
|
+
finally {
|
|
62
|
+
fs.closeSync(fd);
|
|
63
|
+
}
|
|
64
|
+
secretsLockDepth = 1;
|
|
65
|
+
break;
|
|
66
|
+
}
|
|
67
|
+
catch (err) {
|
|
68
|
+
if (err?.code !== "EEXIST")
|
|
69
|
+
throw err;
|
|
70
|
+
try {
|
|
71
|
+
const stat = fs.statSync(SECRETS_LOCK_FILE);
|
|
72
|
+
if (Date.now() - stat.mtimeMs > SECRETS_LOCK_STALE_MS) {
|
|
73
|
+
const owner = Number.parseInt(fs.readFileSync(SECRETS_LOCK_FILE, "utf8").trim(), 10);
|
|
74
|
+
if (!Number.isInteger(owner) || !isProcessAlive(owner)) {
|
|
75
|
+
fs.rmSync(SECRETS_LOCK_FILE, { force: true });
|
|
76
|
+
continue;
|
|
77
|
+
}
|
|
78
|
+
}
|
|
79
|
+
}
|
|
80
|
+
catch {
|
|
81
|
+
// Лок исчез между stat и read — повторяем попытку.
|
|
82
|
+
}
|
|
83
|
+
if (Date.now() >= deadline) {
|
|
84
|
+
throw new Error("Не удалось получить блокировку хранилища секретов за " +
|
|
85
|
+
`${SECRETS_LOCK_TIMEOUT_MS} мс.`);
|
|
86
|
+
}
|
|
87
|
+
sleepSync(25);
|
|
88
|
+
}
|
|
89
|
+
}
|
|
90
|
+
try {
|
|
91
|
+
return fn();
|
|
92
|
+
}
|
|
93
|
+
finally {
|
|
94
|
+
secretsLockDepth = 0;
|
|
95
|
+
try {
|
|
96
|
+
fs.rmSync(SECRETS_LOCK_FILE, { force: true });
|
|
97
|
+
}
|
|
98
|
+
catch {
|
|
99
|
+
// Не критично: лок всё равно станет stale.
|
|
100
|
+
}
|
|
101
|
+
}
|
|
102
|
+
}
|
|
26
103
|
let cache = null;
|
|
27
104
|
let keyCache = null;
|
|
28
105
|
function warn(message, err) {
|
|
@@ -118,11 +195,30 @@ function loadKey() {
|
|
|
118
195
|
catch (err) {
|
|
119
196
|
if (err?.code !== "ENOENT")
|
|
120
197
|
throw err;
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
198
|
+
// Два процесса могли одновременно не найти ключ и сгенерировать разный.
|
|
199
|
+
// Под локом перечитываем файл: побеждает первый, остальные используют его ключ.
|
|
200
|
+
return withSecretsLock(() => {
|
|
201
|
+
try {
|
|
202
|
+
const raw = fs.readFileSync(SECRETS_KEY_FILE);
|
|
203
|
+
if (raw.length !== KEY_BYTES) {
|
|
204
|
+
throw new Error("повреждён файл ключа секретов");
|
|
205
|
+
}
|
|
206
|
+
keyCache = {
|
|
207
|
+
stamp: `${fs.statSync(SECRETS_KEY_FILE).mtimeMs}:${raw.length}`,
|
|
208
|
+
key: raw,
|
|
209
|
+
};
|
|
210
|
+
return raw;
|
|
211
|
+
}
|
|
212
|
+
catch (readErr) {
|
|
213
|
+
if (readErr?.code !== "ENOENT")
|
|
214
|
+
throw readErr;
|
|
215
|
+
}
|
|
216
|
+
const key = crypto.randomBytes(KEY_BYTES);
|
|
217
|
+
fs.writeFileSync(SECRETS_KEY_FILE, key, { mode: 0o600 });
|
|
218
|
+
chmodPrivate(SECRETS_KEY_FILE);
|
|
219
|
+
keyCache = { stamp: `${fs.statSync(SECRETS_KEY_FILE).mtimeMs}:${KEY_BYTES}`, key };
|
|
220
|
+
return key;
|
|
221
|
+
});
|
|
126
222
|
}
|
|
127
223
|
}
|
|
128
224
|
function emptyFile() {
|
|
@@ -151,7 +247,7 @@ function quarantineCorruptStore(err) {
|
|
|
151
247
|
catch (renameErr) {
|
|
152
248
|
corruptedStore = target;
|
|
153
249
|
warn(`secrets.json повреждён, но его не удалось переместить в ${target}. ` +
|
|
154
|
-
|
|
250
|
+
"Запись новых секретов заблокирована, чтобы не потерять данные.", renameErr);
|
|
155
251
|
return false;
|
|
156
252
|
}
|
|
157
253
|
}
|
|
@@ -166,7 +262,7 @@ function readFileSafe() {
|
|
|
166
262
|
if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) {
|
|
167
263
|
throw new Error("некорректный формат secrets.json");
|
|
168
264
|
}
|
|
169
|
-
const rawSecrets = parsed.secrets;
|
|
265
|
+
const rawSecrets = (parsed).secrets;
|
|
170
266
|
const secrets = {};
|
|
171
267
|
if (rawSecrets && typeof rawSecrets === "object" && !Array.isArray(rawSecrets)) {
|
|
172
268
|
for (const [name, entry] of Object.entries(rawSecrets)) {
|
|
@@ -201,14 +297,11 @@ function readFileSafe() {
|
|
|
201
297
|
/** Атомарная запись: temp + rename, права 0600. */
|
|
202
298
|
function writeFileSafe(file) {
|
|
203
299
|
ensureDir();
|
|
204
|
-
|
|
300
|
+
// Уникальный temp: два процесса не должны писать в один и тот же файл.
|
|
301
|
+
const tmp = `${SECRETS_FILE}.${process.pid}.${Date.now()}.tmp`;
|
|
205
302
|
fs.writeFileSync(tmp, JSON.stringify(file, null, 2), { encoding: "utf8", mode: 0o600 });
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
}
|
|
209
|
-
catch {
|
|
210
|
-
// файла нет — не ошибка
|
|
211
|
-
}
|
|
303
|
+
// Без предварительного rm: rename на POSIX и Windows атомарно заменяет файл,
|
|
304
|
+
// а rm открывал окно, в котором secrets.json отсутствовал при краше.
|
|
212
305
|
fs.renameSync(tmp, SECRETS_FILE);
|
|
213
306
|
chmodPrivate(SECRETS_FILE);
|
|
214
307
|
try {
|
|
@@ -248,15 +341,17 @@ export function setSecret(name, value) {
|
|
|
248
341
|
}
|
|
249
342
|
const secretName = validateSecretName(name);
|
|
250
343
|
const text = String(value ?? "");
|
|
251
|
-
|
|
252
|
-
|
|
253
|
-
|
|
254
|
-
|
|
255
|
-
|
|
256
|
-
|
|
257
|
-
|
|
258
|
-
|
|
259
|
-
|
|
344
|
+
return withSecretsLock(() => {
|
|
345
|
+
const key = loadKey();
|
|
346
|
+
const file = readFileSafe();
|
|
347
|
+
file.secrets[secretName] = encryptValue(secretName, text, key);
|
|
348
|
+
writeFileSafe(file);
|
|
349
|
+
return {
|
|
350
|
+
name: secretName,
|
|
351
|
+
preview: previewOf(text),
|
|
352
|
+
updatedAt: file.secrets[secretName].updatedAt,
|
|
353
|
+
};
|
|
354
|
+
});
|
|
260
355
|
}
|
|
261
356
|
/** Читает секрет; undefined, если его нет или он не расшифровывается. */
|
|
262
357
|
export function getSecret(name) {
|
|
@@ -280,12 +375,14 @@ export function hasSecret(name) {
|
|
|
280
375
|
/** Удаляет секрет; true — запись была. */
|
|
281
376
|
export function deleteSecret(name) {
|
|
282
377
|
const secretName = validateSecretName(name);
|
|
283
|
-
|
|
284
|
-
|
|
285
|
-
|
|
286
|
-
|
|
287
|
-
|
|
288
|
-
|
|
378
|
+
return withSecretsLock(() => {
|
|
379
|
+
const file = readFileSafe();
|
|
380
|
+
if (!(secretName in file.secrets))
|
|
381
|
+
return false;
|
|
382
|
+
delete file.secrets[secretName];
|
|
383
|
+
writeFileSafe(file);
|
|
384
|
+
return true;
|
|
385
|
+
});
|
|
289
386
|
}
|
|
290
387
|
function previewOf(value) {
|
|
291
388
|
const text = String(value ?? "");
|
|
@@ -400,7 +497,7 @@ export function redactSecretsInText(text) {
|
|
|
400
497
|
continue;
|
|
401
498
|
result = result.split(value).join("***");
|
|
402
499
|
}
|
|
403
|
-
result = result.replace(
|
|
500
|
+
result = result.replace(/(["']?)\b([A-Za-z0-9_]*(?:TOKEN|SECRET|PASSWORD|PASSWD|API_KEY|APIKEY|CREDENTIAL|AUTH)[A-Za-z0-9_]*)\b\1(\s*[=:]\s*)(["']?)([^\s"',;]+)\4/gi, (_match, openQuote, key, sep, quote) => `${openQuote}${key}${openQuote}${sep}${quote}***${quote}`);
|
|
404
501
|
// Восстанавливаем защищённые ссылки.
|
|
405
502
|
for (let i = 0; i < protectedRefs.length; i++) {
|
|
406
503
|
result = result.split(`\u0000SECRET_REF_${i}\u0000`).join(protectedRefs[i]);
|
|
@@ -13,8 +13,8 @@ export function calculateHealthScore(report) {
|
|
|
13
13
|
const successRateScore = totals.successRate;
|
|
14
14
|
const errorRateScore = Math.max(0, 100 - (totals.error / Math.max(1, totals.total)) * 100);
|
|
15
15
|
const avgDurationScore = Math.min(100, Math.max(0, 100 - (totals.avgDurationMs / 300000) * 100)); // 5 минут = 0 баллов
|
|
16
|
-
const timeoutRateScore = Math.min(100, Math.max(0, 100 - (errors.filter(e => e.message.includes(
|
|
17
|
-
const crashRecoveryRateScore = Math.min(100, Math.max(0, 100 - (errors.filter(e => e.message.includes(
|
|
16
|
+
const timeoutRateScore = Math.min(100, Math.max(0, 100 - (errors.filter(e => e.message.includes("timeout")).length / Math.max(1, totals.total)) * 100));
|
|
17
|
+
const crashRecoveryRateScore = Math.min(100, Math.max(0, 100 - (errors.filter(e => e.message.includes("Прервано")).length / Math.max(1, totals.total)) * 100));
|
|
18
18
|
// Взвешенная сумма
|
|
19
19
|
const score = Math.round(successRateScore * 0.35 +
|
|
20
20
|
errorRateScore * 0.25 +
|
|
@@ -112,8 +112,8 @@ function detectErrorSpike(records, windowDays) {
|
|
|
112
112
|
const half = Math.floor(records.length / 2);
|
|
113
113
|
const older = records.slice(half);
|
|
114
114
|
const recent = records.slice(0, half);
|
|
115
|
-
const recentErrorRate = recent.filter(r => r.status ===
|
|
116
|
-
const olderErrorRate = older.filter(r => r.status ===
|
|
115
|
+
const recentErrorRate = recent.filter(r => r.status === "error").length / recent.length;
|
|
116
|
+
const olderErrorRate = older.filter(r => r.status === "error").length / older.length;
|
|
117
117
|
// Всплеск ошибок: недавний период значительно хуже старого
|
|
118
118
|
if (olderErrorRate < 0.5 && recentErrorRate > olderErrorRate * 2 && recentErrorRate > 0.3) {
|
|
119
119
|
return {
|
|
@@ -124,13 +124,13 @@ function detectErrorSpike(records, windowDays) {
|
|
|
124
124
|
recommendations: [
|
|
125
125
|
"Проверьте логи ошибок за последнее время",
|
|
126
126
|
"Убедитесь, что Quality Gate настроен правильно",
|
|
127
|
-
"Рассмотрите добавление retryCount"
|
|
127
|
+
"Рассмотрите добавление retryCount",
|
|
128
128
|
],
|
|
129
129
|
metadata: {
|
|
130
130
|
recentErrorRate,
|
|
131
131
|
olderErrorRate,
|
|
132
|
-
windowDays
|
|
133
|
-
}
|
|
132
|
+
windowDays,
|
|
133
|
+
},
|
|
134
134
|
};
|
|
135
135
|
}
|
|
136
136
|
return null;
|
|
@@ -155,13 +155,13 @@ function detectDurationSpike(records) {
|
|
|
155
155
|
recommendations: [
|
|
156
156
|
"Проверьте, не завис ли процесс",
|
|
157
157
|
"Увеличьте timeoutSeconds если задача легитимно долгая",
|
|
158
|
-
"Рассмотрите разделение задачи на части"
|
|
158
|
+
"Рассмотрите разделение задачи на части",
|
|
159
159
|
],
|
|
160
160
|
metadata: {
|
|
161
161
|
recentDuration,
|
|
162
162
|
medianDuration: median,
|
|
163
|
-
ratio: recentDuration / median
|
|
164
|
-
}
|
|
163
|
+
ratio: recentDuration / median,
|
|
164
|
+
},
|
|
165
165
|
};
|
|
166
166
|
}
|
|
167
167
|
return null;
|
|
@@ -169,7 +169,7 @@ function detectDurationSpike(records) {
|
|
|
169
169
|
function detectTimeoutSpike(records) {
|
|
170
170
|
if (records.length < 5)
|
|
171
171
|
return null;
|
|
172
|
-
const timeoutCount = records.filter(r => r.error?.includes(
|
|
172
|
+
const timeoutCount = records.filter(r => r.error?.includes("timeout")).length;
|
|
173
173
|
const timeoutRate = timeoutCount / records.length;
|
|
174
174
|
if (timeoutRate > 0.2) {
|
|
175
175
|
return {
|
|
@@ -180,13 +180,13 @@ function detectTimeoutSpike(records) {
|
|
|
180
180
|
recommendations: [
|
|
181
181
|
"Увеличьте timeoutSeconds",
|
|
182
182
|
"Упростите промпты задачи",
|
|
183
|
-
"Проверьте производительность модели"
|
|
183
|
+
"Проверьте производительность модели",
|
|
184
184
|
],
|
|
185
185
|
metadata: {
|
|
186
186
|
timeoutCount,
|
|
187
187
|
totalRecords: records.length,
|
|
188
|
-
timeoutRate
|
|
189
|
-
}
|
|
188
|
+
timeoutRate,
|
|
189
|
+
},
|
|
190
190
|
};
|
|
191
191
|
}
|
|
192
192
|
return null;
|
|
@@ -211,13 +211,13 @@ function detectCostSpike(records) {
|
|
|
211
211
|
recommendations: [
|
|
212
212
|
"Проверьте, не используется ли более дорогая модель",
|
|
213
213
|
"Оптимизируйте промпты для снижения токенов",
|
|
214
|
-
"Рассмотрите использование локальной модели"
|
|
214
|
+
"Рассмотрите использование локальной модели",
|
|
215
215
|
],
|
|
216
216
|
metadata: {
|
|
217
217
|
recentCost,
|
|
218
218
|
medianCost: median,
|
|
219
|
-
ratio: recentCost / median
|
|
220
|
-
}
|
|
219
|
+
ratio: recentCost / median,
|
|
220
|
+
},
|
|
221
221
|
};
|
|
222
222
|
}
|
|
223
223
|
return null;
|
|
@@ -227,8 +227,8 @@ function detectUnusualPattern(records) {
|
|
|
227
227
|
return null;
|
|
228
228
|
// Проверяем паттерн: все подряд ошибки или все подряд успехи
|
|
229
229
|
const recent = records.slice(0, 5);
|
|
230
|
-
const allErrors = recent.every(r => r.status ===
|
|
231
|
-
const allSuccess = recent.every(r => r.status ===
|
|
230
|
+
const allErrors = recent.every(r => r.status === "error");
|
|
231
|
+
const allSuccess = recent.every(r => r.status === "success");
|
|
232
232
|
if (allErrors) {
|
|
233
233
|
return {
|
|
234
234
|
type: "unusual_pattern",
|
|
@@ -238,18 +238,18 @@ function detectUnusualPattern(records) {
|
|
|
238
238
|
recommendations: [
|
|
239
239
|
"Проверьте, не сломалась ли зависимость",
|
|
240
240
|
"Проверьте доступность внешних сервисов",
|
|
241
|
-
"Рассмотрите приостановку задачи до устранения проблемы"
|
|
241
|
+
"Рассмотрите приостановку задачи до устранения проблемы",
|
|
242
242
|
],
|
|
243
243
|
metadata: {
|
|
244
244
|
pattern: "consecutive_errors",
|
|
245
|
-
count: 5
|
|
246
|
-
}
|
|
245
|
+
count: 5,
|
|
246
|
+
},
|
|
247
247
|
};
|
|
248
248
|
}
|
|
249
249
|
return null;
|
|
250
250
|
}
|
|
251
251
|
function detectStalledRun(records, now) {
|
|
252
|
-
const running = records.find(r => r.status ===
|
|
252
|
+
const running = records.find(r => r.status === "running");
|
|
253
253
|
if (!running)
|
|
254
254
|
return null;
|
|
255
255
|
const startedAt = new Date(running.startedAt);
|
|
@@ -263,13 +263,13 @@ function detectStalledRun(records, now) {
|
|
|
263
263
|
recommendations: [
|
|
264
264
|
"Проверьте, не завис ли процесс",
|
|
265
265
|
"Рассмотрите принудительное завершение",
|
|
266
|
-
"Проверьте блокировки (lock file)"
|
|
266
|
+
"Проверьте блокировки (lock file)",
|
|
267
267
|
],
|
|
268
268
|
metadata: {
|
|
269
269
|
hoursRunning,
|
|
270
270
|
startedAt: running.startedAt,
|
|
271
|
-
taskId: running.id
|
|
272
|
-
}
|
|
271
|
+
taskId: running.id,
|
|
272
|
+
},
|
|
273
273
|
};
|
|
274
274
|
}
|
|
275
275
|
return null;
|
|
@@ -286,8 +286,8 @@ export function analyzeTrends(records, options = {}) {
|
|
|
286
286
|
if (older.length < 3 || recent.length < 3)
|
|
287
287
|
return trends;
|
|
288
288
|
// 1. Тренд успешности
|
|
289
|
-
const olderSuccessRate = older.filter(r => r.status ===
|
|
290
|
-
const recentSuccessRate = recent.filter(r => r.status ===
|
|
289
|
+
const olderSuccessRate = older.filter(r => r.status === "success").length / older.length;
|
|
290
|
+
const recentSuccessRate = recent.filter(r => r.status === "success").length / recent.length;
|
|
291
291
|
const successChange = ((recentSuccessRate - olderSuccessRate) / Math.max(olderSuccessRate, 0.01)) * 100;
|
|
292
292
|
trends.push({
|
|
293
293
|
metric: "success_rate",
|
|
@@ -296,8 +296,8 @@ export function analyzeTrends(records, options = {}) {
|
|
|
296
296
|
description: `Успешность: ${Math.round(olderSuccessRate * 100)}% → ${Math.round(recentSuccessRate * 100)}%`,
|
|
297
297
|
recommendations: successChange < -10 ? [
|
|
298
298
|
"Проверьте, что изменилось в последнее время",
|
|
299
|
-
"Проверьте логи ошибок"
|
|
300
|
-
] : []
|
|
299
|
+
"Проверьте логи ошибок",
|
|
300
|
+
] : [],
|
|
301
301
|
});
|
|
302
302
|
// 2. Тренд длительности
|
|
303
303
|
const olderDurations = older.map(r => r.durationMs || 0).filter(d => d > 0);
|
|
@@ -313,8 +313,8 @@ export function analyzeTrends(records, options = {}) {
|
|
|
313
313
|
description: `Средняя длительность: ${Math.round(olderAvgDuration / 1000)}с → ${Math.round(recentAvgDuration / 1000)}с`,
|
|
314
314
|
recommendations: durationChange > 20 ? [
|
|
315
315
|
"Оптимизируйте промпты",
|
|
316
|
-
"Проверьте, не увеличилась ли нагрузка"
|
|
317
|
-
] : []
|
|
316
|
+
"Проверьте, не увеличилась ли нагрузка",
|
|
317
|
+
] : [],
|
|
318
318
|
});
|
|
319
319
|
}
|
|
320
320
|
// 3. Тренд стоимости
|
|
@@ -331,8 +331,8 @@ export function analyzeTrends(records, options = {}) {
|
|
|
331
331
|
description: `Средняя стоимость: $${olderAvgCost.toFixed(4)} → $${recentAvgCost.toFixed(4)}`,
|
|
332
332
|
recommendations: costChange > 20 ? [
|
|
333
333
|
"Проверьте, не используется ли более дорогая модель",
|
|
334
|
-
"Оптимизируйте промпты для снижения токенов"
|
|
335
|
-
] : []
|
|
334
|
+
"Оптимизируйте промпты для снижения токенов",
|
|
335
|
+
] : [],
|
|
336
336
|
});
|
|
337
337
|
}
|
|
338
338
|
return trends;
|
|
@@ -358,8 +358,8 @@ export function generateRecommendations(report, anomalies, trends) {
|
|
|
358
358
|
"Проверьте логи ошибок за последние 7 дней",
|
|
359
359
|
"Убедитесь, что Quality Gate настроен правильно",
|
|
360
360
|
"Добавьте retryCount для флакких задач",
|
|
361
|
-
"Проверьте доступность внешних сервисов"
|
|
362
|
-
]
|
|
361
|
+
"Проверьте доступность внешних сервисов",
|
|
362
|
+
],
|
|
363
363
|
});
|
|
364
364
|
}
|
|
365
365
|
// Рекомендации на основе аномалий
|
|
@@ -367,12 +367,12 @@ export function generateRecommendations(report, anomalies, trends) {
|
|
|
367
367
|
if (anomaly.severity > 70) {
|
|
368
368
|
recommendations.push({
|
|
369
369
|
priority: Math.min(10, Math.round(anomaly.severity / 10)),
|
|
370
|
-
category: anomaly.type.includes(
|
|
370
|
+
category: anomaly.type.includes("cost") ? "cost" : "performance",
|
|
371
371
|
title: `Устраните аномалию: ${anomaly.type}`,
|
|
372
372
|
description: anomaly.description,
|
|
373
373
|
expectedImpact: "Снизит нагрузку и улучшит стабильность",
|
|
374
374
|
effort: "medium",
|
|
375
|
-
steps: anomaly.recommendations
|
|
375
|
+
steps: anomaly.recommendations,
|
|
376
376
|
});
|
|
377
377
|
}
|
|
378
378
|
}
|
|
@@ -381,12 +381,12 @@ export function generateRecommendations(report, anomalies, trends) {
|
|
|
381
381
|
if (trend.direction === "degrading" && Math.abs(trend.changePercent) > 20) {
|
|
382
382
|
recommendations.push({
|
|
383
383
|
priority: 7,
|
|
384
|
-
category: trend.metric.includes(
|
|
384
|
+
category: trend.metric.includes("cost") ? "cost" : "performance",
|
|
385
385
|
title: `Обратите внимание на тренд: ${trend.metric}`,
|
|
386
386
|
description: trend.description,
|
|
387
387
|
expectedImpact: "Предотвратит дальнейшее ухудшение",
|
|
388
388
|
effort: "low",
|
|
389
|
-
steps: trend.recommendations
|
|
389
|
+
steps: trend.recommendations,
|
|
390
390
|
});
|
|
391
391
|
}
|
|
392
392
|
}
|
|
@@ -403,8 +403,8 @@ export function generateRecommendations(report, anomalies, trends) {
|
|
|
403
403
|
"Проверьте, не используется ли более дорогая модель для простых задач",
|
|
404
404
|
"Оптимизируйте промпты для снижения токенов",
|
|
405
405
|
"Рассмотрите использование локальной модели для простых задач",
|
|
406
|
-
"Настройте лимиты на задачи с высокими затратами"
|
|
407
|
-
]
|
|
406
|
+
"Настройте лимиты на задачи с высокими затратами",
|
|
407
|
+
],
|
|
408
408
|
});
|
|
409
409
|
}
|
|
410
410
|
// Рекомендации на основе длительности
|
|
@@ -420,12 +420,12 @@ export function generateRecommendations(report, anomalies, trends) {
|
|
|
420
420
|
"Разбейте длинные задачи на более мелкие",
|
|
421
421
|
"Упростите промпты",
|
|
422
422
|
"Проверьте, не используются ли медленные модели",
|
|
423
|
-
"Увеличьте timeoutSeconds если задачи легитимно долгие"
|
|
424
|
-
]
|
|
423
|
+
"Увеличьте timeoutSeconds если задачи легитимно долгие",
|
|
424
|
+
],
|
|
425
425
|
});
|
|
426
426
|
}
|
|
427
427
|
// Рекомендации на основе таймаутов
|
|
428
|
-
const timeoutErrors = report.errors.filter(e => e.message.includes(
|
|
428
|
+
const timeoutErrors = report.errors.filter(e => e.message.includes("timeout"));
|
|
429
429
|
if (timeoutErrors.length > 0) {
|
|
430
430
|
recommendations.push({
|
|
431
431
|
priority: 8,
|
|
@@ -438,12 +438,12 @@ export function generateRecommendations(report, anomalies, trends) {
|
|
|
438
438
|
"Увеличьте timeoutSeconds для затронутых задач",
|
|
439
439
|
"Упростите промпты",
|
|
440
440
|
"Проверьте производительность модели",
|
|
441
|
-
"Рассмотрите разделение сложных задач"
|
|
442
|
-
]
|
|
441
|
+
"Рассмотрите разделение сложных задач",
|
|
442
|
+
],
|
|
443
443
|
});
|
|
444
444
|
}
|
|
445
445
|
// Рекомендации на основе крашей
|
|
446
|
-
const crashErrors = report.errors.filter(e => e.message.includes(
|
|
446
|
+
const crashErrors = report.errors.filter(e => e.message.includes("Прервано"));
|
|
447
447
|
if (crashErrors.length > 0) {
|
|
448
448
|
recommendations.push({
|
|
449
449
|
priority: 7,
|
|
@@ -456,8 +456,8 @@ export function generateRecommendations(report, anomalies, trends) {
|
|
|
456
456
|
"Проверьте стабильность системы",
|
|
457
457
|
"Проверьте, нет ли конфликтов между задачами",
|
|
458
458
|
"Убедитесь, что задачи не превышают лимиты ресурсов",
|
|
459
|
-
"Рассмотрите настройку crash recovery"
|
|
460
|
-
]
|
|
459
|
+
"Рассмотрите настройку crash recovery",
|
|
460
|
+
],
|
|
461
461
|
});
|
|
462
462
|
}
|
|
463
463
|
// Сортируем по приоритету
|
|
@@ -473,7 +473,7 @@ export function generateSelfAnalysisReport(records, options = {}) {
|
|
|
473
473
|
days: windowDays,
|
|
474
474
|
now,
|
|
475
475
|
topLimit: options.topLimit,
|
|
476
|
-
tasks: options.tasks
|
|
476
|
+
tasks: options.tasks,
|
|
477
477
|
});
|
|
478
478
|
// Health Score
|
|
479
479
|
const health = calculateHealthScore(analyticsReport);
|
|
@@ -496,8 +496,8 @@ export function generateSelfAnalysisReport(records, options = {}) {
|
|
|
496
496
|
sources: {
|
|
497
497
|
historyRecords: records.length,
|
|
498
498
|
recordsInWindow: analyticsReport.sources.recordsInWindow,
|
|
499
|
-
tasksAnalyzed: analyticsReport.tasks.length
|
|
500
|
-
}
|
|
499
|
+
tasksAnalyzed: analyticsReport.tasks.length,
|
|
500
|
+
},
|
|
501
501
|
};
|
|
502
502
|
}
|
|
503
503
|
function generateSummary(health, anomalies, trends, recommendations) {
|
|
@@ -508,7 +508,7 @@ function generateSummary(health, anomalies, trends, recommendations) {
|
|
|
508
508
|
good: "хорошее",
|
|
509
509
|
fair: "удовлетворительное",
|
|
510
510
|
poor: "плохое",
|
|
511
|
-
critical: "критическое"
|
|
511
|
+
critical: "критическое",
|
|
512
512
|
};
|
|
513
513
|
parts.push(`Здоровье системы: ${levelNames[health.level]} (${health.score}/100)`);
|
|
514
514
|
// Аномалии
|
|
@@ -525,7 +525,7 @@ function generateSummary(health, anomalies, trends, recommendations) {
|
|
|
525
525
|
parts.push("Критических аномалий не обнаружено");
|
|
526
526
|
}
|
|
527
527
|
// Тренды
|
|
528
|
-
const degradingTrends = trends.filter(t => t.direction ===
|
|
528
|
+
const degradingTrends = trends.filter(t => t.direction === "degrading").length;
|
|
529
529
|
if (degradingTrends > 0) {
|
|
530
530
|
parts.push(`${degradingTrends} метрик ухудшаются`);
|
|
531
531
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../../src/core/session.ts"],"names":[],"mappings":"AAQA,eAAO,MAAM,aAAa,mCAAoC,CAAC;AAC/D,MAAM,MAAM,WAAW,GAAG,CAAC,OAAO,aAAa,CAAC,CAAC,MAAM,CAAC,CAAC;AAIzD,wDAAwD;AACxD,wBAAgB,iBAAiB,IAAI,MAAM,CAU1C;AAED,kCAAkC;AAClC,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,MAAM,CAEhE;AAED;;;GAGG;AACH,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,OAAO,GAAG,WAAW,GAAG,SAAS,CAI5E;AAED,4DAA4D;AAC5D,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,WAAW,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAShF;AAED,iEAAiE;AACjE,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAE9E;AAED;;;;;GAKG;AACH,wBAAgB,wBAAwB,CACtC,QAAQ,EACJ;IAAE,OAAO,CAAC,EAAE,WAAW,CAAC;IAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAAC,eAAe,CAAC,EAAE,MAAM,CAAA;CAAE,GACvE,SAAS,EACb,OAAO,EAAE,WAAW,EACpB,SAAS,EAAE,MAAM,GAAG,SAAS,GAC5B,MAAM,CAIR;AAED,0DAA0D;AAC1D,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAEzD;AAED;;;;GAIG;AACH,wBAAsB,qBAAqB,CACzC,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,MAAM,GAAG,SAAS,GAC5B,OAAO,CAAC,IAAI,CAAC,CAef;AAED;;;;;GAKG;AACH,wBAAsB,qBAAqB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../../src/core/session.ts"],"names":[],"mappings":"AAQA,eAAO,MAAM,aAAa,mCAAoC,CAAC;AAC/D,MAAM,MAAM,WAAW,GAAG,CAAC,OAAO,aAAa,CAAC,CAAC,MAAM,CAAC,CAAC;AAIzD,wDAAwD;AACxD,wBAAgB,iBAAiB,IAAI,MAAM,CAU1C;AAED,kCAAkC;AAClC,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,MAAM,CAEhE;AAED;;;GAGG;AACH,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,OAAO,GAAG,WAAW,GAAG,SAAS,CAI5E;AAED,4DAA4D;AAC5D,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,WAAW,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAShF;AAED,iEAAiE;AACjE,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAE9E;AAED;;;;;GAKG;AACH,wBAAgB,wBAAwB,CACtC,QAAQ,EACJ;IAAE,OAAO,CAAC,EAAE,WAAW,CAAC;IAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAAC,eAAe,CAAC,EAAE,MAAM,CAAA;CAAE,GACvE,SAAS,EACb,OAAO,EAAE,WAAW,EACpB,SAAS,EAAE,MAAM,GAAG,SAAS,GAC5B,MAAM,CAIR;AAED,0DAA0D;AAC1D,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAEzD;AAED;;;;GAIG;AACH,wBAAsB,qBAAqB,CACzC,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,MAAM,GAAG,SAAS,GAC5B,OAAO,CAAC,IAAI,CAAC,CAef;AAED;;;;;GAKG;AACH,wBAAsB,qBAAqB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAkD3E"}
|
package/dist/core/session.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import crypto from "node:crypto";
|
|
2
2
|
import fs from "node:fs/promises";
|
|
3
3
|
import path from "node:path";
|
|
4
|
-
import {
|
|
4
|
+
import { runOpencode } from "./opencode-cli.js";
|
|
5
5
|
import { getTask, saveTask } from "../db/tasks-repo.js";
|
|
6
6
|
import { appendStructuredLog } from "./structured-log.js";
|
|
7
7
|
import { WRAPPER_DIR, sanitizeName } from "../types.js";
|
|
@@ -100,17 +100,24 @@ export async function rotateSessionIfNeeded(taskName) {
|
|
|
100
100
|
const maxRuns = def.sessionMaxRuns ?? 0;
|
|
101
101
|
const count = (def.sessionRunCount ?? 0) + 1;
|
|
102
102
|
if (shouldRotateSession(count, maxRuns)) {
|
|
103
|
-
const
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
103
|
+
const oldSessionId = def.sessionId;
|
|
104
|
+
const hasOldSession = Boolean(oldSessionId && isValidSessionId(oldSessionId));
|
|
105
|
+
let deleteError;
|
|
106
|
+
if (hasOldSession && oldSessionId) {
|
|
107
|
+
// На Windows `opencode` — это `opencode.cmd`, который Node не запускает
|
|
108
|
+
// напрямую через execFile (ENOENT/EINVAL). Общий модуль сам выбирает
|
|
109
|
+
// cmd.exe на Windows, поэтому удаление действительно выполняется.
|
|
110
|
+
const result = await runOpencode(["session", "delete", oldSessionId]);
|
|
111
|
+
if (!result.ok) {
|
|
112
|
+
deleteError = result.error ?? "неизвестная ошибка";
|
|
113
|
+
console.warn(`[session] Не удалось удалить сессию ${oldSessionId} задачи "${taskName}": ${deleteError}`);
|
|
112
114
|
}
|
|
113
115
|
}
|
|
116
|
+
const rotationNote = !hasOldSession
|
|
117
|
+
? "старой сессии не было"
|
|
118
|
+
: deleteError
|
|
119
|
+
? `старую сессию удалить не удалось (${deleteError})`
|
|
120
|
+
: "сессия удалена";
|
|
114
121
|
const newSessionId = generateSessionId();
|
|
115
122
|
await saveTask({
|
|
116
123
|
...def,
|
|
@@ -121,7 +128,7 @@ export async function rotateSessionIfNeeded(taskName) {
|
|
|
121
128
|
appendStructuredLog({
|
|
122
129
|
event: "session.rotated",
|
|
123
130
|
task: taskName,
|
|
124
|
-
reason: `maxRuns=${maxRuns} достигнут;
|
|
131
|
+
reason: `maxRuns=${maxRuns} достигнут; ${rotationNote}, создана новая, счётчик сброшен`,
|
|
125
132
|
});
|
|
126
133
|
}
|
|
127
134
|
else {
|
package/dist/core/summary.js
CHANGED
|
@@ -32,7 +32,7 @@ function isRecord(value) {
|
|
|
32
32
|
}
|
|
33
33
|
function resolveEndpoint(baseUrl) {
|
|
34
34
|
const base = baseUrl.replace(/\/+$/, "");
|
|
35
|
-
if (
|
|
35
|
+
if (base.endsWith("/v1")) {
|
|
36
36
|
return { url: `${base}/chat/completions`, protocol: "openai" };
|
|
37
37
|
}
|
|
38
38
|
return { url: `${base}/api/chat`, protocol: "ollama" };
|
|
@@ -0,0 +1,24 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* P1-10: разные имена задач могут сжаться в один sanitized-идентификатор
|
|
3
|
+
* («my task» и «my-task» → «my-task»), после чего делят wrapper, prompt,
|
|
4
|
+
* lock и log. При создании новой задачи такую коллизию нужно отклонить,
|
|
5
|
+
* иначе вторая задача молча перезапишет файлы первой.
|
|
6
|
+
*/
|
|
7
|
+
export type SanitizedConflict = {
|
|
8
|
+
kind: "task";
|
|
9
|
+
taskName: string;
|
|
10
|
+
} | {
|
|
11
|
+
kind: "file";
|
|
12
|
+
file: string;
|
|
13
|
+
};
|
|
14
|
+
/**
|
|
15
|
+
* Ищет конфликт sanitized-имени среди существующих задач и их артефактов.
|
|
16
|
+
*
|
|
17
|
+
* @param name имя создаваемой задачи;
|
|
18
|
+
* @param existingNames имена уже существующих задач (без самой создаваемой);
|
|
19
|
+
* @param artifactExists проверка существования файла — подменяется в тестах.
|
|
20
|
+
*/
|
|
21
|
+
export declare function findSanitizedNameConflict(name: string, existingNames: readonly string[], artifactExists?: (file: string) => boolean): SanitizedConflict | null;
|
|
22
|
+
/** Человекочитаемое объяснение конфликта для ошибки создания задачи. */
|
|
23
|
+
export declare function sanitizedConflictMessage(name: string, conflict: SanitizedConflict): string;
|
|
24
|
+
//# sourceMappingURL=task-name.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"task-name.d.ts","sourceRoot":"","sources":["../../src/core/task-name.ts"],"names":[],"mappings":"AAIA;;;;;GAKG;AACH,MAAM,MAAM,iBAAiB,GACzB;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,GAClC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,CAAC;AAEnC;;;;;;GAMG;AACH,wBAAgB,yBAAyB,CACvC,IAAI,EAAE,MAAM,EACZ,aAAa,EAAE,SAAS,MAAM,EAAE,EAChC,cAAc,GAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAoB,GACrD,iBAAiB,GAAG,IAAI,CAwB1B;AAED,wEAAwE;AACxE,wBAAgB,wBAAwB,CACtC,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,iBAAiB,GAC1B,MAAM,CAWR"}
|