openclacky 1.5.22 → 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 +58 -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 +6 -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 +71 -23
- 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/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 +25 -14
- 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 +2 -1
- data/lib/clacky/server/http_server.rb +385 -134
- data/lib/clacky/server/scheduler.rb +166 -85
- data/lib/clacky/session_manager.rb +4 -1
- data/lib/clacky/tools/base.rb +7 -1
- data/lib/clacky/utils/file_processor.rb +20 -10
- data/lib/clacky/version.rb +1 -1
- data/lib/clacky/web/app.css +401 -46
- data/lib/clacky/web/app.js +85 -3
- data/lib/clacky/web/components/code-editor.js +73 -4
- data/lib/clacky/web/components/model-picker.js +1 -1
- data/lib/clacky/web/components/notify.js +37 -10
- data/lib/clacky/web/components/onboard.js +1 -1
- data/lib/clacky/web/features/channels/store.js +19 -4
- data/lib/clacky/web/features/channels/view.js +87 -26
- data/lib/clacky/web/features/extensions/view.js +15 -8
- data/lib/clacky/web/features/new-session/view.js +23 -20
- data/lib/clacky/web/features/tasks/store.js +5 -3
- data/lib/clacky/web/features/tasks/view.js +98 -26
- data/lib/clacky/web/features/workspace/view.js +193 -57
- data/lib/clacky/web/i18n.js +128 -12
- data/lib/clacky/web/index.html +25 -10
- data/lib/clacky/web/sessions.js +82 -41
- data/lib/clacky/web/settings.js +215 -45
- data/lib/clacky/web/utils.js +217 -0
- data/lib/clacky/web/ws-dispatcher.js +7 -3
- data/lib/clacky/work/service.rb +542 -0
- data/lib/clacky/work/store.rb +57 -0
- metadata +30 -1
|
@@ -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).
|
|
@@ -142,14 +186,31 @@ module Clacky
|
|
|
142
186
|
content = begin; read_task(task_name); rescue StandardError; ""; end
|
|
143
187
|
schedule = schedule_map[task_name] || {}
|
|
144
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
|
|
145
203
|
{
|
|
146
204
|
"name" => task_name,
|
|
205
|
+
"title" => title,
|
|
147
206
|
"content" => content,
|
|
148
207
|
"cron" => cron,
|
|
149
208
|
"enabled" => schedule.fetch("enabled", true),
|
|
150
209
|
"scheduled" => !schedule.empty?,
|
|
210
|
+
"created_at" => created_at,
|
|
151
211
|
"last_run" => last_runs[task_name],
|
|
152
|
-
"
|
|
212
|
+
"target" => target,
|
|
213
|
+
"next_run" => schedule["enabled"] == false ? nil : (schedule["next_run_at"] || (cron && cron_next_run(cron)))
|
|
153
214
|
}
|
|
154
215
|
end
|
|
155
216
|
end
|
|
@@ -322,17 +383,38 @@ module Clacky
|
|
|
322
383
|
end
|
|
323
384
|
end
|
|
324
385
|
|
|
325
|
-
#
|
|
386
|
+
# Persist the next occurrence. On resume, collapse missed occurrences to
|
|
387
|
+
# the latest one; a rejected dispatch retains its deadline for retry.
|
|
326
388
|
private def tick(now)
|
|
327
389
|
maybe_run_backup(now)
|
|
328
|
-
|
|
329
|
-
|
|
330
|
-
|
|
331
|
-
|
|
332
|
-
|
|
333
|
-
|
|
334
|
-
|
|
335
|
-
|
|
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
|
|
336
418
|
end
|
|
337
419
|
end
|
|
338
420
|
|
|
@@ -340,7 +422,8 @@ module Clacky
|
|
|
340
422
|
private def fire_task(schedule)
|
|
341
423
|
task_name = schedule["task"].to_s
|
|
342
424
|
prompt = read_task(task_name)
|
|
343
|
-
|
|
425
|
+
label = schedule["title"].to_s.empty? ? schedule["name"] : schedule["title"]
|
|
426
|
+
name = "⏰ #{label} #{Time.now.strftime("%H:%M")}"
|
|
344
427
|
|
|
345
428
|
# Scheduled tasks run unattended — use auto_approve so ask_user doesn't block.
|
|
346
429
|
session_id = @session_builder.call(name: name, permission_mode: :auto_approve, source: :cron)
|
|
@@ -357,13 +440,15 @@ module Clacky
|
|
|
357
440
|
# * broadcasting session_update
|
|
358
441
|
# * persisting the session JSON on success/interrupted/error ← the bit we were missing
|
|
359
442
|
# * idle-compression timer lifecycle
|
|
360
|
-
@task_runner.call(session_id, agent) do
|
|
443
|
+
dispatched = @task_runner.call(session_id, agent) do
|
|
361
444
|
track_run(task_name, session_id, trigger: :schedule) { agent.run(prompt) }
|
|
362
445
|
end
|
|
363
446
|
|
|
364
447
|
Clacky::Logger.info("scheduler_task_dispatched", task: task_name, session: session_id)
|
|
448
|
+
dispatched
|
|
365
449
|
rescue => e
|
|
366
450
|
Clacky::Logger.error("scheduler_fire_error", task: schedule["task"], error: e)
|
|
451
|
+
nil
|
|
367
452
|
end
|
|
368
453
|
|
|
369
454
|
# Built-in automatic backup hook. Runs as a plain system operation —
|
|
@@ -385,54 +470,40 @@ module Clacky
|
|
|
385
470
|
|
|
386
471
|
# ── Cron parsing ─────────────────────────────────────────────────────────
|
|
387
472
|
|
|
388
|
-
#
|
|
389
|
-
# Walks day by day (two years max) and only expands the hour/minute grid
|
|
390
|
-
# for days that match, so a yearly task costs ~365 cheap comparisons.
|
|
391
|
-
# Returns nil for malformed expressions and impossible ones (Feb 30).
|
|
473
|
+
# Search calendar days in server-local time, retaining DOM AND DOW semantics.
|
|
392
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:)
|
|
393
479
|
fields = expr.to_s.strip.split(/\s+/)
|
|
394
480
|
return nil unless fields.size == 5
|
|
395
|
-
|
|
396
|
-
|
|
397
|
-
|
|
398
|
-
|
|
399
|
-
cron_field_values(fields[2], 1, 31),
|
|
400
|
-
cron_field_values(fields[3], 1, 12),
|
|
401
|
-
cron_field_values(fields[4], 0, 6)
|
|
402
|
-
]
|
|
403
|
-
return nil if sets.any?(&:nil?)
|
|
404
|
-
|
|
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? }
|
|
405
485
|
minutes, hours, doms, months, dows = sets
|
|
406
|
-
|
|
407
|
-
|
|
408
|
-
|
|
409
|
-
|
|
410
|
-
noon = Time.local(from.year, from.month, from.day, 12)
|
|
411
|
-
# Minute-of-day of the first candidate; same-day scans start here.
|
|
412
|
-
floor = from.hour * 60 + from.min + 1
|
|
413
|
-
|
|
414
|
-
(0..731).each do |offset|
|
|
415
|
-
day = noon + offset * 86_400
|
|
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
|
|
416
490
|
next unless months.include?(day.month) && doms.include?(day.day) && dows.include?(day.wday)
|
|
417
|
-
|
|
418
|
-
|
|
419
|
-
|
|
420
|
-
next if h * 60 + minutes.last < limit
|
|
421
|
-
|
|
422
|
-
minutes.each do |m|
|
|
423
|
-
next if h * 60 + m < limit
|
|
424
|
-
|
|
425
|
-
return Time.local(day.year, day.month, day.day, h, m, 0)
|
|
491
|
+
candidates = hours.flat_map do |hour|
|
|
492
|
+
minutes.map do |minute|
|
|
493
|
+
Time.local(day.year, day.month, day.day, hour, minute)
|
|
426
494
|
end
|
|
427
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
|
|
428
499
|
end
|
|
429
|
-
|
|
430
500
|
nil
|
|
431
501
|
end
|
|
432
502
|
|
|
433
503
|
# Concrete values a single cron field can take, mirroring the semantics of
|
|
434
504
|
# #cron_part_matches?. Returns nil when the field is unparseable.
|
|
435
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/)
|
|
436
507
|
values = []
|
|
437
508
|
field.to_s.split(",").each do |part|
|
|
438
509
|
part = part.strip
|
|
@@ -449,7 +520,7 @@ module Clacky
|
|
|
449
520
|
return nil if value.nil?
|
|
450
521
|
[value, value]
|
|
451
522
|
end
|
|
452
|
-
return nil if lo.nil? || hi.nil? || hi < lo
|
|
523
|
+
return nil if lo.nil? || hi.nil? || hi < lo || lo < min || hi > max
|
|
453
524
|
|
|
454
525
|
(lo..hi).each do |v|
|
|
455
526
|
next unless v.between?(min, max)
|
|
@@ -522,7 +593,17 @@ module Clacky
|
|
|
522
593
|
|
|
523
594
|
private def save_schedules(list)
|
|
524
595
|
FileUtils.mkdir_p(File.dirname(SCHEDULES_FILE))
|
|
525
|
-
|
|
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
|
|
526
607
|
end
|
|
527
608
|
end
|
|
528
609
|
end
|
|
@@ -25,6 +25,8 @@ module Clacky
|
|
|
25
25
|
# #load_all_sessions.
|
|
26
26
|
LIST_REUSE_WINDOW = 2.0
|
|
27
27
|
|
|
28
|
+
attr_accessor :protected_session_ids
|
|
29
|
+
|
|
28
30
|
def initialize(sessions_dir: nil)
|
|
29
31
|
@sessions_dir = sessions_dir || SESSIONS_DIR
|
|
30
32
|
@recent_list = nil
|
|
@@ -407,7 +409,8 @@ module Clacky
|
|
|
407
409
|
# Archived sessions are user-curated, so they are exempt from the rolling
|
|
408
410
|
# cap exactly like pinned ones — an archive that silently empties itself
|
|
409
411
|
# would be worse than no archive at all.
|
|
410
|
-
|
|
412
|
+
protected_ids = @protected_session_ids ? @protected_session_ids.call : []
|
|
413
|
+
non_pinned = metas.reject { |s| s[:pinned] || s[:archived_at].to_s != "" || protected_ids.include?(s[:session_id]) }
|
|
411
414
|
|
|
412
415
|
groups = non_pinned.group_by { |s| group_key_for(s) }
|
|
413
416
|
|
data/lib/clacky/tools/base.rb
CHANGED
|
@@ -35,7 +35,13 @@ module Clacky
|
|
|
35
35
|
self.class.tool_category || "general"
|
|
36
36
|
end
|
|
37
37
|
|
|
38
|
-
# Execute the tool - must be implemented by subclasses
|
|
38
|
+
# Execute the tool - must be implemented by subclasses.
|
|
39
|
+
# A result hash with end_turn: true records this result and ends the current
|
|
40
|
+
# agent turn, skipping remaining calls in the batch. Set awaiting_feedback: true
|
|
41
|
+
# as well only when an answer is needed. notify_user: false suppresses the
|
|
42
|
+
# completion alert for a handoff turn (an explicit question takes precedence).
|
|
43
|
+
# Ending a turn does not schedule
|
|
44
|
+
# resumption; tools must persist any wait/outcome before returning it.
|
|
39
45
|
def execute(**_args)
|
|
40
46
|
raise NotImplementedError, "#{self.class.name} must implement #execute"
|
|
41
47
|
end
|
|
@@ -691,10 +691,12 @@ module Clacky
|
|
|
691
691
|
real = Clacky::Utils::EnvironmentDetector.resolve_local_path(href)
|
|
692
692
|
|
|
693
693
|
ext = File.extname(real).downcase
|
|
694
|
-
if LOCAL_MEDIA_EXTENSIONS.include?(ext)
|
|
695
|
-
"})"
|
|
696
|
-
else
|
|
694
|
+
if !LOCAL_MEDIA_EXTENSIONS.include?(ext) || !File.exist?(real)
|
|
697
695
|
_match
|
|
696
|
+
elsif LOCAL_VIDEO_EXTENSIONS.include?(ext) || LOCAL_AUDIO_EXTENSIONS.include?(ext)
|
|
697
|
+
local_media_player(alt, href, real)
|
|
698
|
+
else
|
|
699
|
+
"})"
|
|
698
700
|
end
|
|
699
701
|
end
|
|
700
702
|
|
|
@@ -730,7 +732,9 @@ module Clacky
|
|
|
730
732
|
end
|
|
731
733
|
end
|
|
732
734
|
|
|
733
|
-
# Rewrite
|
|
735
|
+
# Rewrite media markdown links [text](file:///path) into inline images or
|
|
736
|
+
# players so the result shows up in the chat whether the model wrote
|
|
737
|
+
# ![...] or [...].
|
|
734
738
|
content = content.gsub(/(?<!!)\[([^\]]*)\]\(((?:file:\/\/)?(?:~\/|\/)[^)]+)\)/) do |_match|
|
|
735
739
|
text = Regexp.last_match(1)
|
|
736
740
|
href = Regexp.last_match(2)
|
|
@@ -738,12 +742,12 @@ module Clacky
|
|
|
738
742
|
real = Clacky::Utils::EnvironmentDetector.resolve_local_path(href)
|
|
739
743
|
|
|
740
744
|
ext = File.extname(real).downcase
|
|
741
|
-
if
|
|
742
|
-
|
|
743
|
-
|
|
744
|
-
|
|
745
|
-
|
|
746
|
-
|
|
745
|
+
if !File.exist?(real)
|
|
746
|
+
_match
|
|
747
|
+
elsif LOCAL_IMAGE_EXTENSIONS.include?(ext)
|
|
748
|
+
"})"
|
|
749
|
+
elsif LOCAL_VIDEO_EXTENSIONS.include?(ext) || LOCAL_AUDIO_EXTENSIONS.include?(ext)
|
|
750
|
+
local_media_player(text, href, real)
|
|
747
751
|
else
|
|
748
752
|
_match
|
|
749
753
|
end
|
|
@@ -752,6 +756,12 @@ module Clacky
|
|
|
752
756
|
content
|
|
753
757
|
end
|
|
754
758
|
|
|
759
|
+
def self.local_media_player(label, href, path)
|
|
760
|
+
tag = LOCAL_VIDEO_EXTENSIONS.include?(File.extname(path).downcase) ? "video" : "audio"
|
|
761
|
+
label = CGI.escapeHTML(label.to_s)
|
|
762
|
+
%(<#{tag} controls preload="metadata" src="#{local_image_proxy_url(href, path)}" title="#{label}" aria-label="#{label}"></#{tag}>)
|
|
763
|
+
end
|
|
764
|
+
|
|
755
765
|
# Build a proxy URL for a local media file, appending a version param
|
|
756
766
|
# derived from the file mtime so an overwritten same-name file produces a
|
|
757
767
|
# different URL and defeats the browser's in-memory image cache.
|
data/lib/clacky/version.rb
CHANGED