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
package/dist/settings.js
CHANGED
|
@@ -2,8 +2,9 @@ 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
|
+
import { defaultBudgetSettings } from "./core/budget.js";
|
|
7
8
|
/** Дни shadow-периода по умолчанию. */
|
|
8
9
|
export const DEFAULT_SHADOW_DAYS = 14;
|
|
9
10
|
export const SETTINGS_FILE = path.join(PLUGIN_DIR, "settings.json");
|
|
@@ -32,6 +33,75 @@ export function defaultAuditSettings() {
|
|
|
32
33
|
maxRecords: DEFAULT_AUDIT_MAX_RECORDS,
|
|
33
34
|
};
|
|
34
35
|
}
|
|
36
|
+
/**
|
|
37
|
+
* Приводит бюджетные лимиты к безопасному виду (Экономика v2, E-1.1).
|
|
38
|
+
* Отрицательные и нечисловые значения откатываются к дефолту; 0 = без лимита.
|
|
39
|
+
*/
|
|
40
|
+
export function normalizeBudgetSettings(value, fallback) {
|
|
41
|
+
if (!value || typeof value !== "object" || Array.isArray(value)) {
|
|
42
|
+
return { ...fallback };
|
|
43
|
+
}
|
|
44
|
+
const raw = value;
|
|
45
|
+
return {
|
|
46
|
+
enabled: typeof raw.enabled === "boolean" ? raw.enabled : fallback.enabled,
|
|
47
|
+
dailyUsd: normalizeFloatInRange(raw.dailyUsd, fallback.dailyUsd, 0, 1000000),
|
|
48
|
+
weeklyUsd: normalizeFloatInRange(raw.weeklyUsd, fallback.weeklyUsd, 0, 1000000),
|
|
49
|
+
};
|
|
50
|
+
}
|
|
51
|
+
/**
|
|
52
|
+
* Деталь 3.8 / UX-3.8.1: рабочий приёмник автора подставлен по умолчанию,
|
|
53
|
+
* чтобы пользователю достаточно было только включить отправку чекбоксом.
|
|
54
|
+
* Отправка всё равно остаётся opt-in (`enabled: false`).
|
|
55
|
+
*/
|
|
56
|
+
export const DEFAULT_FEEDBACK_ENDPOINT = "https://agent-steward-feedback.agent-steward.workers.dev/report";
|
|
57
|
+
/** По умолчанию канал автору выключен, логи не прикладываются. */
|
|
58
|
+
export const DEFAULT_FEEDBACK_SETTINGS = {
|
|
59
|
+
enabled: false,
|
|
60
|
+
endpoint: DEFAULT_FEEDBACK_ENDPOINT,
|
|
61
|
+
includeLogs: false,
|
|
62
|
+
contactEmail: "",
|
|
63
|
+
maxPerHour: 6,
|
|
64
|
+
};
|
|
65
|
+
export function defaultFeedbackSettings() {
|
|
66
|
+
return { ...DEFAULT_FEEDBACK_SETTINGS };
|
|
67
|
+
}
|
|
68
|
+
/**
|
|
69
|
+
* Валидация настроек обратной связи. Неверный URL не отбрасывает всю секцию —
|
|
70
|
+
* он заменяется пустым (fail-open): отправка деградирует до outbox.
|
|
71
|
+
*/
|
|
72
|
+
export function normalizeFeedbackSettings(value, fallback) {
|
|
73
|
+
if (!value || typeof value !== "object" || Array.isArray(value)) {
|
|
74
|
+
return { ...fallback };
|
|
75
|
+
}
|
|
76
|
+
const raw = value;
|
|
77
|
+
let endpoint = typeof raw.endpoint === "string" ? raw.endpoint.trim() : fallback.endpoint;
|
|
78
|
+
// Апгрейд старых профилей: пустой endpoint из previous-версии заменяем дефолтным.
|
|
79
|
+
if (!endpoint)
|
|
80
|
+
endpoint = fallback.endpoint;
|
|
81
|
+
if (endpoint) {
|
|
82
|
+
try {
|
|
83
|
+
const url = new URL(endpoint);
|
|
84
|
+
const local = ["localhost", "127.0.0.1", "[::1]"].includes(url.hostname);
|
|
85
|
+
if ((url.protocol !== "https:" && !(url.protocol === "http:" && local)) ||
|
|
86
|
+
url.username ||
|
|
87
|
+
url.password ||
|
|
88
|
+
url.hash ||
|
|
89
|
+
endpoint.length > 2048) {
|
|
90
|
+
endpoint = "";
|
|
91
|
+
}
|
|
92
|
+
}
|
|
93
|
+
catch {
|
|
94
|
+
endpoint = "";
|
|
95
|
+
}
|
|
96
|
+
}
|
|
97
|
+
return {
|
|
98
|
+
enabled: typeof raw.enabled === "boolean" ? raw.enabled : fallback.enabled,
|
|
99
|
+
endpoint,
|
|
100
|
+
includeLogs: typeof raw.includeLogs === "boolean" ? raw.includeLogs : fallback.includeLogs,
|
|
101
|
+
contactEmail: typeof raw.contactEmail === "string" ? raw.contactEmail.trim().slice(0, 254) : fallback.contactEmail,
|
|
102
|
+
maxPerHour: normalizeIntInRange(raw.maxPerHour, fallback.maxPerHour, 1, 100),
|
|
103
|
+
};
|
|
104
|
+
}
|
|
35
105
|
/** Политика прав по умолчанию: гибрид (без shell/question). */
|
|
36
106
|
export function defaultPermissionsSettings() {
|
|
37
107
|
return { defaultPolicy: DEFAULT_PERMISSION_POLICY };
|
|
@@ -686,12 +756,14 @@ export async function loadSettings() {
|
|
|
686
756
|
const fallbackIntegrations = defaultIntegrations();
|
|
687
757
|
const fallbackAudit = defaultAuditSettings();
|
|
688
758
|
const fallbackPermissions = defaultPermissionsSettings();
|
|
759
|
+
const fallbackBudgets = defaultBudgetSettings();
|
|
760
|
+
const fallbackFeedback = defaultFeedbackSettings();
|
|
689
761
|
try {
|
|
690
762
|
const raw = await fs.readFile(SETTINGS_FILE, "utf8");
|
|
691
763
|
const parsed = JSON.parse(raw);
|
|
692
764
|
return {
|
|
693
765
|
maxConcurrent: normalizeMaxConcurrent(parsed?.maxConcurrent, DEFAULT_MAX_CONCURRENT),
|
|
694
|
-
locale: normalizeLocaleMode(parsed?.locale,
|
|
766
|
+
locale: normalizeLocaleMode(parsed?.locale, DEFAULT_LOCALE_MODE),
|
|
695
767
|
uiLocale: normalizeLocale(parsed?.uiLocale, DEFAULT_LOCALE),
|
|
696
768
|
winterMode: normalizeWinterMode(parsed?.winterMode, DEFAULT_WINTER_MODE),
|
|
697
769
|
notifications: normalizeNotifications(parsed?.notifications, fallbackNotifications),
|
|
@@ -699,12 +771,14 @@ export async function loadSettings() {
|
|
|
699
771
|
integrations: normalizeIntegrations(parsed?.integrations, fallbackIntegrations),
|
|
700
772
|
audit: normalizeAuditSettings(parsed?.audit, fallbackAudit),
|
|
701
773
|
permissions: normalizePermissionsSettings(parsed?.permissions, fallbackPermissions),
|
|
774
|
+
budgets: normalizeBudgetSettings(parsed?.budgets, fallbackBudgets),
|
|
775
|
+
feedback: normalizeFeedbackSettings(parsed?.feedback, fallbackFeedback),
|
|
702
776
|
};
|
|
703
777
|
}
|
|
704
778
|
catch {
|
|
705
779
|
return {
|
|
706
780
|
maxConcurrent: DEFAULT_MAX_CONCURRENT,
|
|
707
|
-
locale:
|
|
781
|
+
locale: DEFAULT_LOCALE_MODE,
|
|
708
782
|
uiLocale: DEFAULT_LOCALE,
|
|
709
783
|
winterMode: DEFAULT_WINTER_MODE,
|
|
710
784
|
notifications: fallbackNotifications,
|
|
@@ -712,6 +786,8 @@ export async function loadSettings() {
|
|
|
712
786
|
integrations: fallbackIntegrations,
|
|
713
787
|
audit: fallbackAudit,
|
|
714
788
|
permissions: fallbackPermissions,
|
|
789
|
+
budgets: fallbackBudgets,
|
|
790
|
+
feedback: fallbackFeedback,
|
|
715
791
|
};
|
|
716
792
|
}
|
|
717
793
|
}
|
|
@@ -746,6 +822,12 @@ export async function saveSettings(patch) {
|
|
|
746
822
|
permissions: patch.permissions !== undefined
|
|
747
823
|
? normalizePermissionsSettings(patch.permissions, current.permissions)
|
|
748
824
|
: current.permissions,
|
|
825
|
+
budgets: patch.budgets !== undefined
|
|
826
|
+
? normalizeBudgetSettings(patch.budgets, current.budgets)
|
|
827
|
+
: current.budgets,
|
|
828
|
+
feedback: patch.feedback !== undefined
|
|
829
|
+
? normalizeFeedbackSettings(patch.feedback, current.feedback)
|
|
830
|
+
: current.feedback,
|
|
749
831
|
};
|
|
750
832
|
// Удобство: при включении хуков без явных учётных данных генерируем их,
|
|
751
833
|
// чтобы функция сразу работала, а секреты не приходилось придумывать вручную.
|
|
@@ -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,19 @@ 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;
|
|
225
|
+
/**
|
|
226
|
+
* Экономика v2 (E-2): лимит токенов на один запуск задачи.
|
|
227
|
+
* 0/undefined — лимит не задан (fail-open, как и глобальные budgets).
|
|
228
|
+
*/
|
|
229
|
+
tokenBudget?: number;
|
|
209
230
|
}
|
|
210
231
|
/** Приоритет по умолчанию — «Обычный». */
|
|
211
232
|
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,14 @@ 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 } : {}),
|
|
170
|
+
// QA-P0.1 (E-2.1): лимит токенов переживает экспорт/импорт.
|
|
171
|
+
...(definition?.tokenBudget !== undefined
|
|
172
|
+
? { tokenBudget: definition.tokenBudget }
|
|
173
|
+
: {}),
|
|
165
174
|
...(Array.isArray(definition?.allowedTools) && definition.allowedTools.length > 0
|
|
166
175
|
? { allowedTools: definition.allowedTools }
|
|
167
176
|
: {}),
|
|
@@ -197,6 +206,25 @@ export async function buildExportJson(tasks) {
|
|
|
197
206
|
};
|
|
198
207
|
return { data: JSON.stringify(payload, null, 2), count: exported.length };
|
|
199
208
|
}
|
|
209
|
+
/**
|
|
210
|
+
* Строковое представление unknown для текстов ошибок импорта (QA-A2.5).
|
|
211
|
+
* Примитивы превращаются в строку так же, как это делал String(); для
|
|
212
|
+
* объектов/функций сохраняется результат стандартной конверсии '[object Object]'.
|
|
213
|
+
*/
|
|
214
|
+
function describeImportValue(value) {
|
|
215
|
+
if (value === null || value === undefined)
|
|
216
|
+
return String(value);
|
|
217
|
+
switch (typeof value) {
|
|
218
|
+
case "string":
|
|
219
|
+
case "number":
|
|
220
|
+
case "boolean":
|
|
221
|
+
case "bigint":
|
|
222
|
+
case "symbol":
|
|
223
|
+
return String(value);
|
|
224
|
+
default:
|
|
225
|
+
return "[object Object]";
|
|
226
|
+
}
|
|
227
|
+
}
|
|
200
228
|
/**
|
|
201
229
|
* Разбирает файл импорта. Поддерживает как { tasks: [...] }, так и просто массив.
|
|
202
230
|
* Ошибки отдельных записей не прерывают импорт остальных.
|
|
@@ -207,7 +235,12 @@ export function parseImportJson(raw) {
|
|
|
207
235
|
parsed = JSON.parse(raw);
|
|
208
236
|
}
|
|
209
237
|
catch (err) {
|
|
210
|
-
|
|
238
|
+
const detail = err instanceof Error
|
|
239
|
+
? err.message
|
|
240
|
+
: typeof err === "object" && err !== null && "message" in err
|
|
241
|
+
? describeImportValue(err.message)
|
|
242
|
+
: describeImportValue(err);
|
|
243
|
+
throw new Error(`Файл не является корректным JSON: ${detail}`);
|
|
211
244
|
}
|
|
212
245
|
const list = Array.isArray(parsed)
|
|
213
246
|
? parsed
|
|
@@ -298,7 +331,7 @@ export function parseImportJson(raw) {
|
|
|
298
331
|
session = source.session;
|
|
299
332
|
}
|
|
300
333
|
else {
|
|
301
|
-
errors.push(`Запись ${position}${name ? ` (${name})` : ""}: неизвестный session «${
|
|
334
|
+
errors.push(`Запись ${position}${name ? ` (${name})` : ""}: неизвестный session «${describeImportValue(source.session)}» (ожидается new, reuse или last).`);
|
|
302
335
|
return;
|
|
303
336
|
}
|
|
304
337
|
}
|
|
@@ -325,6 +358,21 @@ export function parseImportJson(raw) {
|
|
|
325
358
|
source.timeoutSeconds > 0
|
|
326
359
|
? Math.floor(source.timeoutSeconds)
|
|
327
360
|
: undefined;
|
|
361
|
+
// QA-P0.1 (E-2.1): tokenBudget 0..10M, как в схемах create/update. 0 — без лимита.
|
|
362
|
+
let tokenBudget;
|
|
363
|
+
if (source.tokenBudget !== undefined) {
|
|
364
|
+
const raw = source.tokenBudget;
|
|
365
|
+
if (typeof raw === "number" &&
|
|
366
|
+
Number.isFinite(raw) &&
|
|
367
|
+
raw >= 0 &&
|
|
368
|
+
raw <= 10000000) {
|
|
369
|
+
tokenBudget = Math.floor(raw);
|
|
370
|
+
}
|
|
371
|
+
else {
|
|
372
|
+
errors.push(`Запись ${position}${name ? ` (${name})` : ""}: tokenBudget должен быть целым числом 0..10000000.`);
|
|
373
|
+
return;
|
|
374
|
+
}
|
|
375
|
+
}
|
|
328
376
|
// Новое поле workingDirectory; workdir читаем для обратной совместимости.
|
|
329
377
|
const workingDirectory = typeof source.workingDirectory === "string" && source.workingDirectory.trim()
|
|
330
378
|
? source.workingDirectory.trim()
|
|
@@ -391,7 +439,7 @@ export function parseImportJson(raw) {
|
|
|
391
439
|
windowPolicy = source.windowPolicy;
|
|
392
440
|
}
|
|
393
441
|
else {
|
|
394
|
-
errors.push(`Запись ${position}${name ? ` (${name})` : ""}: неизвестный windowPolicy «${
|
|
442
|
+
errors.push(`Запись ${position}${name ? ` (${name})` : ""}: неизвестный windowPolicy «${describeImportValue(source.windowPolicy)}» (ожидается skip, postpone или run).`);
|
|
395
443
|
return;
|
|
396
444
|
}
|
|
397
445
|
}
|
|
@@ -417,6 +465,15 @@ export function parseImportJson(raw) {
|
|
|
417
465
|
// Спринт 27.5.10: режим входа. Только явный `true` делает задачу фоновой;
|
|
418
466
|
// всё остальное (false, null, строка) означает интерактивную задачу.
|
|
419
467
|
const runWhenLoggedOffFlag = source.runWhenLoggedOff === true;
|
|
468
|
+
// W-1: одноразовый git worktree; только явный `true`.
|
|
469
|
+
const worktreeFlag = source.worktree === true;
|
|
470
|
+
// W-3: guard-условия. Ошибка нормализации попадает в общий список ошибок
|
|
471
|
+
// импорта; валидная конфигурация переносится вместе с задачей.
|
|
472
|
+
const guardsResult = normalizeTaskGuards(source.guards);
|
|
473
|
+
if (!guardsResult.ok) {
|
|
474
|
+
errors.push(`Запись ${position}${name ? ` (${name})` : ""}: ${guardsResult.error}`);
|
|
475
|
+
}
|
|
476
|
+
const guards = guardsResult.ok ? guardsResult.guards : undefined;
|
|
420
477
|
// Ограничения инструментов (Спринт 14): массив непустых строк без дублей.
|
|
421
478
|
// Пустой allowedTools отклоняется с явной ошибкой (избегаем «запрещено всё»).
|
|
422
479
|
const readToolList = (raw, fieldLabel) => {
|
|
@@ -621,6 +678,10 @@ export function parseImportJson(raw) {
|
|
|
621
678
|
...(pausedFlag ? { paused: true } : {}),
|
|
622
679
|
// Спринт 27.5.10: сохраняем режим входа при переносе задачи.
|
|
623
680
|
...(runWhenLoggedOffFlag ? { runWhenLoggedOff: true } : {}),
|
|
681
|
+
...(worktreeFlag ? { worktree: true } : {}),
|
|
682
|
+
...(guards ? { guards } : {}),
|
|
683
|
+
// QA-P0.1 (E-2.1): импорт сохраняет tokenBudget.
|
|
684
|
+
...(tokenBudget !== undefined ? { tokenBudget } : {}),
|
|
624
685
|
...(mcpEvent ? { mcpEvent } : {}),
|
|
625
686
|
...(allowedTools !== undefined ? { allowedTools } : {}),
|
|
626
687
|
...(deniedTools !== undefined ? { deniedTools } : {}),
|
package/dist/templates.d.ts
CHANGED
|
@@ -52,6 +52,6 @@ export declare function loadTemplates(): Promise<TaskTemplate[]>;
|
|
|
52
52
|
export declare function saveTemplate(template: Omit<TaskTemplate, "id"> & {
|
|
53
53
|
id?: string;
|
|
54
54
|
}): Promise<TaskTemplate>;
|
|
55
|
-
/** Удаляет шаблон по id. */
|
|
56
|
-
export declare function deleteTemplate(
|
|
55
|
+
/** Удаляет шаблон по id или имени (QA-P3.3). */
|
|
56
|
+
export declare function deleteTemplate(idOrName: string): Promise<void>;
|
|
57
57
|
//# sourceMappingURL=templates.d.ts.map
|
package/dist/templates.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"templates.d.ts","sourceRoot":"","sources":["../src/templates.ts"],"names":[],"mappings":"AAMA;;;;;;GAMG;AACH,MAAM,WAAW,YAAY;IAC3B,uCAAuC;IACvC,EAAE,EAAE,MAAM,CAAC;IACX,oDAAoD;IACpD,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,yEAAyE;IACzE,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,+CAA+C;IAC/C,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,2CAA2C;IAC3C,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,2CAA2C;IAC3C,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,+EAA+E;IAC/E,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;IACrB,WAAW,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,KAAK,GAAG,WAAW,CAAC;IACpD,+DAA+D;IAC/D,QAAQ,CAAC,EAAE;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IAC9D,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,kEAAkE;IAClE,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,uEAAuE;IACvE,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;IACxB,2EAA2E;IAC3E,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;CACxB;AAED,sDAAsD;AACtD,wBAAsB,aAAa,IAAI,OAAO,CAAC,YAAY,EAAE,CAAC,CAE7D;AAED;;;GAGG;AACH,wBAAsB,YAAY,CAChC,QAAQ,EAAE,IAAI,CAAC,YAAY,EAAE,IAAI,CAAC,GAAG;IAAE,EAAE,CAAC,EAAE,MAAM,CAAA;CAAE,GACnD,OAAO,CAAC,YAAY,CAAC,CAEvB;AAED,
|
|
1
|
+
{"version":3,"file":"templates.d.ts","sourceRoot":"","sources":["../src/templates.ts"],"names":[],"mappings":"AAMA;;;;;;GAMG;AACH,MAAM,WAAW,YAAY;IAC3B,uCAAuC;IACvC,EAAE,EAAE,MAAM,CAAC;IACX,oDAAoD;IACpD,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,yEAAyE;IACzE,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,+CAA+C;IAC/C,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,2CAA2C;IAC3C,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,2CAA2C;IAC3C,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,+EAA+E;IAC/E,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;IACrB,WAAW,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,KAAK,GAAG,WAAW,CAAC;IACpD,+DAA+D;IAC/D,QAAQ,CAAC,EAAE;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IAC9D,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,kEAAkE;IAClE,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,uEAAuE;IACvE,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;IACxB,2EAA2E;IAC3E,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;CACxB;AAED,sDAAsD;AACtD,wBAAsB,aAAa,IAAI,OAAO,CAAC,YAAY,EAAE,CAAC,CAE7D;AAED;;;GAGG;AACH,wBAAsB,YAAY,CAChC,QAAQ,EAAE,IAAI,CAAC,YAAY,EAAE,IAAI,CAAC,GAAG;IAAE,EAAE,CAAC,EAAE,MAAM,CAAA;CAAE,GACnD,OAAO,CAAC,YAAY,CAAC,CAEvB;AAED,gDAAgD;AAChD,wBAAsB,cAAc,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAEpE"}
|
package/dist/templates.js
CHANGED
|
@@ -10,7 +10,7 @@ export async function loadTemplates() {
|
|
|
10
10
|
export async function saveTemplate(template) {
|
|
11
11
|
return saveTemplateRow(template);
|
|
12
12
|
}
|
|
13
|
-
/** Удаляет шаблон по id. */
|
|
14
|
-
export async function deleteTemplate(
|
|
15
|
-
deleteTemplateRow(
|
|
13
|
+
/** Удаляет шаблон по id или имени (QA-P3.3). */
|
|
14
|
+
export async function deleteTemplate(idOrName) {
|
|
15
|
+
deleteTemplateRow(idOrName);
|
|
16
16
|
}
|
package/dist/types.d.ts
CHANGED
|
@@ -78,8 +78,8 @@ export type ListJobsArgs = z.infer<typeof ListJobsArgs>;
|
|
|
78
78
|
* Результат преобразования cron в флаги schtasks.
|
|
79
79
|
*/
|
|
80
80
|
export interface CronConversion {
|
|
81
|
-
/** Тип расписания schtasks: MINUTE, DAILY или
|
|
82
|
-
sc: "MINUTE" | "HOURLY" | "DAILY" | "WEEKLY";
|
|
81
|
+
/** Тип расписания schtasks: MINUTE, HOURLY, DAILY, WEEKLY или MONTHLY. */
|
|
82
|
+
sc: "MINUTE" | "HOURLY" | "DAILY" | "WEEKLY" | "MONTHLY";
|
|
83
83
|
/** Дополнительные флаги командной строки (кроме /sc и /tn /tr /f). */
|
|
84
84
|
extraFlags: string[];
|
|
85
85
|
/** Время начала для /st (HH:MM) или undefined. */
|
|
@@ -109,4 +109,24 @@ export interface ScheduledTaskInfo {
|
|
|
109
109
|
/** true — задача поставлена на паузу (disabled). */
|
|
110
110
|
paused?: boolean;
|
|
111
111
|
}
|
|
112
|
+
/**
|
|
113
|
+
* Строка history.json, приведённая к колонкам БД миграцией (QA-A2.4).
|
|
114
|
+
* Все поля уже проверены type guard'ами в src/db/migrate.ts: строки непустые,
|
|
115
|
+
* числа конечные, а status сужен до значений, которые умеет писать миграция.
|
|
116
|
+
*/
|
|
117
|
+
export interface MigrationHistoryRow {
|
|
118
|
+
taskName: string;
|
|
119
|
+
/** skipped/running в legacy JSON не встречаются: миграция пишет только эти четыре. */
|
|
120
|
+
status: "success" | "partial" | "timeout" | "error";
|
|
121
|
+
startedAt: string;
|
|
122
|
+
finishedAt: string | null;
|
|
123
|
+
durationMs: number | null;
|
|
124
|
+
error: string | null;
|
|
125
|
+
tokens: number | null;
|
|
126
|
+
costUsd: number | null;
|
|
127
|
+
model: string | null;
|
|
128
|
+
preFlightStatus: string | null;
|
|
129
|
+
postFlightStatus: string | null;
|
|
130
|
+
nextTask: string | null;
|
|
131
|
+
}
|
|
112
132
|
//# sourceMappingURL=types.d.ts.map
|
package/dist/types.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAGxB,uDAAuD;AACvD,eAAO,MAAM,WAAW,aAAa,CAAC;AACtC;;;;;GAKG;AACH,wBAAgB,wBAAwB,CAAC,OAAO,GAAE,MAAyB,GAAG,MAAM,CAEnF;AAED,+EAA+E;AAC/E,wBAAgB,8BAA8B,CAC5C,OAAO,GAAE,MAAyB,GACjC,MAAM,CAER;AAED,eAAO,MAAM,gBAAgB,QAA6B,CAAC;AAC3D,eAAO,MAAM,uBAAuB,QAAmC,CAAC;AAExE,kCAAkC;AAClC,eAAO,MAAM,WAAW,QAAkC,CAAC;AAC3D,sDAAsD;AACtD,eAAO,MAAM,kBAAkB,QAAyC,CAAC;AAczE,eAAO,MAAM,UAAU,QAAqB,CAAC;AAE7C,eAAO,MAAM,QAAQ,QAAiC,CAAC;AACvD,eAAO,MAAM,OAAO,QAAgC,CAAC;AACrD,eAAO,MAAM,WAAW,QAAoC,CAAC;AAE7D,4CAA4C;AAC5C,eAAO,MAAM,UAAU,SAA+B,CAAC;AAEvD,iFAAiF;AACjF,eAAO,MAAM,qBAAqB,QAAsB,CAAC;AAEzD;;;;GAIG;AACH,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAcjD;AAED;;;;;;;;;GASG;AACH,wBAAgB,eAAe,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAW1D;AAED;;;;;;;;;GASG;AACH,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAsC3D;AAED;;;GAGG;AACH,eAAO,MAAM,eAAe;;;;;;iBA6B1B,CAAC;AAEH,MAAM,MAAM,eAAe,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,eAAe,CAAC,CAAC;AAE9D,eAAO,MAAM,aAAa;;iBAExB,CAAC;AACH,MAAM,MAAM,aAAa,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,aAAa,CAAC,CAAC;AAE1D,eAAO,MAAM,aAAa;;iBAExB,CAAC;AACH,MAAM,MAAM,aAAa,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,aAAa,CAAC,CAAC;AAE1D,eAAO,MAAM,YAAY,gCAAe,CAAC;AACzC,MAAM,MAAM,YAAY,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,YAAY,CAAC,CAAC;AAExD;;GAEG;AACH,MAAM,WAAW,cAAc;IAC7B,
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"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"}
|
package/dist/workspaces.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workspaces.d.ts","sourceRoot":"","sources":["../src/workspaces.ts"],"names":[],"mappings":"AAQA;;;;;;GAMG;AACH,MAAM,WAAW,SAAS;IACxB,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,wEAAwE;IACxE,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC7B,8EAA8E;IAC9E,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,iBAAiB;IAChC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,IAAI,CAAC;IACpC,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACzB;AAED,MAAM,WAAW,oBAAoB;IACnC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,IAAI,CAAC;IACpC,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACzB;AAED,wEAAwE;AACxE,eAAO,MAAM,uBAAuB,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"workspaces.d.ts","sourceRoot":"","sources":["../src/workspaces.ts"],"names":[],"mappings":"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"}
|
package/dist/workspaces.js
CHANGED
|
@@ -7,6 +7,25 @@ import { clearWorkspaceAssignments } from "./db/tasks-repo.js";
|
|
|
7
7
|
import { hasSecretRef, resolveSecretRefs } from "./core/secrets.js";
|
|
8
8
|
/** Максимум пар env на workspace — защита от раздувания строки JSON. */
|
|
9
9
|
export const MAX_WORKSPACE_ENV_PAIRS = 100;
|
|
10
|
+
/**
|
|
11
|
+
* Строковое представление unknown для env и колонок БД (QA-A2.5).
|
|
12
|
+
* Для примитивов совпадает с String(); объекты дают стандартный '[object Object]'
|
|
13
|
+
* (в JSON и в текстовых колонках SQLite таких значений не бывает).
|
|
14
|
+
*/
|
|
15
|
+
function safeString(value) {
|
|
16
|
+
if (value === null || value === undefined)
|
|
17
|
+
return String(value);
|
|
18
|
+
switch (typeof value) {
|
|
19
|
+
case "string":
|
|
20
|
+
case "number":
|
|
21
|
+
case "boolean":
|
|
22
|
+
case "bigint":
|
|
23
|
+
case "symbol":
|
|
24
|
+
return String(value);
|
|
25
|
+
default:
|
|
26
|
+
return "[object Object]";
|
|
27
|
+
}
|
|
28
|
+
}
|
|
10
29
|
/** Палитра цветных маркеров для GUI/дашборда. */
|
|
11
30
|
export const WORKSPACE_COLORS = [
|
|
12
31
|
"#5b8def",
|
|
@@ -44,7 +63,7 @@ export function normalizeWorkspaceEnv(value) {
|
|
|
44
63
|
if (typeof rawValue === "object") {
|
|
45
64
|
throw new Error(`Значение env '${key}' должно быть строкой.`);
|
|
46
65
|
}
|
|
47
|
-
result[key] =
|
|
66
|
+
result[key] = safeString(rawValue);
|
|
48
67
|
}
|
|
49
68
|
return result;
|
|
50
69
|
}
|
|
@@ -212,21 +231,21 @@ function rowToWorkspace(row) {
|
|
|
212
231
|
let env;
|
|
213
232
|
if (row.env_json) {
|
|
214
233
|
try {
|
|
215
|
-
env = normalizeWorkspaceEnv(JSON.parse(
|
|
234
|
+
env = normalizeWorkspaceEnv(JSON.parse(safeString(row.env_json)));
|
|
216
235
|
}
|
|
217
236
|
catch {
|
|
218
237
|
env = undefined;
|
|
219
238
|
}
|
|
220
239
|
}
|
|
221
240
|
return {
|
|
222
|
-
id:
|
|
223
|
-
name:
|
|
224
|
-
path:
|
|
225
|
-
gitRemote: row.git_remote == null ? undefined :
|
|
226
|
-
color: row.color == null ? undefined :
|
|
241
|
+
id: safeString(row.id),
|
|
242
|
+
name: safeString(row.name),
|
|
243
|
+
path: safeString(row.path),
|
|
244
|
+
gitRemote: row.git_remote == null ? undefined : safeString(row.git_remote),
|
|
245
|
+
color: row.color == null ? undefined : safeString(row.color),
|
|
227
246
|
env,
|
|
228
|
-
envFile: row.env_file == null ? undefined :
|
|
229
|
-
createdAt:
|
|
247
|
+
envFile: row.env_file == null ? undefined : safeString(row.env_file),
|
|
248
|
+
createdAt: safeString(row.created_at),
|
|
230
249
|
};
|
|
231
250
|
}
|
|
232
251
|
function normalizePath(value) {
|
|
@@ -306,7 +325,9 @@ export function listWorkspaces() {
|
|
|
306
325
|
export function getWorkspace(id) {
|
|
307
326
|
if (!id)
|
|
308
327
|
return undefined;
|
|
309
|
-
const row = getDb()
|
|
328
|
+
const row = getDb()
|
|
329
|
+
.prepare("SELECT * FROM workspaces WHERE id = ?")
|
|
330
|
+
.get(id);
|
|
310
331
|
return row ? rowToWorkspace(row) : undefined;
|
|
311
332
|
}
|
|
312
333
|
/** Workspace по пути (без учёта регистра, как в Windows). */
|
|
@@ -423,6 +444,8 @@ export function deleteWorkspace(id) {
|
|
|
423
444
|
}
|
|
424
445
|
/** Количество workspace (для сводок и тестов). */
|
|
425
446
|
export function countWorkspaces() {
|
|
426
|
-
const row = getDb()
|
|
447
|
+
const row = getDb()
|
|
448
|
+
.prepare("SELECT COUNT(*) AS count FROM workspaces")
|
|
449
|
+
.get();
|
|
427
450
|
return Number(row?.count) || 0;
|
|
428
451
|
}
|