opencode-windows-scheduler 1.4.0 → 1.5.0
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 +24 -0
- package/README.md +2 -2
- package/ROADMAP-STRATEGY.md +43 -24
- package/ROADMAP.md +280 -31
- package/dist/core/dry-run.d.ts +31 -0
- package/dist/core/dry-run.d.ts.map +1 -1
- package/dist/core/dry-run.js +129 -1
- package/dist/core/file-watcher.d.ts.map +1 -1
- package/dist/core/file-watcher.js +53 -10
- package/dist/core/git-trigger.d.ts +80 -0
- package/dist/core/git-trigger.d.ts.map +1 -0
- package/dist/core/git-trigger.js +288 -0
- package/dist/core/glob.d.ts +38 -0
- package/dist/core/glob.d.ts.map +1 -0
- package/dist/core/glob.js +233 -0
- package/dist/core/ps-wrapper.d.ts.map +1 -1
- package/dist/core/ps-wrapper.js +7 -0
- package/dist/core/schedule-gate.js +55 -30
- package/dist/core/schedule-v2.d.ts +29 -1
- package/dist/core/schedule-v2.d.ts.map +1 -1
- package/dist/core/schedule-v2.js +81 -3
- package/dist/core/scheduler/types.d.ts +1 -1
- package/dist/core/scheduler/types.d.ts.map +1 -1
- package/dist/core/wrappers/bash.d.ts.map +1 -1
- package/dist/core/wrappers/bash.js +4 -0
- package/dist/db/git-state-repo.d.ts +16 -0
- package/dist/db/git-state-repo.d.ts.map +1 -0
- package/dist/db/git-state-repo.js +38 -0
- package/dist/db/schema.d.ts +1 -1
- package/dist/db/schema.d.ts.map +1 -1
- package/dist/db/schema.js +8 -0
- package/dist/index.d.ts +44 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +247 -26
- package/dist/rpc.d.ts +223 -0
- package/dist/rpc.d.ts.map +1 -1
- package/dist/rpc.js +73 -0
- package/dist/task-transfer.d.ts +30 -3
- package/dist/task-transfer.d.ts.map +1 -1
- package/dist/task-transfer.js +83 -6
- package/dist/templates.d.ts +1 -1
- package/dist/templates.d.ts.map +1 -1
- package/docs/ARCHITECTURE.md +1 -0
- package/docs/FEATURES.md +51 -0
- package/docs/README.ru.md +2 -2
- package/gui-experimental.cjs +9 -4
- package/package.json +6 -3
- package/src/core/dry-run.ts +188 -1
- package/src/core/file-watcher.ts +65 -10
- package/src/core/git-trigger.ts +367 -0
- package/src/core/glob.ts +226 -0
- package/src/core/ps-wrapper.ts +7 -0
- package/src/core/schedule-gate.ts +67 -33
- package/src/core/schedule-v2.ts +108 -3
- package/src/core/scheduler/types.ts +1 -1
- package/src/core/wrappers/bash.ts +4 -0
- package/src/db/git-state-repo.ts +62 -0
- package/src/db/schema.ts +8 -0
- package/src/gui.tsx +225 -4
- package/src/index.ts +338 -28
- package/src/rpc.ts +73 -0
- package/src/task-transfer.ts +124 -5
- package/src/templates.ts +1 -1
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Состояние git-триггера (Спринт 27): последний обработанный коммит задачи.
|
|
3
|
+
* Хранится в SQLite, чтобы после перезапуска плагина не запускать задачу
|
|
4
|
+
* повторно на тех же коммитах.
|
|
5
|
+
*/
|
|
6
|
+
export interface GitState {
|
|
7
|
+
taskName: string;
|
|
8
|
+
commitSha: string;
|
|
9
|
+
branch: string | null;
|
|
10
|
+
updatedAt: string;
|
|
11
|
+
}
|
|
12
|
+
export declare function getGitState(taskName: string): GitState | undefined;
|
|
13
|
+
export declare function setGitState(taskName: string, commitSha: string, branch?: string | null): void;
|
|
14
|
+
export declare function deleteGitState(taskName: string): void;
|
|
15
|
+
export declare function listGitStates(): GitState[];
|
|
16
|
+
//# sourceMappingURL=git-state-repo.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"git-state-repo.d.ts","sourceRoot":"","sources":["../../src/db/git-state-repo.ts"],"names":[],"mappings":"AAEA;;;;GAIG;AACH,MAAM,WAAW,QAAQ;IACvB,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,SAAS,EAAE,MAAM,CAAC;CACnB;AASD,wBAAgB,WAAW,CAAC,QAAQ,EAAE,MAAM,GAAG,QAAQ,GAAG,SAAS,CAWlE;AAED,wBAAgB,WAAW,CAAC,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,IAAI,CAW7F;AAED,wBAAgB,cAAc,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,CAErD;AAED,wBAAgB,aAAa,IAAI,QAAQ,EAAE,CAU1C"}
|
|
@@ -0,0 +1,38 @@
|
|
|
1
|
+
import { getDb } from "./index.js";
|
|
2
|
+
export function getGitState(taskName) {
|
|
3
|
+
const row = getDb()
|
|
4
|
+
.prepare("SELECT task_name, commit_sha, branch, updated_at FROM git_state WHERE task_name = ?")
|
|
5
|
+
.get(taskName);
|
|
6
|
+
if (!row)
|
|
7
|
+
return undefined;
|
|
8
|
+
return {
|
|
9
|
+
taskName: String(row.task_name),
|
|
10
|
+
commitSha: String(row.commit_sha),
|
|
11
|
+
branch: row.branch == null ? null : String(row.branch),
|
|
12
|
+
updatedAt: String(row.updated_at),
|
|
13
|
+
};
|
|
14
|
+
}
|
|
15
|
+
export function setGitState(taskName, commitSha, branch) {
|
|
16
|
+
getDb()
|
|
17
|
+
.prepare(`INSERT INTO git_state (task_name, commit_sha, branch, updated_at)
|
|
18
|
+
VALUES (?, ?, ?, ?)
|
|
19
|
+
ON CONFLICT(task_name) DO UPDATE SET
|
|
20
|
+
commit_sha = excluded.commit_sha,
|
|
21
|
+
branch = excluded.branch,
|
|
22
|
+
updated_at = excluded.updated_at`)
|
|
23
|
+
.run(taskName, commitSha, branch ?? null, new Date().toISOString());
|
|
24
|
+
}
|
|
25
|
+
export function deleteGitState(taskName) {
|
|
26
|
+
getDb().prepare("DELETE FROM git_state WHERE task_name = ?").run(taskName);
|
|
27
|
+
}
|
|
28
|
+
export function listGitStates() {
|
|
29
|
+
const rows = getDb()
|
|
30
|
+
.prepare("SELECT task_name, commit_sha, branch, updated_at FROM git_state ORDER BY task_name")
|
|
31
|
+
.all();
|
|
32
|
+
return rows.map((row) => ({
|
|
33
|
+
taskName: String(row.task_name),
|
|
34
|
+
commitSha: String(row.commit_sha),
|
|
35
|
+
branch: row.branch == null ? null : String(row.branch),
|
|
36
|
+
updatedAt: String(row.updated_at),
|
|
37
|
+
}));
|
|
38
|
+
}
|
package/dist/db/schema.d.ts
CHANGED
|
@@ -5,7 +5,7 @@
|
|
|
5
5
|
* безопасно выполнять при каждом открытии соединения — это же служит
|
|
6
6
|
* механизмом «мини-миграций» при обновлении плагина.
|
|
7
7
|
*/
|
|
8
|
-
export declare const SCHEMA_SQL = "\nCREATE TABLE IF NOT EXISTS tasks (\n name TEXT PRIMARY KEY,\n definition_json TEXT NOT NULL,\n created_at TEXT NOT NULL,\n updated_at TEXT NOT NULL,\n matrix_parent_id TEXT,\n is_matrix_parent INTEGER DEFAULT 0\n);\n\nCREATE TABLE IF NOT EXISTS history (\n id INTEGER PRIMARY KEY AUTOINCREMENT,\n task_name TEXT NOT NULL,\n status TEXT NOT NULL,\n started_at TEXT NOT NULL,\n finished_at TEXT,\n duration_ms INTEGER,\n error TEXT,\n tokens INTEGER,\n cost_usd REAL,\n model TEXT,\n pre_flight_status TEXT,\n post_flight_status TEXT,\n next_task TEXT,\n workspace_id TEXT,\n allowed_tools TEXT,\n denied_tools TEXT\n);\n\nCREATE INDEX IF NOT EXISTS idx_history_task ON history(task_name, started_at DESC);\n\nCREATE TABLE IF NOT EXISTS metrics (\n task_name TEXT PRIMARY KEY,\n total INTEGER DEFAULT 0,\n success INTEGER DEFAULT 0,\n error INTEGER DEFAULT 0,\n partial INTEGER DEFAULT 0,\n total_tokens INTEGER DEFAULT 0,\n total_cost REAL DEFAULT 0\n);\n\nCREATE TABLE IF NOT EXISTS templates (\n id TEXT PRIMARY KEY,\n name TEXT NOT NULL,\n definition_json TEXT NOT NULL\n);\n\nCREATE TABLE IF NOT EXISTS settings (\n key TEXT PRIMARY KEY,\n value_json TEXT NOT NULL\n);\n\nCREATE TABLE IF NOT EXISTS workspaces (\n id TEXT PRIMARY KEY,\n name TEXT NOT NULL,\n path TEXT NOT NULL UNIQUE,\n git_remote TEXT,\n color TEXT,\n env_json TEXT,\n env_file TEXT,\n created_at TEXT NOT NULL\n);\n\nCREATE TABLE IF NOT EXISTS audit_log (\n id INTEGER PRIMARY KEY AUTOINCREMENT,\n ts TEXT NOT NULL,\n action TEXT NOT NULL,\n target_type TEXT,\n target TEXT,\n actor TEXT NOT NULL,\n source TEXT,\n details_json TEXT,\n remote TEXT\n);\n\nCREATE INDEX IF NOT EXISTS idx_audit_ts ON audit_log(ts DESC);\nCREATE INDEX IF NOT EXISTS idx_audit_action ON audit_log(action, ts DESC);\n";
|
|
8
|
+
export declare const SCHEMA_SQL = "\nCREATE TABLE IF NOT EXISTS tasks (\n name TEXT PRIMARY KEY,\n definition_json TEXT NOT NULL,\n created_at TEXT NOT NULL,\n updated_at TEXT NOT NULL,\n matrix_parent_id TEXT,\n is_matrix_parent INTEGER DEFAULT 0\n);\n\nCREATE TABLE IF NOT EXISTS history (\n id INTEGER PRIMARY KEY AUTOINCREMENT,\n task_name TEXT NOT NULL,\n status TEXT NOT NULL,\n started_at TEXT NOT NULL,\n finished_at TEXT,\n duration_ms INTEGER,\n error TEXT,\n tokens INTEGER,\n cost_usd REAL,\n model TEXT,\n pre_flight_status TEXT,\n post_flight_status TEXT,\n next_task TEXT,\n workspace_id TEXT,\n allowed_tools TEXT,\n denied_tools TEXT\n);\n\nCREATE INDEX IF NOT EXISTS idx_history_task ON history(task_name, started_at DESC);\n\nCREATE TABLE IF NOT EXISTS metrics (\n task_name TEXT PRIMARY KEY,\n total INTEGER DEFAULT 0,\n success INTEGER DEFAULT 0,\n error INTEGER DEFAULT 0,\n partial INTEGER DEFAULT 0,\n total_tokens INTEGER DEFAULT 0,\n total_cost REAL DEFAULT 0\n);\n\nCREATE TABLE IF NOT EXISTS templates (\n id TEXT PRIMARY KEY,\n name TEXT NOT NULL,\n definition_json TEXT NOT NULL\n);\n\nCREATE TABLE IF NOT EXISTS settings (\n key TEXT PRIMARY KEY,\n value_json TEXT NOT NULL\n);\n\nCREATE TABLE IF NOT EXISTS workspaces (\n id TEXT PRIMARY KEY,\n name TEXT NOT NULL,\n path TEXT NOT NULL UNIQUE,\n git_remote TEXT,\n color TEXT,\n env_json TEXT,\n env_file TEXT,\n created_at TEXT NOT NULL\n);\n\nCREATE TABLE IF NOT EXISTS audit_log (\n id INTEGER PRIMARY KEY AUTOINCREMENT,\n ts TEXT NOT NULL,\n action TEXT NOT NULL,\n target_type TEXT,\n target TEXT,\n actor TEXT NOT NULL,\n source TEXT,\n details_json TEXT,\n remote TEXT\n);\n\nCREATE INDEX IF NOT EXISTS idx_audit_ts ON audit_log(ts DESC);\nCREATE INDEX IF NOT EXISTS idx_audit_action ON audit_log(action, ts DESC);\n\n-- \u0421\u043F\u0440\u0438\u043D\u0442 27: \u043F\u043E\u0441\u043B\u0435\u0434\u043D\u0438\u0439 \u043E\u0431\u0440\u0430\u0431\u043E\u0442\u0430\u043D\u043D\u044B\u0439 \u043A\u043E\u043C\u043C\u0438\u0442 \u0434\u043B\u044F git-\u0442\u0440\u0438\u0433\u0433\u0435\u0440\u043E\u0432.\nCREATE TABLE IF NOT EXISTS git_state (\n task_name TEXT PRIMARY KEY,\n commit_sha TEXT NOT NULL,\n branch TEXT,\n updated_at TEXT NOT NULL\n);\n";
|
|
9
9
|
interface SchemaDb {
|
|
10
10
|
exec(sql: string): void;
|
|
11
11
|
prepare(sql: string): {
|
package/dist/db/schema.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../src/db/schema.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AACH,eAAO,MAAM,UAAU,
|
|
1
|
+
{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../src/db/schema.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AACH,eAAO,MAAM,UAAU,ytEAqFtB,CAAC;AAEF,UAAU,QAAQ;IAChB,IAAI,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,OAAO,CAAC,GAAG,EAAE,MAAM,GAAG;QAAE,GAAG,IAAI,OAAO,EAAE,CAAA;KAAE,CAAC;CAC5C;AAED;;;;;;GAMG;AACH,wBAAgB,WAAW,CAAC,EAAE,EAAE,QAAQ,GAAG,IAAI,CAkD9C"}
|
package/dist/db/schema.js
CHANGED
|
@@ -82,6 +82,14 @@ CREATE TABLE IF NOT EXISTS audit_log (
|
|
|
82
82
|
|
|
83
83
|
CREATE INDEX IF NOT EXISTS idx_audit_ts ON audit_log(ts DESC);
|
|
84
84
|
CREATE INDEX IF NOT EXISTS idx_audit_action ON audit_log(action, ts DESC);
|
|
85
|
+
|
|
86
|
+
-- Спринт 27: последний обработанный коммит для git-триггеров.
|
|
87
|
+
CREATE TABLE IF NOT EXISTS git_state (
|
|
88
|
+
task_name TEXT PRIMARY KEY,
|
|
89
|
+
commit_sha TEXT NOT NULL,
|
|
90
|
+
branch TEXT,
|
|
91
|
+
updated_at TEXT NOT NULL
|
|
92
|
+
);
|
|
85
93
|
`;
|
|
86
94
|
/**
|
|
87
95
|
* Применяет схему к открытому соединению.
|
package/dist/index.d.ts
CHANGED
|
@@ -63,6 +63,7 @@ export declare const scheduleTaskSchema: z.ZodObject<{
|
|
|
63
63
|
triggerType: z.ZodOptional<z.ZodEnum<{
|
|
64
64
|
file: "file";
|
|
65
65
|
cron: "cron";
|
|
66
|
+
git: "git";
|
|
66
67
|
"mcp-event": "mcp-event";
|
|
67
68
|
once: "once";
|
|
68
69
|
}>>;
|
|
@@ -72,6 +73,18 @@ export declare const scheduleTaskSchema: z.ZodObject<{
|
|
|
72
73
|
filter: z.ZodOptional<z.ZodString>;
|
|
73
74
|
}, z.core.$strip>>;
|
|
74
75
|
watchPath: z.ZodOptional<z.ZodString>;
|
|
76
|
+
watchGlobs: z.ZodOptional<z.ZodArray<z.ZodString>>;
|
|
77
|
+
watchIgnore: z.ZodOptional<z.ZodArray<z.ZodString>>;
|
|
78
|
+
gitBranch: z.ZodOptional<z.ZodString>;
|
|
79
|
+
gitPaths: z.ZodOptional<z.ZodArray<z.ZodString>>;
|
|
80
|
+
gitIgnore: z.ZodOptional<z.ZodArray<z.ZodString>>;
|
|
81
|
+
gitPollSeconds: z.ZodOptional<z.ZodNumber>;
|
|
82
|
+
activeDays: z.ZodOptional<z.ZodArray<z.ZodNumber>>;
|
|
83
|
+
windowPolicy: z.ZodOptional<z.ZodEnum<{
|
|
84
|
+
skip: "skip";
|
|
85
|
+
run: "run";
|
|
86
|
+
postpone: "postpone";
|
|
87
|
+
}>>;
|
|
75
88
|
workingDirectory: z.ZodOptional<z.ZodString>;
|
|
76
89
|
workspaceId: z.ZodOptional<z.ZodString>;
|
|
77
90
|
allowedTools: z.ZodOptional<z.ZodArray<z.ZodString>>;
|
|
@@ -115,6 +128,18 @@ export declare const updateTaskSchema: z.ZodObject<{
|
|
|
115
128
|
timezone: z.ZodOptional<z.ZodString>;
|
|
116
129
|
notBefore: z.ZodOptional<z.ZodString>;
|
|
117
130
|
notAfter: z.ZodOptional<z.ZodString>;
|
|
131
|
+
activeDays: z.ZodOptional<z.ZodArray<z.ZodNumber>>;
|
|
132
|
+
windowPolicy: z.ZodOptional<z.ZodEnum<{
|
|
133
|
+
skip: "skip";
|
|
134
|
+
run: "run";
|
|
135
|
+
postpone: "postpone";
|
|
136
|
+
}>>;
|
|
137
|
+
watchGlobs: z.ZodOptional<z.ZodArray<z.ZodString>>;
|
|
138
|
+
watchIgnore: z.ZodOptional<z.ZodArray<z.ZodString>>;
|
|
139
|
+
gitBranch: z.ZodOptional<z.ZodString>;
|
|
140
|
+
gitPaths: z.ZodOptional<z.ZodArray<z.ZodString>>;
|
|
141
|
+
gitIgnore: z.ZodOptional<z.ZodArray<z.ZodString>>;
|
|
142
|
+
gitPollSeconds: z.ZodOptional<z.ZodNumber>;
|
|
118
143
|
prompt: z.ZodOptional<z.ZodString>;
|
|
119
144
|
timeoutSeconds: z.ZodOptional<z.ZodNumber>;
|
|
120
145
|
model: z.ZodOptional<z.ZodString>;
|
|
@@ -130,6 +155,7 @@ export declare const updateTaskSchema: z.ZodObject<{
|
|
|
130
155
|
triggerType: z.ZodOptional<z.ZodEnum<{
|
|
131
156
|
file: "file";
|
|
132
157
|
cron: "cron";
|
|
158
|
+
git: "git";
|
|
133
159
|
"mcp-event": "mcp-event";
|
|
134
160
|
once: "once";
|
|
135
161
|
}>>;
|
|
@@ -315,4 +341,22 @@ export declare const getAuditLogSchema: z.ZodObject<{
|
|
|
315
341
|
}, z.core.$strip>;
|
|
316
342
|
declare const _default: Plugin.Plugin;
|
|
317
343
|
export default _default;
|
|
344
|
+
/**
|
|
345
|
+
* Общая логика создания задачи: используется и schedule_task (инструмент),
|
|
346
|
+
* и create_task (RPC-метод для GUI).
|
|
347
|
+
*/
|
|
348
|
+
/**
|
|
349
|
+
* Спринт 27: дополнительные параметры триггеров (дни недели, политика окна,
|
|
350
|
+
* glob-фильтры файловых триггеров и git-триггеры).
|
|
351
|
+
*/
|
|
352
|
+
export interface TriggerExtras {
|
|
353
|
+
activeDays?: number[];
|
|
354
|
+
windowPolicy?: "skip" | "postpone" | "run";
|
|
355
|
+
watchGlobs?: string[];
|
|
356
|
+
watchIgnore?: string[];
|
|
357
|
+
gitBranch?: string;
|
|
358
|
+
gitPaths?: string[];
|
|
359
|
+
gitIgnore?: string[];
|
|
360
|
+
gitPollSeconds?: number;
|
|
361
|
+
}
|
|
318
362
|
//# sourceMappingURL=index.d.ts.map
|
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAO,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAO,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AA8JxB,6DAA6D;AAC7D,eAAO,MAAM,oBAAoB;;;;;;iBAM/B,CAAC;AAEH,sCAAsC;AACtC,eAAO,MAAM,YAAY;;;;;;;;;;;;;;;;;;;;;;;iBAwCvB,CAAC;AAEH,yCAAyC;AACzC,eAAO,MAAM,kBAAkB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;iBAiP7B,CAAC;AAYH,eAAO,MAAM,gBAAgB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;iBAgL3B,CAAC;AAsEH,eAAO,MAAM,mBAAmB;;;;;;;;;;;;;;;;;;;;;iBA0B9B,CAAC;AAEH,+CAA+C;AAC/C,eAAO,MAAM,gBAAgB,gCAAe,CAAC;AAE7C,2CAA2C;AAC3C,eAAO,MAAM,kBAAkB;;;iBAe7B,CAAC;AAEH,2DAA2D;AAC3D,eAAO,MAAM,oBAAoB;;;;;;;;;;;;;;iBAoC/B,CAAC;AAEH,yDAAyD;AACzD,eAAO,MAAM,qBAAqB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;iBA+BhC,CAAC;AAEH,4DAA4D;AAC5D,eAAO,MAAM,oBAAoB;;;;;;;;;iBAM/B,CAAC;AAEH,+CAA+C;AAC/C,eAAO,MAAM,mBAAmB;;;;;;iBAG9B,CAAC;AAEH,2DAA2D;AAC3D,eAAO,MAAM,sBAAsB;;;;;;;;;;;iBAQjC,CAAC;AAEH,yDAAyD;AACzD,eAAO,MAAM,sBAAsB,gCAAe,CAAC;AAEnD,iDAAiD;AACjD,eAAO,MAAM,oBAAoB;;;iBAG/B,CAAC;AAEH,gDAAgD;AAChD,eAAO,MAAM,eAAe;;;iBAG1B,CAAC;AAEH,qEAAqE;AACrE,eAAO,MAAM,mBAAmB;;;;;;;;iBAS9B,CAAC;AAEH,mEAAmE;AACnE,eAAO,MAAM,iBAAiB;;;;;;;iBAU5B,CAAC;;AAgyDH,wBA86CG;AA4DH;;;GAGG;AACH;;;GAGG;AACH,MAAM,WAAW,aAAa;IAC5B,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;IACtB,YAAY,CAAC,EAAE,MAAM,GAAG,UAAU,GAAG,KAAK,CAAC;IAC3C,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;IACtB,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;IACvB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;IACrB,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB"}
|
package/dist/index.js
CHANGED
|
@@ -6,7 +6,7 @@ import fs from "node:fs/promises";
|
|
|
6
6
|
import path from "node:path";
|
|
7
7
|
import { LockManager } from "./core/lock.js";
|
|
8
8
|
import { LOCK_DIR, LOG_DIR, PLUGIN_DIR, sanitizeName } from "./types.js";
|
|
9
|
-
import { parseCron, buildScheduleGate, isValidIanaTimeZone, validateLaunchWindow, prevRun } from "./core/schedule-v2.js";
|
|
9
|
+
import { parseCron, buildScheduleGate, isValidIanaTimeZone, validateLaunchWindow, prevRun, normalizeActiveDays, activeWindowState, nextWindowOpenDelayMs } from "./core/schedule-v2.js";
|
|
10
10
|
import { buildLaunchdOneShotCleanup, normalizeOneShotRunAt, } from "./core/one-shot.js";
|
|
11
11
|
import { generateSessionId, normalizeSessionMode, preservedSessionRunCount, } from "./core/session.js";
|
|
12
12
|
import { ensureWrapper, writePromptFile, writeWrapperCmd, lockFilePath, requestImmediateRun } from "./core/ps-wrapper.js";
|
|
@@ -26,6 +26,7 @@ import { getAllMetrics } from "./db/metrics-repo.js";
|
|
|
26
26
|
import { findStuckMatrixClones, maybeSendDigest, notifyStuckMatrix, sendDigestNow, sendTestNotification, } from "./notifications.js";
|
|
27
27
|
import { loadTaskDefinitions, saveTaskDefinition, removeTaskDefinition, buildExportJson, parseImportJson, normalizePriority, } from "./task-transfer.js";
|
|
28
28
|
import { FileWatchManager } from "./core/file-watcher.js";
|
|
29
|
+
import { GitTriggerManager } from "./core/git-trigger.js";
|
|
29
30
|
import { loadTemplates, saveTemplate, deleteTemplate } from "./templates.js";
|
|
30
31
|
import { startDashboardServer, closeDashboardServer, getDashboardPort } from "./server.js";
|
|
31
32
|
import { DEFAULT_PROFILE, createProfile, deleteProfile, getProfileDir, getProfileName, isProfilePinnedByEnv, listProfiles, sanitizeProfileName, setActiveProfile, } from "./profiles.js";
|
|
@@ -201,9 +202,9 @@ export const scheduleTaskSchema = z.object({
|
|
|
201
202
|
.optional()
|
|
202
203
|
.describe("Compensation/rollback task started after a failed run."),
|
|
203
204
|
triggerType: z
|
|
204
|
-
.enum(["cron", "file", "mcp-event", "once"])
|
|
205
|
+
.enum(["cron", "file", "git", "mcp-event", "once"])
|
|
205
206
|
.optional()
|
|
206
|
-
.describe("Trigger type: cron (default), file, mcp-event or once (single run at runAt/delaySeconds)."),
|
|
207
|
+
.describe("Trigger type: cron (default), file, git (new commits in the task working directory), mcp-event or once (single run at runAt/delaySeconds)."),
|
|
207
208
|
mcpEvent: z
|
|
208
209
|
.object({
|
|
209
210
|
server: z.string(),
|
|
@@ -216,6 +217,40 @@ export const scheduleTaskSchema = z.object({
|
|
|
216
217
|
.string()
|
|
217
218
|
.optional()
|
|
218
219
|
.describe("File or directory to watch when triggerType is \"file\". Can be set here or later via update_task."),
|
|
220
|
+
watchGlobs: z
|
|
221
|
+
.array(z.string())
|
|
222
|
+
.optional()
|
|
223
|
+
.describe("Glob masks that limit a file trigger, e.g. [\"**/*.md\", \"src/**\"]. Empty means any change under watchPath."),
|
|
224
|
+
watchIgnore: z
|
|
225
|
+
.array(z.string())
|
|
226
|
+
.optional()
|
|
227
|
+
.describe("Glob masks excluded from a file trigger, e.g. [\"node_modules/**\", \"*.log\"]. Supports leading ! to re-include."),
|
|
228
|
+
gitBranch: z
|
|
229
|
+
.string()
|
|
230
|
+
.optional()
|
|
231
|
+
.describe("Only for triggerType=git: branch name or glob (main, release/*, comma-separated). Empty means any branch."),
|
|
232
|
+
gitPaths: z
|
|
233
|
+
.array(z.string())
|
|
234
|
+
.optional()
|
|
235
|
+
.describe("Only for triggerType=git: glob masks of changed files that must match to start the task (git diff --name-only)."),
|
|
236
|
+
gitIgnore: z
|
|
237
|
+
.array(z.string())
|
|
238
|
+
.optional()
|
|
239
|
+
.describe("Only for triggerType=git: glob masks of changed files to ignore."),
|
|
240
|
+
gitPollSeconds: z
|
|
241
|
+
.number()
|
|
242
|
+
.int()
|
|
243
|
+
.min(5)
|
|
244
|
+
.optional()
|
|
245
|
+
.describe("Only for triggerType=git: polling interval in seconds (default 60, minimum 5)."),
|
|
246
|
+
activeDays: z
|
|
247
|
+
.array(z.number().int().min(0).max(6))
|
|
248
|
+
.optional()
|
|
249
|
+
.describe("Allowed weekdays 0=Sunday..6=Saturday for cron and event triggers. Empty or all seven means every day."),
|
|
250
|
+
windowPolicy: z
|
|
251
|
+
.enum(["skip", "postpone", "run"])
|
|
252
|
+
.optional()
|
|
253
|
+
.describe("Behaviour outside the launch window / active days: postpone (default, wait for the next opening), skip or run anyway."),
|
|
219
254
|
workingDirectory: z
|
|
220
255
|
.string()
|
|
221
256
|
.optional()
|
|
@@ -314,6 +349,40 @@ export const updateTaskSchema = z.object({
|
|
|
314
349
|
.string()
|
|
315
350
|
.optional()
|
|
316
351
|
.describe("New launch window end HH:MM. Empty string clears the window."),
|
|
352
|
+
activeDays: z
|
|
353
|
+
.array(z.number().int().min(0).max(6))
|
|
354
|
+
.optional()
|
|
355
|
+
.describe("New allowed weekdays 0=Sunday..6=Saturday. Empty array clears the restriction."),
|
|
356
|
+
windowPolicy: z
|
|
357
|
+
.enum(["skip", "postpone", "run"])
|
|
358
|
+
.optional()
|
|
359
|
+
.describe("New behaviour outside the window: postpone (default), skip or run."),
|
|
360
|
+
watchGlobs: z
|
|
361
|
+
.array(z.string())
|
|
362
|
+
.optional()
|
|
363
|
+
.describe("New glob masks for a file trigger. Empty array clears them."),
|
|
364
|
+
watchIgnore: z
|
|
365
|
+
.array(z.string())
|
|
366
|
+
.optional()
|
|
367
|
+
.describe("New ignore masks for a file trigger. Empty array clears them."),
|
|
368
|
+
gitBranch: z
|
|
369
|
+
.string()
|
|
370
|
+
.optional()
|
|
371
|
+
.describe("New git branch filter (glob, comma-separated). Empty string clears it."),
|
|
372
|
+
gitPaths: z
|
|
373
|
+
.array(z.string())
|
|
374
|
+
.optional()
|
|
375
|
+
.describe("New changed-file masks for a git trigger. Empty array clears them."),
|
|
376
|
+
gitIgnore: z
|
|
377
|
+
.array(z.string())
|
|
378
|
+
.optional()
|
|
379
|
+
.describe("New ignored changed-file masks for a git trigger. Empty array clears them."),
|
|
380
|
+
gitPollSeconds: z
|
|
381
|
+
.number()
|
|
382
|
+
.int()
|
|
383
|
+
.min(5)
|
|
384
|
+
.optional()
|
|
385
|
+
.describe("New git polling interval in seconds."),
|
|
317
386
|
prompt: z
|
|
318
387
|
.string()
|
|
319
388
|
.optional()
|
|
@@ -351,7 +420,7 @@ export const updateTaskSchema = z.object({
|
|
|
351
420
|
.optional()
|
|
352
421
|
.describe("New error-chain task. Empty string clears it."),
|
|
353
422
|
triggerType: z
|
|
354
|
-
.enum(["cron", "file", "mcp-event", "once"])
|
|
423
|
+
.enum(["cron", "file", "git", "mcp-event", "once"])
|
|
355
424
|
.optional()
|
|
356
425
|
.describe("New trigger type."),
|
|
357
426
|
mcpEvent: z
|
|
@@ -658,7 +727,7 @@ function wrapExecute(fn) {
|
|
|
658
727
|
}
|
|
659
728
|
/** schedule_task — создаёт задачу в schtasks через общий schedulerCreateTask. */
|
|
660
729
|
const scheduleTaskExecute = wrapExecute(async (args) => {
|
|
661
|
-
const { name, schedule, runAt, delaySeconds, prompt, timeoutSeconds, model, priority, beforeScript, afterScript, qualityGate, dependsOn, retryCount, retryDelay, nextTaskOnSuccess, nextTaskOnError, triggerType, mcpEvent, watchPath, workingDirectory, workspaceId, allowedTools, deniedTools, matrix, timezone, notBefore, notAfter, session, sessionMaxRuns, } = args;
|
|
730
|
+
const { name, schedule, runAt, delaySeconds, prompt, timeoutSeconds, model, priority, beforeScript, afterScript, qualityGate, dependsOn, retryCount, retryDelay, nextTaskOnSuccess, nextTaskOnError, triggerType, mcpEvent, watchPath, workingDirectory, workspaceId, allowedTools, deniedTools, matrix, timezone, notBefore, notAfter, session, sessionMaxRuns, activeDays, windowPolicy, watchGlobs, watchIgnore, gitBranch, gitPaths, gitIgnore, gitPollSeconds, } = args;
|
|
662
731
|
let effectiveRunAt;
|
|
663
732
|
if ((triggerType ?? "cron") === "once") {
|
|
664
733
|
const normalized = normalizeOneShotRunAt({ runAt, delaySeconds });
|
|
@@ -674,7 +743,16 @@ const scheduleTaskExecute = wrapExecute(async (args) => {
|
|
|
674
743
|
const effectiveSession = normalizeSessionMode(session) ?? "new";
|
|
675
744
|
const effectiveSessionId = effectiveSession === "reuse" ? generateSessionId() : undefined;
|
|
676
745
|
try {
|
|
677
|
-
await schedulerCreateTask(name, schedule ?? "", prompt, timeoutSeconds, workingDirectory, retryCount, retryDelay, qualityGate, nextTaskOnSuccess, nextTaskOnError, triggerType, watchPath, dependsOn, model, priority, beforeScript, afterScript, mcpEvent, workspaceId, allowedTools, deniedTools, matrix, undefined, "create", timezone, notBefore, notAfter, undefined, effectiveRunAt, effectiveSession, effectiveSessionId, sessionMaxRuns
|
|
746
|
+
await schedulerCreateTask(name, schedule ?? "", prompt, timeoutSeconds, workingDirectory, retryCount, retryDelay, qualityGate, nextTaskOnSuccess, nextTaskOnError, triggerType, watchPath, dependsOn, model, priority, beforeScript, afterScript, mcpEvent, workspaceId, allowedTools, deniedTools, matrix, undefined, "create", timezone, notBefore, notAfter, undefined, effectiveRunAt, effectiveSession, effectiveSessionId, sessionMaxRuns, {
|
|
747
|
+
activeDays,
|
|
748
|
+
windowPolicy,
|
|
749
|
+
watchGlobs,
|
|
750
|
+
watchIgnore,
|
|
751
|
+
gitBranch,
|
|
752
|
+
gitPaths,
|
|
753
|
+
gitIgnore,
|
|
754
|
+
gitPollSeconds,
|
|
755
|
+
});
|
|
678
756
|
}
|
|
679
757
|
catch (err) {
|
|
680
758
|
return {
|
|
@@ -686,7 +764,7 @@ const scheduleTaskExecute = wrapExecute(async (args) => {
|
|
|
686
764
|
}
|
|
687
765
|
// Новый файловый триггер должен начать работать сразу, без перезапуска
|
|
688
766
|
// OpenCode: пересобираем набор watcher-ов после создания задачи.
|
|
689
|
-
await
|
|
767
|
+
await refreshTriggers();
|
|
690
768
|
const workspace = workspaceId ? getWorkspace(workspaceId) : undefined;
|
|
691
769
|
const effectiveWorkdir = workspace?.path || workingDirectory?.trim() || projectDirectory || process.cwd();
|
|
692
770
|
return {
|
|
@@ -880,7 +958,7 @@ const deleteTaskExecute = wrapExecute(async (args) => {
|
|
|
880
958
|
try {
|
|
881
959
|
const { removed, existed } = await deleteTaskWithFamily(name);
|
|
882
960
|
// Убираем watcher удалённой задачи, не дожидаясь перезапуска плагина.
|
|
883
|
-
await
|
|
961
|
+
await refreshTriggers();
|
|
884
962
|
if (!existed && removed.length === 0) {
|
|
885
963
|
return {
|
|
886
964
|
content: JSON.stringify({
|
|
@@ -1060,20 +1138,44 @@ async function updateTaskFromInput(input) {
|
|
|
1060
1138
|
`Запустите матрицу вручную или используйте cron/file-триггер.`,
|
|
1061
1139
|
};
|
|
1062
1140
|
}
|
|
1141
|
+
// Спринт 27: параметры триггеров сохраняются, если поле не передано.
|
|
1142
|
+
const mergeStringList = (next, prev) => {
|
|
1143
|
+
if (next === undefined)
|
|
1144
|
+
return prev;
|
|
1145
|
+
const cleaned = next
|
|
1146
|
+
.filter((item) => typeof item === "string")
|
|
1147
|
+
.map((item) => item.trim())
|
|
1148
|
+
.filter(Boolean);
|
|
1149
|
+
return cleaned.length > 0 ? cleaned : undefined;
|
|
1150
|
+
};
|
|
1151
|
+
const triggerExtras = {
|
|
1152
|
+
activeDays: input.activeDays === undefined
|
|
1153
|
+
? previous.activeDays
|
|
1154
|
+
: input.activeDays.length > 0
|
|
1155
|
+
? input.activeDays
|
|
1156
|
+
: undefined,
|
|
1157
|
+
windowPolicy: input.windowPolicy ?? previous.windowPolicy,
|
|
1158
|
+
watchGlobs: mergeStringList(input.watchGlobs, previous.watchGlobs),
|
|
1159
|
+
watchIgnore: mergeStringList(input.watchIgnore, previous.watchIgnore),
|
|
1160
|
+
gitBranch: clearableString(input.gitBranch, previous.gitBranch),
|
|
1161
|
+
gitPaths: mergeStringList(input.gitPaths, previous.gitPaths),
|
|
1162
|
+
gitIgnore: mergeStringList(input.gitIgnore, previous.gitIgnore),
|
|
1163
|
+
gitPollSeconds: input.gitPollSeconds ?? previous.gitPollSeconds,
|
|
1164
|
+
};
|
|
1063
1165
|
try {
|
|
1064
1166
|
// Обновление = пересоздание в планировщике с сохранением старых значений.
|
|
1065
1167
|
await scheduler.deleteTask(name);
|
|
1066
1168
|
await schedulerCreateTask(name, schedule ?? "", prompt, input.timeoutSeconds ?? previous.timeoutSeconds, clearableString(input.workingDirectory, previous.workingDirectory), input.retryCount ?? previous.retryCount, input.retryDelay ?? previous.retryDelay, clearableString(input.qualityGate, previous.qualityGate), clearableString(input.nextTaskOnSuccess, previous.nextTaskOnSuccess), clearableString(input.nextTaskOnError, previous.nextTaskOnError), triggerType, clearableString(input.watchPath, previous.watchPath), clearableList(input.dependsOn, previous.dependsOn), clearableString(input.model, previous.model), input.priority ?? previous.priority, clearableString(input.beforeScript, previous.beforeScript), clearableString(input.afterScript, previous.afterScript), input.mcpEvent ?? previous.mcpEvent, clearableString(input.workspaceId, previous.workspaceId), clearableList(input.allowedTools, previous.allowedTools), clearableList(input.deniedTools, previous.deniedTools), matrixNext, undefined,
|
|
1067
1169
|
// Если задача была матрицей — синхронизируем клонов, а не
|
|
1068
1170
|
// пересоздаём их с нуля (Спринт 17).
|
|
1069
|
-
matrixWas && matrixNext ? "sync" : "create", timezone, notBefore, notAfter, previous.pausedUntil, runAt, session, sessionId, sessionMaxRuns);
|
|
1171
|
+
matrixWas && matrixNext ? "sync" : "create", timezone, notBefore, notAfter, previous.pausedUntil, runAt, session, sessionId, sessionMaxRuns, triggerExtras);
|
|
1070
1172
|
// Матрица отключена при обновлении — убираем клонов и агрегатор.
|
|
1071
1173
|
if (matrixWas && !matrixNext) {
|
|
1072
1174
|
await removeMatrixChildrenFromScheduler(name);
|
|
1073
1175
|
}
|
|
1074
1176
|
// Пересоздание могло изменить triggerType/watchPath — сразу
|
|
1075
1177
|
// пересобираем набор файловых watcher-ов.
|
|
1076
|
-
await
|
|
1178
|
+
await refreshTriggers();
|
|
1077
1179
|
return { success: true, message: `Задача "${name}" обновлена.` };
|
|
1078
1180
|
}
|
|
1079
1181
|
catch (err) {
|
|
@@ -1720,7 +1822,7 @@ const transferTasksExecute = wrapExecute(async (args) => {
|
|
|
1720
1822
|
errors.push(`${def.name}: ${err instanceof Error ? err.message : String(err)}`);
|
|
1721
1823
|
}
|
|
1722
1824
|
}
|
|
1723
|
-
await
|
|
1825
|
+
await refreshTriggers();
|
|
1724
1826
|
return {
|
|
1725
1827
|
content: JSON.stringify({ success: errors.length === 0, imported, errors }),
|
|
1726
1828
|
};
|
|
@@ -1976,15 +2078,74 @@ function withRpcAudit(handlers) {
|
|
|
1976
2078
|
* работать лишь после перезапуска OpenCode.
|
|
1977
2079
|
*/
|
|
1978
2080
|
let fileWatcherManager = null;
|
|
1979
|
-
|
|
1980
|
-
|
|
2081
|
+
/**
|
|
2082
|
+
* Спринт 27: менеджер git-триггеров. Опрашивает HEAD задач с
|
|
2083
|
+
* triggerType === "git" и запускает их при новых подходящих коммитах.
|
|
2084
|
+
*/
|
|
2085
|
+
let gitTriggerManager = null;
|
|
2086
|
+
/**
|
|
2087
|
+
* Приводит в актуальное состояние все событийные триггеры (файлы и git).
|
|
2088
|
+
* Вызывается после создания, изменения и удаления задачи.
|
|
2089
|
+
*/
|
|
2090
|
+
async function refreshTriggers() {
|
|
2091
|
+
if (fileWatcherManager) {
|
|
2092
|
+
try {
|
|
2093
|
+
await fileWatcherManager.refresh();
|
|
2094
|
+
}
|
|
2095
|
+
catch (err) {
|
|
2096
|
+
console.error(`[windows-scheduler] Не удалось обновить файловые триггеры: ${err instanceof Error ? err.message : String(err)}`);
|
|
2097
|
+
}
|
|
2098
|
+
}
|
|
2099
|
+
if (gitTriggerManager) {
|
|
2100
|
+
try {
|
|
2101
|
+
await gitTriggerManager.refresh();
|
|
2102
|
+
}
|
|
2103
|
+
catch (err) {
|
|
2104
|
+
console.error(`[windows-scheduler] Не удалось обновить git-триггеры: ${err instanceof Error ? err.message : String(err)}`);
|
|
2105
|
+
}
|
|
2106
|
+
}
|
|
2107
|
+
}
|
|
2108
|
+
/** Максимальная задержка переноса событийного запуска (12 часов). */
|
|
2109
|
+
const EVENT_POSTPONE_MAX_MS = 12 * 60 * 60 * 1000;
|
|
2110
|
+
/**
|
|
2111
|
+
* Спринт 27: запуск задачи по событию (файл, git, MCP) с учётом окна запуска
|
|
2112
|
+
* и разрешённых дней недели. Вне окна: skip — пишем причину и выходим,
|
|
2113
|
+
* postpone — таймер до ближайшего открытия, run — запускаем сразу.
|
|
2114
|
+
*/
|
|
2115
|
+
async function scheduleEventRun(taskName, reason) {
|
|
2116
|
+
const definition = getTask(taskName);
|
|
2117
|
+
if (!definition)
|
|
2118
|
+
return;
|
|
2119
|
+
const policy = definition.windowPolicy ?? "postpone";
|
|
2120
|
+
const options = {
|
|
2121
|
+
notBefore: definition.notBefore,
|
|
2122
|
+
notAfter: definition.notAfter,
|
|
2123
|
+
days: definition.activeDays,
|
|
2124
|
+
timeZone: definition.timezone,
|
|
2125
|
+
};
|
|
2126
|
+
const now = new Date();
|
|
2127
|
+
const state = activeWindowState(now, options);
|
|
2128
|
+
if (state.active || policy === "run") {
|
|
2129
|
+
await runTaskEntry(taskName);
|
|
2130
|
+
console.log(`[windows-scheduler] Запуск задачи "${taskName}" (${reason}).`);
|
|
1981
2131
|
return;
|
|
1982
|
-
try {
|
|
1983
|
-
await fileWatcherManager.refresh();
|
|
1984
2132
|
}
|
|
1985
|
-
|
|
1986
|
-
console.
|
|
2133
|
+
if (policy === "skip") {
|
|
2134
|
+
console.log(`[windows-scheduler] Задача "${taskName}" не запущена (${reason}): ${state.reason ?? "вне окна"} — политика skip.`);
|
|
2135
|
+
return;
|
|
1987
2136
|
}
|
|
2137
|
+
const delay = nextWindowOpenDelayMs(now, options);
|
|
2138
|
+
if (delay <= 0 || delay > EVENT_POSTPONE_MAX_MS) {
|
|
2139
|
+
console.log(`[windows-scheduler] Задача "${taskName}" не запущена (${reason}): ${state.reason ?? "вне окна"} — до открытия окна больше 12 ч.`);
|
|
2140
|
+
return;
|
|
2141
|
+
}
|
|
2142
|
+
console.log(`[windows-scheduler] Задача "${taskName}" (${reason}) отложена на ~${Math.round(delay / 60000)} мин: ${state.reason ?? "вне окна"}.`);
|
|
2143
|
+
const timer = setTimeout(() => {
|
|
2144
|
+
void scheduleEventRun(taskName, reason).catch((err) => {
|
|
2145
|
+
console.error(`[windows-scheduler] Не удалось запустить отложенную задачу "${taskName}": ${err instanceof Error ? err.message : String(err)}`);
|
|
2146
|
+
});
|
|
2147
|
+
}, delay);
|
|
2148
|
+
timer.unref?.();
|
|
1988
2149
|
}
|
|
1989
2150
|
export default Plugin.define({
|
|
1990
2151
|
id: "opencode-windows-scheduler",
|
|
@@ -2096,14 +2257,23 @@ export default Plugin.define({
|
|
|
2096
2257
|
// запускаются при изменении watchPath через chokidar (с дебаунсом).
|
|
2097
2258
|
fileWatcherManager = new FileWatchManager(async (taskName) => {
|
|
2098
2259
|
try {
|
|
2099
|
-
await
|
|
2100
|
-
console.log(`[windows-scheduler] Запуск задачи "${taskName}" по изменению отслеживаемого файла.`);
|
|
2260
|
+
await scheduleEventRun(taskName, "изменение отслеживаемого файла");
|
|
2101
2261
|
}
|
|
2102
2262
|
catch (err) {
|
|
2103
2263
|
console.error(`[windows-scheduler] Не удалось запустить задачу "${taskName}" по файловому триггеру: ${err instanceof Error ? err.message : String(err)}`);
|
|
2104
2264
|
}
|
|
2105
2265
|
});
|
|
2106
|
-
|
|
2266
|
+
// Спринт 27: git-триггеры — опрос HEAD и запуск при новых коммитах,
|
|
2267
|
+
// затронувших подходящие файлы.
|
|
2268
|
+
gitTriggerManager = new GitTriggerManager(async (taskName, info) => {
|
|
2269
|
+
try {
|
|
2270
|
+
await scheduleEventRun(taskName, `новый коммит ${info.head?.slice(0, 7) ?? ""}`);
|
|
2271
|
+
}
|
|
2272
|
+
catch (err) {
|
|
2273
|
+
console.error(`[windows-scheduler] Не удалось запустить задачу "${taskName}" по git-триггеру: ${err instanceof Error ? err.message : String(err)}`);
|
|
2274
|
+
}
|
|
2275
|
+
});
|
|
2276
|
+
void refreshTriggers();
|
|
2107
2277
|
const registration = await ctx.tool.transform((editor) => {
|
|
2108
2278
|
// editor.add регистрирует новые инструменты плагина с codemode: true,
|
|
2109
2279
|
// чтобы они были видны в Code Mode. Встроенные schedule_* отключены
|
|
@@ -3120,10 +3290,6 @@ function resolveMatrixExtraConfig(name, matrix, ids) {
|
|
|
3120
3290
|
}
|
|
3121
3291
|
return extra;
|
|
3122
3292
|
}
|
|
3123
|
-
/**
|
|
3124
|
-
* Общая логика создания задачи: используется и schedule_task (инструмент),
|
|
3125
|
-
* и create_task (RPC-метод для GUI).
|
|
3126
|
-
*/
|
|
3127
3293
|
async function schedulerCreateTask(name, schedule, prompt, timeoutSeconds, workingDirectory, retryCount, retryDelay, qualityGate, nextTaskOnSuccess, nextTaskOnError, triggerType, watchPath, dependsOn, model, priority, beforeScript, afterScript, mcpEvent, workspaceId, allowedTools, deniedTools, matrix, matrixParentId,
|
|
3128
3294
|
/** create — пересоздать клонов с нуля; sync — только diff (Спринт 17). */
|
|
3129
3295
|
matrixMode = "create",
|
|
@@ -3142,7 +3308,9 @@ session,
|
|
|
3142
3308
|
/** ID сессии для reuse (генерируется автоматически; пользователь не задаёт). */
|
|
3143
3309
|
sessionId,
|
|
3144
3310
|
/** Сколько запусков переживает reuse-сессия до ротации (0/undefined — без ограничения). */
|
|
3145
|
-
sessionMaxRuns
|
|
3311
|
+
sessionMaxRuns,
|
|
3312
|
+
/** Спринт 27: дни недели, политика окна, glob- и git-фильтры. */
|
|
3313
|
+
triggerExtras) {
|
|
3146
3314
|
const normalizedModel = model?.trim() || undefined;
|
|
3147
3315
|
const normalizedPriority = normalizePriority(priority);
|
|
3148
3316
|
const normalizedBefore = beforeScript?.trim() || undefined;
|
|
@@ -3151,6 +3319,30 @@ sessionMaxRuns) {
|
|
|
3151
3319
|
const normalizedNotBefore = notBefore?.trim() || undefined;
|
|
3152
3320
|
const normalizedNotAfter = notAfter?.trim() || undefined;
|
|
3153
3321
|
const normalizedPausedUntil = pausedUntil?.trim() || undefined;
|
|
3322
|
+
// Спринт 27: дни недели, политика окна и glob/git-фильтры.
|
|
3323
|
+
const normalizeGlobList = (raw) => {
|
|
3324
|
+
if (!Array.isArray(raw))
|
|
3325
|
+
return undefined;
|
|
3326
|
+
const cleaned = Array.from(new Set(raw
|
|
3327
|
+
.filter((item) => typeof item === "string")
|
|
3328
|
+
.map((item) => item.trim())
|
|
3329
|
+
.filter(Boolean)));
|
|
3330
|
+
return cleaned.length > 0 ? cleaned : undefined;
|
|
3331
|
+
};
|
|
3332
|
+
const normalizedActiveDays = normalizeActiveDays(triggerExtras?.activeDays);
|
|
3333
|
+
const normalizedWindowPolicy = triggerExtras?.windowPolicy === "skip" || triggerExtras?.windowPolicy === "run"
|
|
3334
|
+
? triggerExtras.windowPolicy
|
|
3335
|
+
: undefined;
|
|
3336
|
+
const normalizedWatchGlobs = normalizeGlobList(triggerExtras?.watchGlobs);
|
|
3337
|
+
const normalizedWatchIgnore = normalizeGlobList(triggerExtras?.watchIgnore);
|
|
3338
|
+
const normalizedGitBranch = triggerExtras?.gitBranch?.trim() || undefined;
|
|
3339
|
+
const normalizedGitPaths = normalizeGlobList(triggerExtras?.gitPaths);
|
|
3340
|
+
const normalizedGitIgnore = normalizeGlobList(triggerExtras?.gitIgnore);
|
|
3341
|
+
const normalizedGitPollSeconds = typeof triggerExtras?.gitPollSeconds === "number" &&
|
|
3342
|
+
Number.isFinite(triggerExtras.gitPollSeconds) &&
|
|
3343
|
+
triggerExtras.gitPollSeconds >= 5
|
|
3344
|
+
? Math.floor(triggerExtras.gitPollSeconds)
|
|
3345
|
+
: undefined;
|
|
3154
3346
|
const normalizedMcpEvent = mcpEvent && mcpEvent.event?.trim()
|
|
3155
3347
|
? {
|
|
3156
3348
|
server: mcpEvent.server?.trim() || "",
|
|
@@ -3245,6 +3437,18 @@ sessionMaxRuns) {
|
|
|
3245
3437
|
if (effectiveTriggerType === "mcp-event" && !normalizedMcpEvent) {
|
|
3246
3438
|
throw new Error("Для MCP-триггера нужно указать имя события (mcpEvent.event).");
|
|
3247
3439
|
}
|
|
3440
|
+
// Спринт 27: git-триггеру нужен git-репозиторий в рабочей директории.
|
|
3441
|
+
if (effectiveTriggerType === "git") {
|
|
3442
|
+
const gitCwd = workspaceId?.trim()
|
|
3443
|
+
? getWorkspace(workspaceId.trim())?.path
|
|
3444
|
+
: workingDirectory?.trim() || projectDirectory || process.cwd();
|
|
3445
|
+
if (!gitCwd) {
|
|
3446
|
+
throw new Error(`Задача "${name}": для git-триггера нужна рабочая директория или workspace.`);
|
|
3447
|
+
}
|
|
3448
|
+
if (!readGitBranch(gitCwd)) {
|
|
3449
|
+
throw new Error(`Задача "${name}": git-триггер требует git-репозиторий в "${gitCwd}".`);
|
|
3450
|
+
}
|
|
3451
|
+
}
|
|
3248
3452
|
// Валидируем cron-выражение до создания файлов. Для file/mcp-event
|
|
3249
3453
|
// расписание не используется вовсе.
|
|
3250
3454
|
if (effectiveTriggerType === "cron") {
|
|
@@ -3265,13 +3469,21 @@ sessionMaxRuns) {
|
|
|
3265
3469
|
throw new Error(`Задача "${name}": ${windowError}`);
|
|
3266
3470
|
}
|
|
3267
3471
|
}
|
|
3472
|
+
// Спринт 27: окно и дни недели применимы и к событийным триггерам
|
|
3473
|
+
// (file/git/mcp-event/once) — проверяем корректность до создания задачи.
|
|
3474
|
+
if (effectiveTriggerType !== "cron") {
|
|
3475
|
+
const windowError = validateLaunchWindow(normalizedNotBefore, normalizedNotAfter);
|
|
3476
|
+
if (windowError) {
|
|
3477
|
+
throw new Error(`Задача "${name}": ${windowError}`);
|
|
3478
|
+
}
|
|
3479
|
+
}
|
|
3268
3480
|
const sanitized = sanitizeName(name);
|
|
3269
3481
|
const lockFile = lockFilePath(sanitized);
|
|
3270
3482
|
const logFile = path.join(LOG_DIR, `${sanitized}.log`);
|
|
3271
3483
|
// Шлюз расписания (Спринт 19): нужен только для cron в poll-режиме
|
|
3272
3484
|
// (нестандартный cron или чужая IANA-зона) либо при окне запуска.
|
|
3273
3485
|
const gate = effectiveTriggerType === "cron"
|
|
3274
|
-
? buildScheduleGate(schedule, normalizedTz, normalizedNotBefore, normalizedNotAfter)
|
|
3486
|
+
? buildScheduleGate(schedule, normalizedTz, normalizedNotBefore, normalizedNotAfter, normalizedActiveDays, normalizedWindowPolicy)
|
|
3275
3487
|
: undefined;
|
|
3276
3488
|
const wrapperGate = gate
|
|
3277
3489
|
? {
|
|
@@ -3411,6 +3623,15 @@ sessionMaxRuns) {
|
|
|
3411
3623
|
timezone: normalizedTz,
|
|
3412
3624
|
notBefore: normalizedNotBefore,
|
|
3413
3625
|
notAfter: normalizedNotAfter,
|
|
3626
|
+
// Спринт 27: дни недели, политика окна, glob- и git-фильтры.
|
|
3627
|
+
activeDays: normalizedActiveDays,
|
|
3628
|
+
windowPolicy: normalizedWindowPolicy,
|
|
3629
|
+
watchGlobs: normalizedWatchGlobs,
|
|
3630
|
+
watchIgnore: normalizedWatchIgnore,
|
|
3631
|
+
gitBranch: normalizedGitBranch,
|
|
3632
|
+
gitPaths: normalizedGitPaths,
|
|
3633
|
+
gitIgnore: normalizedGitIgnore,
|
|
3634
|
+
gitPollSeconds: normalizedGitPollSeconds,
|
|
3414
3635
|
pausedUntil: normalizedPausedUntil,
|
|
3415
3636
|
allowedTools: normalizedAllowedTools,
|
|
3416
3637
|
deniedTools: normalizedDeniedTools,
|