agent-steward 0.0.3 → 0.0.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 +154 -2
- package/CROSS_PLATFORM.md +19 -0
- package/README.md +54 -9
- package/ROADMAP-STRATEGY.md +23 -20
- package/ROADMAP.md +140 -143
- package/dist/cli.d.ts +3 -0
- package/dist/cli.d.ts.map +1 -0
- package/dist/cli.js +351 -0
- 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 +18 -1
- 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/gate-integrity.d.ts +35 -0
- package/dist/core/gate-integrity.d.ts.map +1 -0
- package/dist/core/gate-integrity.js +132 -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/lock.d.ts +61 -4
- package/dist/core/lock.d.ts.map +1 -1
- package/dist/core/lock.js +213 -26
- package/dist/core/matrix.d.ts.map +1 -1
- package/dist/core/matrix.js +75 -15
- package/dist/core/mission.d.ts +83 -0
- package/dist/core/mission.d.ts.map +1 -0
- package/dist/core/mission.js +334 -0
- package/dist/core/one-shot.d.ts +5 -1
- package/dist/core/one-shot.d.ts.map +1 -1
- package/dist/core/one-shot.js +33 -8
- 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/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 +64 -0
- package/dist/core/pipeline-map.d.ts +46 -0
- package/dist/core/pipeline-map.d.ts.map +1 -0
- package/dist/core/pipeline-map.js +196 -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 +19 -2
- package/dist/core/ps-wrapper.d.ts.map +1 -1
- package/dist/core/ps-wrapper.js +261 -63
- 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 +183 -58
- 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 +91 -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 +34 -0
- package/dist/core/schedule-v2.d.ts.map +1 -1
- package/dist/core/schedule-v2.js +91 -5
- package/dist/core/scheduler/at-fallback.d.ts +55 -2
- package/dist/core/scheduler/at-fallback.d.ts.map +1 -1
- package/dist/core/scheduler/at-fallback.js +135 -5
- package/dist/core/scheduler/linux.d.ts +18 -2
- package/dist/core/scheduler/linux.d.ts.map +1 -1
- package/dist/core/scheduler/linux.js +63 -20
- 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/posix.d.ts.map +1 -1
- package/dist/core/scheduler/posix.js +25 -1
- package/dist/core/scheduler/registry.d.ts +11 -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.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 +125 -28
- package/dist/core/session.d.ts.map +1 -1
- package/dist/core/session.js +18 -11
- package/dist/core/structured-log.d.ts +7 -1
- package/dist/core/structured-log.d.ts.map +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/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 +17 -0
- package/dist/core/wrappers/bash.d.ts.map +1 -1
- package/dist/core/wrappers/bash.js +224 -28
- package/dist/db/capability-repo.d.ts +124 -0
- package/dist/db/capability-repo.d.ts.map +1 -0
- package/dist/db/capability-repo.js +267 -0
- package/dist/db/history-repo.d.ts +46 -5
- package/dist/db/history-repo.d.ts.map +1 -1
- package/dist/db/history-repo.js +107 -25
- package/dist/db/index.d.ts +4 -0
- package/dist/db/index.d.ts.map +1 -1
- package/dist/db/index.js +39 -1
- package/dist/db/metrics-repo.js +2 -2
- package/dist/db/migrate.d.ts.map +1 -1
- package/dist/db/migrate.js +3 -1
- package/dist/db/recovery.d.ts.map +1 -1
- package/dist/db/recovery.js +5 -4
- 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 +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 +10 -2
- package/dist/db/run-resume.d.ts.map +1 -1
- package/dist/db/run-resume.js +39 -13
- package/dist/db/runs-repo.d.ts +32 -7
- package/dist/db/runs-repo.d.ts.map +1 -1
- package/dist/db/runs-repo.js +50 -11
- package/dist/db/schema.d.ts +2 -2
- package/dist/db/schema.d.ts.map +1 -1
- package/dist/db/schema.js +216 -3
- 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/history.d.ts +1 -1
- package/dist/history.d.ts.map +1 -1
- 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 +140 -6
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +480 -18
- package/dist/notifications.d.ts +22 -0
- package/dist/notifications.d.ts.map +1 -1
- package/dist/notifications.js +36 -8
- package/dist/profiles.d.ts.map +1 -1
- package/dist/profiles.js +25 -4
- package/dist/rpc.d.ts +924 -0
- package/dist/rpc.d.ts.map +1 -1
- package/dist/rpc.js +352 -0
- package/dist/server.d.ts +46 -0
- package/dist/server.d.ts.map +1 -1
- package/dist/server.js +172 -53
- package/dist/settings.d.ts +2 -2
- package/dist/settings.d.ts.map +1 -1
- package/dist/settings.js +3 -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 +16 -0
- package/dist/task-transfer.d.ts.map +1 -1
- package/dist/task-transfer.js +16 -0
- package/dist/types.d.ts.map +1 -1
- package/dist/types.js +7 -0
- package/dist/workspaces.d.ts +25 -3
- package/dist/workspaces.d.ts.map +1 -1
- package/dist/workspaces.js +43 -8
- package/docs/ARCHITECTURE.md +498 -58
- package/docs/COMPATIBILITY.md +2 -2
- package/docs/CONCEPT.md +185 -91
- package/docs/CROSS_PLATFORM.ru.md +20 -0
- package/docs/CROSS_PLATFORM.zh.md +18 -0
- package/docs/EXECUTION-LOOP.md +211 -0
- package/docs/FEATURES.md +65 -4
- package/docs/FEATURES.zh.md +52 -4
- package/docs/MIGRATION.md +2 -2
- package/docs/PIPELINE.md +293 -0
- package/docs/README.ru.md +44 -5
- package/docs/README.zh.md +46 -6
- package/docs/SAFETY.md +142 -0
- package/docs/SAVINGS.md +29 -0
- package/docs/SAVINGS.ru.md +29 -0
- package/docs/SAVINGS.zh.md +18 -0
- package/gui-experimental.cjs +9 -8
- package/locales/en.json +84 -1
- package/locales/ru.json +84 -1
- package/locales/zh.json +84 -1
- package/opencode.pipeline.yaml +35 -0
- package/package.json +46 -2
- package/scripts/audit-bundle.mjs +215 -0
- package/scripts/test-home.mjs +83 -0
- package/src/cli.ts +412 -0
- package/src/core/dlq-api.ts +98 -0
- package/src/core/dry-run.ts +27 -3
- package/src/core/execution.ts +538 -0
- package/src/core/file-watcher.ts +2 -2
- package/src/core/gate-integrity.ts +160 -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/lock.ts +244 -30
- package/src/core/matrix.ts +95 -50
- package/src/core/mission.ts +485 -0
- package/src/core/native-notify.ts +1 -1
- package/src/core/one-shot.ts +36 -8
- package/src/core/opencode-cli.ts +103 -0
- package/src/core/opencode-models.ts +315 -0
- package/src/core/pipeline-apply.ts +158 -0
- package/src/core/pipeline-io.ts +79 -0
- package/src/core/pipeline-map.ts +264 -0
- package/src/core/pipeline-spec.ts +775 -0
- package/src/core/ps-wrapper.ts +274 -64
- package/src/core/record-history.ts +229 -104
- 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 +115 -0
- package/src/core/run-panel-api.ts +262 -0
- package/src/core/schedule-gate.ts +7 -3
- package/src/core/schedule-v2.ts +114 -5
- package/src/core/scheduler/at-fallback.ts +190 -5
- package/src/core/scheduler/linux.ts +72 -21
- package/src/core/scheduler/logs.ts +2 -2
- package/src/core/scheduler/mac.ts +174 -14
- package/src/core/scheduler/posix.ts +20 -1
- package/src/core/scheduler/registry.ts +107 -26
- package/src/core/scheduler/run-now.ts +32 -0
- package/src/core/scheduler/windows.ts +19 -15
- package/src/core/secrets.ts +131 -31
- package/src/core/session.ts +23 -10
- package/src/core/structured-log.ts +22 -5
- package/src/core/task-name.ts +67 -0
- 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/worktree-run.ts +199 -0
- package/src/core/worktree.ts +600 -0
- package/src/core/wrappers/bash.ts +239 -27
- package/src/db/capability-repo.ts +402 -0
- package/src/db/history-repo.ts +151 -22
- package/src/db/index.ts +37 -1
- package/src/db/metrics-repo.ts +2 -2
- package/src/db/migrate.ts +3 -1
- package/src/db/recovery.ts +5 -4
- package/src/db/run-context.ts +370 -0
- package/src/db/run-dlq.ts +310 -0
- package/src/db/run-journal.ts +100 -13
- package/src/db/run-resume.ts +65 -13
- package/src/db/runs-repo.ts +66 -13
- package/src/db/schema.ts +218 -3
- package/src/db/settings-repo.ts +31 -0
- package/src/db/step-idempotency.ts +185 -0
- package/src/gui.tsx +692 -13
- package/src/history.ts +1 -1
- package/src/i18n.ts +12 -4
- package/src/index.ts +648 -8
- package/src/notifications.ts +38 -8
- package/src/profiles.ts +26 -4
- package/src/rpc.ts +379 -0
- package/src/server.ts +206 -54
- package/src/settings.ts +5 -5
- package/src/shared/jobs-view.ts +3 -1
- package/src/task-transfer.ts +31 -0
- package/src/types.ts +9 -0
- package/src/workspaces.ts +58 -9
package/dist/server.js
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import http from "node:http";
|
|
2
|
+
import { randomBytes } from "node:crypto";
|
|
2
3
|
import fs from "node:fs/promises";
|
|
3
4
|
import { execFile } from "node:child_process";
|
|
4
5
|
import { promisify } from "node:util";
|
|
@@ -9,9 +10,10 @@ import { getSchedulerTitle } from "./core/scheduler/index.js";
|
|
|
9
10
|
import { getPluginVersion } from "./version.js";
|
|
10
11
|
import { checkpointDb, getDbFile, getDbStatus } from "./db/index.js";
|
|
11
12
|
import { listWorkspaces } from "./workspaces.js";
|
|
12
|
-
import { getProfileName, getProfilePort } from "./profiles.js";
|
|
13
|
+
import { DEFAULT_PROFILE, getProfileName, getProfilePort } from "./profiles.js";
|
|
13
14
|
import { simulatePipeline } from "./core/dry-run.js";
|
|
14
15
|
import { loadSettings } from "./settings.js";
|
|
16
|
+
import { DEFAULT_MODEL_PRICE_PER_MILLION, DEFAULT_PRICE_PER_MILLION, catalogPricePerMillion, normalizeModelId, resolveWhatIfModels, } from "./core/opencode-models.js";
|
|
15
17
|
import { authenticateHookRequest, extractHookSignature, extractHookToken, readRequestBody, } from "./integrations.js";
|
|
16
18
|
import { appendStructuredLog, readStructuredLogs } from "./core/structured-log.js";
|
|
17
19
|
import { PROMETHEUS_CONTENT_TYPE, renderPrometheusMetrics } from "./core/prometheus.js";
|
|
@@ -51,23 +53,42 @@ function normalizeProcessName(name) {
|
|
|
51
53
|
const DASHBOARD_HEADER = "x-plugin-dashboard";
|
|
52
54
|
const DASHBOARD_MARKER = "agent-steward";
|
|
53
55
|
/**
|
|
54
|
-
*
|
|
55
|
-
*
|
|
56
|
+
* Профиль, которому принадлежит ответившее приложение (B4).
|
|
57
|
+
* Маркер DASHBOARD_MARKER одинаков у всех профилей, поэтому без этого
|
|
58
|
+
* заголовка второй профиль принимал чужой дашборд за свой: переиспользовал
|
|
59
|
+
* чужой порт и показывал данные другого профиля.
|
|
56
60
|
*/
|
|
57
|
-
const
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
}
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
61
|
+
const PROFILE_HEADER = "x-plugin-profile";
|
|
62
|
+
/** Чтение JSON из переменной окружения с фолбэком на значение по умолчанию. */
|
|
63
|
+
function envJson(name, fallback) {
|
|
64
|
+
const raw = process.env[name];
|
|
65
|
+
if (!raw)
|
|
66
|
+
return fallback;
|
|
67
|
+
try {
|
|
68
|
+
return JSON.parse(raw);
|
|
69
|
+
}
|
|
70
|
+
catch {
|
|
71
|
+
console.warn(`[scheduler] Неверный JSON в переменной ${name}, используются значения по умолчанию.`);
|
|
72
|
+
return fallback;
|
|
73
|
+
}
|
|
74
|
+
}
|
|
75
|
+
/** Ручное переопределение цен: OPENCODE_SCHEDULER_MODEL_PRICES (JSON). */
|
|
76
|
+
const envModelPrices = envJson("OPENCODE_SCHEDULER_MODEL_PRICES", {});
|
|
77
|
+
/**
|
|
78
|
+
* Цена модели за 1M токенов.
|
|
79
|
+
*
|
|
80
|
+
* Порядок: ручное переопределение → каталог цен OpenCode (models.dev) →
|
|
81
|
+
* встроенная таблица → средняя оценка.
|
|
82
|
+
*/
|
|
83
|
+
export function modelPrice(model) {
|
|
84
|
+
const key = normalizeModelId(model);
|
|
85
|
+
const override = envModelPrices[key];
|
|
86
|
+
if (typeof override === "number" && Number.isFinite(override))
|
|
87
|
+
return override;
|
|
88
|
+
const fromOpencode = catalogPricePerMillion(key);
|
|
89
|
+
if (fromOpencode !== null)
|
|
90
|
+
return fromOpencode;
|
|
91
|
+
return DEFAULT_MODEL_PRICE_PER_MILLION[key] ?? DEFAULT_PRICE_PER_MILLION;
|
|
71
92
|
}
|
|
72
93
|
/** Оценка стоимости запуска по токенам (если точная цена неизвестна). */
|
|
73
94
|
function estimateCost(tokens, model) {
|
|
@@ -77,7 +98,7 @@ function estimateCost(tokens, model) {
|
|
|
77
98
|
* Агрегирует историю по моделям и считает сценарии What-If.
|
|
78
99
|
* Возвращает данные для GET /api/models-analysis и блока дашборда.
|
|
79
100
|
*/
|
|
80
|
-
function aggregateModels(history) {
|
|
101
|
+
export function aggregateModels(history) {
|
|
81
102
|
const map = new Map();
|
|
82
103
|
let totalTokens = 0;
|
|
83
104
|
let totalCost = 0;
|
|
@@ -111,13 +132,27 @@ function aggregateModels(history) {
|
|
|
111
132
|
successRate: item.runs > 0 ? Math.round((item.success / item.runs) * 100) : 0,
|
|
112
133
|
}))
|
|
113
134
|
.sort((a, b) => b.totalRuns - a.totalRuns);
|
|
114
|
-
|
|
115
|
-
|
|
135
|
+
// What-If: сначала модели, которые реально запускались, затем по одной
|
|
136
|
+
// модели на каждую цену из доступных в OpenCode. Явный список из
|
|
137
|
+
// окружения главнее.
|
|
138
|
+
const usedModels = models
|
|
139
|
+
.map((item) => item.model)
|
|
140
|
+
.filter((model) => model !== "по умолчанию");
|
|
141
|
+
const envWhatIfModels = envJson("OPENCODE_SCHEDULER_WHAT_IF_MODELS", null);
|
|
142
|
+
const selection = Array.isArray(envWhatIfModels) && envWhatIfModels.length > 0
|
|
143
|
+
? { models: envWhatIfModels, source: "env" }
|
|
144
|
+
: resolveWhatIfModels(usedModels);
|
|
145
|
+
const whatIf = selection.models.map((model) => ({
|
|
116
146
|
model,
|
|
117
147
|
pricePerMillion: modelPrice(model),
|
|
118
148
|
cost: Number(((totalTokens * modelPrice(model)) / 1000000).toFixed(4)),
|
|
119
149
|
}));
|
|
120
|
-
return {
|
|
150
|
+
return {
|
|
151
|
+
models,
|
|
152
|
+
totals: { totalRuns, totalTokens, totalCost: Number(totalCost.toFixed(6)) },
|
|
153
|
+
whatIf,
|
|
154
|
+
whatIfSource: selection.source,
|
|
155
|
+
};
|
|
121
156
|
}
|
|
122
157
|
/**
|
|
123
158
|
* Оценка стоимости токенов, если OpenCode не напечатал цену в логе:
|
|
@@ -243,12 +278,19 @@ export async function startDashboardServer(deps, ports) {
|
|
|
243
278
|
console.error(`[agent-steward] Не удалось запустить дашборд на порту ${port}: ${err instanceof Error ? err.message : String(err)}`);
|
|
244
279
|
return null;
|
|
245
280
|
}
|
|
246
|
-
// Порт занят: если это уже наш дашборд (другой
|
|
247
|
-
// в том же процессе/сессии), переиспользуем его,
|
|
248
|
-
|
|
281
|
+
// Порт занят: если это уже наш дашборд того же профиля (другой
|
|
282
|
+
// экземпляр плагина в том же процессе/сессии), переиспользуем его,
|
|
283
|
+
// а не вешаем второй порт. Дашборд другого профиля не наш: его нельзя
|
|
284
|
+
// ни переиспользовать (покажет чужие данные), ни снимать как зомби.
|
|
285
|
+
const probe = port !== 0 ? await probeDashboardOn(port) : null;
|
|
286
|
+
if (probe?.dashboard && probe.profile === getProfileName()) {
|
|
249
287
|
console.log(`[agent-steward] Дашборд уже запущен на http://localhost:${port} — переиспользуем его.`);
|
|
250
288
|
return { port };
|
|
251
289
|
}
|
|
290
|
+
if (probe?.dashboard && probe.profile !== getProfileName()) {
|
|
291
|
+
console.warn(`[agent-steward] Порт ${port} занят дашбордом профиля "${probe.profile}" — не трогаем, пробуем другой порт.`);
|
|
292
|
+
continue;
|
|
293
|
+
}
|
|
252
294
|
// Порт занят чужим или старым процессом: пробуем снять зомби
|
|
253
295
|
// (только node/bun этого плагина) и повторить bind.
|
|
254
296
|
if (port !== 0 && (await tryFreeZombiePort(port))) {
|
|
@@ -460,17 +502,28 @@ async function getProcessInfoPosix(pid) {
|
|
|
460
502
|
return null;
|
|
461
503
|
}
|
|
462
504
|
}
|
|
463
|
-
/**
|
|
464
|
-
|
|
505
|
+
/**
|
|
506
|
+
* Проверяет по маркер-заголовку, что на порту отвечает наш дашборд,
|
|
507
|
+
* и определяет его профиль (B4.1).
|
|
508
|
+
*
|
|
509
|
+
* Заголовок профиля появился в B4.1. Более старые сборки его не отдают —
|
|
510
|
+
* таких считаем профилем `default`: до появления профилей база была одна,
|
|
511
|
+
* а значит старый процесс работал именно с default.
|
|
512
|
+
*/
|
|
513
|
+
export async function probeDashboardOn(port) {
|
|
465
514
|
try {
|
|
466
515
|
const res = await fetch(`http://127.0.0.1:${port}/`, {
|
|
467
516
|
method: "GET",
|
|
468
517
|
signal: AbortSignal.timeout(1500),
|
|
469
518
|
});
|
|
470
|
-
|
|
519
|
+
if (res.headers.get(DASHBOARD_HEADER) !== DASHBOARD_MARKER) {
|
|
520
|
+
return { dashboard: false, profile: null };
|
|
521
|
+
}
|
|
522
|
+
const profile = res.headers.get(PROFILE_HEADER)?.trim() || DEFAULT_PROFILE;
|
|
523
|
+
return { dashboard: true, profile };
|
|
471
524
|
}
|
|
472
525
|
catch {
|
|
473
|
-
return false;
|
|
526
|
+
return { dashboard: false, profile: null };
|
|
474
527
|
}
|
|
475
528
|
}
|
|
476
529
|
/**
|
|
@@ -570,7 +623,10 @@ async function handleRequest(req, res, deps) {
|
|
|
570
623
|
}
|
|
571
624
|
// Статический HTML-файл — страница дашборда.
|
|
572
625
|
if (req.method === "GET" && (pathname === "/" || pathname === "/index.html")) {
|
|
573
|
-
|
|
626
|
+
const nonce = randomBytes(16).toString("base64");
|
|
627
|
+
send(res, 200, "text/html; charset=utf-8", renderPage(nonce), {
|
|
628
|
+
"Content-Security-Policy": dashboardCsp(nonce),
|
|
629
|
+
});
|
|
574
630
|
return;
|
|
575
631
|
}
|
|
576
632
|
// JSON-API.
|
|
@@ -1102,15 +1158,35 @@ function sanitizeError(err) {
|
|
|
1102
1158
|
return String(err).slice(0, 300);
|
|
1103
1159
|
}
|
|
1104
1160
|
/** Отправляет ответ с телом и закрывает соединение. */
|
|
1105
|
-
function send(res, status, contentType, body) {
|
|
1161
|
+
function send(res, status, contentType, body, extraHeaders) {
|
|
1106
1162
|
res.writeHead(status, {
|
|
1107
1163
|
"Content-Type": contentType,
|
|
1108
1164
|
"Cache-Control": "no-store",
|
|
1109
1165
|
"X-Content-Type-Options": "nosniff",
|
|
1110
1166
|
[DASHBOARD_HEADER]: DASHBOARD_MARKER,
|
|
1167
|
+
[PROFILE_HEADER]: getProfileName(),
|
|
1168
|
+
...extraHeaders,
|
|
1111
1169
|
});
|
|
1112
1170
|
res.end(body);
|
|
1113
1171
|
}
|
|
1172
|
+
/**
|
|
1173
|
+
* CSP страницы дашборда: defense in depth к экранированию (B3.4).
|
|
1174
|
+
* Единственный инлайн-скрипт помечается nonce, внешние скрипты запрещены;
|
|
1175
|
+
* инлайн-стили остаются разрешёнными, потому что разметка использует style="…".
|
|
1176
|
+
*/
|
|
1177
|
+
function dashboardCsp(nonce) {
|
|
1178
|
+
return [
|
|
1179
|
+
"default-src 'none'",
|
|
1180
|
+
`script-src 'nonce-${nonce}'`,
|
|
1181
|
+
"style-src 'unsafe-inline'",
|
|
1182
|
+
"connect-src 'self'",
|
|
1183
|
+
"img-src 'self' data:",
|
|
1184
|
+
"base-uri 'none'",
|
|
1185
|
+
"form-action 'none'",
|
|
1186
|
+
"frame-ancestors 'none'",
|
|
1187
|
+
"object-src 'none'",
|
|
1188
|
+
].join("; ");
|
|
1189
|
+
}
|
|
1114
1190
|
/** Отправляет бинарный файл (скачивание .db-бэкапа). */
|
|
1115
1191
|
function sendBuffer(res, status, contentType, body, filename) {
|
|
1116
1192
|
if (res.headersSent) {
|
|
@@ -1124,6 +1200,7 @@ function sendBuffer(res, status, contentType, body, filename) {
|
|
|
1124
1200
|
"Cache-Control": "no-store",
|
|
1125
1201
|
"X-Content-Type-Options": "nosniff",
|
|
1126
1202
|
[DASHBOARD_HEADER]: DASHBOARD_MARKER,
|
|
1203
|
+
[PROFILE_HEADER]: getProfileName(),
|
|
1127
1204
|
});
|
|
1128
1205
|
res.end(body);
|
|
1129
1206
|
}
|
|
@@ -1140,6 +1217,7 @@ function sendAttachment(res, status, contentType, body, filename) {
|
|
|
1140
1217
|
"Cache-Control": "no-store",
|
|
1141
1218
|
"X-Content-Type-Options": "nosniff",
|
|
1142
1219
|
[DASHBOARD_HEADER]: DASHBOARD_MARKER,
|
|
1220
|
+
[PROFILE_HEADER]: getProfileName(),
|
|
1143
1221
|
});
|
|
1144
1222
|
res.end(body);
|
|
1145
1223
|
}
|
|
@@ -1179,7 +1257,7 @@ async function collectTasksWithMetrics(deps) {
|
|
|
1179
1257
|
* Данные тянутся fetch'ем с JSON-API и перерисовываются каждые 5 секунд.
|
|
1180
1258
|
* Внутри строковой константы не используются бэктики и ${}, чтобы не экранировать.
|
|
1181
1259
|
*/
|
|
1182
|
-
function renderPage() {
|
|
1260
|
+
function renderPage(nonce) {
|
|
1183
1261
|
return `<!DOCTYPE html>
|
|
1184
1262
|
<html lang="${getLocale()}">
|
|
1185
1263
|
<head>
|
|
@@ -1464,7 +1542,7 @@ function renderPage() {
|
|
|
1464
1542
|
</div>
|
|
1465
1543
|
<div id="toast" role="status" aria-live="polite"></div>
|
|
1466
1544
|
|
|
1467
|
-
<script>
|
|
1545
|
+
<script nonce="${nonce}">
|
|
1468
1546
|
(function () {
|
|
1469
1547
|
'use strict';
|
|
1470
1548
|
|
|
@@ -1472,6 +1550,7 @@ function renderPage() {
|
|
|
1472
1550
|
var updated = document.getElementById('updated');
|
|
1473
1551
|
var allTasks = [];
|
|
1474
1552
|
var allWorkspaces = [];
|
|
1553
|
+
var allAnalytics = null;
|
|
1475
1554
|
var activeWorkspace = 'all';
|
|
1476
1555
|
/** Раскрытые родители матриц (имя → true). */
|
|
1477
1556
|
var expandedMatrixParents = {};
|
|
@@ -1483,11 +1562,20 @@ function renderPage() {
|
|
|
1483
1562
|
// (HTTP 499), и тогда в консоли появляется ошибка при каждой загрузке.
|
|
1484
1563
|
var preferSummaryMetrics = true;
|
|
1485
1564
|
var metricsFallbackLogged = false;
|
|
1565
|
+
// P3-29: тяжёлая аналитика обновляется реже остальных блоков.
|
|
1566
|
+
var ANALYTICS_INTERVAL_MS = 60000;
|
|
1486
1567
|
|
|
1568
|
+
// Экранирование для текстового и атрибутного контекста.
|
|
1569
|
+
// Раньше использовался div.innerHTML: он превращает & < > в сущности,
|
|
1570
|
+
// но оставляет кавычки как есть, а результат подставляется в
|
|
1571
|
+
// title="…", style="…", data-*="…" и href="…" — это и был вектор XSS.
|
|
1487
1572
|
function esc(s) {
|
|
1488
|
-
|
|
1489
|
-
|
|
1490
|
-
|
|
1573
|
+
return String(s == null ? '' : s)
|
|
1574
|
+
.replace(/&/g, '&')
|
|
1575
|
+
.replace(/</g, '<')
|
|
1576
|
+
.replace(/>/g, '>')
|
|
1577
|
+
.replace(/"/g, '"')
|
|
1578
|
+
.replace(/'/g, ''');
|
|
1491
1579
|
}
|
|
1492
1580
|
|
|
1493
1581
|
function toast(msg, kind) {
|
|
@@ -1557,7 +1645,7 @@ function renderPage() {
|
|
|
1557
1645
|
);
|
|
1558
1646
|
throw new Error('Сервер вернул не JSON. Проверьте консоль.');
|
|
1559
1647
|
}
|
|
1560
|
-
if (marker !== 'opencode-windows-scheduler') {
|
|
1648
|
+
if (marker !== 'agent-steward' && marker !== 'opencode-windows-scheduler') {
|
|
1561
1649
|
console.warn(
|
|
1562
1650
|
'В ответе нет заголовка x-plugin-dashboard — возможно, это не дашборд плагина.'
|
|
1563
1651
|
);
|
|
@@ -1827,18 +1915,18 @@ function renderPage() {
|
|
|
1827
1915
|
html += '</tbody></table>';
|
|
1828
1916
|
box.innerHTML = html;
|
|
1829
1917
|
|
|
1830
|
-
var gpt = null;
|
|
1831
|
-
var deepseek = null;
|
|
1832
|
-
for (var j = 0; j < whatIf.length; j++) {
|
|
1833
|
-
if (whatIf[j].model === 'openai/gpt-4o') gpt = whatIf[j];
|
|
1834
|
-
if (whatIf[j].model === 'deepseek/deepseek-coder') deepseek = whatIf[j];
|
|
1835
|
-
}
|
|
1836
1918
|
var parts = [];
|
|
1837
|
-
|
|
1838
|
-
|
|
1919
|
+
var source = data && data.whatIfSource;
|
|
1920
|
+
if (source === 'opencode') {
|
|
1921
|
+
parts.push('Модели и цены — из OpenCode (ваши доступные модели):');
|
|
1922
|
+
} else if (source === 'history') {
|
|
1923
|
+
parts.push('Модели для сравнения — те, что уже запускались:');
|
|
1924
|
+
} else if (source === 'default') {
|
|
1925
|
+
parts.push('OpenCode недоступен, показаны модели по умолчанию:');
|
|
1839
1926
|
}
|
|
1840
|
-
|
|
1841
|
-
|
|
1927
|
+
for (var j = 0; j < whatIf.length; j++) {
|
|
1928
|
+
var w = whatIf[j];
|
|
1929
|
+
parts.push('Если бы все запуски выполнялись через <b>' + esc(w.model) + '</b>, это стоило бы ~<b>' + money(w.cost) + '</b> (' + w.pricePerMillion + ' $/1M токенов).');
|
|
1842
1930
|
}
|
|
1843
1931
|
parts.push('Всего запусков: <b>' + totals.totalRuns + '</b>, токенов: <b>' + Number(totals.totalTokens || 0).toLocaleString('ru-RU') + '</b>, фактическая стоимость: <b>' + money(totals.totalCost) + '</b>.');
|
|
1844
1932
|
text.innerHTML = parts.join(' ');
|
|
@@ -1937,8 +2025,9 @@ function renderPage() {
|
|
|
1937
2025
|
var text = String(value == null ? '' : value);
|
|
1938
2026
|
return text.length > max ? text.slice(0, max - 1) + '…' : text;
|
|
1939
2027
|
}
|
|
2028
|
+
// esc() уже экранирует кавычки, отдельная подмена " больше не нужна.
|
|
1940
2029
|
function attr(value) {
|
|
1941
|
-
return esc(
|
|
2030
|
+
return esc(value);
|
|
1942
2031
|
}
|
|
1943
2032
|
function statusClass(status) {
|
|
1944
2033
|
if (status === 'success') return ' okg';
|
|
@@ -2065,7 +2154,7 @@ function renderPage() {
|
|
|
2065
2154
|
}
|
|
2066
2155
|
|
|
2067
2156
|
if (visible.length === 0) {
|
|
2068
|
-
rows.innerHTML = '<tr><td colspan="9" class="empty"
|
|
2157
|
+
rows.innerHTML = '<tr><td colspan="9" class="empty">' + EMPTY_TASKS_HTML + '</td></tr>';
|
|
2069
2158
|
return;
|
|
2070
2159
|
}
|
|
2071
2160
|
var html = '';
|
|
@@ -2086,7 +2175,7 @@ function renderPage() {
|
|
|
2086
2175
|
}
|
|
2087
2176
|
}
|
|
2088
2177
|
if (shown === 0) {
|
|
2089
|
-
rows.innerHTML = '<tr><td colspan="9" class="empty"
|
|
2178
|
+
rows.innerHTML = '<tr><td colspan="9" class="empty">' + EMPTY_TASKS_HTML + '</td></tr>';
|
|
2090
2179
|
return;
|
|
2091
2180
|
}
|
|
2092
2181
|
rows.innerHTML = html;
|
|
@@ -2149,6 +2238,16 @@ function renderPage() {
|
|
|
2149
2238
|
// Без него кросс-сайтовый fetch не пройдёт (нужен CORS-preflight, которого нет).
|
|
2150
2239
|
var CLIENT_HEADERS = { 'X-Scheduler-Client': 'dashboard' };
|
|
2151
2240
|
|
|
2241
|
+
// P3-29: новогоднее оформление (снежинки и «украсить ёлку») — только по
|
|
2242
|
+
// явному флагу ?snow=1, чтобы не крутить 18 анимаций круглый год.
|
|
2243
|
+
var FESTIVE = false;
|
|
2244
|
+
try {
|
|
2245
|
+
FESTIVE = new URLSearchParams(location.search).get('snow') === '1';
|
|
2246
|
+
} catch (_) {}
|
|
2247
|
+
var EMPTY_TASKS_HTML = FESTIVE
|
|
2248
|
+
? '🎄 Задач пока нет. Самое время украсить ёлку!'
|
|
2249
|
+
: 'Задач пока нет. Самое время создать!';
|
|
2250
|
+
|
|
2152
2251
|
// Устойчивая загрузка: антивирусы иногда блокируют отдельные URL
|
|
2153
2252
|
// (например, /api/metrics) статусом 499 и картинкой вместо JSON.
|
|
2154
2253
|
// Один сбой не должен ломать весь дашборд.
|
|
@@ -2196,8 +2295,7 @@ function renderPage() {
|
|
|
2196
2295
|
loadMetricsJson(),
|
|
2197
2296
|
safeJson('/api/history', { records: [] }),
|
|
2198
2297
|
safeJson('/api/models-analysis', { models: [], totals: {}, whatIf: [] }),
|
|
2199
|
-
safeJson('/api/workspaces', { workspaces: [] })
|
|
2200
|
-
safeJson('/api/analytics?days=14', null)
|
|
2298
|
+
safeJson('/api/workspaces', { workspaces: [] })
|
|
2201
2299
|
]);
|
|
2202
2300
|
var tasks = (results[0] && results[0].tasks) || [];
|
|
2203
2301
|
var m = results[1] || {};
|
|
@@ -2217,7 +2315,7 @@ function renderPage() {
|
|
|
2217
2315
|
renderGraph(tasks);
|
|
2218
2316
|
renderHistory(history);
|
|
2219
2317
|
renderModelsAnalysis(modelsAnalysis);
|
|
2220
|
-
renderAnalytics(
|
|
2318
|
+
renderAnalytics(allAnalytics);
|
|
2221
2319
|
showServerWarn(results[0] ? null : 'Не удалось загрузить список задач — остальные блоки обновлены. Подробности в консоли (F12).');
|
|
2222
2320
|
updated.textContent = 'Обновлено: ' + new Date().toLocaleTimeString();
|
|
2223
2321
|
} catch (err) {
|
|
@@ -2227,6 +2325,25 @@ function renderPage() {
|
|
|
2227
2325
|
}
|
|
2228
2326
|
}
|
|
2229
2327
|
|
|
2328
|
+
// P3-29: аналитика — тяжёлая агрегация SQLite, грузим реже основных блоков
|
|
2329
|
+
// и используем ETag/If-None-Match, чтобы не перезапрашивать неизменённые данные.
|
|
2330
|
+
var analyticsEtag = null;
|
|
2331
|
+
async function loadAnalytics() {
|
|
2332
|
+
try {
|
|
2333
|
+
var headers = { 'X-Scheduler-Client': 'dashboard' };
|
|
2334
|
+
if (analyticsEtag) headers['If-None-Match'] = analyticsEtag;
|
|
2335
|
+
var res = await fetch('/api/analytics?days=14', { cache: 'no-store', headers: headers });
|
|
2336
|
+
if (res.status === 304) return; // не изменилось с прошлого раза
|
|
2337
|
+
analyticsEtag = res.headers.get('ETag');
|
|
2338
|
+
allAnalytics = await readJson(res);
|
|
2339
|
+
if (allAnalytics && allAnalytics.totals) {
|
|
2340
|
+
renderAnalytics(allAnalytics);
|
|
2341
|
+
}
|
|
2342
|
+
} catch (err) {
|
|
2343
|
+
console.error('Аналитика недоступна:', err);
|
|
2344
|
+
}
|
|
2345
|
+
}
|
|
2346
|
+
|
|
2230
2347
|
document.addEventListener('click', function (e) {
|
|
2231
2348
|
var matrixBtn = e.target && e.target.closest ? e.target.closest('button[data-matrix]') : null;
|
|
2232
2349
|
if (!matrixBtn) return;
|
|
@@ -2391,10 +2508,12 @@ function renderPage() {
|
|
|
2391
2508
|
|
|
2392
2509
|
loadAll();
|
|
2393
2510
|
setInterval(loadAll, 5000);
|
|
2511
|
+
loadAnalytics();
|
|
2512
|
+
setInterval(loadAnalytics, ANALYTICS_INTERVAL_MS);
|
|
2394
2513
|
})();
|
|
2395
2514
|
</script>
|
|
2396
2515
|
|
|
2397
|
-
<script>
|
|
2516
|
+
<script nonce="${nonce}">
|
|
2398
2517
|
(function () {
|
|
2399
2518
|
var flakes = ['❄', '❅', '❆'];
|
|
2400
2519
|
for (var i = 0; i < 18; i++) {
|
package/dist/settings.d.ts
CHANGED
|
@@ -312,8 +312,8 @@ export interface SchedulerSettings {
|
|
|
312
312
|
/** Максимум одновременно выполняющихся задач. 0 — без ограничения. */
|
|
313
313
|
maxConcurrent: number;
|
|
314
314
|
/**
|
|
315
|
-
* Язык интерфейса (Спринт 28, режим `auto` — T7): `
|
|
316
|
-
* `en`/`zh` — явный
|
|
315
|
+
* Язык интерфейса (Спринт 28, режим `auto` — T7): `auto` по умолчанию —
|
|
316
|
+
* следовать за языком OpenCode; `ru`/`en`/`zh` — явный выбор пользователя.
|
|
317
317
|
*/
|
|
318
318
|
locale: LocaleMode;
|
|
319
319
|
/**
|
package/dist/settings.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"settings.d.ts","sourceRoot":"","sources":["../src/settings.ts"],"names":[],"mappings":"AAIA,OAAO,
|
|
1
|
+
{"version":3,"file":"settings.d.ts","sourceRoot":"","sources":["../src/settings.ts"],"names":[],"mappings":"AAIA,OAAO,EAA8G,KAAK,MAAM,EAAE,KAAK,UAAU,EAAE,MAAM,WAAW,CAAC;AACrK,OAAO,EAGL,KAAK,gBAAgB,EACtB,MAAM,uBAAuB,CAAC;AAE/B,6DAA6D;AAC7D,MAAM,WAAW,2BAA2B;IAC1C,wBAAwB;IACxB,OAAO,EAAE,OAAO,CAAC;IACjB,mBAAmB;IACnB,GAAG,EAAE,MAAM,CAAC;IACZ,2CAA2C;IAC3C,SAAS,EAAE,MAAM,CAAC;IAClB,mEAAmE;IACnE,UAAU,EAAE,MAAM,CAAC;IACnB,iFAAiF;IACjF,YAAY,EAAE,MAAM,CAAC;CACtB;AAED,2DAA2D;AAC3D,MAAM,WAAW,qBAAqB;IACpC,+EAA+E;IAC/E,OAAO,EAAE,MAAM,CAAC;IAChB,4EAA4E;IAC5E,KAAK,EAAE,MAAM,CAAC;CACf;AAED,4EAA4E;AAC5E,MAAM,WAAW,mBAAmB;IAClC,oEAAoE;IACpE,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,0DAA0D;IAC1D,OAAO,EAAE,MAAM,EAAE,CAAC;CACnB;AAED,0CAA0C;AAC1C,MAAM,WAAW,0BAA0B;IACzC,0CAA0C;IAC1C,OAAO,EAAE,OAAO,CAAC;IACjB,+CAA+C;IAC/C,SAAS,EAAE,OAAO,CAAC;IACnB,uCAAuC;IACvC,WAAW,EAAE,OAAO,CAAC;IACrB,iEAAiE;IACjE,iBAAiB,EAAE,MAAM,CAAC;CAC3B;AAED,+BAA+B;AAC/B,MAAM,MAAM,eAAe,GAAG,OAAO,GAAG,QAAQ,CAAC;AAEjD,2CAA2C;AAC3C,MAAM,MAAM,UAAU,GAAG,KAAK,GAAG,OAAO,GAAG,KAAK,GAAG,MAAM,CAAC;AAE1D;;;;;GAKG;AACH,MAAM,MAAM,cAAc,GAAG,OAAO,GAAG,QAAQ,GAAG,MAAM,CAAC;AAEzD,yDAAyD;AACzD,MAAM,MAAM,eAAe,GAAG,QAAQ,GAAG,MAAM,GAAG,OAAO,GAAG,MAAM,CAAC;AAEnE,kCAAkC;AAClC,MAAM,MAAM,kBAAkB,GAC1B,QAAQ,GACR,UAAU,GACV,OAAO,GACP,IAAI,GACJ,IAAI,GACJ,KAAK,GACL,KAAK,CAAC;AAEV,wDAAwD;AACxD,MAAM,MAAM,gBAAgB,GAAG,QAAQ,GAAG,MAAM,CAAC;AAEjD,2DAA2D;AAC3D,MAAM,MAAM,kBAAkB,GAC1B,SAAS,GACT,SAAS,GACT,YAAY,GACZ,SAAS,GACT,SAAS,CAAC;AACd,MAAM,MAAM,kBAAkB,GAAG,KAAK,GAAG,QAAQ,GAAG,MAAM,CAAC;AAE3D;;;;;GAKG;AACH,MAAM,WAAW,UAAU;IACzB,oDAAoD;IACpD,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,eAAe,CAAC;IACvB,QAAQ,EAAE,kBAAkB,CAAC;IAC7B,oDAAoD;IACpD,KAAK,EAAE,MAAM,GAAG,MAAM,CAAC;IACvB,QAAQ,CAAC,EAAE,kBAAkB,CAAC;IAC9B,QAAQ,CAAC,EAAE,kBAAkB,CAAC;IAC9B,oDAAoD;IACpD,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,MAAM,CAAC,EAAE,gBAAgB,CAAC;IAC1B,kEAAkE;IAClE,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,0DAA0D;IAC1D,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,2DAA2D;AAC3D,MAAM,WAAW,cAAc;IAC7B,uGAAuG;IACvG,IAAI,EAAE,UAAU,CAAC;IACjB,0EAA0E;IAC1E,OAAO,EAAE,MAAM,CAAC;IAChB,+CAA+C;IAC/C,KAAK,EAAE,MAAM,CAAC;IACd,oDAAoD;IACpD,SAAS,EAAE,MAAM,CAAC;IAClB,6EAA6E;IAC7E,QAAQ,EAAE,cAAc,CAAC;IACzB,+EAA+E;IAC/E,mBAAmB,EAAE,MAAM,CAAC;IAC5B;;;OAGG;IACH,KAAK,CAAC,EAAE,UAAU,EAAE,CAAC;IACrB,gFAAgF;IAChF,MAAM,CAAC,EAAE,oBAAoB,CAAC;CAC/B;AAED,yCAAyC;AACzC,MAAM,WAAW,oBAAoB;IACnC,kDAAkD;IAClD,OAAO,EAAE,OAAO,CAAC;IACjB,0DAA0D;IAC1D,IAAI,EAAE,MAAM,CAAC;IACb,iEAAiE;IACjE,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;CAC1B;AAED,uCAAuC;AACvC,eAAO,MAAM,mBAAmB,KAAK,CAAC;AAEtC,gDAAgD;AAChD,MAAM,WAAW,cAAc;IAC7B,2BAA2B;IAC3B,OAAO,EAAE,OAAO,CAAC;IACjB,oDAAoD;IACpD,SAAS,EAAE,eAAe,CAAC;IAC3B,gEAAgE;IAChE,IAAI,EAAE,MAAM,CAAC;IACb,yEAAyE;IACzE,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;CAC3B;AAED,mEAAmE;AACnE,MAAM,MAAM,iBAAiB,GAAG,EAAE,GAAG,MAAM,GAAG,UAAU,GAAG,YAAY,CAAC;AAExE,8CAA8C;AAC9C,MAAM,WAAW,4BAA4B;IAC3C,iCAAiC;IACjC,OAAO,EAAE,OAAO,CAAC;IACjB,0DAA0D;IAC1D,QAAQ,EAAE,MAAM,CAAC;IACjB,qCAAqC;IACrC,MAAM,EAAE,MAAM,CAAC;IACf,8CAA8C;IAC9C,SAAS,EAAE,iBAAiB,CAAC;IAC7B,4BAA4B;IAC5B,mBAAmB,EAAE,OAAO,CAAC;IAC7B,qEAAqE;IACrE,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,6CAA6C;IAC7C,oBAAoB,EAAE,OAAO,CAAC;IAC9B,uDAAuD;IACvD,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,2CAA2C;AAC3C,MAAM,WAAW,0BAA0B;IACzC,mEAAmE;IACnE,OAAO,EAAE,OAAO,CAAC;IACjB,sCAAsC;IACtC,KAAK,EAAE,OAAO,CAAC;CAChB;AAED,4EAA4E;AAC5E,MAAM,WAAW,kBAAkB;IACjC,oCAAoC;IACpC,OAAO,EAAE,OAAO,CAAC;IACjB,wCAAwC;IACxC,IAAI,EAAE,MAAM,CAAC;IACb,8DAA8D;IAC9D,EAAE,EAAE,MAAM,CAAC;CACZ;AAED;;;;;GAKG;AACH,MAAM,WAAW,oBAAoB;IACnC,uCAAuC;IACvC,OAAO,EAAE,OAAO,CAAC;IACjB,yEAAyE;IACzE,WAAW,EAAE,OAAO,CAAC;IACrB,qBAAqB;IACrB,OAAO,CAAC,EAAE,2BAA2B,CAAC;IACtC,sBAAsB;IACtB,QAAQ,CAAC,EAAE,4BAA4B,CAAC;IACxC,+BAA+B;IAC/B,MAAM,CAAC,EAAE,0BAA0B,CAAC;IACpC,kBAAkB;IAClB,UAAU,CAAC,EAAE,kBAAkB,CAAC;IAChC,yEAAyE;IACzE,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,yBAAyB;IACzB,SAAS,CAAC,EAAE,qBAAqB,CAAC;IAClC,0BAA0B;IAC1B,OAAO,CAAC,EAAE,mBAAmB,CAAC;IAC9B,8BAA8B;IAC9B,MAAM,CAAC,EAAE,0BAA0B,CAAC;IACpC,8BAA8B;IAC9B,MAAM,CAAC,EAAE,cAAc,CAAC;IACxB,mCAAmC;IACnC,MAAM,CAAC,EAAE,cAAc,CAAC;IACxB,uCAAuC;IACvC,KAAK,CAAC,EAAE,yBAAyB,CAAC;IAClC,0DAA0D;IAC1D,SAAS,CAAC,EAAE,6BAA6B,CAAC;IAC1C,iDAAiD;IACjD,OAAO,CAAC,EAAE,2BAA2B,CAAC;CACvC;AAED;;;GAGG;AACH,MAAM,WAAW,2BAA2B;IAC1C,+CAA+C;IAC/C,OAAO,EAAE,OAAO,CAAC;IACjB,6CAA6C;IAC7C,QAAQ,EAAE,MAAM,CAAC;IACjB,oDAAoD;IACpD,eAAe,EAAE,MAAM,CAAC;IACxB,wDAAwD;IACxD,SAAS,EAAE,MAAM,CAAC;CACnB;AAED;;;GAGG;AACH,MAAM,WAAW,yBAAyB;IACxC,4CAA4C;IAC5C,OAAO,EAAE,OAAO,CAAC;IACjB,mDAAmD;IACnD,aAAa,EAAE,MAAM,CAAC;IACtB,6EAA6E;IAC7E,kBAAkB,EAAE,OAAO,CAAC;IAC5B,qEAAqE;IACrE,iBAAiB,EAAE,MAAM,EAAE,CAAC;IAC5B,wCAAwC;IACxC,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED;;;;GAIG;AACH,MAAM,WAAW,6BAA6B;IAC5C,0DAA0D;IAC1D,OAAO,EAAE,OAAO,CAAC;IACjB,sEAAsE;IACtE,kBAAkB,EAAE,OAAO,CAAC;IAC5B,mDAAmD;IACnD,aAAa,EAAE,MAAM,CAAC;IACtB,6EAA6E;IAC7E,SAAS,EAAE,MAAM,CAAC;IAClB,gEAAgE;IAChE,UAAU,EAAE,MAAM,CAAC;CACpB;AAED;;;;;;GAMG;AACH,MAAM,WAAW,eAAe;IAC9B,6EAA6E;IAC7E,aAAa,EAAE,MAAM,CAAC;IACtB,kEAAkE;IAClE,UAAU,EAAE,MAAM,CAAC;IACnB,yDAAyD;IACzD,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,gEAAgE;IAChE,kBAAkB,EAAE,MAAM,CAAC;CAC5B;AAED;;;;;;GAMG;AACH,MAAM,WAAW,YAAY;IAC3B,6CAA6C;IAC7C,OAAO,EAAE,OAAO,CAAC;IACjB,wEAAwE;IACxE,KAAK,EAAE,MAAM,CAAC;IACd,qDAAqD;IACrD,MAAM,EAAE,MAAM,CAAC;IACf,gFAAgF;IAChF,gBAAgB,EAAE,OAAO,CAAC;IAC1B,gEAAgE;IAChE,YAAY,EAAE,MAAM,CAAC;IACrB,oGAAoG;IACpG,yBAAyB,EAAE,MAAM,CAAC;CACnC;AAED,gDAAgD;AAChD,MAAM,WAAW,mBAAmB;IAClC,0CAA0C;IAC1C,KAAK,EAAE,YAAY,CAAC;CACrB;AAED,4CAA4C;AAC5C,MAAM,WAAW,aAAa;IAC5B,4BAA4B;IAC5B,OAAO,EAAE,OAAO,CAAC;IACjB,mEAAmE;IACnE,aAAa,EAAE,MAAM,CAAC;IACtB,kDAAkD;IAClD,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,0DAA0D;AAC1D,MAAM,WAAW,kBAAkB;IACjC,iFAAiF;IACjF,aAAa,EAAE,gBAAgB,CAAC;CACjC;AAED;;;GAGG;AACH,MAAM,WAAW,iBAAiB;IAChC,sEAAsE;IACtE,aAAa,EAAE,MAAM,CAAC;IACtB;;;OAGG;IACH,MAAM,EAAE,UAAU,CAAC;IACnB;;;;OAIG;IACH,QAAQ,EAAE,MAAM,CAAC;IACjB,uEAAuE;IACvE,UAAU,EAAE,OAAO,CAAC;IACpB,sCAAsC;IACtC,aAAa,EAAE,oBAAoB,CAAC;IACpC,gCAAgC;IAChC,OAAO,EAAE,eAAe,CAAC;IACzB,qDAAqD;IACrD,YAAY,EAAE,mBAAmB,CAAC;IAClC,yCAAyC;IACzC,KAAK,EAAE,aAAa,CAAC;IACrB,+CAA+C;IAC/C,WAAW,EAAE,kBAAkB,CAAC;CACjC;AAED,eAAO,MAAM,aAAa,QAAyC,CAAC;AACpE,eAAO,MAAM,sBAAsB,IAAI,CAAC;AACxC,eAAO,MAAM,mBAAmB,QAAQ,CAAC;AACzC,eAAO,MAAM,sBAAsB,KAAK,CAAC;AACzC,eAAO,MAAM,mBAAmB,OAAO,CAAC;AAExC,oFAAoF;AACpF,eAAO,MAAM,0BAA0B,QAAS,CAAC;AACjD,eAAO,MAAM,2BAA2B,IAAI,CAAC;AAC7C,eAAO,MAAM,8BAA8B,OAAQ,CAAC;AACpD,eAAO,MAAM,2BAA2B,KAAK,CAAC;AAE9C,sEAAsE;AACtE,eAAO,MAAM,2BAA2B,QAAa,CAAC;AACtD,eAAO,MAAM,wCAAwC,MAAM,CAAC;AAI5D,sEAAsE;AACtE,eAAO,MAAM,4BAA4B,KAAK,CAAC;AAC/C,eAAO,MAAM,yBAAyB,QAAS,CAAC;AAEhD,oCAAoC;AACpC,wBAAgB,oBAAoB,IAAI,aAAa,CAMpD;AAED,+DAA+D;AAC/D,wBAAgB,0BAA0B,IAAI,kBAAkB,CAE/D;AAmCD,6EAA6E;AAC7E,wBAAgB,mBAAmB,IAAI,mBAAmB,CAWzD;AAED,kEAAkE;AAClE,wBAAgB,uBAAuB,IAAI;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAK3E;AAED,8DAA8D;AAC9D,wBAAgB,sBAAsB,IAAI,eAAe,CAOxD;AAkCD,uEAAuE;AACvE,wBAAgB,oBAAoB,IAAI,oBAAoB,CAkF3D;AAwUD,4EAA4E;AAC5E,wBAAgB,cAAc,CAAC,MAAM,EAAE,oBAAoB,GAAG,SAAS,GAAG,OAAO,CAOhF;AAED,8FAA8F;AAC9F,wBAAgB,WAAW,CAAC,MAAM,EAAE,oBAAoB,GAAG,SAAS,GAAG,oBAAoB,CAS1F;AAED;;;GAGG;AACH,wBAAgB,kBAAkB,CAChC,MAAM,EAAE,oBAAoB,GAAG,SAAS,GACvC,oBAAoB,CAItB;AAED;;;;;GAKG;AACH,wBAAgB,uBAAuB,CACrC,KAAK,EAAE,OAAO,EACd,QAAQ,EAAE,cAAc,GACvB,cAAc,CA0BhB;AA4PD,0EAA0E;AAC1E,wBAAsB,YAAY,IAAI,OAAO,CAAC,iBAAiB,CAAC,CAgD/D;AAED,iEAAiE;AACjE,wBAAsB,YAAY,CAChC,KAAK,EAAE,OAAO,CAAC,iBAAiB,CAAC,GAChC,OAAO,CAAC,iBAAiB,CAAC,CA6D5B"}
|
package/dist/settings.js
CHANGED
|
@@ -2,7 +2,7 @@ import crypto from "node:crypto";
|
|
|
2
2
|
import fs from "node:fs/promises";
|
|
3
3
|
import path from "node:path";
|
|
4
4
|
import { PLUGIN_DIR } from "./types.js";
|
|
5
|
-
import { DEFAULT_LOCALE, normalizeLocale, normalizeLocaleMode, SUPPORTED_LOCALES, messageIn, t } from "./i18n.js";
|
|
5
|
+
import { DEFAULT_LOCALE, DEFAULT_LOCALE_MODE, normalizeLocale, normalizeLocaleMode, SUPPORTED_LOCALES, messageIn, t } from "./i18n.js";
|
|
6
6
|
import { DEFAULT_PERMISSION_POLICY, normalizePolicy, } from "./core/permissions.js";
|
|
7
7
|
/** Дни shadow-периода по умолчанию. */
|
|
8
8
|
export const DEFAULT_SHADOW_DAYS = 14;
|
|
@@ -691,7 +691,7 @@ export async function loadSettings() {
|
|
|
691
691
|
const parsed = JSON.parse(raw);
|
|
692
692
|
return {
|
|
693
693
|
maxConcurrent: normalizeMaxConcurrent(parsed?.maxConcurrent, DEFAULT_MAX_CONCURRENT),
|
|
694
|
-
locale: normalizeLocaleMode(parsed?.locale,
|
|
694
|
+
locale: normalizeLocaleMode(parsed?.locale, DEFAULT_LOCALE_MODE),
|
|
695
695
|
uiLocale: normalizeLocale(parsed?.uiLocale, DEFAULT_LOCALE),
|
|
696
696
|
winterMode: normalizeWinterMode(parsed?.winterMode, DEFAULT_WINTER_MODE),
|
|
697
697
|
notifications: normalizeNotifications(parsed?.notifications, fallbackNotifications),
|
|
@@ -704,7 +704,7 @@ export async function loadSettings() {
|
|
|
704
704
|
catch {
|
|
705
705
|
return {
|
|
706
706
|
maxConcurrent: DEFAULT_MAX_CONCURRENT,
|
|
707
|
-
locale:
|
|
707
|
+
locale: DEFAULT_LOCALE_MODE,
|
|
708
708
|
uiLocale: DEFAULT_LOCALE,
|
|
709
709
|
winterMode: DEFAULT_WINTER_MODE,
|
|
710
710
|
notifications: fallbackNotifications,
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { type HistoryRecord } from "../history.js";
|
|
2
2
|
import { type TaskDefinition } from "../task-transfer.js";
|
|
3
3
|
import type { ScheduledTaskInfo } from "../types.js";
|
|
4
|
-
export type JobStatus = "running" | "success" | "error" | "partial" | "idle" | "unknown";
|
|
4
|
+
export type JobStatus = "running" | "success" | "error" | "partial" | "skipped" | "idle" | "unknown";
|
|
5
5
|
export interface JobView {
|
|
6
6
|
name: string;
|
|
7
7
|
status: JobStatus;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"jobs-view.d.ts","sourceRoot":"","sources":["../../src/shared/jobs-view.ts"],"names":[],"mappings":"AACA,OAAO,EAAoC,KAAK,aAAa,EAAE,MAAM,eAAe,CAAC;AACrF,OAAO,EAEL,KAAK,cAAc,EACpB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAErD,MAAM,MAAM,SAAS,GAAG,SAAS,GAAG,SAAS,GAAG,OAAO,GAAG,SAAS,GAAG,MAAM,GAAG,SAAS,CAAA;
|
|
1
|
+
{"version":3,"file":"jobs-view.d.ts","sourceRoot":"","sources":["../../src/shared/jobs-view.ts"],"names":[],"mappings":"AACA,OAAO,EAAoC,KAAK,aAAa,EAAE,MAAM,eAAe,CAAC;AACrF,OAAO,EAEL,KAAK,cAAc,EACpB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAErD,MAAM,MAAM,SAAS,GAAG,SAAS,GAAG,SAAS,GAAG,OAAO,GAAG,SAAS,GAAG,SAAS,GAAG,MAAM,GAAG,SAAS,CAAA;AAEpG,MAAM,WAAW,OAAO;IACtB,IAAI,EAAE,MAAM,CAAA;IACZ,MAAM,EAAE,SAAS,CAAA;IACjB,oDAAoD;IACpD,MAAM,CAAC,EAAE,OAAO,CAAA;IAChB,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,mDAAmD;IACnD,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,mEAAmE;IACnE,cAAc,CAAC,EAAE,OAAO,CAAA;CACzB;AAED,0DAA0D;AAC1D,MAAM,WAAW,aAAa;IAC5B,GAAG,EAAE,OAAO,CAAA;IACZ,6CAA6C;IAC7C,KAAK,EAAE,MAAM,CAAA;CACd;AAED;;;;GAIG;AACH,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,SAAS,OAAO,EAAE,GAAG,aAAa,EAAE,CAkC7E;AAED;;;GAGG;AACH,wBAAgB,gBAAgB,CAC9B,IAAI,EAAE,SAAS,aAAa,EAAE,EAC9B,WAAW,EAAE,MAAM,GAAG,SAAS,EAC/B,KAAK,EAAE,MAAM,GACZ,MAAM,GAAG,SAAS,CAQpB;AAED;;;GAGG;AACH,wBAAgB,YAAY,CAC1B,IAAI,EAAE,MAAM,GAAG,SAAS,EACxB,KAAK,EAAE,MAAM,GAAG,SAAS,EACzB,QAAQ,SAAK,GACZ,MAAM,CAMR;AAED;;;GAGG;AACH,wBAAgB,UAAU,CAAC,MAAM,EAAE,SAAS,GAAG,MAAM,CAkBpD;AASD;;;;GAIG;AACH,wBAAgB,aAAa,CAC3B,KAAK,EAAE,SAAS,iBAAiB,EAAE,EACnC,OAAO,EAAE,SAAS,aAAa,EAAE,EACjC,WAAW,EAAE,SAAS,cAAc,EAAE,GACrC,OAAO,EAAE,CAsBX;AAED;;;;;;;GAOG;AACH,wBAAsB,WAAW,CAAC,QAAQ,EAAE,OAAO,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC,CAYvE"}
|
package/dist/shared/jobs-view.js
CHANGED
package/dist/task-transfer.d.ts
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import type { ScheduledTaskInfo } from "./types.js";
|
|
2
|
+
import { type TaskGuards } from "./core/guard.js";
|
|
2
3
|
/** Триггер задачи по событию из MCP-шины. */
|
|
3
4
|
export interface McpEventTrigger {
|
|
4
5
|
/** Имя MCP-сервера/источника (например, "github", "jira"). */
|
|
@@ -139,6 +140,13 @@ export interface TaskDefinition {
|
|
|
139
140
|
* перечислить shell в allowedTools.
|
|
140
141
|
*/
|
|
141
142
|
legacyShell?: boolean;
|
|
143
|
+
/**
|
|
144
|
+
* W-1: запускать задачу в одноразовом git worktree, созданном от HEAD
|
|
145
|
+
* рабочей директории. По умолчанию выключено. Требует git-репозиторий.
|
|
146
|
+
*/
|
|
147
|
+
worktree?: boolean;
|
|
148
|
+
/** W-3: guard-условия перед запуском (semantic-проверки и shell-команда). */
|
|
149
|
+
guards?: TaskGuards;
|
|
142
150
|
/** Настройки fan-out матрицы (родитель). */
|
|
143
151
|
matrix?: MatrixConfig;
|
|
144
152
|
/** Для клона матрицы — имя родительской задачи-шаблона. */
|
|
@@ -206,6 +214,14 @@ export interface TaskDefinition {
|
|
|
206
214
|
runWhenLoggedOff?: boolean;
|
|
207
215
|
/** Когда задача была создана — защита от ложного catch-up сразу после создания. */
|
|
208
216
|
createdAt?: string;
|
|
217
|
+
/**
|
|
218
|
+
* Спринт 32 (Pipeline-as-code): имя pipeline, из которого создан шаг.
|
|
219
|
+
* Хранится в definition_json и позволяет apply отличать «свои» задачи
|
|
220
|
+
* от созданных вручную. Не участвует в запуске.
|
|
221
|
+
*/
|
|
222
|
+
pipelineName?: string;
|
|
223
|
+
/** Спринт 32: стабильный id шага внутри pipeline (для diff/apply). */
|
|
224
|
+
pipelineStepId?: string;
|
|
209
225
|
}
|
|
210
226
|
/** Приоритет по умолчанию — «Обычный». */
|
|
211
227
|
export declare const DEFAULT_PRIORITY = 5;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"task-transfer.d.ts","sourceRoot":"","sources":["../src/task-transfer.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"task-transfer.d.ts","sourceRoot":"","sources":["../src/task-transfer.ts"],"names":[],"mappings":"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"}
|
package/dist/task-transfer.js
CHANGED
|
@@ -5,6 +5,7 @@ import { listTasks, saveTask, deleteTask, } from "./db/tasks-repo.js";
|
|
|
5
5
|
import { normalizeOneShotRunAt } from "./core/one-shot.js";
|
|
6
6
|
import { isValidIanaTimeZone, normalizeActiveDays, validateLaunchWindow, } from "./core/schedule-v2.js";
|
|
7
7
|
import { isValidSessionId } from "./core/session.js";
|
|
8
|
+
import { normalizeTaskGuards } from "./core/guard.js";
|
|
8
9
|
const PREFIX = `\\OpenCode\\${TASK_FOLDER_NAME}\\`;
|
|
9
10
|
const LEGACY_PREFIX = `\\OpenCode\\${LEGACY_TASK_FOLDER_NAME}\\`;
|
|
10
11
|
/** Приоритет по умолчанию — «Обычный». */
|
|
@@ -162,6 +163,10 @@ export async function buildExportJson(tasks) {
|
|
|
162
163
|
...(definition?.paused === true ? { paused: true } : {}),
|
|
163
164
|
// Спринт 27.5.10: режим входа переживает перенос между профилями.
|
|
164
165
|
...(definition?.runWhenLoggedOff === true ? { runWhenLoggedOff: true } : {}),
|
|
166
|
+
// W-1: изоляция запуска в одноразовом git worktree.
|
|
167
|
+
...(definition?.worktree === true ? { worktree: true } : {}),
|
|
168
|
+
// W-3: guard-условия переживают перенос между профилями.
|
|
169
|
+
...(definition?.guards ? { guards: definition.guards } : {}),
|
|
165
170
|
...(Array.isArray(definition?.allowedTools) && definition.allowedTools.length > 0
|
|
166
171
|
? { allowedTools: definition.allowedTools }
|
|
167
172
|
: {}),
|
|
@@ -417,6 +422,15 @@ export function parseImportJson(raw) {
|
|
|
417
422
|
// Спринт 27.5.10: режим входа. Только явный `true` делает задачу фоновой;
|
|
418
423
|
// всё остальное (false, null, строка) означает интерактивную задачу.
|
|
419
424
|
const runWhenLoggedOffFlag = source.runWhenLoggedOff === true;
|
|
425
|
+
// W-1: одноразовый git worktree; только явный `true`.
|
|
426
|
+
const worktreeFlag = source.worktree === true;
|
|
427
|
+
// W-3: guard-условия. Ошибка нормализации попадает в общий список ошибок
|
|
428
|
+
// импорта; валидная конфигурация переносится вместе с задачей.
|
|
429
|
+
const guardsResult = normalizeTaskGuards(source.guards);
|
|
430
|
+
if (!guardsResult.ok) {
|
|
431
|
+
errors.push(`Запись ${position}${name ? ` (${name})` : ""}: ${guardsResult.error}`);
|
|
432
|
+
}
|
|
433
|
+
const guards = guardsResult.ok ? guardsResult.guards : undefined;
|
|
420
434
|
// Ограничения инструментов (Спринт 14): массив непустых строк без дублей.
|
|
421
435
|
// Пустой allowedTools отклоняется с явной ошибкой (избегаем «запрещено всё»).
|
|
422
436
|
const readToolList = (raw, fieldLabel) => {
|
|
@@ -621,6 +635,8 @@ export function parseImportJson(raw) {
|
|
|
621
635
|
...(pausedFlag ? { paused: true } : {}),
|
|
622
636
|
// Спринт 27.5.10: сохраняем режим входа при переносе задачи.
|
|
623
637
|
...(runWhenLoggedOffFlag ? { runWhenLoggedOff: true } : {}),
|
|
638
|
+
...(worktreeFlag ? { worktree: true } : {}),
|
|
639
|
+
...(guards ? { guards } : {}),
|
|
624
640
|
...(mcpEvent ? { mcpEvent } : {}),
|
|
625
641
|
...(allowedTools !== undefined ? { allowedTools } : {}),
|
|
626
642
|
...(deniedTools !== undefined ? { deniedTools } : {}),
|