samagotchi 0.50.0 → 0.52.0

data/lib/samagotchi/web/app.rb

@@ -10,6 +10,7 @@ require "rack"
 require "rack/request"
 
 require_relative "../client_id"
+require_relative "../delivery"
 require_relative "../answer_tail"
 require_relative "../bridge_client"
 require_relative "../bridge/bounded_queue"
@@ -23,6 +24,7 @@ require_relative "../host_registry"
 require_relative "../llm_context_override"
 require_relative "../model_catalog"
 require_relative "../model_profile"
+require_relative "../thinking"
 require_relative "../sampling_settings"
 require_relative "../served_model"
 require_relative "../project_scope"
@@ -476,6 +478,7 @@ module Samagotchi
           summary = SamplingSettings.summary(target, names: names, models: settings)
           model[:sampling] = summary if summary
           add_llm_context(model, target, names, settings)
+          add_thinking(model, target, names, settings)
         end
       rescue StandardError
         nil
@@ -489,6 +492,14 @@ module Samagotchi
         nil
       end
 
+      # The thinking level +model+ starts at, with where it came from (the
+      # start page's think chip; Thinking::Explained#summary, no session).
+      def add_thinking(model, target, names, settings)
+        model[:thinking] = Thinking.explain(target, names: names, models: settings).summary
+      rescue StandardError
+        nil
+      end
+
       # The served model a session's last generation reported (analytics.json,
       # SessionMetrics#persist), for a session no worker runs: shown only
       # while the name it answered is still the session's model, as
@@ -525,6 +536,19 @@ module Samagotchi
         LLMContextStrategy.for_session(session, registry: host_registry)
       end
 
+      # A session's thinking level with where it came from and its own
+      # (Thinking::Explained#summary), as its worker would resolve it; nil
+      # when it can't be. Config and the registry only: no network.
+      def thinking_for(session)
+        registry = host_registry
+        name = session.model_name.to_s.strip.empty? ? ModelProfile.required_model_name(nil) : session.model_name
+        target = registry.resolve(name)
+        names = registry.lookup_names(session.model_typed || name, resolved: name, target: target)
+        Thinking.explain(target, names: names, session: session.thinking).summary
+      rescue StandardError
+        nil
+      end
+
       # Built again when config.yml's hosts: changed (compared as read: the
       # YAML read is mtime-cached), so the model picker lists a host added
       # while chi web runs. An injected registry (specs) stays.
@@ -607,6 +631,11 @@ module Samagotchi
         llm_context, error = request_llm_context(body["llm_context"])
         return error if error
 
+        # thinking: the session's own thinking level (the start page's think
+        # chip; chi --thinking), checked the same way.
+        thinking, error = request_thinking(body["thinking"])
+        return error if error
+
         folder = dir ? { working_directory: dir } : {}
         # model: the model the session starts on (the start page's picker,
         # spelled as GET /api/models lists it); blank means the default.
@@ -617,7 +646,8 @@ module Samagotchi
         # until that turn is saved.
         preview = idle ? body["preview"].to_s.strip : ""
         folder[:title] = preview unless preview.empty?
-        folder[:llm_context] = llm_context if llm_context
+        setup = SessionSetup.new(llm_context: llm_context, thinking: thinking)
+        folder[:setup] = setup unless setup.empty?
         begin
           session = @manager.spawn_session(prompt: idle ? nil : prompt.to_s, state_dir: @state_dir, **folder)
         rescue ModelProfile::MissingModel => e
@@ -635,8 +665,8 @@ module Samagotchi
 
       # POST /api/sessions with continues: <id, prefix or last:id>: the next
       # link of that session's chain (SessionManager.continue_session), in its
-      # folder, on its model and with its llm_context, so dir, model and
-      # llm_context are refused beside it. 409 continued (with next_id, the
+      # folder, on its model and with its llm_context and thinking level, so
+      # dir, model, llm_context and thinking are refused beside it. 409 continued (with next_id, the
       # link that continues it already: the page opens that one),
       # open_children (ids), folder_gone, busy, scratch or owned_by_tui.
       def handle_continue(body, prompt, idle)
@@ -644,9 +674,9 @@ module Samagotchi
         unless given.is_a?(String) && !given.strip.empty?
           return error_response(400, "invalid_continues", "continues is a session id")
         end
-        if (fields = %w[dir model model_name llm_context].select { |key| body.key?(key) }).any?
+        if (fields = %w[dir model model_name llm_context thinking].select { |key| body.key?(key) }).any?
           return error_response(400, "invalid_continues",
-                                "continues takes the previous session's folder, model and llm_context; " \
+                                "continues takes the previous session's folder, model, llm_context and thinking; " \
                                 "leave out #{fields.join(", ")}")
         end
 
@@ -701,6 +731,20 @@ module Samagotchi
         [nil, error_response(400, "invalid_llm_context", e.message)]
       end
 
+      # The create request's "thinking" (a level word as /thinking takes it,
+      # "default" for none) as the session's own level: [level, nil] (nil
+      # when absent or default), or [nil, a 400 response] for anything else.
+      def request_thinking(raw)
+        return [nil, nil] if raw.nil?
+
+        word = raw.is_a?(String) ? raw.strip.downcase : nil
+        unless word && Thinking::LEVELS.map(&:to_s).include?(word)
+          return [nil, error_response(400, "invalid_thinking", "thinking is one of #{Thinking::LEVELS.join(", ")}")]
+        end
+
+        [Thinking.session_level(word), nil]
+      end
+
       def handle_show(req, id)
         # The page's light re-reads: never the whole conversation.
         return handle_cards_read(id) if req.params["cards"] == "1"
@@ -750,6 +794,8 @@ module Samagotchi
         # The LLM context strategy the next turn runs under (the info bar's
         # chip): the worker's, else worked out here from the session file.
         session_json = session_json.merge(llm_context: (snapshot && snapshot["llm_context"]) || llm_context_for(session))
+        # The thinking level the next turn runs at (the think chip), the same way.
+        session_json = session_json.merge(thinking: (snapshot && snapshot["thinking"]) || thinking_for(session))
         raw_messages = turn_snapshot ? turn_snapshot["messages"] : session.messages
         timing = timing_payload(id, live_metrics: snapshot && snapshot["metrics"], persisted: persisted)
         json_response(200, {
@@ -1065,8 +1111,14 @@ module Samagotchi
         images = turn_images(id, body["images"])
         return error_response(400, "bad_images", images) if images.is_a?(String)
 
-        result = SessionManager.deliver_turn(id, prompt: prompt.to_s, client_id: client_id, images: images, state_dir: @state_dir,
-                                             manager: @manager, bridge: -> { live_bridge_client(id) })
+        delivery = body["delivery"] || body[:delivery]
+        if (refused = Delivery.refusal(delivery))
+          return error_response(400, refused[:error], refused[:detail])
+        end
+
+        result = SessionManager.deliver_turn(id, prompt: prompt.to_s, client_id: client_id, images: images,
+                                                 delivery: delivery, state_dir: @state_dir, manager: @manager,
+                                                 bridge: -> { live_bridge_client(id) })
         case result[:status]
         when :accepted
           record_history(body, prompt)

data/lib/samagotchi/web/message_parts.rb

@@ -233,6 +233,9 @@ module Samagotchi
         part = { tool: name, params: params.to_s }
         title = ToolActivity.tool_title(name, call, cwd: cwd)
         part[:title] = title if title
+        # The name the model called it by when that was an alias's (the
+        # saved call is rebuilt by BuiltinCalls, which sets it again).
+        part[:called_as] = call[:called_as] if call[:called_as]
         # Built from the saved call (never saved itself), so older sessions
         # get it too.
         view = ToolView.for(name, call)&.to_h

data/lib/samagotchi/web/public/activity.js

@@ -53,6 +53,7 @@ export function addStarted(model, event = {}, now = null) {
     row.label = event.label || row.label;
     row.params = event.params || row.params;
     row.title = event.title || row.title;
+    row.called_as = event.called_as || row.called_as;
     row.view = event.view || row.view;
     markStart(row, event, now);
     return { row, created: false };
@@ -68,6 +69,9 @@ export function addStarted(model, event = {}, now = null) {
     // project-relative path, a command without its "cd … &&"); rows show it
     // in place of the params when there is one.
     title: event.title || null,
+    // The name the model called the tool by when it was an alias's ("bash"
+    // run as execute); the row says so.
+    called_as: event.called_as || null,
     // The call's full arguments for the expanded row and the hovers (the
     // server's ToolView: an execute/task_create's command, its cwd).
     view: event.view || null,
@@ -104,6 +108,7 @@ export function addCompleted(model, event = {}, now = null) {
       label: event.label,
       params: event.activity?.params || "",
       title: event.activity?.title,
+      called_as: event.activity?.called_as,
       view: event.view,
     });
     row = synthesized.row;
@@ -113,6 +118,7 @@ export function addCompleted(model, event = {}, now = null) {
   row.output_truncated = !!event.output_truncated;
   if (event.activity?.params) row.params = event.activity.params;
   if (event.activity?.title) row.title = event.activity.title;
+  if (event.activity?.called_as) row.called_as = event.activity.called_as;
   // The images the tool returned (a reload in the turn view draws them from
   // the saved parts, turn_html.js toolRowHtml).
   if (event.images?.length) row.images = event.images;