samagotchi 0.120.0 → 0.121.1
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 +116 -1
- data/bin/chi +3 -2
- data/docs/architecture.md +36 -11
- data/docs/bundle-authoring.md +2 -1
- data/docs/cli.md +10 -4
- data/docs/configuration.md +34 -11
- data/docs/guardrails.md +48 -19
- data/docs/internals/anthropic.md +1 -1
- data/docs/internals/background-tasks.md +1 -1
- data/docs/internals/participants.md +6 -2
- data/docs/internals/prompt-caching.md +7 -6
- data/docs/internals/remote-sessions.md +15 -11
- data/docs/internals/web-push.md +22 -11
- data/docs/plugins.md +28 -8
- data/docs/sessions.md +15 -0
- data/docs/testing.md +44 -2
- data/lib/samagotchi/answer_command.rb +1 -1
- data/lib/samagotchi/bridge.rb +8 -8
- data/lib/samagotchi/bridge_client/event_stream.rb +11 -27
- data/lib/samagotchi/bridge_client/stream_open.rb +79 -0
- data/lib/samagotchi/bridge_client/stream_request.rb +8 -2
- data/lib/samagotchi/bridge_client.rb +52 -65
- data/lib/samagotchi/bridge_secret.rb +9 -7
- data/lib/samagotchi/bundle_command/check.rb +27 -2
- data/lib/samagotchi/bundles/claude-peer/manifest.yml +2 -2
- data/lib/samagotchi/bundles/claude-peer/scripts/pair +21 -7
- data/lib/samagotchi/bundles/codex-peer/manifest.yml +2 -2
- data/lib/samagotchi/bundles/codex-peer/scripts/pair +14 -3
- data/lib/samagotchi/bundles/dev/manifest.yml +2 -2
- data/lib/samagotchi/bundles/github-pr/manifest.yml +2 -2
- data/lib/samagotchi/bundles/github-pr/plugin.rb +2 -6
- data/lib/samagotchi/bundles/mcp/manifest.yml +3 -3
- data/lib/samagotchi/bundles/mcp/plugin.rb +5 -1
- data/lib/samagotchi/bundles/system/manifest.yml +1 -1
- data/lib/samagotchi/child_move.rb +5 -7
- data/lib/samagotchi/children_status.rb +2 -1
- data/lib/samagotchi/engine.rb +1 -0
- data/lib/samagotchi/guardrail_wiring.rb +19 -2
- data/lib/samagotchi/guardrails/parent_approvals.rb +9 -0
- data/lib/samagotchi/guardrails_command.rb +41 -6
- data/lib/samagotchi/image_store.rb +6 -3
- data/lib/samagotchi/interrupted_turn.rb +6 -3
- data/lib/samagotchi/kernel_loop.rb +5 -0
- data/lib/samagotchi/live_versions.rb +6 -7
- data/lib/samagotchi/memory_bundle/profile.rb +1 -1
- data/lib/samagotchi/memory_bundle/uninstaller.rb +6 -2
- data/lib/samagotchi/plugin/api.rb +14 -8
- data/lib/samagotchi/plugin/sessions.rb +13 -4
- data/lib/samagotchi/push_command.rb +1 -1
- data/lib/samagotchi/relay_verifier.rb +2 -3
- data/lib/samagotchi/relay_watcher.rb +2 -2
- data/lib/samagotchi/remote_attach_command.rb +1 -1
- data/lib/samagotchi/reply_wait/poll.rb +8 -2
- data/lib/samagotchi/reply_wait.rb +4 -3
- data/lib/samagotchi/review_command.rb +1 -1
- data/lib/samagotchi/run_options.rb +1 -0
- data/lib/samagotchi/session.rb +4 -0
- data/lib/samagotchi/session_access/local.rb +18 -8
- data/lib/samagotchi/session_access/remote.rb +5 -0
- data/lib/samagotchi/session_access/web_bridge_client.rb +31 -19
- data/lib/samagotchi/session_access.rb +21 -9
- data/lib/samagotchi/session_continue.rb +2 -3
- data/lib/samagotchi/session_manager.rb +118 -28
- data/lib/samagotchi/sessions_command.rb +10 -5
- data/lib/samagotchi/system_one/client.rb +6 -1
- data/lib/samagotchi/system_one/fake_backend.rb +0 -2
- data/lib/samagotchi/system_one/log.rb +21 -6
- data/lib/samagotchi/system_one/self_protect.rb +39 -43
- data/lib/samagotchi/terminal_ui/attach_launcher.rb +8 -3
- data/lib/samagotchi/terminal_ui/attached_loop.rb +4 -2
- data/lib/samagotchi/terminal_ui/local_link.rb +28 -19
- data/lib/samagotchi/terminal_ui/question_slot.rb +19 -8
- data/lib/samagotchi/tool_declarations.rb +1 -1
- data/lib/samagotchi/tool_runner.rb +37 -1
- data/lib/samagotchi/toolkit.rb +117 -27
- data/lib/samagotchi/toolkit_binding.rb +32 -0
- data/lib/samagotchi/toolkit_command.rb +23 -0
- data/lib/samagotchi/tools/deferred_tools.rb +10 -2
- data/lib/samagotchi/tools/delegate.rb +1 -1
- data/lib/samagotchi/tools/delegate_relay.rb +9 -7
- data/lib/samagotchi/tools/registry.rb +20 -6
- data/lib/samagotchi/tools/tool_index.rb +103 -20
- data/lib/samagotchi/turn_checkpoint.rb +15 -9
- data/lib/samagotchi/version.rb +1 -1
- data/lib/samagotchi/web/app.rb +123 -65
- data/lib/samagotchi/web/participant_access.rb +26 -7
- data/lib/samagotchi/web/participant_review.rb +11 -6
- data/lib/samagotchi/web/participant_view.rb +7 -3
- data/lib/samagotchi/web/participants_admin.rb +13 -0
- data/lib/samagotchi/web/public/app.js +1 -1
- data/lib/samagotchi/web/public/forms.css +12 -0
- data/lib/samagotchi/web/public/index.html +7 -5
- data/lib/samagotchi/web/public/level_chip.js +2 -2
- data/lib/samagotchi/web/public/llm_context_chip.js +4 -4
- data/lib/samagotchi/web/public/notifications.js +21 -1
- data/lib/samagotchi/web/public/participant.html +4 -2
- data/lib/samagotchi/web/public/participant.js +34 -11
- data/lib/samagotchi/web/public/participants_panel.js +49 -14
- data/lib/samagotchi/web/public/push.js +4 -3
- data/lib/samagotchi/web/public/push_devices.js +17 -3
- data/lib/samagotchi/web/public/question_card.js +15 -1
- data/lib/samagotchi/web/public/question_cards.js +11 -2
- data/lib/samagotchi/web/public/review_history.js +24 -4
- data/lib/samagotchi/web/public/review_start.js +1 -3
- data/lib/samagotchi/web/public/session_actions.js +14 -2
- data/lib/samagotchi/web/public/storage.js +16 -0
- data/lib/samagotchi/web/public/toolkit_chip.js +3 -0
- data/lib/samagotchi/web/push/client.rb +5 -0
- data/lib/samagotchi/web/push/store.rb +16 -3
- data/lib/samagotchi/web/push_routes.rb +3 -2
- data/lib/samagotchi/web/session_access_routes.rb +25 -17
- data/lib/samagotchi/web/session_create.rb +4 -4
- data/lib/samagotchi/web/session_hub.rb +6 -4
- data/lib/samagotchi/web/session_summary.rb +8 -16
- data/lib/samagotchi/web/tunnel.rb +10 -1
- data/lib/samagotchi/worker.rb +1 -1
- data/lib/samagotchi/worker_link.rb +213 -0
- data/lib/samagotchi/worker_sidecar.rb +15 -37
- metadata +4 -1
|
@@ -6,6 +6,7 @@ require_relative "../session_access"
|
|
|
6
6
|
require_relative "../bridge_client"
|
|
7
7
|
require_relative "../delivery"
|
|
8
8
|
require_relative "../log"
|
|
9
|
+
require_relative "../worker_link"
|
|
9
10
|
require_relative "http_transport"
|
|
10
11
|
|
|
11
12
|
module Samagotchi
|
|
@@ -39,9 +40,6 @@ module Samagotchi
|
|
|
39
40
|
# A read a join waits on (a turn's saved records, the children
|
|
40
41
|
# counts): a slow chi web can't hold the join up for long (L9).
|
|
41
42
|
JOIN_READ_TIMEOUT = 5
|
|
42
|
-
# chi web answers no live worker for the session (Mapping).
|
|
43
|
-
NO_WORKER = "no live worker for session %s on %s"
|
|
44
|
-
|
|
45
43
|
# chi web's answers as the session's Bridge would have given them.
|
|
46
44
|
module Mapping
|
|
47
45
|
module_function
|
|
@@ -60,7 +58,7 @@ module Samagotchi
|
|
|
60
58
|
def response(route, reply, session_id:, remote:)
|
|
61
59
|
json = reply.json.is_a?(Hash) ? reply.json : {}
|
|
62
60
|
case [reply.status, json["error"]]
|
|
63
|
-
in [503, "not_live"] | [404, "not_found"] then raise Unreachable,
|
|
61
|
+
in [503, "not_live"] | [404, "not_found"] then raise Unreachable, "#{WorkerLink.not_live(session_id)} on #{remote}"
|
|
64
62
|
in [504, _] then bridge(408, error: "deadline_passed", detail: json["detail"])
|
|
65
63
|
in [501, _] if route == :command && json["command"]
|
|
66
64
|
bridge(400, error: "unknown_command", detail: json["detail"], command: json["command"])
|
|
@@ -69,6 +67,8 @@ module Samagotchi
|
|
|
69
67
|
end
|
|
70
68
|
end
|
|
71
69
|
|
|
70
|
+
def stream(sock, status, headers) = BridgeClient::StreamOpen.classify(sock, status, headers)
|
|
71
|
+
|
|
72
72
|
def bridge(status, **body) = BridgeClient::Response.new(status: status, body: JSON.generate(body.compact))
|
|
73
73
|
end
|
|
74
74
|
|
|
@@ -198,24 +198,35 @@ module Samagotchi
|
|
|
198
198
|
idle_timeout: STREAM_IDLE_TIMEOUT, &on_event).start
|
|
199
199
|
end
|
|
200
200
|
|
|
201
|
-
# GET /api/sessions/:id/stream through StreamRequest,
|
|
202
|
-
#
|
|
203
|
-
#
|
|
204
|
-
#
|
|
205
|
-
#
|
|
206
|
-
|
|
201
|
+
# GET /api/sessions/:id/stream through StreamRequest, classifying chi
|
|
202
|
+
# web's stream answers as Bridge outcomes.
|
|
203
|
+
# @param header_timeout [Float] see BridgeClient::STREAM_HEADER_TIMEOUT
|
|
204
|
+
# @yield [sock] called after response headers arrive, before classifying a
|
|
205
|
+
# refusal; EventStream uses it to publish the socket for #close
|
|
206
|
+
# @return [BridgeClient::StreamOpen::Opened, BridgeClient::StreamOpen::Refused,
|
|
207
|
+
# BridgeClient::StreamOpen::Unreachable]
|
|
208
|
+
def open_stream(query: "", last_event_id: nil, header_timeout: BridgeClient::STREAM_HEADER_TIMEOUT, attempts: 1)
|
|
207
209
|
uri = URI(@remote.entry.url)
|
|
208
210
|
return refused("tls_unsupported") if uri.scheme == "https"
|
|
209
211
|
|
|
210
212
|
token = @remote.entry.token
|
|
211
|
-
|
|
212
|
-
|
|
213
|
-
|
|
214
|
-
|
|
215
|
-
return
|
|
213
|
+
connection = BridgeClient::StreamRequest.open(host: uri.hostname, port: uri.port,
|
|
214
|
+
path: "/api/sessions/#{@session_id}/stream#{query}",
|
|
215
|
+
last_event_id: last_event_id, timeout: header_timeout,
|
|
216
|
+
headers: token ? { "Authorization" => "Bearer #{token}" } : {})
|
|
217
|
+
return BridgeClient::StreamOpen::Unreachable.new(attempts: 1) unless connection
|
|
218
|
+
|
|
219
|
+
sock, status, headers = connection
|
|
220
|
+
unless !block_given? || yield(sock)
|
|
221
|
+
sock.close rescue nil
|
|
222
|
+
return BridgeClient::StreamOpen::Unreachable.new(attempts: 1)
|
|
223
|
+
end
|
|
224
|
+
return refused("chunked_unsupported", sock) if headers["transfer-encoding"].to_s.downcase.include?("chunked")
|
|
216
225
|
|
|
217
|
-
|
|
218
|
-
|
|
226
|
+
Mapping.stream(sock, status, headers)
|
|
227
|
+
rescue SystemCallError, SocketError, IOError
|
|
228
|
+
sock&.close rescue nil
|
|
229
|
+
BridgeClient::StreamOpen::Unreachable.new(attempts: 1)
|
|
219
230
|
end
|
|
220
231
|
|
|
221
232
|
private
|
|
@@ -234,9 +245,10 @@ module Samagotchi
|
|
|
234
245
|
raise Unreachable, e.message
|
|
235
246
|
end
|
|
236
247
|
|
|
237
|
-
def refused(reason)
|
|
248
|
+
def refused(reason, sock = nil)
|
|
249
|
+
sock&.close rescue nil
|
|
238
250
|
Log.warn(:attached, "stream_refused", reason: reason, remote: @remote.name)
|
|
239
|
-
|
|
251
|
+
BridgeClient::StreamOpen::Unreachable.new(attempts: 1)
|
|
240
252
|
end
|
|
241
253
|
end
|
|
242
254
|
end
|
|
@@ -179,15 +179,27 @@ module Samagotchi
|
|
|
179
179
|
end
|
|
180
180
|
|
|
181
181
|
# A session's worker as an attach finds it (Local#worker, chi web's GET
|
|
182
|
-
# …/worker): +
|
|
183
|
-
#
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
#
|
|
190
|
-
def
|
|
182
|
+
# …/worker): +link+ the one WorkerLink outcome every field reads, +stopped+
|
|
183
|
+
# its stop marker.
|
|
184
|
+
WorkerState = Data.define(:link, :stopped) do
|
|
185
|
+
# @return [WorkerSidecar, nil] the live worker's (port, version,
|
|
186
|
+
# features, epoch; nil: none answers)
|
|
187
|
+
def sidecar = link.live? ? link.sidecar : nil
|
|
188
|
+
|
|
189
|
+
# @return [OwnerLock::Owner, nil] a worker, a chi REPL, nil
|
|
190
|
+
def owner = link.owner
|
|
191
|
+
|
|
192
|
+
def live? = link.live?
|
|
193
|
+
|
|
194
|
+
# The owner is a worker leaving (writing its recap on leave): a wake
|
|
195
|
+
# waits for it (Local#wake).
|
|
196
|
+
def leaving? = link.is_a?(WorkerLink::Leaving)
|
|
197
|
+
|
|
198
|
+
# A worker holds the lock past WorkerLink::START_LIMIT with no Bridge.
|
|
199
|
+
def stuck? = link.is_a?(WorkerLink::Starting) && link.stuck
|
|
200
|
+
|
|
201
|
+
# A worker whose sidecar speaks a newer protocol than this chi.
|
|
202
|
+
def skew? = link.is_a?(WorkerLink::Skew)
|
|
191
203
|
end
|
|
192
204
|
|
|
193
205
|
# What a wake for an attach did (Local#wake, chi web's POST …/wake):
|
|
@@ -9,6 +9,7 @@ require_relative "child_move"
|
|
|
9
9
|
require_relative "archive_store"
|
|
10
10
|
require_relative "recap_store"
|
|
11
11
|
require_relative "bridge_client"
|
|
12
|
+
require_relative "worker_link"
|
|
12
13
|
require_relative "model_profile"
|
|
13
14
|
require_relative "log"
|
|
14
15
|
require_relative "session_manager"
|
|
@@ -303,10 +304,8 @@ module Samagotchi
|
|
|
303
304
|
# answers at once. Best effort: the continue goes on without. A review
|
|
304
305
|
# fork (ReviewStart) asks the same, with nothing archived after.
|
|
305
306
|
def self.recap_before_archive(id, state_dir, wait:)
|
|
306
|
-
return unless SessionManager.worker_live?(id, state_dir: state_dir)
|
|
307
|
-
|
|
308
307
|
dir = Session.session_dir(id, state_dir: state_dir)
|
|
309
|
-
client =
|
|
308
|
+
client = WorkerLink.client(id, session_dir: dir) or return
|
|
310
309
|
before = RecapStore.read(dir)
|
|
311
310
|
reply = client.request_recap
|
|
312
311
|
asked = reply.status == 200 && reply.json.is_a?(Hash) ? reply.json["request"] : nil
|
|
@@ -25,6 +25,7 @@ require_relative "turn_note"
|
|
|
25
25
|
require_relative "owner_lock"
|
|
26
26
|
require_relative "bridge_client"
|
|
27
27
|
require_relative "worker_sidecar"
|
|
28
|
+
require_relative "worker_link"
|
|
28
29
|
require_relative "worker_signals"
|
|
29
30
|
require_relative "log"
|
|
30
31
|
require_relative "log_path"
|
|
@@ -40,6 +41,7 @@ require_relative "plugin_session_state"
|
|
|
40
41
|
require_relative "context_sources"
|
|
41
42
|
require_relative "session_chain"
|
|
42
43
|
require_relative "child_move"
|
|
44
|
+
require_relative "tools/task_runtime"
|
|
43
45
|
|
|
44
46
|
module Samagotchi
|
|
45
47
|
# SessionManager coordinates background session processes.
|
|
@@ -587,7 +589,7 @@ module Samagotchi
|
|
|
587
589
|
|
|
588
590
|
# How long after a spawn a resume trusts that worker to take the
|
|
589
591
|
# session, while it runs (and the session wasn't stopped since).
|
|
590
|
-
WORKER_START_GRACE =
|
|
592
|
+
WORKER_START_GRACE = WorkerLink::START_LIMIT
|
|
591
593
|
|
|
592
594
|
@spawns = {}
|
|
593
595
|
@spawns_mutex = Mutex.new
|
|
@@ -626,15 +628,17 @@ module Samagotchi
|
|
|
626
628
|
# the next prompt starts one on the newest chi anyway), :unsupported (a
|
|
627
629
|
# worker from before restarts, running +version+: stop it instead), a
|
|
628
630
|
# WorkerIdleExit#hold_for_restart hold (:turn_running, :reminders, ...),
|
|
629
|
-
#
|
|
631
|
+
# :fallback_held (disk-visible work blocks an unresponsive-worker restart),
|
|
632
|
+
# or :failed (the worker answered something else or didn't release).
|
|
630
633
|
class RestartRefused < StandardError
|
|
631
|
-
attr_reader :session_id, :reason, :version
|
|
634
|
+
attr_reader :session_id, :reason, :version, :holds
|
|
632
635
|
|
|
633
|
-
def initialize(session_id, reason, version: nil)
|
|
636
|
+
def initialize(session_id, reason, version: nil, holds: [])
|
|
634
637
|
@session_id = session_id
|
|
635
638
|
@reason = reason.to_sym
|
|
636
639
|
@version = version
|
|
637
|
-
|
|
640
|
+
@holds = Array(holds).map(&:to_sym).freeze
|
|
641
|
+
super(RestartRefused.words(session_id, @reason, version, @holds))
|
|
638
642
|
end
|
|
639
643
|
|
|
640
644
|
HOLDS = {
|
|
@@ -650,13 +654,17 @@ module Samagotchi
|
|
|
650
654
|
}.freeze
|
|
651
655
|
|
|
652
656
|
# What the CLI and the web say.
|
|
653
|
-
def self.words(session_id, reason, version = nil)
|
|
657
|
+
def self.words(session_id, reason, version = nil, holds = [])
|
|
654
658
|
case reason
|
|
655
659
|
when :not_running
|
|
656
660
|
"session #{session_id} has no running worker; the next prompt starts one on the newest chi"
|
|
657
661
|
when :unsupported
|
|
658
662
|
"session #{session_id}'s worker runs chi #{version || "(older)"}, which can't restart: " \
|
|
659
663
|
"chi sessions stop #{session_id}, then any prompt starts it on the newest chi"
|
|
664
|
+
when :fallback_held
|
|
665
|
+
why = holds.map { |hold| HOLDS.fetch(hold, hold.to_s.tr("_", " ")) }.join("; ")
|
|
666
|
+
"session #{session_id} has disk-visible work that a restart might lose#{": #{why}" unless why.empty?}; " \
|
|
667
|
+
"run `chi sessions stop #{session_id}`, then any prompt starts it on the newest chi"
|
|
660
668
|
when :failed then "session #{session_id}'s worker didn't take the restart"
|
|
661
669
|
else "not now: #{HOLDS.fetch(reason, reason.to_s.tr("_", " "))}"
|
|
662
670
|
end
|
|
@@ -668,12 +676,14 @@ module Samagotchi
|
|
|
668
676
|
Restarted = Struct.new(:session_id, :from_version, :version, keyword_init: true)
|
|
669
677
|
|
|
670
678
|
RESTART_WAIT = 10.0
|
|
679
|
+
# A TERMed worker writes its recap on leave (an LLM call) while it still
|
|
680
|
+
# holds the lock: STOP_WAIT plus the recap's own wait (SessionContinue::RECAP_WAIT).
|
|
681
|
+
FALLBACK_STOP_WAIT = 40
|
|
671
682
|
|
|
672
683
|
# Hand a session to a new worker on the newest chi installed: ask its
|
|
673
684
|
# worker (POST /exit restart: true), which leaves only when nothing would
|
|
674
|
-
# be lost and starts its successor
|
|
675
|
-
#
|
|
676
|
-
# terminals reconnect to it.
|
|
685
|
+
# be lost and starts its successor. If the worker cannot be asked, stop
|
|
686
|
+
# it without a stop marker and resume only when disk shows no work to lose.
|
|
677
687
|
# @return [Restarted]
|
|
678
688
|
# @raise [OwnedByTUI] a chi REPL owns the session
|
|
679
689
|
# @raise [RestartRefused]
|
|
@@ -683,23 +693,109 @@ module Samagotchi
|
|
|
683
693
|
Session.load(session_id, state_dir: sd) # ArgumentError for none
|
|
684
694
|
owner = refuse_tui!(session_id, state_dir: sd)
|
|
685
695
|
dir = Session.session_dir(session_id, state_dir: sd)
|
|
686
|
-
|
|
687
|
-
|
|
696
|
+
link = WorkerLink.resolve(dir, unlink: false, owner: owner)
|
|
697
|
+
if link.is_a?(WorkerLink::Skew)
|
|
698
|
+
return restart_fallback(session_id, owner: owner, sidecar: link.sidecar, state_dir: sd, wait: wait, why: :skew)
|
|
699
|
+
end
|
|
700
|
+
|
|
701
|
+
if link.is_a?(WorkerLink::Starting)
|
|
702
|
+
return restart_fallback(session_id, owner: owner, sidecar: nil, state_dir: sd, wait: wait, why: :starting_stuck) if link.stuck
|
|
703
|
+
|
|
704
|
+
raise RestartRefused.new(session_id, :starting)
|
|
705
|
+
end
|
|
706
|
+
raise RestartRefused.new(session_id, :not_running) unless link.live?
|
|
707
|
+
|
|
708
|
+
sidecar = link.sidecar
|
|
688
709
|
unless sidecar.features.include?("restart")
|
|
689
710
|
raise RestartRefused.new(session_id, :unsupported, version: sidecar.version)
|
|
690
711
|
end
|
|
691
712
|
|
|
692
|
-
|
|
713
|
+
begin
|
|
714
|
+
reply = BridgeClient.for_sidecar(session_id, sidecar).request_exit(client_id: client_id, restart: true)
|
|
715
|
+
rescue SystemCallError, IOError => e
|
|
716
|
+
return restart_fallback(session_id, owner: owner, sidecar: sidecar, state_dir: sd, wait: wait, why: :unreachable,
|
|
717
|
+
error: e)
|
|
718
|
+
end
|
|
693
719
|
raise RestartRefused.new(session_id, reply.json&.fetch("reason", nil) || :failed) if reply.status == 409
|
|
720
|
+
if reply.secret_refused?
|
|
721
|
+
return restart_fallback(session_id, owner: owner, sidecar: sidecar, state_dir: sd, wait: wait, why: :bridge_secret)
|
|
722
|
+
end
|
|
694
723
|
raise RestartRefused.new(session_id, :failed) unless reply.status == 200
|
|
695
724
|
|
|
696
725
|
Log.info(:worker, "restart", sid: session_id, from: sidecar.version, by: client_id)
|
|
697
|
-
fresh =
|
|
698
|
-
|
|
699
|
-
|
|
726
|
+
fresh = WorkerLink.await(session_id, session_dir: dir, timeout: wait, unlink: false, interval: 0.1,
|
|
727
|
+
until: ->(live) { live.epoch != sidecar.epoch || live.started_at != sidecar.started_at })
|
|
728
|
+
# Timed out: the last outcome, the old worker's Live too, is no successor.
|
|
729
|
+
changed = fresh.live? && (fresh.epoch != sidecar.epoch || fresh.started_at != sidecar.started_at)
|
|
730
|
+
version = fresh.version if changed
|
|
731
|
+
Restarted.new(session_id: session_id, from_version: sidecar.version, version: version)
|
|
732
|
+
end
|
|
733
|
+
|
|
734
|
+
def self.restart_fallback(session_id, owner:, sidecar:, state_dir:, wait:, why:, error: nil)
|
|
735
|
+
Log.info(:worker, "restart_fallback", sid: session_id, why: why, error: error&.class&.name, msg: error&.message)
|
|
736
|
+
dir = Session.session_dir(session_id, state_dir: state_dir)
|
|
737
|
+
session = Session.load(session_id, state_dir: state_dir)
|
|
738
|
+
holds = restart_fallback_holds(session, dir)
|
|
739
|
+
raise RestartRefused.new(session_id, :fallback_held, holds: holds) unless holds.empty?
|
|
740
|
+
raise RestartRefused.new(session_id, :failed, version: sidecar&.version) unless (owner&.pid || 0).to_i.positive?
|
|
741
|
+
|
|
742
|
+
# The ask may have taken READ_TIMEOUT: TERM only the owner read at the
|
|
743
|
+
# start; a successor that took the lock meanwhile is awaited, not killed.
|
|
744
|
+
current = session_owner(session_id, state_dir: state_dir)
|
|
745
|
+
if current.nil?
|
|
746
|
+
resume_session(session_id, state_dir: state_dir)
|
|
747
|
+
elsif current.pid == owner.pid && current.started_at == owner.started_at
|
|
748
|
+
begin
|
|
749
|
+
Process.kill("TERM", owner.pid)
|
|
750
|
+
rescue Errno::ESRCH
|
|
751
|
+
nil
|
|
752
|
+
rescue SystemCallError => e
|
|
753
|
+
Log.warn(:worker, "restart_fallback_failed", sid: session_id, why: why, error: e.class.name, msg: e.message)
|
|
754
|
+
raise RestartRefused.new(session_id, :failed, version: sidecar&.version)
|
|
755
|
+
end
|
|
756
|
+
unless wait_for_owner_release(session_id, timeout: FALLBACK_STOP_WAIT, state_dir: state_dir)
|
|
757
|
+
raise RestartRefused.new(session_id, :failed, version: sidecar&.version)
|
|
758
|
+
end
|
|
759
|
+
|
|
760
|
+
resume_session(session_id, state_dir: state_dir)
|
|
761
|
+
end
|
|
762
|
+
previous_epoch = sidecar&.epoch
|
|
763
|
+
previous_started_at = sidecar&.started_at
|
|
764
|
+
fresh = WorkerLink.await(session_id, session_dir: dir, timeout: wait, unlink: false, interval: 0.1,
|
|
765
|
+
until: ->(live) { live.epoch != previous_epoch || live.started_at != previous_started_at })
|
|
766
|
+
changed = fresh.live? && (fresh.epoch != previous_epoch || fresh.started_at != previous_started_at)
|
|
767
|
+
Restarted.new(session_id: session_id, from_version: sidecar&.version, version: (fresh.version if changed))
|
|
768
|
+
end
|
|
769
|
+
private_class_method :restart_fallback
|
|
770
|
+
|
|
771
|
+
def self.restart_fallback_holds(session, session_dir)
|
|
772
|
+
holds = []
|
|
773
|
+
holds << :turn_running if session.status == Session::STATUS_RUNNING
|
|
774
|
+
holds << :question_pending if session.pending_question
|
|
775
|
+
holds << :input_queued unless SessionInbox.find_new_input_files(session_dir).empty?
|
|
776
|
+
holds << :background_tasks if running_created_task?(session)
|
|
777
|
+
holds
|
|
778
|
+
end
|
|
779
|
+
private_class_method :restart_fallback_holds
|
|
780
|
+
|
|
781
|
+
def self.running_created_task?(session)
|
|
782
|
+
root = session.working_directory.to_s
|
|
783
|
+
return false if root.empty?
|
|
784
|
+
|
|
785
|
+
Tools::TaskRuntime.created_ids_in(session.messages).any? do |id|
|
|
786
|
+
next false unless Tools::TaskRuntime::TASK_ID.match?(id)
|
|
787
|
+
|
|
788
|
+
path = File.join(root, Tools::TaskRuntime::TASKS_DIR, id, Tools::TaskRuntime::METADATA_FILENAME)
|
|
789
|
+
next false unless File.file?(path)
|
|
790
|
+
|
|
791
|
+
Tools::TaskRecord.from_file(JSON.parse(File.read(path)))&.running?
|
|
792
|
+
rescue JSON::ParserError, SystemCallError => e
|
|
793
|
+
Log.warn(:worker, "restart_task_check_failed", sid: session.id, task_id: id,
|
|
794
|
+
error: e.class.name, msg: e.message)
|
|
795
|
+
true
|
|
700
796
|
end
|
|
701
|
-
Restarted.new(session_id: session_id, from_version: sidecar.version, version: fresh&.version)
|
|
702
797
|
end
|
|
798
|
+
private_class_method :running_created_task?
|
|
703
799
|
|
|
704
800
|
# Stop a session by sending TERM to its process.
|
|
705
801
|
# With +wait+ (seconds), also wait for the owner to let go of the session,
|
|
@@ -741,7 +837,7 @@ module Samagotchi
|
|
|
741
837
|
private_class_method def self.cancel_running_turn(session_id, state_dir:)
|
|
742
838
|
return unless Session.load(session_id, state_dir: state_dir).status == Session::STATUS_RUNNING
|
|
743
839
|
|
|
744
|
-
client =
|
|
840
|
+
client = WorkerLink.client(session_id, session_dir: Session.session_dir(session_id, state_dir: state_dir))
|
|
745
841
|
return unless client && client.cancel(reason: STOP_CANCEL_REASON).status == 202
|
|
746
842
|
|
|
747
843
|
BridgeClient.poll(STOP_CANCEL_WAIT) do
|
|
@@ -757,7 +853,7 @@ module Samagotchi
|
|
|
757
853
|
# session keeps. "pid" is the pid file workers wrote until 2026-10-01:
|
|
758
854
|
# nothing writes or reads it now, but a folder from before still has one
|
|
759
855
|
# and is still empty.
|
|
760
|
-
EMPTY_SKELETON_FILES = ["pid", "owner.lock",
|
|
856
|
+
EMPTY_SKELETON_FILES = ["pid", "owner.lock", WorkerLink::FILE, AnalyticsFile::NAME].freeze
|
|
761
857
|
EMPTY_DIRS = [SessionInbox::INPUT_DIR, SessionInbox::NOTES_DIR, "images"].freeze
|
|
762
858
|
EMPTY_SKELETON_DIRS = (EMPTY_DIRS + [SessionInbox::OUTPUT_DIR]).freeze
|
|
763
859
|
|
|
@@ -1252,7 +1348,10 @@ module Samagotchi
|
|
|
1252
1348
|
def self.deliver_turn(session_id, prompt:, client_id: nil, images: [], delivery: nil, no_interrupt: false,
|
|
1253
1349
|
author: nil, pending_limit: nil, state_dir: nil, manager: self, bridge: nil)
|
|
1254
1350
|
session_dir = Session.session_dir(session_id, state_dir: state_dir || Session.default_state_dir)
|
|
1255
|
-
bridge ||=
|
|
1351
|
+
bridge ||= lambda do
|
|
1352
|
+
link = WorkerLink.await(session_id, session_dir: session_dir, timeout: TURN_BRIDGE_WAIT)
|
|
1353
|
+
link.live? ? link.client(session_id) : nil
|
|
1354
|
+
end
|
|
1256
1355
|
manager.resume_session(session_id, state_dir: state_dir)
|
|
1257
1356
|
if (client = bridge.call)
|
|
1258
1357
|
# A worker from before queueing (no "delivery" feature) ignores the
|
|
@@ -1404,15 +1503,6 @@ module Samagotchi
|
|
|
1404
1503
|
OwnerLock.owner(Session.session_dir(session_id, state_dir: state_dir || Session.default_state_dir))
|
|
1405
1504
|
end
|
|
1406
1505
|
|
|
1407
|
-
# A worker owns the session now: the one rule for whether a saved
|
|
1408
|
-
# pending question waits for anyone (Session#waiting_question's live:).
|
|
1409
|
-
# A chi REPL's question is its own (nothing else can answer it), and one
|
|
1410
|
-
# a dead worker saved waits for no one.
|
|
1411
|
-
# @return [Boolean]
|
|
1412
|
-
def self.worker_live?(session_id, state_dir: nil)
|
|
1413
|
-
!!session_owner(session_id, state_dir: state_dir)&.worker?
|
|
1414
|
-
end
|
|
1415
|
-
|
|
1416
1506
|
# The session's owner (#session_owner), unless it is the interactive
|
|
1417
1507
|
# TUI, which nothing else may resume, stop or delete.
|
|
1418
1508
|
# @return [OwnerLock::Owner, nil]
|
|
@@ -10,7 +10,7 @@ require_relative "session_metrics"
|
|
|
10
10
|
require_relative "recap_store"
|
|
11
11
|
require_relative "session_delete_command"
|
|
12
12
|
require_relative "session_archive_command"
|
|
13
|
-
require_relative "
|
|
13
|
+
require_relative "worker_link"
|
|
14
14
|
require_relative "terminal_ui/formatting"
|
|
15
15
|
require_relative "terminal_ui/event_renderer"
|
|
16
16
|
require_relative "cli/command"
|
|
@@ -298,7 +298,7 @@ module Samagotchi
|
|
|
298
298
|
child = s.parent_id ? " ↳ #{s.parent_id[0, 8]}" : ""
|
|
299
299
|
child += " ↪ #{s.continues[0, 8]}" if s.continues
|
|
300
300
|
# A question waits for an answer (chi answer, the web, chi --attach).
|
|
301
|
-
live = s.pending_question &&
|
|
301
|
+
live = s.pending_question && worker_owned?(s.id, state_dir)
|
|
302
302
|
waiting = s.waiting_question(live: !!live)
|
|
303
303
|
status = if waiting&.dig(:relayed_to) then "waiting (in parent #{waiting[:relayed_to]})"
|
|
304
304
|
elsif waiting then "waiting"
|
|
@@ -371,7 +371,7 @@ module Samagotchi
|
|
|
371
371
|
# @return [Array(Hash, nil, Boolean, String, nil)]
|
|
372
372
|
def stats_snapshot_for(session)
|
|
373
373
|
dir = Samagotchi::Session.session_dir(session.id)
|
|
374
|
-
if (client = Samagotchi::
|
|
374
|
+
if (client = Samagotchi::WorkerLink.client(session.id, session_dir: dir, read_timeout: STATS_TIMEOUT))
|
|
375
375
|
body = client.get_json("stats")&.dig("metrics")
|
|
376
376
|
if body.is_a?(Hash)
|
|
377
377
|
return [TerminalUI::EventRenderer.deep_symbolize_keys(body), true, nil]
|
|
@@ -384,7 +384,12 @@ module Samagotchi
|
|
|
384
384
|
[snapshot, false, note]
|
|
385
385
|
end
|
|
386
386
|
|
|
387
|
-
def live_worker?(session_id) =
|
|
387
|
+
def live_worker?(session_id) = worker_owned?(session_id, nil)
|
|
388
|
+
|
|
389
|
+
def worker_owned?(session_id, state_dir)
|
|
390
|
+
dir = Samagotchi::Session.session_dir(session_id, state_dir: state_dir || Samagotchi::Session.default_state_dir)
|
|
391
|
+
Samagotchi::WorkerLink.resolve(dir, unlink: false).worker_owned?
|
|
392
|
+
end
|
|
388
393
|
|
|
389
394
|
def stop(ids)
|
|
390
395
|
return usage_error("give session ids") if ids.empty?
|
|
@@ -432,7 +437,7 @@ module Samagotchi
|
|
|
432
437
|
next false
|
|
433
438
|
rescue Samagotchi::SessionManager::RestartRefused => e
|
|
434
439
|
@stdout.flush
|
|
435
|
-
@stderr.puts %i[not_running unsupported].include?(e.reason) ? e.message : "session #{id}: #{e.message}"
|
|
440
|
+
@stderr.puts %i[not_running unsupported fallback_held failed].include?(e.reason) ? e.message : "session #{id}: #{e.message}"
|
|
436
441
|
next false
|
|
437
442
|
rescue ArgumentError => e
|
|
438
443
|
@stdout.flush
|
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
|
|
3
3
|
require_relative "../config"
|
|
4
4
|
require_relative "../log"
|
|
5
|
+
require_relative "../llm/errors"
|
|
5
6
|
require_relative "answer"
|
|
6
7
|
require_relative "errors"
|
|
7
8
|
require_relative "http_backend"
|
|
@@ -12,7 +13,9 @@ module Samagotchi
|
|
|
12
13
|
# The one way anything asks System 1 a question: #ask answers a set of
|
|
13
14
|
# questions about a state, or says nothing. A backend that is unreachable,
|
|
14
15
|
# slow, refusing or nonsensical is a nil — no judgment, one log line — and
|
|
15
|
-
# the caller asks the user as it would have anyway.
|
|
16
|
+
# the caller asks the user as it would have anyway. A turn cancelled
|
|
17
|
+
# while the judge is asked is not a failed judgment: its
|
|
18
|
+
# LLM::RequestCancelled goes on to the caller, which asks no one.
|
|
16
19
|
#
|
|
17
20
|
# client = SystemOne::Client.from_config(host_registry: registry)
|
|
18
21
|
# client&.ask(state: "git push origin main", questions: {"allow" => question})
|
|
@@ -61,6 +64,8 @@ module Samagotchi
|
|
|
61
64
|
|
|
62
65
|
answers = begin
|
|
63
66
|
@backend.ask(state: state, questions: questions, cancel_controller: cancel_controller)
|
|
67
|
+
rescue LLM::RequestCancelled
|
|
68
|
+
raise
|
|
64
69
|
rescue StandardError => e
|
|
65
70
|
return no_judgment("#{e.class}: #{e.message}", error: e.class.name)
|
|
66
71
|
end
|
|
@@ -47,20 +47,27 @@ module Samagotchi
|
|
|
47
47
|
|
|
48
48
|
# @param id [String] a judgment's id
|
|
49
49
|
# @param answer [String] one of ANSWERS
|
|
50
|
+
# @param question_id [String, nil] the question the user answered: a
|
|
51
|
+
# live judgment is written before its card exists, so its label
|
|
52
|
+
# carries the card's id (what `chi guardrails replay` skips by)
|
|
50
53
|
# @return [Boolean] whether the line was written
|
|
51
|
-
def label(id, answer)
|
|
54
|
+
def label(id, answer, question_id: nil)
|
|
52
55
|
return false if id.to_s.strip.empty?
|
|
53
56
|
|
|
54
|
-
|
|
57
|
+
line = { "kind" => "label", "id" => id.to_s, "at" => Time.now.utc.iso8601, "answer" => answer.to_s }
|
|
58
|
+
line["question_id"] = question_id.to_s unless question_id.to_s.empty?
|
|
59
|
+
append(line)
|
|
55
60
|
end
|
|
56
61
|
|
|
57
62
|
# The judgments, oldest first, each joined with its LAST label
|
|
58
|
-
# (answer: nil when it has none)
|
|
59
|
-
#
|
|
63
|
+
# (answer: nil when it has none) and the first question_id a label
|
|
64
|
+
# gave it, when the judgment line has none. Lines that don't parse are
|
|
65
|
+
# skipped; labels of a judgment that isn't there are dropped.
|
|
60
66
|
# @return [Array<Hash>]
|
|
61
67
|
def entries
|
|
62
68
|
judgments = {}
|
|
63
69
|
labels = {}
|
|
70
|
+
question_ids = {}
|
|
64
71
|
with_lock(File::LOCK_SH) do |file|
|
|
65
72
|
file.each_line do |line|
|
|
66
73
|
data = parse(line)
|
|
@@ -68,11 +75,19 @@ module Samagotchi
|
|
|
68
75
|
|
|
69
76
|
case data["kind"]
|
|
70
77
|
when "judgment" then judgments[data["id"]] = data
|
|
71
|
-
when "label"
|
|
78
|
+
when "label"
|
|
79
|
+
next unless data.key?("id")
|
|
80
|
+
|
|
81
|
+
labels[data["id"]] = data["answer"]
|
|
82
|
+
question_ids[data["id"]] ||= data["question_id"]
|
|
72
83
|
end
|
|
73
84
|
end
|
|
74
85
|
end
|
|
75
|
-
judgments.map
|
|
86
|
+
judgments.map do |id, judgment|
|
|
87
|
+
joined = judgment.merge("answer" => labels[id])
|
|
88
|
+
joined["question_id"] ||= question_ids[id] if question_ids[id]
|
|
89
|
+
joined
|
|
90
|
+
end
|
|
76
91
|
rescue StandardError => e
|
|
77
92
|
warn_about(e)
|
|
78
93
|
[]
|