opencode-windows-scheduler 1.5.2 → 1.5.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +107 -2
- package/CROSS_PLATFORM.md +107 -71
- package/LICENSE +21 -21
- package/README.md +74 -26
- package/ROADMAP-STRATEGY.md +11 -4
- package/ROADMAP.md +322 -112
- package/dist/core/analytics.d.ts +3 -0
- package/dist/core/analytics.d.ts.map +1 -1
- package/dist/core/analytics.js +4 -0
- package/dist/core/audit.d.ts +2 -1
- package/dist/core/audit.d.ts.map +1 -1
- package/dist/core/audit.js +32 -1
- package/dist/core/cron-to-schtasks.d.ts.map +1 -1
- package/dist/core/cron-to-schtasks.js +21 -4
- package/dist/core/file-watcher.d.ts.map +1 -1
- package/dist/core/file-watcher.js +16 -1
- package/dist/core/git-trigger.d.ts +4 -2
- package/dist/core/git-trigger.d.ts.map +1 -1
- package/dist/core/git-trigger.js +34 -16
- package/dist/core/local-ai.d.ts +52 -0
- package/dist/core/local-ai.d.ts.map +1 -0
- package/dist/core/local-ai.js +119 -0
- package/dist/core/lock.d.ts +14 -0
- package/dist/core/lock.d.ts.map +1 -1
- package/dist/core/lock.js +81 -4
- package/dist/core/matrix.d.ts.map +1 -1
- package/dist/core/matrix.js +3 -2
- package/dist/core/native-notify.d.ts.map +1 -1
- package/dist/core/native-notify.js +3 -0
- package/dist/core/one-shot.d.ts +7 -1
- package/dist/core/one-shot.d.ts.map +1 -1
- package/dist/core/one-shot.js +15 -2
- package/dist/core/permissions.d.ts +69 -0
- package/dist/core/permissions.d.ts.map +1 -0
- package/dist/core/permissions.js +143 -0
- package/dist/core/ps-wrapper.d.ts +9 -30
- package/dist/core/ps-wrapper.d.ts.map +1 -1
- package/dist/core/ps-wrapper.js +477 -108
- package/dist/core/record-history.d.ts +11 -0
- package/dist/core/record-history.d.ts.map +1 -1
- package/dist/core/record-history.js +106 -4
- package/dist/core/savings.d.ts +70 -0
- package/dist/core/savings.d.ts.map +1 -0
- package/dist/core/savings.js +87 -0
- package/dist/core/schedule-gate.js +7 -3
- package/dist/core/schedule-v2.js +1 -1
- package/dist/core/scheduler/index.d.ts +13 -1
- package/dist/core/scheduler/index.d.ts.map +1 -1
- package/dist/core/scheduler/index.js +35 -4
- package/dist/core/scheduler/linux.d.ts +4 -1
- package/dist/core/scheduler/linux.d.ts.map +1 -1
- package/dist/core/scheduler/linux.js +53 -20
- package/dist/core/scheduler/mac.d.ts +2 -1
- package/dist/core/scheduler/mac.d.ts.map +1 -1
- package/dist/core/scheduler/mac.js +24 -6
- package/dist/core/scheduler/posix.d.ts +1 -1
- package/dist/core/scheduler/posix.d.ts.map +1 -1
- package/dist/core/scheduler/posix.js +2 -2
- package/dist/core/scheduler/registry.d.ts +3 -2
- package/dist/core/scheduler/registry.d.ts.map +1 -1
- package/dist/core/scheduler/registry.js +6 -5
- package/dist/core/scheduler/windows.d.ts +49 -1
- package/dist/core/scheduler/windows.d.ts.map +1 -1
- package/dist/core/scheduler/windows.js +219 -34
- package/dist/core/secrets.d.ts +5 -3
- package/dist/core/secrets.d.ts.map +1 -1
- package/dist/core/secrets.js +86 -8
- package/dist/core/self-analysis.d.ts +117 -0
- package/dist/core/self-analysis.d.ts.map +1 -0
- package/dist/core/self-analysis.js +539 -0
- package/dist/core/session.d.ts +11 -3
- package/dist/core/session.d.ts.map +1 -1
- package/dist/core/session.js +34 -5
- package/dist/core/shutdown.d.ts +26 -0
- package/dist/core/shutdown.d.ts.map +1 -0
- package/dist/core/shutdown.js +49 -0
- package/dist/core/summary.d.ts +69 -0
- package/dist/core/summary.d.ts.map +1 -0
- package/dist/core/summary.js +250 -0
- package/dist/core/telegram.d.ts +10 -0
- package/dist/core/telegram.d.ts.map +1 -1
- package/dist/core/telegram.js +228 -47
- package/dist/core/triage-chain.d.ts +40 -0
- package/dist/core/triage-chain.d.ts.map +1 -0
- package/dist/core/triage-chain.js +80 -0
- package/dist/core/triage-compare.d.ts +68 -0
- package/dist/core/triage-compare.d.ts.map +1 -0
- package/dist/core/triage-compare.js +184 -0
- package/dist/core/triage-rules.d.ts +23 -0
- package/dist/core/triage-rules.d.ts.map +1 -0
- package/dist/core/triage-rules.js +196 -0
- package/dist/core/triage-shadow.d.ts +91 -0
- package/dist/core/triage-shadow.d.ts.map +1 -0
- package/dist/core/triage-shadow.js +160 -0
- package/dist/core/triage-worker.d.ts +55 -0
- package/dist/core/triage-worker.d.ts.map +1 -0
- package/dist/core/triage-worker.js +314 -0
- package/dist/core/triage.d.ts +76 -0
- package/dist/core/triage.d.ts.map +1 -0
- package/dist/core/triage.js +271 -0
- package/dist/core/watch-paths.d.ts +6 -0
- package/dist/core/watch-paths.d.ts.map +1 -0
- package/dist/core/watch-paths.js +62 -0
- package/dist/core/wrappers/bash.d.ts +15 -3
- package/dist/core/wrappers/bash.d.ts.map +1 -1
- package/dist/core/wrappers/bash.js +153 -120
- package/dist/db/history-repo.d.ts +1 -1
- package/dist/db/history-repo.d.ts.map +1 -1
- package/dist/db/history-repo.js +29 -14
- package/dist/db/schema.d.ts +1 -1
- package/dist/db/schema.d.ts.map +1 -1
- package/dist/db/schema.js +31 -0
- package/dist/history.d.ts +2 -2
- package/dist/history.d.ts.map +1 -1
- package/dist/history.js +3 -3
- package/dist/i18n.d.ts +25 -2
- package/dist/i18n.d.ts.map +1 -1
- package/dist/i18n.js +75 -10
- package/dist/index.d.ts +66 -3
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +527 -68
- package/dist/integrations.d.ts +9 -1
- package/dist/integrations.d.ts.map +1 -1
- package/dist/integrations.js +34 -6
- package/dist/notifications.d.ts +30 -2
- package/dist/notifications.d.ts.map +1 -1
- package/dist/notifications.js +289 -10
- package/dist/profiles.d.ts +1 -1
- package/dist/profiles.d.ts.map +1 -1
- package/dist/profiles.js +21 -3
- package/dist/rpc.d.ts +401 -5
- package/dist/rpc.d.ts.map +1 -1
- package/dist/rpc.js +138 -5
- package/dist/server.d.ts +20 -0
- package/dist/server.d.ts.map +1 -1
- package/dist/server.js +136 -14
- package/dist/settings.d.ts +167 -3
- package/dist/settings.d.ts.map +1 -1
- package/dist/settings.js +322 -3
- package/dist/task-transfer.d.ts +8 -1
- package/dist/task-transfer.d.ts.map +1 -1
- package/dist/task-transfer.js +2 -2
- package/dist/types.d.ts +8 -1
- package/dist/types.d.ts.map +1 -1
- package/dist/types.js +23 -5
- package/dist/workspaces.d.ts +9 -0
- package/dist/workspaces.d.ts.map +1 -1
- package/dist/workspaces.js +25 -0
- package/docs/ARCHITECTURE.md +48 -28
- package/docs/CONCEPT.md +230 -0
- package/docs/CROSS_PLATFORM.ru.md +150 -0
- package/docs/CROSS_PLATFORM.zh.md +146 -0
- package/docs/FAQ.md +52 -0
- package/docs/FAQ.ru.md +53 -0
- package/docs/FAQ.zh.md +43 -0
- package/docs/FEATURES.md +141 -44
- package/docs/FEATURES.zh.md +655 -0
- package/docs/LOCAL-AI.md +300 -0
- package/docs/MIGRATION.md +17 -0
- package/docs/README.ru.md +22 -16
- package/docs/README.zh.md +286 -0
- package/docs/SAVINGS.md +61 -0
- package/docs/SAVINGS.ru.md +60 -0
- package/docs/SAVINGS.zh.md +52 -0
- package/docs/ZH-LOCALE-PLAN.md +324 -0
- package/docs/spikes/local-model-structured-output.md +81 -0
- package/docs/spikes/ollama-qwen3-4b-smoke.json +28 -0
- package/docs/spikes/ollama-qwen3-4b.json +163 -0
- package/gui-experimental.cjs +8 -8
- package/locales/en.json +85 -0
- package/locales/ru.json +85 -0
- package/locales/zh.json +780 -0
- package/package.json +31 -7
- package/scripts/bench-local.mjs +321 -0
- package/scripts/check-zh-locale.mjs +218 -0
- package/scripts/run-tests.mjs +236 -0
- package/scripts/spike-local-structured.mjs +182 -0
- package/scripts/test-locale.mjs +4 -3
- package/skills/scheduled-job-best-practices/SKILL.md +6 -3
- package/skills/scheduled-job-best-practices/references/recipes.md +40 -0
- package/src/core/analytics.ts +10 -0
- package/src/core/audit.ts +39 -1
- package/src/core/cron-to-schtasks.ts +23 -4
- package/src/core/file-watcher.ts +20 -1
- package/src/core/git-trigger.ts +34 -16
- package/src/core/local-ai.ts +173 -0
- package/src/core/lock.ts +88 -3
- package/src/core/matrix.ts +5 -1
- package/src/core/native-notify.ts +3 -0
- package/src/core/one-shot.ts +18 -2
- package/src/core/permissions.ts +200 -0
- package/src/core/ps-wrapper.ts +492 -108
- package/src/core/record-history.ts +111 -4
- package/src/core/savings.ts +150 -0
- package/src/core/schedule-gate.ts +9 -3
- package/src/core/schedule-v2.ts +1 -1
- package/src/core/scheduler/index.ts +41 -3
- package/src/core/scheduler/linux.ts +67 -22
- package/src/core/scheduler/mac.ts +24 -7
- package/src/core/scheduler/posix.ts +2 -2
- package/src/core/scheduler/registry.ts +7 -5
- package/src/core/scheduler/windows.ts +237 -32
- package/src/core/secrets.ts +101 -7
- package/src/core/self-analysis.ts +744 -0
- package/src/core/session.ts +40 -5
- package/src/core/shutdown.ts +69 -0
- package/src/core/summary.ts +318 -0
- package/src/core/telegram.ts +266 -55
- package/src/core/triage-chain.ts +125 -0
- package/src/core/triage-compare.ts +277 -0
- package/src/core/triage-rules.ts +238 -0
- package/src/core/triage-shadow.ts +240 -0
- package/src/core/triage-worker.ts +344 -0
- package/src/core/triage.ts +366 -0
- package/src/core/watch-paths.ts +70 -0
- package/src/core/wrappers/bash.ts +181 -138
- package/src/db/history-repo.ts +31 -18
- package/src/db/schema.ts +31 -0
- package/src/gui.tsx +551 -14
- package/src/history.ts +7 -3
- package/src/i18n.ts +87 -13
- package/src/index.ts +649 -71
- package/src/integrations.ts +50 -6
- package/src/notifications.ts +468 -5
- package/src/profiles.ts +21 -3
- package/src/rpc.ts +143 -5
- package/src/server.ts +135 -16
- package/src/settings.ts +582 -5
- package/src/task-transfer.ts +10 -3
- package/src/types.ts +24 -5
- package/src/workspaces.ts +22 -0
package/dist/rpc.js
CHANGED
|
@@ -53,6 +53,8 @@ const TaskItem = {
|
|
|
53
53
|
properties: {
|
|
54
54
|
name: { type: "string" },
|
|
55
55
|
schedule: { type: "string" },
|
|
56
|
+
/** Hotfix 1.5.3.1: лимит времени задачи в секундах (null - по умолчанию). */
|
|
57
|
+
timeoutSeconds: { type: ["number", "null"] },
|
|
56
58
|
status: { type: "string" },
|
|
57
59
|
nextRun: { type: ["string", "null"] },
|
|
58
60
|
/** LLM-модель задачи (null — модель OpenCode по умолчанию). */
|
|
@@ -234,9 +236,9 @@ const CreateTaskInput = {
|
|
|
234
236
|
workspaceId: { type: "string" },
|
|
235
237
|
/** Рабочая директория задачи (по умолчанию — папка проекта). */
|
|
236
238
|
workingDirectory: { type: "string" },
|
|
237
|
-
/** Белый список инструментов задачи (role-scoped,
|
|
239
|
+
/** Белый список инструментов задачи (role-scoped, enforced through OPENCODE_CONFIG_CONTENT). Пустой массив запрещён. */
|
|
238
240
|
allowedTools: { type: "array", items: { type: "string" } },
|
|
239
|
-
/** Чёрный список инструментов задачи (приоритет над allowedTools).
|
|
241
|
+
/** Чёрный список инструментов задачи (приоритет над allowedTools и политикой). Enforced. */
|
|
240
242
|
deniedTools: { type: "array", items: { type: "string" } },
|
|
241
243
|
/** Matrix (fan-out): раскладывает задачу-шаблон на клоны по workspace. */
|
|
242
244
|
matrix: MatrixSchema,
|
|
@@ -513,6 +515,62 @@ const NotificationSettingsSchema = {
|
|
|
513
515
|
},
|
|
514
516
|
required: ["enabled", "frequency", "time"],
|
|
515
517
|
},
|
|
518
|
+
triage: {
|
|
519
|
+
type: "object",
|
|
520
|
+
properties: {
|
|
521
|
+
mode: { type: "string", enum: ["off", "rules", "llm", "auto"] },
|
|
522
|
+
baseUrl: { type: "string" },
|
|
523
|
+
model: { type: "string" },
|
|
524
|
+
timeoutMs: { type: "number" },
|
|
525
|
+
fallback: { type: "string", enum: ["rules", "notify", "skip"] },
|
|
526
|
+
confidenceThreshold: { type: "number" },
|
|
527
|
+
rules: {
|
|
528
|
+
type: "array",
|
|
529
|
+
items: {
|
|
530
|
+
type: "object",
|
|
531
|
+
properties: {
|
|
532
|
+
id: { type: "string" },
|
|
533
|
+
field: {
|
|
534
|
+
type: "string",
|
|
535
|
+
enum: ["status", "task", "error", "cost"],
|
|
536
|
+
},
|
|
537
|
+
operator: {
|
|
538
|
+
type: "string",
|
|
539
|
+
enum: ["equals", "contains", "regex", "gt", "lt", "gte", "lte"],
|
|
540
|
+
},
|
|
541
|
+
value: { type: ["string", "number"] },
|
|
542
|
+
category: {
|
|
543
|
+
type: "string",
|
|
544
|
+
enum: ["quality", "timeout", "permission", "network", "unknown"],
|
|
545
|
+
},
|
|
546
|
+
severity: { type: "string", enum: ["low", "medium", "high"] },
|
|
547
|
+
confidence: { type: "number" },
|
|
548
|
+
action: { type: "string", enum: ["notify", "skip"] },
|
|
549
|
+
reason: { type: "string" },
|
|
550
|
+
priority: { type: "number" },
|
|
551
|
+
},
|
|
552
|
+
required: ["field", "operator", "value"],
|
|
553
|
+
},
|
|
554
|
+
},
|
|
555
|
+
shadow: {
|
|
556
|
+
type: "object",
|
|
557
|
+
properties: {
|
|
558
|
+
enabled: { type: "boolean" },
|
|
559
|
+
days: { type: "number" },
|
|
560
|
+
startedAt: { type: ["string", "null"] },
|
|
561
|
+
},
|
|
562
|
+
required: ["enabled", "days", "startedAt"],
|
|
563
|
+
},
|
|
564
|
+
},
|
|
565
|
+
required: [
|
|
566
|
+
"mode",
|
|
567
|
+
"baseUrl",
|
|
568
|
+
"model",
|
|
569
|
+
"timeoutMs",
|
|
570
|
+
"fallback",
|
|
571
|
+
"confidenceThreshold",
|
|
572
|
+
],
|
|
573
|
+
},
|
|
516
574
|
},
|
|
517
575
|
required: ["enabled", "onlyOnError"],
|
|
518
576
|
};
|
|
@@ -537,15 +595,28 @@ const AuditSettingsSchema = {
|
|
|
537
595
|
},
|
|
538
596
|
required: ["enabled", "retentionDays", "maxRecords"],
|
|
539
597
|
};
|
|
598
|
+
/** Политика прав фоновых задач (Спринт 32). */
|
|
599
|
+
const PermissionSettingsSchema = {
|
|
600
|
+
type: "object",
|
|
601
|
+
properties: {
|
|
602
|
+
defaultPolicy: {
|
|
603
|
+
type: "string",
|
|
604
|
+
enum: ["hybrid", "secure", "legacy"],
|
|
605
|
+
},
|
|
606
|
+
},
|
|
607
|
+
required: ["defaultPolicy"],
|
|
608
|
+
};
|
|
540
609
|
const GetSettingsOutput = {
|
|
541
610
|
type: "object",
|
|
542
611
|
properties: {
|
|
543
612
|
maxConcurrent: { type: "number" },
|
|
544
|
-
locale: { type: "string", enum: ["ru", "en"] },
|
|
613
|
+
locale: { type: "string", enum: ["auto", "ru", "en", "zh"] },
|
|
614
|
+
uiLocale: { type: "string", enum: ["ru", "en", "zh"] },
|
|
545
615
|
winterMode: { type: "boolean" },
|
|
546
616
|
notifications: NotificationSettingsSchema,
|
|
547
617
|
history: HistorySettingsSchema,
|
|
548
618
|
audit: AuditSettingsSchema,
|
|
619
|
+
permissions: PermissionSettingsSchema,
|
|
549
620
|
},
|
|
550
621
|
required: ["maxConcurrent", "locale", "winterMode", "notifications"],
|
|
551
622
|
};
|
|
@@ -554,11 +625,13 @@ const SaveSettingsInput = {
|
|
|
554
625
|
properties: {
|
|
555
626
|
maxConcurrent: { type: "number" },
|
|
556
627
|
/** Язык интерфейса (Спринт 28): ru по умолчанию, en — опционально. */
|
|
557
|
-
locale: { type: "string", enum: ["ru", "en"] },
|
|
628
|
+
locale: { type: "string", enum: ["auto", "ru", "en", "zh"] },
|
|
629
|
+
uiLocale: { type: "string", enum: ["ru", "en", "zh"] },
|
|
558
630
|
winterMode: { type: "boolean" },
|
|
559
631
|
notifications: NotificationSettingsSchema,
|
|
560
632
|
history: HistorySettingsSchema,
|
|
561
633
|
audit: AuditSettingsSchema,
|
|
634
|
+
permissions: PermissionSettingsSchema,
|
|
562
635
|
},
|
|
563
636
|
additionalProperties: false,
|
|
564
637
|
};
|
|
@@ -567,11 +640,13 @@ const SaveSettingsOutput = {
|
|
|
567
640
|
properties: {
|
|
568
641
|
success: { type: "boolean" },
|
|
569
642
|
maxConcurrent: { type: "number" },
|
|
570
|
-
locale: { type: "string", enum: ["ru", "en"] },
|
|
643
|
+
locale: { type: "string", enum: ["auto", "ru", "en", "zh"] },
|
|
644
|
+
uiLocale: { type: "string", enum: ["ru", "en", "zh"] },
|
|
571
645
|
winterMode: { type: "boolean" },
|
|
572
646
|
notifications: NotificationSettingsSchema,
|
|
573
647
|
history: HistorySettingsSchema,
|
|
574
648
|
audit: AuditSettingsSchema,
|
|
649
|
+
permissions: PermissionSettingsSchema,
|
|
575
650
|
},
|
|
576
651
|
required: ["success", "maxConcurrent", "locale", "winterMode", "notifications"],
|
|
577
652
|
};
|
|
@@ -620,6 +695,32 @@ const GetAnalyticsOutput = {
|
|
|
620
695
|
},
|
|
621
696
|
required: ["success", "report"],
|
|
622
697
|
};
|
|
698
|
+
const SelfAnalysisInput = {
|
|
699
|
+
type: "object",
|
|
700
|
+
properties: {
|
|
701
|
+
/** Окно анализа в днях (по умолчанию 14, максимум 365). */
|
|
702
|
+
days: { type: "number" },
|
|
703
|
+
/** Сколько строк в топах (по умолчанию 10). */
|
|
704
|
+
topLimit: { type: "number" },
|
|
705
|
+
/** Включить обнаружение аномалий (по умолчанию true). */
|
|
706
|
+
includeAnomalies: { type: "boolean" },
|
|
707
|
+
/** Включить анализ трендов (по умолчанию true). */
|
|
708
|
+
includeTrends: { type: "boolean" },
|
|
709
|
+
/** Включить рекомендации (по умолчанию true). */
|
|
710
|
+
includeRecommendations: { type: "boolean" },
|
|
711
|
+
},
|
|
712
|
+
additionalProperties: false,
|
|
713
|
+
};
|
|
714
|
+
const SelfAnalysisOutput = {
|
|
715
|
+
type: "object",
|
|
716
|
+
properties: {
|
|
717
|
+
success: { type: "boolean" },
|
|
718
|
+
// null при ошибке: report формируется только при success=true.
|
|
719
|
+
report: { type: ["object", "null"] },
|
|
720
|
+
error: { type: "string" },
|
|
721
|
+
},
|
|
722
|
+
required: ["success", "report"],
|
|
723
|
+
};
|
|
623
724
|
const TestNotificationInput = {
|
|
624
725
|
type: "object",
|
|
625
726
|
properties: {},
|
|
@@ -741,6 +842,33 @@ const GetAuditOutput = {
|
|
|
741
842
|
},
|
|
742
843
|
required: ["success", "records", "total"],
|
|
743
844
|
};
|
|
845
|
+
/** Сравнение триажа «до/после» (Спринт 31.5). */
|
|
846
|
+
const CompareTriageInput = {
|
|
847
|
+
type: "object",
|
|
848
|
+
properties: {
|
|
849
|
+
taskName: { type: "string" },
|
|
850
|
+
status: { type: "string" },
|
|
851
|
+
error: { type: ["string", "null"] },
|
|
852
|
+
durationMs: { type: "number" },
|
|
853
|
+
tokens: { type: "number" },
|
|
854
|
+
costUsd: { type: "number" },
|
|
855
|
+
before: { type: ["object", "null"] },
|
|
856
|
+
after: { type: ["object", "null"] },
|
|
857
|
+
dedupCount: { type: "number" },
|
|
858
|
+
},
|
|
859
|
+
required: ["taskName", "status"],
|
|
860
|
+
additionalProperties: false,
|
|
861
|
+
};
|
|
862
|
+
const CompareTriageOutput = {
|
|
863
|
+
type: "object",
|
|
864
|
+
properties: {
|
|
865
|
+
success: { type: "boolean" },
|
|
866
|
+
result: { type: "object" },
|
|
867
|
+
error: { type: "string" },
|
|
868
|
+
},
|
|
869
|
+
required: ["success", "result"],
|
|
870
|
+
additionalProperties: false,
|
|
871
|
+
};
|
|
744
872
|
const TemplateItem = {
|
|
745
873
|
type: "object",
|
|
746
874
|
properties: {
|
|
@@ -1337,6 +1465,7 @@ export const SchedulerRpc = Rpc.define({
|
|
|
1337
1465
|
},
|
|
1338
1466
|
cleanup_history: { input: CleanupHistoryInput, output: CleanupHistoryOutput },
|
|
1339
1467
|
get_analytics: { input: GetAnalyticsInput, output: GetAnalyticsOutput },
|
|
1468
|
+
self_analysis: { input: SelfAnalysisInput, output: SelfAnalysisOutput },
|
|
1340
1469
|
expand_matrix_preview: {
|
|
1341
1470
|
input: ExpandMatrixPreviewInput,
|
|
1342
1471
|
output: ExpandMatrixPreviewOutput,
|
|
@@ -1369,6 +1498,10 @@ export const SchedulerRpc = Rpc.define({
|
|
|
1369
1498
|
save_secret: { input: SaveSecretInput, output: SaveSecretOutput },
|
|
1370
1499
|
delete_secret: { input: DeleteSecretInput, output: DeleteSecretOutput },
|
|
1371
1500
|
get_audit: { input: GetAuditInput, output: GetAuditOutput },
|
|
1501
|
+
compare_triage: {
|
|
1502
|
+
input: CompareTriageInput,
|
|
1503
|
+
output: CompareTriageOutput,
|
|
1504
|
+
},
|
|
1372
1505
|
},
|
|
1373
1506
|
events: {},
|
|
1374
1507
|
});
|
package/dist/server.d.ts
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import http from "node:http";
|
|
1
2
|
/** Переопределение портов (используется в тестах; по умолчанию 3782/4782). */
|
|
2
3
|
export interface DashboardPorts {
|
|
3
4
|
preferred?: number;
|
|
@@ -91,6 +92,25 @@ export interface ModelAnalysis {
|
|
|
91
92
|
export declare function isDashboardRunning(): boolean;
|
|
92
93
|
/** Порт, на котором слушает дашборд (или null, если не запущен). */
|
|
93
94
|
export declare function getDashboardPort(): number | null;
|
|
95
|
+
/**
|
|
96
|
+
* Проверяет, что запрос к дашборду исходит из доверенного источника,
|
|
97
|
+
* чтобы защититься от CSRF и DNS-ребиндинга.
|
|
98
|
+
*
|
|
99
|
+
* Правила:
|
|
100
|
+
* - при наличии Origin он ОБЯЗАН быть локальным — проверка Host при этом
|
|
101
|
+
* не спасает, потому что Host всегда равен адресату запроса;
|
|
102
|
+
* - без Origin (не-браузерный клиент, curl, свои fetch) требуется локальный Host —
|
|
103
|
+
* это защита от DNS-rebinding;
|
|
104
|
+
* - Origin: null, чужие схемы и чужие хосты отклоняются;
|
|
105
|
+
* - X-Scheduler-Client — только дополнительное подтверждение: он не обходит
|
|
106
|
+
* проверку Origin и не превращает внешний запрос в доверенный.
|
|
107
|
+
*/
|
|
108
|
+
export declare function isDashboardRequestTrusted(req: http.IncomingMessage): boolean;
|
|
109
|
+
/**
|
|
110
|
+
* Путь защищён проверкой источника: весь /api/*, кроме /api/hooks/*
|
|
111
|
+
* (hooks аутентифицируются HMAC и должны принимать внешние вызовы).
|
|
112
|
+
*/
|
|
113
|
+
export declare function needsDashboardSourceCheck(pathname: string): boolean;
|
|
94
114
|
/**
|
|
95
115
|
* Запускает сервер на первом свободном порту.
|
|
96
116
|
* Если порт занят не нашим дашбордом, сначала пытается снять зомби-процесс
|
package/dist/server.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"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"}
|
package/dist/server.js
CHANGED
|
@@ -35,8 +35,18 @@ const IS_WINDOWS = process.platform === "win32";
|
|
|
35
35
|
/**
|
|
36
36
|
* Имена процессов, которые считаем «зомби» от прошлых запусков плагина.
|
|
37
37
|
* На Windows процессы называются node.exe / bun.exe, на POSIX — node / bun.
|
|
38
|
+
* Ayrıca принимаем versioned-бинарники (node22, bun1.2 и т.п.) —
|
|
39
|
+
* они нормализуются в normalizeProcessName перед проверкой.
|
|
38
40
|
*/
|
|
39
41
|
const ZOMBIE_IMAGE_NAMES = new Set(["node", "nodejs", "node.exe", "bun", "bun.exe"]);
|
|
42
|
+
/** Нормализует имя процесса: node22 → node, bun1.2 → bun, остальные без изменений. */
|
|
43
|
+
function normalizeProcessName(name) {
|
|
44
|
+
if (/^node\d+(\.\d+)*$/i.test(name))
|
|
45
|
+
return "node";
|
|
46
|
+
if (/^bun\d+(\.\d+)*$/i.test(name))
|
|
47
|
+
return "bun";
|
|
48
|
+
return name;
|
|
49
|
+
}
|
|
40
50
|
/** Маркер-заголовок: по нему узнаём «свой» дашборд, уже слушающий порт. */
|
|
41
51
|
const DASHBOARD_HEADER = "x-plugin-dashboard";
|
|
42
52
|
const DASHBOARD_MARKER = "opencode-windows-scheduler";
|
|
@@ -126,6 +136,81 @@ export function isDashboardRunning() {
|
|
|
126
136
|
export function getDashboardPort() {
|
|
127
137
|
return running?.port ?? null;
|
|
128
138
|
}
|
|
139
|
+
/** Локальные имена, которым разрешено обращаться к дашборду. */
|
|
140
|
+
const LOCAL_HOSTNAMES = new Set(["127.0.0.1", "localhost", "::1", "[::1]"]);
|
|
141
|
+
/**
|
|
142
|
+
* Извлекает hostname из значения заголовка Host/Origin.
|
|
143
|
+
* Понимает `http://host:port`, `host:port`, `[::1]:port`, userinfo.
|
|
144
|
+
*/
|
|
145
|
+
function parseLocalHostname(value) {
|
|
146
|
+
if (!value)
|
|
147
|
+
return undefined;
|
|
148
|
+
let raw = value.trim();
|
|
149
|
+
if (!raw)
|
|
150
|
+
return undefined;
|
|
151
|
+
// Отбрасываем схему и userinfo.
|
|
152
|
+
raw = raw.replace(/^[a-z][a-z0-9+.-]*:\/\//i, "");
|
|
153
|
+
const at = raw.lastIndexOf("@");
|
|
154
|
+
if (at >= 0)
|
|
155
|
+
raw = raw.slice(at + 1);
|
|
156
|
+
// Путь/query в Origin не входят, но на всякий случай отрезаем.
|
|
157
|
+
raw = raw.split(/[/?#]/)[0];
|
|
158
|
+
if (raw.startsWith("[")) {
|
|
159
|
+
const end = raw.indexOf("]");
|
|
160
|
+
if (end > 0)
|
|
161
|
+
return raw.slice(0, end + 1).toLowerCase();
|
|
162
|
+
}
|
|
163
|
+
const colon = raw.lastIndexOf(":");
|
|
164
|
+
const host = (colon > 0 ? raw.slice(0, colon) : raw).replace(/\.$/, "");
|
|
165
|
+
return host.toLowerCase();
|
|
166
|
+
}
|
|
167
|
+
/**
|
|
168
|
+
* Проверяет, что запрос к дашборду исходит из доверенного источника,
|
|
169
|
+
* чтобы защититься от CSRF и DNS-ребиндинга.
|
|
170
|
+
*
|
|
171
|
+
* Правила:
|
|
172
|
+
* - при наличии Origin он ОБЯЗАН быть локальным — проверка Host при этом
|
|
173
|
+
* не спасает, потому что Host всегда равен адресату запроса;
|
|
174
|
+
* - без Origin (не-браузерный клиент, curl, свои fetch) требуется локальный Host —
|
|
175
|
+
* это защита от DNS-rebinding;
|
|
176
|
+
* - Origin: null, чужие схемы и чужие хосты отклоняются;
|
|
177
|
+
* - X-Scheduler-Client — только дополнительное подтверждение: он не обходит
|
|
178
|
+
* проверку Origin и не превращает внешний запрос в доверенный.
|
|
179
|
+
*/
|
|
180
|
+
export function isDashboardRequestTrusted(req) {
|
|
181
|
+
const headers = req.headers ?? {};
|
|
182
|
+
const origin = typeof headers.origin === "string" ? headers.origin : undefined;
|
|
183
|
+
if (origin !== undefined) {
|
|
184
|
+
// "null" (sandbox/file://) и любые не-localhost Origin — не доверяем.
|
|
185
|
+
// X-Scheduler-Client НЕ обходит эту проверку: заголовок можно подделать
|
|
186
|
+
// через CORS с ошибкой в конфиге или XSS на странице дашборда.
|
|
187
|
+
const originHost = parseLocalHostname(origin);
|
|
188
|
+
const localOrigin = Boolean(originHost && LOCAL_HOSTNAMES.has(originHost));
|
|
189
|
+
if (!localOrigin)
|
|
190
|
+
return false;
|
|
191
|
+
// Локальный Origin — доверяем; X-Scheduler-Client — дополнительное подтверждение.
|
|
192
|
+
return true;
|
|
193
|
+
}
|
|
194
|
+
// Origin отсутствует — не браузерный cross-origin запрос. Проверяем Host,
|
|
195
|
+
// чтобы запрос не пришёл через DNS-rebinding на чужое имя.
|
|
196
|
+
const hostHost = parseLocalHostname(typeof headers.host === "string" ? headers.host : undefined);
|
|
197
|
+
const localHost = Boolean(hostHost && LOCAL_HOSTNAMES.has(hostHost));
|
|
198
|
+
if (!localHost)
|
|
199
|
+
return false;
|
|
200
|
+
// Без Origin, но локальный Host — доверяем; X-Scheduler-Client — бонус.
|
|
201
|
+
return true;
|
|
202
|
+
}
|
|
203
|
+
/**
|
|
204
|
+
* Путь защищён проверкой источника: весь /api/*, кроме /api/hooks/*
|
|
205
|
+
* (hooks аутентифицируются HMAC и должны принимать внешние вызовы).
|
|
206
|
+
*/
|
|
207
|
+
export function needsDashboardSourceCheck(pathname) {
|
|
208
|
+
if (!/^\/api(?:\/|$)/.test(pathname))
|
|
209
|
+
return false;
|
|
210
|
+
if (pathname === "/api/hooks" || pathname.startsWith("/api/hooks/"))
|
|
211
|
+
return false;
|
|
212
|
+
return true;
|
|
213
|
+
}
|
|
129
214
|
/**
|
|
130
215
|
* Запускает сервер на первом свободном порту.
|
|
131
216
|
* Если порт занят не нашим дашбордом, сначала пытается снять зомби-процесс
|
|
@@ -212,7 +297,8 @@ async function tryFreeZombiePort(port) {
|
|
|
212
297
|
const info = await getProcessInfo(pid);
|
|
213
298
|
if (!info)
|
|
214
299
|
continue;
|
|
215
|
-
|
|
300
|
+
const normName = normalizeProcessName(info.name.toLowerCase());
|
|
301
|
+
if (!ZOMBIE_IMAGE_NAMES.has(normName)) {
|
|
216
302
|
console.warn(`[windows-scheduler] Порт ${port} занят процессом ${info.name} (PID ${pid}) — не трогаем, пробуем другой порт.`);
|
|
217
303
|
continue;
|
|
218
304
|
}
|
|
@@ -470,6 +556,17 @@ async function handleRequest(req, res, deps) {
|
|
|
470
556
|
res.end();
|
|
471
557
|
return;
|
|
472
558
|
}
|
|
559
|
+
// --- CSRF / DNS-rebinding защита для всего /api/* (кроме /api/hooks) --- //
|
|
560
|
+
// Требуем либо кастомный заголовок X-Scheduler-Client (браузер не отправит
|
|
561
|
+
// его межсайтово без ответа на preflight, которого сервер не даёт),
|
|
562
|
+
// либо локальный Origin, либо (для не-браузерных клиентов) локальный Host.
|
|
563
|
+
// GET-запросы защищены тоже: иначе DNS-rebinding позволяет прочитать
|
|
564
|
+
// /api/export-db (вся SQLite-база), историю, аудит и настройки.
|
|
565
|
+
// POST /api/hooks остаётся без этой проверки: он защищён HMAC отдельно.
|
|
566
|
+
if (needsDashboardSourceCheck(pathname) && !isDashboardRequestTrusted(req)) {
|
|
567
|
+
sendJson(res, 403, { error: "Запрос не прошёл проверку источника (CSRF/DNS-rebinding)." });
|
|
568
|
+
return;
|
|
569
|
+
}
|
|
473
570
|
// Статический HTML-файл — страница дашборда.
|
|
474
571
|
if (req.method === "GET" && (pathname === "/" || pathname === "/index.html")) {
|
|
475
572
|
send(res, 200, "text/html; charset=utf-8", renderPage());
|
|
@@ -607,7 +704,7 @@ async function handleRequest(req, res, deps) {
|
|
|
607
704
|
tasks: [],
|
|
608
705
|
totals: { estimatedDurationSec: null, estimatedCostUsd: null, estimatedTokens: null },
|
|
609
706
|
warnings: [],
|
|
610
|
-
error:
|
|
707
|
+
error: sanitizeError(err),
|
|
611
708
|
});
|
|
612
709
|
}
|
|
613
710
|
return;
|
|
@@ -709,7 +806,7 @@ async function handleRequest(req, res, deps) {
|
|
|
709
806
|
}
|
|
710
807
|
catch (err) {
|
|
711
808
|
sendJson(res, 500, {
|
|
712
|
-
error: `Не удалось экспортировать БД: ${
|
|
809
|
+
error: `Не удалось экспортировать БД: ${sanitizeError(err)}`,
|
|
713
810
|
});
|
|
714
811
|
}
|
|
715
812
|
return;
|
|
@@ -730,7 +827,7 @@ async function handleRequest(req, res, deps) {
|
|
|
730
827
|
}
|
|
731
828
|
catch (err) {
|
|
732
829
|
sendJson(res, 500, {
|
|
733
|
-
error:
|
|
830
|
+
error: sanitizeError(err),
|
|
734
831
|
});
|
|
735
832
|
}
|
|
736
833
|
return;
|
|
@@ -796,7 +893,7 @@ async function handleRequest(req, res, deps) {
|
|
|
796
893
|
catch (err) {
|
|
797
894
|
const message = err instanceof Error ? err.message : String(err);
|
|
798
895
|
logHook(500, "rejected", `Не удалось получить список задач: ${message}`, bodyResult.body.length);
|
|
799
|
-
sendJson(res, 500, { success: false, error:
|
|
896
|
+
sendJson(res, 500, { success: false, error: sanitizeError(err) });
|
|
800
897
|
return;
|
|
801
898
|
}
|
|
802
899
|
const key = taskName.toLowerCase();
|
|
@@ -834,7 +931,7 @@ async function handleRequest(req, res, deps) {
|
|
|
834
931
|
catch (err) {
|
|
835
932
|
const message = err instanceof Error ? err.message : String(err);
|
|
836
933
|
logHook(500, "rejected", message, bodyResult.body.length);
|
|
837
|
-
sendJson(res, 500, { success: false, error:
|
|
934
|
+
sendJson(res, 500, { success: false, error: sanitizeError(err) });
|
|
838
935
|
}
|
|
839
936
|
return;
|
|
840
937
|
}
|
|
@@ -867,7 +964,7 @@ async function handleRequest(req, res, deps) {
|
|
|
867
964
|
catch (err) {
|
|
868
965
|
sendJson(res, 500, {
|
|
869
966
|
success: false,
|
|
870
|
-
error:
|
|
967
|
+
error: sanitizeError(err),
|
|
871
968
|
});
|
|
872
969
|
}
|
|
873
970
|
return;
|
|
@@ -904,7 +1001,7 @@ async function handleRequest(req, res, deps) {
|
|
|
904
1001
|
catch (err) {
|
|
905
1002
|
sendJson(res, 500, {
|
|
906
1003
|
success: false,
|
|
907
|
-
error:
|
|
1004
|
+
error: sanitizeError(err),
|
|
908
1005
|
});
|
|
909
1006
|
}
|
|
910
1007
|
return;
|
|
@@ -937,7 +1034,7 @@ async function handleRequest(req, res, deps) {
|
|
|
937
1034
|
catch (err) {
|
|
938
1035
|
sendJson(res, 500, {
|
|
939
1036
|
success: false,
|
|
940
|
-
error:
|
|
1037
|
+
error: sanitizeError(err),
|
|
941
1038
|
});
|
|
942
1039
|
}
|
|
943
1040
|
return;
|
|
@@ -965,7 +1062,7 @@ async function handleRequest(req, res, deps) {
|
|
|
965
1062
|
catch (err) {
|
|
966
1063
|
sendJson(res, 500, {
|
|
967
1064
|
success: false,
|
|
968
|
-
error:
|
|
1065
|
+
error: sanitizeError(err),
|
|
969
1066
|
});
|
|
970
1067
|
}
|
|
971
1068
|
return;
|
|
@@ -981,7 +1078,7 @@ async function handleRequest(req, res, deps) {
|
|
|
981
1078
|
res.destroy();
|
|
982
1079
|
return;
|
|
983
1080
|
}
|
|
984
|
-
sendJson(res, 500, { error:
|
|
1081
|
+
sendJson(res, 500, { error: sanitizeError(err) });
|
|
985
1082
|
}
|
|
986
1083
|
}
|
|
987
1084
|
const JSON_TYPE = "application/json; charset=utf-8";
|
|
@@ -993,6 +1090,16 @@ function sendJson(res, status, payload) {
|
|
|
993
1090
|
}
|
|
994
1091
|
send(res, status, JSON_TYPE, JSON.stringify(payload));
|
|
995
1092
|
}
|
|
1093
|
+
/** Санитизирует сообщение об ошибке для клиентского ответа.
|
|
1094
|
+
* Подробности стека/пути/токенов не утекают наружу — пишем только в лог. */
|
|
1095
|
+
function sanitizeError(err) {
|
|
1096
|
+
if (err instanceof Error) {
|
|
1097
|
+
const msg = err.message;
|
|
1098
|
+
// Убираем внутренние пути и стеки
|
|
1099
|
+
return msg.replace(/[A-Z]:\\/g, "").replace(/\\/g, "/").replace(/\s+at\s+/g, " ").slice(0, 300);
|
|
1100
|
+
}
|
|
1101
|
+
return String(err).slice(0, 300);
|
|
1102
|
+
}
|
|
996
1103
|
/** Отправляет ответ с телом и закрывает соединение. */
|
|
997
1104
|
function send(res, status, contentType, body) {
|
|
998
1105
|
res.writeHead(status, {
|
|
@@ -1609,6 +1716,16 @@ function renderPage() {
|
|
|
1609
1716
|
}
|
|
1610
1717
|
|
|
1611
1718
|
var t = an.totals;
|
|
1719
|
+
var savings = an.savings || null;
|
|
1720
|
+
var savingsChip = '';
|
|
1721
|
+
if (savings && savings.savedUsd > 0) {
|
|
1722
|
+
var savingsTip = 'Оценка: ' + Number(savings.runs) + ' запусков, ' +
|
|
1723
|
+
Number(savings.tokens || 0).toLocaleString('ru-RU') + ' токенов без записанной стоимости, ' +
|
|
1724
|
+
'по эталонной цене $' + Number(savings.referenceCostPer1kTokensUsd || 0) + ' за 1k токенов.';
|
|
1725
|
+
savingsChip = '<span title="' + esc(savingsTip) + '">Сэкономлено: <b>' +
|
|
1726
|
+
money(savings.savedUsd) + '</b> <span class="an-partial">оценка</span> <a href="' +
|
|
1727
|
+
esc(savings.methodologyUrl) + '" target="_blank" rel="noopener noreferrer">методика</a></span>';
|
|
1728
|
+
}
|
|
1612
1729
|
kpis.innerHTML =
|
|
1613
1730
|
'<span>Запусков: <b>' + t.total + '</b></span>' +
|
|
1614
1731
|
'<span>Успех: <b class="an-rate ' + rateClass(t.successRate) + '">' + t.successRate + '%</b>' +
|
|
@@ -1616,6 +1733,7 @@ function renderPage() {
|
|
|
1616
1733
|
'<span>Ср. длительность: <b>' + durationText(t.avgDurationMs) + '</b></span>' +
|
|
1617
1734
|
'<span>Токены: <b>' + Number(t.tokens || 0).toLocaleString('ru-RU') + '</b></span>' +
|
|
1618
1735
|
'<span>Стоимость: <b>' + money(t.costUsd) + '</b></span>' +
|
|
1736
|
+
savingsChip +
|
|
1619
1737
|
'<span>Окно: <b>' + an.windowDays + ' дн.</b></span>';
|
|
1620
1738
|
|
|
1621
1739
|
var daily = an.daily || [];
|
|
@@ -1977,7 +2095,7 @@ function renderPage() {
|
|
|
1977
2095
|
function taskRow(t, isClone, cloneCount, expanded) {
|
|
1978
2096
|
var sessionBadge = t.session === 'reuse' || t.session === 'last'
|
|
1979
2097
|
? '<span title="' + (t.session === 'reuse'
|
|
1980
|
-
? 'Переиспользуемая сессия OpenCode' + (t.sessionId ? ': ' + t.sessionId : '')
|
|
2098
|
+
? 'Переиспользуемая сессия OpenCode' + (t.sessionId ? ': ' + esc(t.sessionId) : '')
|
|
1981
2099
|
: 'Продолжение последней сессии OpenCode (--continue)') +
|
|
1982
2100
|
'" style="margin-left:6px;padding:1px 6px;border-radius:999px;border:1px solid #30d158;color:#30d158;font-size:11px">' +
|
|
1983
2101
|
(t.session === 'reuse' ? '⟳ сессия' : '↪ продолжение') + '</span>'
|
|
@@ -2026,6 +2144,10 @@ function renderPage() {
|
|
|
2026
2144
|
'</tr>';
|
|
2027
2145
|
}
|
|
2028
2146
|
|
|
2147
|
+
// Заголовок, подтверждающий, что запрос отправлен самим дашбордом.
|
|
2148
|
+
// Без него кросс-сайтовый fetch не пройдёт (нужен CORS-preflight, которого нет).
|
|
2149
|
+
var CLIENT_HEADERS = { 'X-Scheduler-Client': 'dashboard' };
|
|
2150
|
+
|
|
2029
2151
|
// Устойчивая загрузка: антивирусы иногда блокируют отдельные URL
|
|
2030
2152
|
// (например, /api/metrics) статусом 499 и картинкой вместо JSON.
|
|
2031
2153
|
// Один сбой не должен ломать весь дашборд.
|
|
@@ -2132,7 +2254,7 @@ function renderPage() {
|
|
|
2132
2254
|
if (act === 'cleanup-orphans') {
|
|
2133
2255
|
btn.disabled = true;
|
|
2134
2256
|
try {
|
|
2135
|
-
var cleanRes = await fetch('/api/matrix-cleanup', { method: 'POST', cache: 'no-store' });
|
|
2257
|
+
var cleanRes = await fetch('/api/matrix-cleanup', { method: 'POST', cache: 'no-store', headers: CLIENT_HEADERS });
|
|
2136
2258
|
var cleanData = await readJson(cleanRes);
|
|
2137
2259
|
toast(cleanData.success ? (cleanData.message || 'Готово') : (cleanData.error || 'Ошибка очистки'), cleanData.success ? 'ok2' : 'err2');
|
|
2138
2260
|
} catch (err) {
|
|
@@ -2179,7 +2301,7 @@ function renderPage() {
|
|
|
2179
2301
|
btn.disabled = false;
|
|
2180
2302
|
return;
|
|
2181
2303
|
}
|
|
2182
|
-
var res = await fetch(url, { method: 'POST', cache: 'no-store' });
|
|
2304
|
+
var res = await fetch(url, { method: 'POST', cache: 'no-store', headers: CLIENT_HEADERS });
|
|
2183
2305
|
var data = await readJson(res);
|
|
2184
2306
|
if (data.success) {
|
|
2185
2307
|
toast(data.message || 'Готово', 'ok2');
|