samagotchi 0.65.0 → 0.67.0

data/lib/samagotchi/tools/tool_index.rb

@@ -0,0 +1,454 @@
+# frozen_string_literal: true
+
+require "json"
+require_relative "args"
+require_relative "../token_usage"
+require_relative "../tool_declarations"
+require_relative "../plugin/tool_spec"
+
+module Samagotchi
+  module Tools
+    # The tools a session knows but doesn't declare one by one, and the two
+    # declared tools that reach them (docs/plugins.md, "Publishing tools to
+    # the index"): find_tools, a keyword search that answers each
+    # match's inputSchema, and call_tool, which calls one as <group>/<tool>.
+    # A source (the mcp bundle, chi.tool_source) publishes its groups (an
+    # MCP server each) and runs the calls; the index searches them, looks a
+    # call's tool up and checks it. The two tools are declared once, after
+    # the plugins load, and only when a source registered: nothing a source
+    # publishes later changes the request's tools, so the prompt cache keeps.
+    #
+    # They are registry entries of source SOURCE, not "core": a plugin
+    # tool's paths (guardrail targets, the row's label and preview, native
+    # flat schemas, every toolkit declaring them) are the ones call_tool has
+    # always had. MCP is the only source so far, so the texts speak of MCP
+    # servers.
+    class ToolIndex
+      SOURCE = "index"
+      FIND_NAME = "find_tools"
+      CALL_NAME = "call_tool"
+      # Matches a search answers, and names a miss suggests.
+      FIND_RESULTS = 5
+      CLOSEST = 3
+      # A query word in a tool's name (or its group's) counts this many
+      # times one in its description.
+      NAME_WEIGHT = 3
+      PREVIEW_CHARS = 60
+
+      FIND_PARAMS = {
+        query: { type: "string", required: true,
+                 description: "keywords for what the tool does (\"screenshot page\"); empty lists every tool's name" },
+        server: { type: "string", description: "search only this server" }
+      }.freeze
+      CALL_DESCRIPTION = "Call an MCP server's tool that #{FIND_NAME} found.".freeze
+      CALL_PARAMS = {
+        tool: { type: "string", required: true, description: "the tool as <server>/<tool>" },
+        args: { type: "object", description: "the arguments, per the inputSchema #{FIND_NAME} gave" }
+      }.freeze
+
+      # One tool in the index: +group+/+name+ is what the call tool takes,
+      # +schema+ its inputSchema, +acts_as+ the name guardrail rules match
+      # (mcp_<server>_<tool>; a bare name the call tool looks up too).
+      # +refusal+ is why it can't be called (nil when it can), +mark+ what a
+      # search shows beside its name then ("(bad schema)"). A blank
+      # +acts_as+ raises ArgumentError: no rule could match the tool's calls.
+      Tool = Data.define(:group, :name, :description, :schema, :acts_as, :refusal, :mark) do
+        def initialize(group:, name:, acts_as:, description: "", schema: nil, refusal: nil, mark: nil)
+          raise ArgumentError, "tool #{group}/#{name}: acts_as is blank" if acts_as.to_s.strip.empty?
+
+          super(group: group.to_s, name: name.to_s, description: description.to_s,
+                schema: schema || { "type" => "object", "properties" => {} }, acts_as: acts_as.to_s,
+                refusal: refusal, mark: mark)
+        end
+
+        def full_name = "#{group}/#{name}"
+      end
+
+      # A Group's states.
+      STATES = %i[ready starting failed].freeze
+
+      # One group of a source's tools (an MCP server): +summary+ its line in
+      # the search tool's description (nil: its name and tool count only),
+      # +state+ :ready, :starting (its tools may come: a lookup waits) or
+      # :failed (+error+ says why). A group exists before its tools do.
+      # Another state, or a tool of another group, raises ArgumentError (a
+      # lookup would neither wait on it nor find the tool's source).
+      Group = Data.define(:name, :summary, :state, :error, :tools) do
+        def initialize(name:, summary: nil, state: :ready, error: nil, tools: [])
+          raise ArgumentError, "group #{name}: state must be one of #{STATES.join(", ")}" unless STATES.include?(state)
+
+          tools = Array(tools)
+          raise ArgumentError, "group #{name}: tools must be ToolIndex::Tool values" unless tools.all?(Tool)
+          if (stray = tools.find { |tool| tool.group != name.to_s })
+            raise ArgumentError, "group #{name}: tool #{stray.full_name} belongs to group #{stray.group}"
+          end
+
+          summary = summary.to_s.strip
+          super(name: name.to_s, summary: summary.empty? ? nil : summary, state: state, error: error,
+                tools: tools.dup.freeze)
+        end
+
+        # The tools the call tool can call.
+        def callable = tools.reject(&:refusal)
+
+        # What a search says about a group whose tools can't be called now.
+        def note
+          case state
+          when :failed then "(failed: #{error})"
+          when :starting then "(starting, try again)"
+          end
+        end
+      end
+
+      # What a source (a plugin, chi.tool_source) holds: its groups, which
+      # #publish swaps in whole, and how its calls run. Its hooks: +call+
+      # (tool, args, ctx) runs a checked call (args typed by the tool's
+      # schema; ctx the plugin's Context) and returns its result; +wait+
+      # (group) waits for a :starting group's start; +acts_as+ (group, tool)
+      # names a tool guardrails see from the names alone (one not listed
+      # yet). +prefix+: a bare name with it is taken as an acts_as as given.
+      # +label+ is the call tool's row label.
+      class Source
+        attr_reader :label, :prefix, :context, :groups, :declared_names, :declared_tokens
+
+        def initialize(label:, call:, acts_as:, wait: nil, prefix: nil, context: nil)
+          raise ArgumentError, "tool_source: call must respond to #call" unless call.respond_to?(:call)
+          raise ArgumentError, "tool_source: acts_as must respond to #call" unless acts_as.respond_to?(:call)
+          raise ArgumentError, "tool_source: wait must respond to #call" if wait && !wait.respond_to?(:call)
+
+          @label = label.to_s
+          @call = call
+          @acts_as = acts_as
+          @wait = wait
+          @prefix = prefix&.to_s
+          @context = context
+          @groups = [].freeze
+          @declared_names = []
+          @declared_tokens = 0
+        end
+
+        def inspect = "#<ToolIndex::Source #{@label} groups=#{@groups.map(&:name).join(",")}>"
+
+        # Make +groups+ the source's: one swap, so a search on another
+        # thread sees the old list or the new one, never half.
+        # @param groups [Array<Group>]
+        def publish(groups)
+          groups = Array(groups)
+          raise ArgumentError, "publish takes ToolIndex::Group values" unless groups.all?(Group)
+
+          @groups = groups.dup.freeze
+          nil
+        end
+
+        def run(tool, args) = @call.call(tool, args, @context)
+
+        def wait(group)
+          @wait&.call(group)
+        rescue StandardError
+          nil
+        end
+
+        def acts_as(group, tool) = @acts_as.call(group, tool).to_s
+
+        # What ToolIndex#declare registered: the tools' names and their
+        # definitions' estimated tokens (the mcp bundle's /mcp says them).
+        def declared!(names, tokens)
+          @declared_names = names.dup.freeze
+          @declared_tokens = tokens
+        end
+      end
+
+      def initialize
+        @sources = []
+      end
+
+      # A new source, not in the index yet (Plugin::Api#commit! #add's it).
+      def source(**) = Source.new(**)
+
+      def add(source)
+        @sources << source
+        nil
+      end
+
+      def sources = @sources.dup
+
+      # Every source's groups, now.
+      def groups = @sources.flat_map(&:groups)
+
+      # Register the search and call tools in +registry+, once, after the
+      # plugins load: nothing without a source. A name another tool has is
+      # left out (a line in +failures+).
+      # @return [Array<String>] the names registered
+      def declare(registry, failures: nil)
+        return [] if @sources.empty?
+
+        specs = [find_spec, call_spec]
+        declared = specs.filter_map do |spec|
+          if (taken = registry[spec.name])
+            failures&.add("tool #{spec.name}", "already registered (#{taken.source}); the tool index's is left out",
+                          required: false)
+            next
+          end
+
+          registry.register(spec.name, source: SOURCE, **spec.entry_fields(nil))
+          spec
+        end
+        names = declared.map(&:name)
+        tokens = declared.sum { |spec| ToolIndex.spec_tokens(spec) }
+        @sources.each { |source| source.declared!(names, tokens) }
+        names
+      end
+
+      # A checked tool declaration's (Plugin::ToolSpec) definition as
+      # the chat path sends it (LLM::ChatLoop#tool_definitions: the chat
+      # schema, wrapped as a function), in estimated tokens
+      # (TokenUsage::CHARS_PER_TOKEN). The native prompts (Gemma, Qwen)
+      # render a flatter schema, so it is an upper bound there.
+      def self.spec_tokens(spec)
+        function = ToolDeclarations.chat_schemas([spec.schema]).first.slice(:name, :description, :parameters)
+        TokenUsage.estimate(JSON.generate({ type: "function", function: function }))
+      end
+
+      # Appended to a failure the arguments may cause: the tool's
+      # inputSchema, so the next call can fix them (a call guessed without
+      # a search).
+      def self.schema_note(tool)
+        "\n\n#{tool.full_name}'s inputSchema: #{JSON.generate(tool.schema)}"
+      end
+
+      # The search tool's description: how to use it, and one line per
+      # group from what is known when it is declared (a first-run server's:
+      # its name, and its summary if it has one). Never every tool: knowing
+      # the names, a model searches less and guesses arguments.
+      def find_description
+        lines = groups.map do |group|
+          count = group.callable.size
+          line = "- #{group.name}"
+          line += ": #{group.summary}" if group.summary
+          line += " (#{count} tool#{"s" unless count == 1})" unless group.tools.empty?
+          line
+        end
+        "Search the tools of the MCP servers below by keywords. It answers up to #{FIND_RESULTS} tools, each with " \
+          "its name (<server>/<tool>) and inputSchema; call one with #{CALL_NAME}. An empty query lists every tool's " \
+          "name.\nServers:\n#{lines.join("\n")}"
+      end
+
+      # ── Search ──────────────────────────────────────────────────────────
+
+      # The search tool: the best matches with their schemas, or with an
+      # empty query every group's tool names.
+      def find(query, only = nil)
+        all = groups
+        searched = all
+        if only && !only.strip.empty?
+          searched = all.select { |group| group.name == only.strip }
+          return "Error: no MCP server #{only.strip}. Servers: #{all.map(&:name).join(", ")}" if searched.empty?
+        end
+        return names_text(searched) if words(query).empty?
+
+        matches = ranked(query, searched.flat_map(&:tools)).take(FIND_RESULTS)
+        return "No MCP tool matches \"#{query.strip}\".\n\n#{names_text(searched)}" if matches.empty?
+
+        blocks = matches.map { |tool| match_text(tool, all) }
+        unsearched = searched.filter_map { |group| "#{group.name} #{group.note}" if group.tools.empty? && group.note }
+        blocks << "Not searched: #{unsearched.join("; ")}." unless unsearched.empty?
+        "Call one with #{CALL_NAME}(tool: \"<server>/<tool>\", args: {…}).\n\n#{blocks.join("\n\n")}"
+      end
+
+      # ── The call ────────────────────────────────────────────────────────
+
+      # A call of the tool +name+ names, with +args+ typed by its schema,
+      # run by its source. It fails closed: a tool that isn't the one
+      # guardrails were given (#claimed) is refused.
+      def call(name, args)
+        tool = lookup(name)
+        return tool if tool.is_a?(String)
+        unless claimed(name.strip)&.first == tool.acts_as
+          return "Error: the MCP tools changed while the call waited for its server; call #{tool.full_name} again"
+        end
+        return "Error: #{tool.full_name} can't be called: #{tool.refusal}" if tool.refusal
+
+        inner = inner_args(args, tool)
+        return "Error: args must be an object.#{ToolIndex.schema_note(tool)}" unless inner
+
+        source_of(tool.group).run(tool, inner)
+      end
+
+      # The call tool's activity row: <group>/<tool> and its arguments.
+      def call_preview(args)
+        tool = lookup_quietly(args["tool"].to_s)
+        name = tool ? tool.full_name : args["tool"].to_s.strip
+        inner = tool && inner_args(args["args"], tool)
+        inner ? [name, preview(inner)].reject(&:empty?).join(" ") : name
+      end
+
+      # What guardrail rules match a call: the tool it calls, by its
+      # acts_as, its arguments, and the question's label. A tool not
+      # indexed yet (its server still starting) is named from what the
+      # model gave (#claimed), so a rule on it fires before the call waits
+      # for the server. Nothing for a name that can't be a tool (the call
+      # refuses it).
+      def call_targets(args)
+        name = args["tool"].to_s.strip
+        tool = lookup_quietly(name)
+        acts_as, label = tool ? [tool.acts_as, "#{tool.group}: #{tool.name}"] : claimed(name)
+        return {} unless acts_as
+
+        { acts_as: acts_as, args: inner_args(args["args"], tool) || {}, label: label }.compact
+      end
+
+      private
+
+      def find_spec
+        Plugin::ToolSpec.build(FIND_NAME, find_description, params: FIND_PARAMS,
+                                                           preview: lambda { |args|
+                                                             [args["query"].to_s.strip, args["server"] && "in #{args["server"]}"].compact.join(" ")
+                                                           }) do |args, _ctx|
+          find(args["query"].to_s, args["server"])
+        end
+      end
+
+      def call_spec
+        Plugin::ToolSpec.build(CALL_NAME, CALL_DESCRIPTION, params: CALL_PARAMS, label: @sources.first.label,
+                                                           preview: ->(args) { call_preview(args) },
+                                                           targets: ->(args) { call_targets(args) }) do |args, _ctx|
+          call(args["tool"].to_s, args["args"])
+        end
+      end
+
+      def source_of(group) = @sources.find { |source| source.groups.any? { |g| g.name == group } }
+
+      # One match: its name, why it can't be called (if so), its
+      # description and schema.
+      def match_text(tool, all)
+        group = all.find { |g| g.name == tool.group }
+        head = [tool.full_name, tool.mark, group&.note].compact.join(" ")
+        return "#{head}: #{tool.description}\nIt can't be called: #{tool.refusal}" if tool.refusal
+
+        "#{head}: #{tool.description}\ninputSchema: #{JSON.generate(tool.schema)}"
+      end
+
+      # Each group's tool names, one line each.
+      def names_text(groups)
+        lines = groups.map do |group|
+          names = group.tools.map { |tool| [tool.name, tool.mark].compact.join(" ") }
+          head = [group.name, group.note].compact.join(" ")
+          names.empty? ? head : "#{head}: #{names.join(", ")}"
+        end
+        "MCP tools by server (call one as <server>/<tool>; search for its inputSchema):\n#{lines.join("\n")}"
+      end
+
+      # +tools+ that share a word with +query+, best first: a word scores
+      # its IDF over +tools+ (a word most of them have counts little), times
+      # NAME_WEIGHT in the tool's or its group's name. Ties keep the index's
+      # order.
+      def ranked(query, tools)
+        wanted = words(query).uniq
+        docs = tools.map { |tool| [words("#{tool.group} #{tool.name}"), words(tool.description)] }
+        df = Hash.new(0)
+        docs.each { |name, text| (name | text).each { |word| df[word] += 1 } }
+        count = tools.size.to_f
+        scored = tools.each_with_index.filter_map do |tool, i|
+          name, text = docs[i]
+          score = wanted.sum do |word|
+            idf = Math.log(((count - df[word] + 0.5) / (df[word] + 0.5)) + 1)
+            if name.include?(word) then NAME_WEIGHT * idf
+            elsif text.include?(word) then idf
+            else 0
+            end
+          end
+          [tool, score, i] if score.positive?
+        end
+        scored.sort_by { |_, score, i| [-score, i] }.map(&:first)
+      end
+
+      # Lower-case words, split at camelCase too, a plural's s dropped.
+      def words(text)
+        text.to_s.gsub(/([a-z0-9])([A-Z])/, '\1 \2').downcase.scan(/[a-z0-9]+/).map do |word|
+          word.length > 3 && word.end_with?("s") && !word.end_with?("ss") ? word.chomp("s") : word
+        end
+      end
+
+      # The Tool +name+ names: <group>/<tool>, or an acts_as looked up as
+      # it is (never parsed: group names may hold _, and long names are
+      # cut). A miss while a group is starting waits for it (its tools may
+      # be the one; for a <group>/ name, that group's start only); then a
+      # miss is the error text: a failed group's error, else the closest
+      # tools.
+      # @return [Tool, String]
+      def lookup(name, waited: false)
+        name = name.strip
+        all = groups
+        tool = all.lazy.filter_map do |group|
+          next unless name.start_with?("#{group.name}/")
+
+          rest = name.delete_prefix("#{group.name}/")
+          group.tools.find { |t| t.name == rest }
+        end.first
+        return tool if tool
+
+        same = all.flat_map(&:tools).select { |t| t.acts_as == name }
+        return same.first if same.size == 1
+        return "Error: #{name} names #{same.map(&:full_name).join(" and ")}; call one as <server>/<tool>" if same.size > 1
+
+        # A name with a group's <group>/ waits for that group only; any
+        # other name (an acts_as) for every one starting.
+        named = all.select { |group| name.start_with?("#{group.name}/") }
+        starting = (named.empty? ? all : named).select { |group| group.state == :starting }
+        unless waited || starting.empty?
+          starting.each { |group| source_of(group.name)&.wait(group.name) }
+          return lookup(name, waited: true)
+        end
+
+        failed = all.find { |group| group.state == :failed && name.start_with?("#{group.name}/") }
+        return "Error: MCP server #{failed.name} didn't start: #{failed.error}" if failed
+
+        closest = ranked(name, all.flat_map(&:tools)).take(CLOSEST)
+        return "Error: no MCP tool #{name}. Search with #{FIND_NAME}." if closest.empty?
+
+        "Error: no MCP tool #{name}. Closest: #{closest.map(&:full_name).join(", ")}"
+      end
+
+      # #lookup's tool, without waiting for a start: nil on a miss.
+      def lookup_quietly(name)
+        tool = lookup(name, waited: true)
+        tool.is_a?(Tool) ? tool : nil
+      end
+
+      # The acts_as and label +name+ stands for, from the name alone:
+      # <group>/<tool> of a known group (the one that has the tool, else the
+      # first whose name it starts with), its source naming the acts_as; or
+      # a bare name with a source's prefix as it is (no label). Nil for
+      # anything else.
+      # @return [Array(String, String), Array(String, nil), nil]
+      def claimed(name)
+        all = groups
+        named = all.select { |group| name.start_with?("#{group.name}/") }
+        group = named.find { |g| g.tools.any? { |t| t.name == name.delete_prefix("#{g.name}/") } } || named.first
+        if group
+          rest = name.delete_prefix("#{group.name}/")
+          [source_of(group.name).acts_as(group.name, rest), "#{group.name}: #{rest}"]
+        elsif @sources.any? { |source| source.prefix && name.start_with?(source.prefix) }
+          [name, nil]
+        end
+      end
+
+      # The inner arguments as a Hash typed by +tool+'s schema (a JSON text
+      # parsed; untyped without a tool), nil when they aren't an object;
+      # none is {}.
+      def inner_args(args, tool)
+        args = {} if args.nil? || (args.is_a?(String) && args.strip.empty?)
+        args = Args.coerce({ "args" => args }, { "properties" => { "args" => { "type" => "object" } } })["args"]
+        return nil unless args.is_a?(Hash)
+
+        Args.coerce(args, tool&.schema)
+      end
+
+      def preview(args)
+        line = args.map { |key, value| "#{key}=#{value.is_a?(String) ? value : JSON.generate(value)}" }.join(" ")
+        line = line.gsub(/\s+/, " ")
+        line.length > PREVIEW_CHARS ? "#{line[0, PREVIEW_CHARS - 1]}…" : line
+      end
+    end
+  end
+end

data/lib/samagotchi/update_command.rb

@@ -225,13 +225,16 @@ module Samagotchi
       row.from = helper.app_version
       if helper.stale?
         row.to = VERSION
-        return done(row, :update, @dry_run ? "rebuilds and restarts it" : "restarted") { helper.upgrade { nil } }
+        done(row, :update, @dry_run ? "rebuilds and restarts it" : "restarted") { helper.upgrade { nil } }
+      elsif helper.launch_outdated?
+        helper.refresh_launch_file unless @dry_run
+        up_to_date(row).tap { |r| r.status += @dry_run ? " (would refresh the launch file)" : " (launch file refreshed)" }
+      else
+        up_to_date(row)
       end
-
-      return up_to_date(row) unless helper.launch_outdated?
-
-      helper.refresh_launch_file unless @dry_run
-      up_to_date(row).tap { |r| r.status += @dry_run ? " (would refresh the launch file)" : " (launch file refreshed)" }
+      # The terminals' warnings only: the host key ones read the Keychain.
+      helper.terminal_warnings.each { |warning| row.status += "; #{warning}" }
+      row
     rescue Desktop::MacOS::Error, SystemCallError => e
       failed(row, e.message.lines.first.to_s.strip)
     end

data/lib/samagotchi/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Samagotchi
-  VERSION = "0.65.0"
+  VERSION = "0.67.0"
   # Sent as the User-Agent of every HTTP request chi makes.
   USER_AGENT = "chi/#{VERSION}"
 end

data/lib/samagotchi/web/app.rb

@@ -566,6 +566,14 @@ module Samagotchi
         LLMContextStrategy.for_session(session, registry: host_registry)
       end
 
+      # A session's toolkit as its file names it ({name:, label:}), nil on
+      # full: without a worker nothing resolves it (a bundle's kits load in
+      # the worker), so the tools it leaves out aren't known here.
+      def toolkit_for(session)
+        toolkit = session.toolkit
+        toolkit && !toolkit.full? ? { name: toolkit.name, label: toolkit.label } : nil
+      end
+
       # A session's thinking level with where it came from and its own
       # (SettingExplained#summary), as its worker would resolve it; nil
       # when it can't be. Config and the registry only: no network.
@@ -711,9 +719,13 @@ 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 own setup (SessionSetup: llm_context,
-      # thinking and reasoning_history levels), so dir, model, llm_context and
-      # thinking are refused beside it (a create takes no reasoning_history).
+      # folder and with its own setup (SessionSetup: llm_context, thinking
+      # and reasoning_history levels), so dir, llm_context and thinking are
+      # refused beside it (a create takes no reasoning_history). It runs on
+      # model (or model_name) when given, else on the previous link's: one
+      # whose host is gone falls back to the default, and the 201's
+      # model_warning (null when none) says so. A model it can't start on is
+      # 400 invalid_model, nothing archived.
       # 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.
@@ -722,14 +734,16 @@ 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 thinking].select { |key| body.key?(key) }).any?
+        if (fields = %w[dir llm_context thinking].select { |key| body.key?(key) }).any?
           return error_response(400, "invalid_continues",
-                                "continues takes the previous session's folder, model, llm_context and thinking; " \
+                                "continues takes the previous session's folder, llm_context and thinking; " \
                                 "leave out #{fields.join(", ")}")
         end
 
         preview = idle ? body["preview"].to_s.strip : ""
-        session, error = continue_from(given, prompt: idle ? nil : prompt.to_s, title: preview.empty? ? nil : preview)
+        model = (body["model"] || body["model_name"]).to_s.strip
+        session, error = continue_from(given, prompt: idle ? nil : prompt.to_s, title: preview.empty? ? nil : preview,
+                                              model: model.empty? ? nil : model)
         return error if error
 
         port = await_bridge_port(session.id)
@@ -737,14 +751,15 @@ module Samagotchi
         # The moved delegates' cards fold under the new link now.
         [session.continues, session.id, *moved].each { |sid| @hub&.touch(sid) }
         record_history(body, prompt) if !idle && PromptHistory.shell_line?(prompt.to_s.strip)
-        json_response(201, session_to_json(session).merge(bridge_port: port, moved: moved))
+        json_response(201, session_to_json(session).merge(bridge_port: port, moved: moved,
+                                                          model_warning: session.model_warning))
       end
 
       # SessionManager.continue_session, its refusals as responses: [session,
       # nil] or [nil, the response]. Only its own errors: what fails after
       # the new link started is not a refusal of it.
-      def continue_from(given, prompt:, title:)
-        [@manager.continue_session(given, prompt: prompt, title: title, state_dir: @state_dir), nil]
+      def continue_from(given, prompt:, title:, model:)
+        [@manager.continue_session(given, prompt: prompt, title: title, model: model, state_dir: @state_dir), nil]
       rescue SessionContinue::Refused => e
         extra = e.reason == :continued ? { next_id: e.ids.first } : { ids: e.ids }
         [nil, json_response(409, { error: e.reason.to_s, detail: e.message, **extra })]
@@ -848,6 +863,10 @@ module Samagotchi
         # native host), else the server's reading (an older worker, none).
         history = snapshot&.key?("reasoning_history") ? snapshot["reasoning_history"] : reasoning_history_for(session)
         session_json = session_json.merge(reasoning_history: history)
+        # Its toolkit when it isn't full (the tools chip): the worker's, which
+        # resolved it, else the name saved in the session file.
+        toolkit = snapshot&.key?("toolkit") ? snapshot["toolkit"] : toolkit_for(session)
+        session_json = session_json.merge(toolkit: toolkit)
         raw_messages = turn_snapshot ? turn_snapshot["messages"] : session.messages
         timing = timing_payload(id, live_metrics: snapshot && snapshot["metrics"], persisted: persisted)
         json_response(200, {

data/lib/samagotchi/web/capabilities.rb

@@ -3,7 +3,7 @@
 module Samagotchi
   module Web
     # What this web page renders that a notice may stand in for
-    # (Engine#hook_notify's fallback_for:), and what this viewer can do. The
+    # (HookRoutes#notify's fallback_for:), and what this viewer can do. The
     # session and tail JSON carry it as +capabilities+; the page leaves out
     # a notice whose fallback_for names a capability that is true here.
     # +display+: the answer's display is rendered as markdown, so its links

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

@@ -6,7 +6,7 @@
 // state from :tool_call_started / :tool_call_completed events. Keeping the
 // state pure makes it unit-testable under `node --test` like data.js/format.js.
 
-export const ROW_STATUS = Object.freeze({
+const ROW_STATUS = Object.freeze({
   RUNNING: "running",
   OK: "ok",
   ERROR: "error",
@@ -161,7 +161,7 @@ function callDuration(row, event, now) {
 
 // A completed call's row status from the server's: error, stopped,
 // blocked, else ok.
-export function completedStatus(status) {
+function completedStatus(status) {
   if (status === "error") return ROW_STATUS.ERROR;
   if (status === "stopped") return ROW_STATUS.STOPPED;
   if (status === "blocked") return ROW_STATUS.BLOCKED;