openclacky 1.5.21 → 1.5.23
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.
- checksums.yaml +4 -4
- data/CHANGELOG.md +119 -0
- data/docs/secretary-prototype.md +286 -0
- data/lib/clacky/agent/session_serializer.rb +15 -11
- data/lib/clacky/agent.rb +58 -15
- data/lib/clacky/agent_config.rb +3 -1
- data/lib/clacky/agent_profile.rb +33 -6
- data/lib/clacky/billing/platform_billing.rb +9 -0
- data/lib/clacky/default_extensions/advisor/README.md +25 -0
- data/lib/clacky/default_extensions/advisor/README.zh.md +25 -0
- data/lib/clacky/default_extensions/advisor/ext.yml +1 -1
- data/lib/clacky/default_extensions/advisor/icon.svg +14 -0
- data/lib/clacky/default_extensions/coding/ext.yml +0 -1
- data/lib/clacky/default_extensions/computer-use/README.md +48 -0
- data/lib/clacky/default_extensions/computer-use/README.zh.md +48 -0
- data/lib/clacky/default_extensions/computer-use/ext.yml +1 -1
- data/lib/clacky/default_extensions/computer-use/icon.svg +16 -0
- data/lib/clacky/default_extensions/ext-studio/ext.yml +0 -1
- data/lib/clacky/default_extensions/general/ext.yml +0 -1
- data/lib/clacky/default_extensions/git/README.md +41 -0
- data/lib/clacky/default_extensions/git/README.zh.md +41 -0
- data/lib/clacky/default_extensions/git/ext.yml +1 -1
- data/lib/clacky/default_extensions/git/icon.svg +15 -0
- data/lib/clacky/default_extensions/git/panels/git/view.js +1960 -399
- data/lib/clacky/default_extensions/meeting/README.md +46 -0
- data/lib/clacky/default_extensions/meeting/README.zh.md +47 -0
- data/lib/clacky/default_extensions/meeting/ext.yml +1 -1
- data/lib/clacky/default_extensions/meeting/icon.svg +13 -0
- data/lib/clacky/default_extensions/preview/README.md +29 -0
- data/lib/clacky/default_extensions/preview/README.zh.md +29 -0
- data/lib/clacky/default_extensions/preview/ext.yml +1 -1
- data/lib/clacky/default_extensions/preview/icon.svg +13 -0
- data/lib/clacky/default_extensions/preview/panels/preview/view.js +199 -34
- data/lib/clacky/default_extensions/secretary/agents/secretary.md +41 -0
- data/lib/clacky/default_extensions/secretary/agents/worker.md +35 -0
- data/lib/clacky/default_extensions/secretary/api/handler.rb +8 -0
- data/lib/clacky/default_extensions/secretary/ext.yml +39 -0
- data/lib/clacky/default_extensions/secretary/panels/work/view.js +344 -0
- data/lib/clacky/default_extensions/secretary/tools/delegate_work.rb +37 -0
- data/lib/clacky/default_extensions/secretary/tools/manage_work.rb +22 -0
- data/lib/clacky/default_extensions/secretary/tools/yield_work.rb +35 -0
- data/lib/clacky/default_extensions/time_machine/README.md +32 -0
- data/lib/clacky/default_extensions/time_machine/README.zh.md +32 -0
- data/lib/clacky/default_extensions/time_machine/ext.yml +1 -1
- data/lib/clacky/default_extensions/time_machine/icon.svg +14 -0
- data/lib/clacky/default_skills/channel-manager/SKILL.md +79 -8
- data/lib/clacky/default_skills/channel-manager/discord_setup.rb +5 -1
- data/lib/clacky/default_skills/channel-manager/weixin_setup.rb +8 -1
- data/lib/clacky/default_skills/cron-task-creator/SKILL.md +183 -206
- data/lib/clacky/default_skills/cron-task-creator/evals/evals.json +45 -0
- data/lib/clacky/default_skills/media-gen/SKILL.md +17 -8
- data/lib/clacky/extension/api_extension.rb +10 -2
- data/lib/clacky/extension/loader.rb +2 -0
- data/lib/clacky/extension/verifier.rb +2 -2
- data/lib/clacky/locales/en.rb +14 -0
- data/lib/clacky/locales/zh.rb +14 -0
- data/lib/clacky/prompts/base.md +1 -1
- data/lib/clacky/providers.rb +68 -31
- data/lib/clacky/search_config.rb +33 -11
- data/lib/clacky/server/channel/adapters/base.rb +18 -0
- data/lib/clacky/server/channel/adapters/feishu/message_parser.rb +1 -0
- data/lib/clacky/server/channel/adapters/telegram/adapter.rb +1 -0
- data/lib/clacky/server/channel/channel_config.rb +185 -48
- data/lib/clacky/server/channel/channel_manager.rb +179 -66
- data/lib/clacky/server/git_panel.rb +362 -35
- data/lib/clacky/server/http_server.rb +530 -181
- data/lib/clacky/server/preview.rb +118 -17
- data/lib/clacky/server/scheduler.rb +211 -51
- data/lib/clacky/server/web_ui_controller.rb +35 -27
- data/lib/clacky/session_manager.rb +56 -6
- data/lib/clacky/tools/base.rb +7 -1
- data/lib/clacky/utils/file_processor.rb +20 -10
- data/lib/clacky/utils/mac_app_detector.rb +8 -7
- data/lib/clacky/utils/model_pricing.rb +60 -2
- data/lib/clacky/utils/windows_app_detector.rb +3 -1
- data/lib/clacky/version.rb +1 -1
- data/lib/clacky/web/app.css +1114 -205
- data/lib/clacky/web/app.js +143 -8
- data/lib/clacky/web/auth.js +1 -1
- data/lib/clacky/web/components/code-editor.js +73 -4
- data/lib/clacky/web/components/composer.js +107 -8
- data/lib/clacky/web/components/image-zoom.js +165 -0
- data/lib/clacky/web/components/model-picker.js +7 -5
- data/lib/clacky/web/components/notify.js +39 -12
- data/lib/clacky/web/components/onboard.js +1 -1
- data/lib/clacky/web/core/aside.js +60 -3
- data/lib/clacky/web/features/billing/view.js +2 -2
- data/lib/clacky/web/features/channels/store.js +19 -4
- data/lib/clacky/web/features/channels/view.js +92 -28
- data/lib/clacky/web/features/extensions/view.js +17 -10
- data/lib/clacky/web/features/new-session/store.js +79 -2
- data/lib/clacky/web/features/new-session/view.js +516 -75
- data/lib/clacky/web/features/skills/store.js +1 -1
- data/lib/clacky/web/features/tasks/store.js +5 -3
- data/lib/clacky/web/features/tasks/view.js +249 -66
- data/lib/clacky/web/features/workspace/store.js +13 -6
- data/lib/clacky/web/features/workspace/view.js +340 -214
- data/lib/clacky/web/i18n.js +366 -68
- data/lib/clacky/web/index.html +196 -165
- data/lib/clacky/web/projects.js +37 -4
- data/lib/clacky/web/sessions.js +263 -146
- data/lib/clacky/web/settings.js +241 -53
- data/lib/clacky/web/skills.js +2 -2
- data/lib/clacky/web/theme.js +17 -2
- data/lib/clacky/web/utils.js +234 -2
- data/lib/clacky/web/weixin-qr.html +2 -1
- data/lib/clacky/web/ws-dispatcher.js +14 -31
- data/lib/clacky/work/service.rb +542 -0
- data/lib/clacky/work/store.rb +57 -0
- metadata +31 -1
|
@@ -3,6 +3,7 @@
|
|
|
3
3
|
require "net/http"
|
|
4
4
|
require "socket"
|
|
5
5
|
require "timeout"
|
|
6
|
+
require "uri"
|
|
6
7
|
|
|
7
8
|
module Clacky
|
|
8
9
|
module Server
|
|
@@ -47,18 +48,53 @@ module Clacky
|
|
|
47
48
|
".ogg" => "audio/ogg"
|
|
48
49
|
}.freeze
|
|
49
50
|
|
|
50
|
-
# Injected into preview HTML responses. The preview iframe is
|
|
51
|
-
#
|
|
52
|
-
#
|
|
53
|
-
#
|
|
54
|
-
|
|
51
|
+
# Injected into preview HTML responses. The preview iframe is cross-origin
|
|
52
|
+
# to the host page, so the host cannot read its location (and the iframe's
|
|
53
|
+
# src property does not follow internal navigations). Each served page
|
|
54
|
+
# therefore announces its own URL to the parent. Re-reporting is not just
|
|
55
|
+
# the initial load: Turbo/htmx/React-Router navigations swap the DOM
|
|
56
|
+
# without a full page load, so the same script also listens for their
|
|
57
|
+
# events, patches the History API and falls back to a slow poll.
|
|
58
|
+
PREVIEW_NAV_REPORT = <<~JS.freeze
|
|
59
|
+
<script>(function(){
|
|
60
|
+
var last = null;
|
|
61
|
+
function report(){
|
|
62
|
+
try {
|
|
63
|
+
if (location.href === last) return;
|
|
64
|
+
last = location.href;
|
|
65
|
+
parent.postMessage({__clackyPreview:1,href:location.href},"*");
|
|
66
|
+
} catch(e){}
|
|
67
|
+
}
|
|
68
|
+
report();
|
|
69
|
+
["turbo:load","turbo:render","turbo:frame-load","htmx:afterSwap","pjax:end","DOMContentLoaded"].forEach(function(n){
|
|
70
|
+
document.addEventListener(n, report);
|
|
71
|
+
});
|
|
72
|
+
window.addEventListener("popstate", report);
|
|
73
|
+
window.addEventListener("hashchange", report);
|
|
74
|
+
var push = history.pushState, replace = history.replaceState;
|
|
75
|
+
history.pushState = function(){ push.apply(history, arguments); report(); };
|
|
76
|
+
history.replaceState = function(){ replace.apply(history, arguments); report(); };
|
|
77
|
+
setInterval(report, 500);
|
|
78
|
+
})()</script>
|
|
79
|
+
JS
|
|
80
|
+
|
|
81
|
+
|
|
82
|
+
# Must match ISOLATED_PREVIEW_HOST in
|
|
83
|
+
# default_extensions/preview/panels/preview/view.js. Chrome resolves
|
|
84
|
+
# every *.localhost name to loopback, so the preview frame runs on this
|
|
85
|
+
# origin while the UI stays on 127.0.0.1/localhost.
|
|
86
|
+
ISOLATED_PREVIEW_HOST = "preview.localhost"
|
|
87
|
+
|
|
88
|
+
# Hostnames a dev server may redirect to with an absolute URL. Only these
|
|
89
|
+
# are folded back into the proxy prefix; anything else is a deliberate
|
|
90
|
+
# off-box redirect and is passed through untouched.
|
|
91
|
+
LOOPBACK_HOSTS = %w[127.0.0.1 localhost ::1].freeze
|
|
55
92
|
|
|
56
93
|
# Headers dropped when proxying a localhost dev server through the
|
|
57
|
-
# preview panel. X-Frame-Options is what blocks the sandboxed iframe
|
|
58
|
-
# hop-by-hop headers
|
|
59
|
-
# (
|
|
60
|
-
#
|
|
61
|
-
# rest of the policy survives.
|
|
94
|
+
# preview panel. X-Frame-Options is what blocks the sandboxed iframe and
|
|
95
|
+
# hop-by-hop headers are recomputed by WEBrick. Set-Cookie is handled
|
|
96
|
+
# separately (see #preview_cookie) because the isolated preview origin
|
|
97
|
+
# needs the upstream session to survive inside a third-party frame.
|
|
62
98
|
PROXY_SKIP_HEADERS = %w[
|
|
63
99
|
x-frame-options
|
|
64
100
|
transfer-encoding
|
|
@@ -70,7 +106,6 @@ module Clacky
|
|
|
70
106
|
te
|
|
71
107
|
trailer
|
|
72
108
|
upgrade
|
|
73
|
-
set-cookie
|
|
74
109
|
].freeze
|
|
75
110
|
|
|
76
111
|
# Connection-stage failures when dialing the localhost dev server. The
|
|
@@ -189,11 +224,8 @@ module Clacky
|
|
|
189
224
|
# the document start) so the reporter runs before page scripts while a
|
|
190
225
|
# leading <!DOCTYPE> stays first — prepending would flip the document
|
|
191
226
|
# into quirks mode.
|
|
192
|
-
private def
|
|
193
|
-
|
|
194
|
-
return body unless (PREVIEW_CONTENT_TYPES[File.extname(abs).downcase] || "").start_with?("text/html")
|
|
195
|
-
|
|
196
|
-
html = body.force_encoding(Encoding::UTF_8)
|
|
227
|
+
private def inject_nav_report(html)
|
|
228
|
+
html = html.force_encoding(Encoding::UTF_8)
|
|
197
229
|
if (m = html.match(/<head[^>]*>/i))
|
|
198
230
|
html[m.end(0), 0] = PREVIEW_NAV_REPORT
|
|
199
231
|
elsif (m = html.match(/<html[^>]*>/i))
|
|
@@ -206,6 +238,13 @@ module Clacky
|
|
|
206
238
|
html
|
|
207
239
|
end
|
|
208
240
|
|
|
241
|
+
private def preview_body(abs)
|
|
242
|
+
body = File.binread(abs)
|
|
243
|
+
return body unless (PREVIEW_CONTENT_TYPES[File.extname(abs).downcase] || "").start_with?("text/html")
|
|
244
|
+
|
|
245
|
+
inject_nav_report(body)
|
|
246
|
+
end
|
|
247
|
+
|
|
209
248
|
# Decode %XX escapes in a preview path segment without treating "+" as
|
|
210
249
|
# space: "+" is a legal literal character in file names.
|
|
211
250
|
private def preview_decode_path(seg)
|
|
@@ -285,6 +324,15 @@ module Clacky
|
|
|
285
324
|
next if value.nil? || value.empty?
|
|
286
325
|
end
|
|
287
326
|
next if PROXY_SKIP_HEADERS.include?(down)
|
|
327
|
+
if down == "set-cookie"
|
|
328
|
+
cookie = preview_cookie(value)
|
|
329
|
+
res.cookies << cookie if cookie && isolated_preview_request?(req)
|
|
330
|
+
next
|
|
331
|
+
end
|
|
332
|
+
if down == "location"
|
|
333
|
+
res[name] = rewrite_preview_location(value, port, req)
|
|
334
|
+
next
|
|
335
|
+
end
|
|
288
336
|
if down == "content-type"
|
|
289
337
|
is_html = value.start_with?("text/html")
|
|
290
338
|
is_css = value.start_with?("text/css")
|
|
@@ -300,7 +348,7 @@ module Clacky
|
|
|
300
348
|
if req.request_method != "HEAD"
|
|
301
349
|
body = resp.body.to_s
|
|
302
350
|
if is_html
|
|
303
|
-
body = rewrite_preview_paths(body, port)
|
|
351
|
+
body = inject_nav_report(rewrite_preview_paths(body, port))
|
|
304
352
|
elsif is_css
|
|
305
353
|
body = rewrite_preview_css(body, port)
|
|
306
354
|
end
|
|
@@ -319,6 +367,59 @@ module Clacky
|
|
|
319
367
|
stripped.empty? ? nil : stripped
|
|
320
368
|
end
|
|
321
369
|
|
|
370
|
+
# Rewrites an upstream Set-Cookie so it survives inside the preview
|
|
371
|
+
# frame. The frame is a third-party context for the host UI, where Chrome
|
|
372
|
+
# drops SameSite=Lax/Strict cookies outright, so the session cookie the
|
|
373
|
+
# dev server just set would be discarded and every page would look like a
|
|
374
|
+
# fresh, cookie-less visit. SameSite=None needs Secure, which Chrome
|
|
375
|
+
# accepts over http for *.localhost because it is a trustworthy origin.
|
|
376
|
+
# Domain is dropped so the cookie stays pinned to the preview origin and
|
|
377
|
+
# can never be read by the host UI.
|
|
378
|
+
private def preview_cookie(value)
|
|
379
|
+
parts = value.to_s.split(";").map(&:strip).reject(&:empty?)
|
|
380
|
+
return nil if parts.empty?
|
|
381
|
+
|
|
382
|
+
kept = parts[1..-1].reject do |attr|
|
|
383
|
+
attr =~ /\A(?:domain|samesite)\s*=/i || attr =~ /\Asecure\z/i
|
|
384
|
+
end
|
|
385
|
+
([parts.first] + kept + ["SameSite=None", "Secure"]).join("; ")
|
|
386
|
+
end
|
|
387
|
+
|
|
388
|
+
private def isolated_preview_request?(req)
|
|
389
|
+
req["Host"].to_s.split(":").first.to_s.downcase == ISOLATED_PREVIEW_HOST
|
|
390
|
+
end
|
|
391
|
+
|
|
392
|
+
# An upstream 3xx points at the dev server root (/dashboard). Inside the
|
|
393
|
+
# isolated preview frame that resolves against the proxy origin and loses
|
|
394
|
+
# the /preview/p/<port> prefix, so the redirect lands on a 404 — and the
|
|
395
|
+
# address bar never sees the new page. Keep root-relative redirects inside
|
|
396
|
+
# the prefix and fold absolute ones that point back at the same dev
|
|
397
|
+
# server. Off-box and already-prefixed URLs pass through untouched.
|
|
398
|
+
private def rewrite_preview_location(value, port, req)
|
|
399
|
+
return value unless isolated_preview_request?(req)
|
|
400
|
+
|
|
401
|
+
prefix = "/preview/p/#{port}"
|
|
402
|
+
if value.start_with?("/") && !value.start_with?("//")
|
|
403
|
+
return value if value == prefix || value.start_with?("#{prefix}/", "#{prefix}?")
|
|
404
|
+
|
|
405
|
+
return "#{prefix}#{value}"
|
|
406
|
+
end
|
|
407
|
+
|
|
408
|
+
uri = begin
|
|
409
|
+
URI.parse(value)
|
|
410
|
+
rescue URI::InvalidURIError
|
|
411
|
+
return value
|
|
412
|
+
end
|
|
413
|
+
return value unless uri.host
|
|
414
|
+
return value unless LOOPBACK_HOSTS.include?(uri.host.downcase)
|
|
415
|
+
return value unless uri.port == port
|
|
416
|
+
|
|
417
|
+
path = uri.path.to_s.empty? ? "/" : uri.path
|
|
418
|
+
path += "?#{uri.query}" if uri.query
|
|
419
|
+
path += "##{uri.fragment}" if uri.fragment
|
|
420
|
+
"#{prefix}#{path}"
|
|
421
|
+
end
|
|
422
|
+
|
|
322
423
|
# Rewrites absolute-path resource URLs (/assets/app.js) in a proxied HTML
|
|
323
424
|
# page to the proxy prefix so the browser resolves them against the dev
|
|
324
425
|
# server instead of the host origin. Protocol-relative (//), already
|
|
@@ -5,14 +5,16 @@ require "json"
|
|
|
5
5
|
require "time"
|
|
6
6
|
require "securerandom"
|
|
7
7
|
require "fileutils"
|
|
8
|
+
require "monitor"
|
|
9
|
+
require "date"
|
|
8
10
|
|
|
9
11
|
module Clacky
|
|
10
12
|
module Server
|
|
11
13
|
# Scheduler reads ~/.clacky/schedules.yml and runs tasks on a cron-like schedule.
|
|
12
14
|
#
|
|
13
15
|
# It starts a background thread that ticks every 60 seconds, checks all
|
|
14
|
-
# configured schedules, and
|
|
15
|
-
# the
|
|
16
|
+
# configured schedules, and dispatches due tasks. Persisted next-run cursors
|
|
17
|
+
# allow a resumed process to catch up the latest missed occurrence.
|
|
16
18
|
#
|
|
17
19
|
# Schedule file format (~/.clacky/schedules.yml):
|
|
18
20
|
#
|
|
@@ -28,7 +30,9 @@ module Clacky
|
|
|
28
30
|
RUNS_FILE = File.expand_path("~/.clacky/cron_runs.json")
|
|
29
31
|
MAX_RUNS = 500
|
|
30
32
|
|
|
31
|
-
def initialize(session_registry:, session_builder:, task_runner:)
|
|
33
|
+
def initialize(session_registry:, session_builder:, task_runner:, scheduled_dispatcher: nil)
|
|
34
|
+
@scheduled_dispatcher = scheduled_dispatcher
|
|
35
|
+
@schedule_mutex = Monitor.new
|
|
32
36
|
@registry = session_registry
|
|
33
37
|
@session_builder = session_builder # callable: (name:, working_dir:) -> session_id
|
|
34
38
|
# Callable that runs a task on an agent with unified status/save/broadcast
|
|
@@ -74,62 +78,102 @@ module Clacky
|
|
|
74
78
|
# ── Schedule CRUD ────────────────────────────────────────────────────────
|
|
75
79
|
|
|
76
80
|
# Add or update a schedule entry in schedules.yml.
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
"
|
|
84
|
-
"
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
81
|
+
# `title` is the human-readable label; `name` stays an ASCII identifier.
|
|
82
|
+
def add_schedule(name:, task:, cron:, enabled: true, target: nil, title: nil)
|
|
83
|
+
due = cron_next_run(cron)
|
|
84
|
+
raise ArgumentError, "Invalid or impossible cron schedule" unless due
|
|
85
|
+
@schedule_mutex.synchronize do
|
|
86
|
+
list = load_schedules
|
|
87
|
+
previous = list.find { |s| s["name"] == name }
|
|
88
|
+
list.reject! { |s| s["name"] == name }
|
|
89
|
+
entry = {
|
|
90
|
+
"id" => SecureRandom.hex(12), "name" => name, "task" => task,
|
|
91
|
+
"cron" => cron, "enabled" => enabled,
|
|
92
|
+
"target" => target, "next_run_at" => due.utc.iso8601
|
|
93
|
+
}
|
|
94
|
+
created = previous && previous["created_at"]
|
|
95
|
+
entry["created_at"] = created || Time.now.utc.iso8601
|
|
96
|
+
entry["title"] = title unless title.nil? || title.to_s.empty?
|
|
97
|
+
list << entry
|
|
98
|
+
save_schedules(list)
|
|
99
|
+
end
|
|
88
100
|
end
|
|
89
101
|
|
|
90
102
|
# Remove a schedule entry by name.
|
|
91
103
|
def remove_schedule(name)
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
104
|
+
@schedule_mutex.synchronize do
|
|
105
|
+
list = load_schedules
|
|
106
|
+
before_count = list.size
|
|
107
|
+
list.reject! { |s| s["name"] == name }
|
|
108
|
+
save_schedules(list)
|
|
109
|
+
list.size < before_count
|
|
110
|
+
end
|
|
97
111
|
end
|
|
98
112
|
|
|
99
113
|
# Update an existing schedule entry (cron and/or enabled).
|
|
114
|
+
# Pass title: nil to leave it unchanged, or title: "" to clear it.
|
|
100
115
|
# Returns false if the schedule does not exist.
|
|
101
|
-
def update_schedule(name, cron: nil, enabled: nil)
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
116
|
+
def update_schedule(name, cron: nil, enabled: nil, title: nil)
|
|
117
|
+
@schedule_mutex.synchronize do
|
|
118
|
+
list = load_schedules
|
|
119
|
+
entry = list.find { |s| s["name"] == name }
|
|
120
|
+
return false unless entry
|
|
121
|
+
reset = cron || (enabled == true && entry["enabled"] == false)
|
|
122
|
+
entry["cron"] = cron unless cron.nil?
|
|
123
|
+
entry["enabled"] = enabled unless enabled.nil?
|
|
124
|
+
unless title.nil?
|
|
125
|
+
if title.to_s.empty?
|
|
126
|
+
entry.delete("title")
|
|
127
|
+
entry["target"].delete("title") if entry["target"].is_a?(Hash)
|
|
128
|
+
else
|
|
129
|
+
entry["title"] = title
|
|
130
|
+
entry["target"]["title"] = title if entry["target"].is_a?(Hash)
|
|
131
|
+
end
|
|
132
|
+
end
|
|
133
|
+
if reset
|
|
134
|
+
due = cron_next_run(entry["cron"])
|
|
135
|
+
raise ArgumentError, "Invalid or impossible cron schedule" unless due
|
|
136
|
+
entry["next_run_at"] = due.utc.iso8601
|
|
137
|
+
end
|
|
138
|
+
save_schedules(list)
|
|
139
|
+
true
|
|
140
|
+
end
|
|
110
141
|
end
|
|
111
142
|
|
|
112
143
|
# ── Composite cron-task helpers ──────────────────────────────────────────
|
|
113
144
|
|
|
114
145
|
# Create a task file and its schedule in one step.
|
|
115
|
-
def create_cron_task(name:, content:, cron:, enabled: true)
|
|
116
|
-
|
|
117
|
-
|
|
146
|
+
def create_cron_task(name:, content:, cron:, enabled: true, target: nil, title: nil)
|
|
147
|
+
@schedule_mutex.synchronize do
|
|
148
|
+
existing = load_schedules.find { |plan| plan["name"] == name }
|
|
149
|
+
if existing && (target || existing["target"])
|
|
150
|
+
raise ArgumentError, "Plan already exists; update it with PATCH or choose another name"
|
|
151
|
+
end
|
|
152
|
+
raise ArgumentError, "Invalid or impossible cron schedule" unless cron_next_run(cron)
|
|
153
|
+
write_task(name, content)
|
|
154
|
+
add_schedule(name: name, task: name, cron: cron, enabled: enabled, target: target, title: title)
|
|
155
|
+
end
|
|
118
156
|
end
|
|
119
157
|
|
|
120
158
|
# Update a cron-task: optionally update content and/or schedule fields.
|
|
121
|
-
def update_cron_task(name, content: nil, cron: nil, enabled: nil)
|
|
159
|
+
def update_cron_task(name, content: nil, cron: nil, enabled: nil, title: nil)
|
|
122
160
|
raise "Cron task not found: #{name}" unless list_tasks.include?(name)
|
|
123
161
|
|
|
124
|
-
|
|
125
|
-
|
|
162
|
+
@schedule_mutex.synchronize do
|
|
163
|
+
if cron || !enabled.nil? || !title.nil?
|
|
164
|
+
update_schedule(name, cron: cron, enabled: enabled, title: title)
|
|
165
|
+
end
|
|
166
|
+
write_task(name, content) unless content.nil?
|
|
167
|
+
end
|
|
126
168
|
end
|
|
127
169
|
|
|
128
170
|
# Delete a cron-task: remove both the task file and its schedule.
|
|
129
171
|
def delete_cron_task(name)
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
172
|
+
@schedule_mutex.synchronize do
|
|
173
|
+
removed_schedule = remove_schedule(name)
|
|
174
|
+
removed_task = delete_task(name)
|
|
175
|
+
removed_schedule || removed_task
|
|
176
|
+
end
|
|
133
177
|
end
|
|
134
178
|
|
|
135
179
|
# Return a merged list of cron-tasks (task content + schedule metadata).
|
|
@@ -141,13 +185,32 @@ module Clacky
|
|
|
141
185
|
list_tasks.map do |task_name|
|
|
142
186
|
content = begin; read_task(task_name); rescue StandardError; ""; end
|
|
143
187
|
schedule = schedule_map[task_name] || {}
|
|
188
|
+
cron = schedule["cron"]
|
|
189
|
+
target = schedule["target"]
|
|
190
|
+
title = schedule["title"]
|
|
191
|
+
title = target["title"] if title.to_s.empty? && target.is_a?(Hash)
|
|
192
|
+
created_at = schedule["created_at"]
|
|
193
|
+
created_at ||= begin
|
|
194
|
+
stat = File.stat(task_file_path(task_name))
|
|
195
|
+
begin
|
|
196
|
+
stat.birthtime.utc.iso8601
|
|
197
|
+
rescue NotImplementedError
|
|
198
|
+
stat.mtime.utc.iso8601
|
|
199
|
+
end
|
|
200
|
+
rescue StandardError
|
|
201
|
+
nil
|
|
202
|
+
end
|
|
144
203
|
{
|
|
145
204
|
"name" => task_name,
|
|
205
|
+
"title" => title,
|
|
146
206
|
"content" => content,
|
|
147
|
-
"cron" =>
|
|
207
|
+
"cron" => cron,
|
|
148
208
|
"enabled" => schedule.fetch("enabled", true),
|
|
149
209
|
"scheduled" => !schedule.empty?,
|
|
150
|
-
"
|
|
210
|
+
"created_at" => created_at,
|
|
211
|
+
"last_run" => last_runs[task_name],
|
|
212
|
+
"target" => target,
|
|
213
|
+
"next_run" => schedule["enabled"] == false ? nil : (schedule["next_run_at"] || (cron && cron_next_run(cron)))
|
|
151
214
|
}
|
|
152
215
|
end
|
|
153
216
|
end
|
|
@@ -320,17 +383,38 @@ module Clacky
|
|
|
320
383
|
end
|
|
321
384
|
end
|
|
322
385
|
|
|
323
|
-
#
|
|
386
|
+
# Persist the next occurrence. On resume, collapse missed occurrences to
|
|
387
|
+
# the latest one; a rejected dispatch retains its deadline for retry.
|
|
324
388
|
private def tick(now)
|
|
325
389
|
maybe_run_backup(now)
|
|
326
|
-
|
|
327
|
-
|
|
328
|
-
|
|
329
|
-
|
|
330
|
-
|
|
331
|
-
|
|
332
|
-
|
|
333
|
-
|
|
390
|
+
@schedule_mutex.synchronize do
|
|
391
|
+
list = load_schedules
|
|
392
|
+
list.each do |schedule|
|
|
393
|
+
next if schedule["enabled"] == false
|
|
394
|
+
begin
|
|
395
|
+
unless schedule["next_run_at"]
|
|
396
|
+
# Legacy plans have no cursor: begin with this minute, not an
|
|
397
|
+
# invented backlog from before the plan existed.
|
|
398
|
+
schedule["id"] ||= SecureRandom.hex(12)
|
|
399
|
+
from = Time.at(now.to_i / 60 * 60 - 1)
|
|
400
|
+
schedule["next_run_at"] = cron_next_run(schedule["cron"], from: from)&.utc&.iso8601
|
|
401
|
+
save_schedules(list)
|
|
402
|
+
end
|
|
403
|
+
next unless schedule["next_run_at"] && Time.iso8601(schedule["next_run_at"]) <= now
|
|
404
|
+
due = cron_occurrence(schedule["cron"], from: now, direction: -1)
|
|
405
|
+
next unless due && due >= Time.iso8601(schedule["next_run_at"])
|
|
406
|
+
accepted = if schedule["target"]
|
|
407
|
+
@scheduled_dispatcher&.call(schedule, read_task(schedule["task"]), due)
|
|
408
|
+
else
|
|
409
|
+
fire_task(schedule)
|
|
410
|
+
end
|
|
411
|
+
next unless accepted
|
|
412
|
+
schedule["next_run_at"] = cron_next_run(schedule["cron"], from: now)&.utc&.iso8601
|
|
413
|
+
save_schedules(list)
|
|
414
|
+
rescue => e
|
|
415
|
+
Clacky::Logger.error("scheduler_tick_error", schedule: schedule["name"], error: e)
|
|
416
|
+
end
|
|
417
|
+
end
|
|
334
418
|
end
|
|
335
419
|
end
|
|
336
420
|
|
|
@@ -338,7 +422,8 @@ module Clacky
|
|
|
338
422
|
private def fire_task(schedule)
|
|
339
423
|
task_name = schedule["task"].to_s
|
|
340
424
|
prompt = read_task(task_name)
|
|
341
|
-
|
|
425
|
+
label = schedule["title"].to_s.empty? ? schedule["name"] : schedule["title"]
|
|
426
|
+
name = "⏰ #{label} #{Time.now.strftime("%H:%M")}"
|
|
342
427
|
|
|
343
428
|
# Scheduled tasks run unattended — use auto_approve so ask_user doesn't block.
|
|
344
429
|
session_id = @session_builder.call(name: name, permission_mode: :auto_approve, source: :cron)
|
|
@@ -355,13 +440,15 @@ module Clacky
|
|
|
355
440
|
# * broadcasting session_update
|
|
356
441
|
# * persisting the session JSON on success/interrupted/error ← the bit we were missing
|
|
357
442
|
# * idle-compression timer lifecycle
|
|
358
|
-
@task_runner.call(session_id, agent) do
|
|
443
|
+
dispatched = @task_runner.call(session_id, agent) do
|
|
359
444
|
track_run(task_name, session_id, trigger: :schedule) { agent.run(prompt) }
|
|
360
445
|
end
|
|
361
446
|
|
|
362
447
|
Clacky::Logger.info("scheduler_task_dispatched", task: task_name, session: session_id)
|
|
448
|
+
dispatched
|
|
363
449
|
rescue => e
|
|
364
450
|
Clacky::Logger.error("scheduler_fire_error", task: schedule["task"], error: e)
|
|
451
|
+
nil
|
|
365
452
|
end
|
|
366
453
|
|
|
367
454
|
# Built-in automatic backup hook. Runs as a plain system operation —
|
|
@@ -383,6 +470,69 @@ module Clacky
|
|
|
383
470
|
|
|
384
471
|
# ── Cron parsing ─────────────────────────────────────────────────────────
|
|
385
472
|
|
|
473
|
+
# Search calendar days in server-local time, retaining DOM AND DOW semantics.
|
|
474
|
+
private def cron_next_run(expr, from: Time.now)
|
|
475
|
+
cron_occurrence(expr, from: from, direction: 1)
|
|
476
|
+
end
|
|
477
|
+
|
|
478
|
+
private def cron_occurrence(expr, from:, direction:)
|
|
479
|
+
fields = expr.to_s.strip.split(/\s+/)
|
|
480
|
+
return nil unless fields.size == 5
|
|
481
|
+
sets = fields.zip([[0, 59], [0, 23], [1, 31], [1, 12], [0, 6]]).map do |field, bounds|
|
|
482
|
+
cron_field_values(field, *bounds)
|
|
483
|
+
end
|
|
484
|
+
return nil if sets.any? { |set| set.nil? || set.empty? }
|
|
485
|
+
minutes, hours, doms, months, dows = sets
|
|
486
|
+
local = from.getlocal
|
|
487
|
+
date = Date.new(local.year, local.month, local.day)
|
|
488
|
+
(0..2922).each do |offset|
|
|
489
|
+
day = date + offset * direction
|
|
490
|
+
next unless months.include?(day.month) && doms.include?(day.day) && dows.include?(day.wday)
|
|
491
|
+
candidates = hours.flat_map do |hour|
|
|
492
|
+
minutes.map do |minute|
|
|
493
|
+
Time.local(day.year, day.month, day.day, hour, minute)
|
|
494
|
+
end
|
|
495
|
+
end
|
|
496
|
+
valid = candidates.select { |time| direction == 1 ? time > from : time <= from }
|
|
497
|
+
result = direction == 1 ? valid.min : valid.max
|
|
498
|
+
return result if result
|
|
499
|
+
end
|
|
500
|
+
nil
|
|
501
|
+
end
|
|
502
|
+
|
|
503
|
+
# Concrete values a single cron field can take, mirroring the semantics of
|
|
504
|
+
# #cron_part_matches?. Returns nil when the field is unparseable.
|
|
505
|
+
private def cron_field_values(field, min, max)
|
|
506
|
+
return nil unless field.to_s.match?(/\A(?:\*|\d+(?:-\d+)?)(?:\/\d+)?(?:,(?:\*|\d+(?:-\d+)?)(?:\/\d+)?)*\z/)
|
|
507
|
+
values = []
|
|
508
|
+
field.to_s.split(",").each do |part|
|
|
509
|
+
part = part.strip
|
|
510
|
+
base, step = part.split("/")
|
|
511
|
+
step = step ? step.to_i : 1
|
|
512
|
+
return nil if step <= 0
|
|
513
|
+
|
|
514
|
+
lo, hi = if base == "*"
|
|
515
|
+
[min, max]
|
|
516
|
+
elsif base.include?("-")
|
|
517
|
+
base.split("-").map(&:to_i)
|
|
518
|
+
else
|
|
519
|
+
value = Integer(base, exception: false)
|
|
520
|
+
return nil if value.nil?
|
|
521
|
+
[value, value]
|
|
522
|
+
end
|
|
523
|
+
return nil if lo.nil? || hi.nil? || hi < lo || lo < min || hi > max
|
|
524
|
+
|
|
525
|
+
(lo..hi).each do |v|
|
|
526
|
+
next unless v.between?(min, max)
|
|
527
|
+
# `*` steps from zero (matches value % step), ranges step from lo.
|
|
528
|
+
next unless base == "*" ? (v % step).zero? : ((v - lo) % step).zero?
|
|
529
|
+
|
|
530
|
+
values << v
|
|
531
|
+
end
|
|
532
|
+
end
|
|
533
|
+
values.uniq.sort
|
|
534
|
+
end
|
|
535
|
+
|
|
386
536
|
# Returns true if the 5-field cron expression matches the given Time.
|
|
387
537
|
# Fields: minute hour day-of-month month day-of-week
|
|
388
538
|
private def cron_matches?(expr, time)
|
|
@@ -443,7 +593,17 @@ module Clacky
|
|
|
443
593
|
|
|
444
594
|
private def save_schedules(list)
|
|
445
595
|
FileUtils.mkdir_p(File.dirname(SCHEDULES_FILE))
|
|
446
|
-
|
|
596
|
+
tmp = "#{SCHEDULES_FILE}.#{SecureRandom.hex(6)}.tmp"
|
|
597
|
+
begin
|
|
598
|
+
File.open(tmp, "w", 0o600) do |file|
|
|
599
|
+
file.write(YAML.dump(list))
|
|
600
|
+
file.flush
|
|
601
|
+
file.fsync
|
|
602
|
+
end
|
|
603
|
+
File.rename(tmp, SCHEDULES_FILE)
|
|
604
|
+
ensure
|
|
605
|
+
FileUtils.rm_f(tmp)
|
|
606
|
+
end
|
|
447
607
|
end
|
|
448
608
|
end
|
|
449
609
|
end
|