samagotchi 0.131.0 → 0.132.0

data/lib/samagotchi/system_prompt.rb

@@ -14,6 +14,7 @@ require_relative "memory_bundle/index_size"
 require_relative "thinking"
 require_relative "prompt_files"
 require_relative "participant_mode"
+require_relative "plugin/prompt_sections"
 
 module Samagotchi
   # The system prompt an Engine gives its model: the base prompt (tool
@@ -57,9 +58,12 @@ module Samagotchi
     # @param participants [#call] → ParticipantMode::PAIR / REVIEW while the
     #   session has participants (SessionParticipants#prompt_mode; true reads
     #   as review), nil or false with none (the #participants_section line)
+    # @param sections [#call] → Array<Plugin::PromptSections::Built>, the
+    #   plugins' prompt sections (chi.prompt_section) run for this build
     def initialize(profile:, tools:, session:, thinking:, model: -> {}, model_notes: -> { [] }, memories: [],
-                   muted_memory_names: [], appended_files: [], participants: -> { false })
+                   muted_memory_names: [], appended_files: [], participants: -> { false }, sections: -> { [] })
       @profile_lookup = profile
+      @sections_lookup = sections
       @participants_lookup = participants
       @model_lookup = model
       @model_notes_lookup = model_notes
@@ -97,19 +101,23 @@ module Samagotchi
       @index_sizes ||= {}
       @notes_loaded ||= {}
       @files_loaded ||= {}
+      @sections_loaded ||= {}
       unless @built.key?(key)
         @section_notes = nil
         @section_files = []
+        @section_plugins = []
         @built[key] = system_prompt_with_index(
           assist_system_prompt(chat: chat, layers: layers), chat: chat, thinking: thinking, layers: layers
         )
         @index_sizes[key] = @measured_index
         @notes_loaded[key] = @section_notes || []
         @files_loaded[key] = @section_files.freeze
+        @sections_loaded[key] = @section_plugins.freeze
       end
       @memory_index = @index_sizes[key]
       @prompt_notes = @notes_loaded[key]
       @prompt_files = @files_loaded[key]
+      @prompt_sections = @sections_loaded[key]
       @built[key]
     end
 
@@ -135,6 +143,12 @@ module Samagotchi
     # @return [Array<String>]
     def prompt_files = @prompt_files || []
 
+    # The plugins' prompt sections the prompt #build returned last holds
+    # (Plugin::PromptSections::Built, prompt order), [] before a build and
+    # after #reset!.
+    # @return [Array<Plugin::PromptSections::Built>]
+    def prompt_sections = @prompt_sections || []
+
     # Drops the built prompts: the next #build reads the profile, tools,
     # indexes and memories again (a model or profile switch, changed tools).
     def reset!
@@ -144,6 +158,8 @@ module Samagotchi
       @prompt_notes = nil
       @files_loaded = nil
       @prompt_files = nil
+      @sections_loaded = nil
+      @prompt_sections = nil
       @stable_lengths = nil
     end
 
@@ -298,7 +314,8 @@ module Samagotchi
     # prefix): what every session shares first, what changes least before
     # what changes more, and the per-session lines last. The global parts
     # (identity, preloads) come before the project's AGENTS.md, the
-    # toolkit's prompt text after the appended files, the memory indexes (a
+    # toolkit's prompt text after the appended files, then the plugins'
+    # prompt sections, the memory indexes (a
     # memory write changes them) after all of them; the model, the location
     # and the session close the prompt (Gemma's tool declarations still
     # follow them).
@@ -311,7 +328,7 @@ module Samagotchi
         "System memories:\n#{indexes[:system]}"
       ].join("\n\n")
       stable = [thinking_token + base, not_loaded_line(layers), rg_guidance, system_identity_section, model_notes_section, explicit_memory_section,
-                project_specific_description, appended_section, kit_prompt_section, memory_sections]
+                project_specific_description, appended_section, kit_prompt_section, plugin_prompt_section, memory_sections]
       stable_text = stable.compact.join("\n")
       volatile = [participants_section, current_model, project_location, current_session].compact
       return with_tail_declarations(stable_text, chat: chat, layers: layers) if volatile.empty?
@@ -362,6 +379,20 @@ module Samagotchi
       registry.respond_to?(:toolkit) ? registry.toolkit&.prompt : nil
     end
 
+    # The plugins' prompt sections (chi.prompt_section), right after the
+    # kit prompt and before the memory indexes: a plugin's text depends on
+    # its settings and the model, not on a memory write. Each is
+    # "From <bundle> (<name>):\n<text>", sorted by (bundle, name)
+    # (Plugin::PromptSections). nil with none: the prompt is what it was
+    # before prompt sections.
+    def plugin_prompt_section
+      built = Array(@sections_lookup.call)
+      @section_plugins = built
+      Plugin::PromptSections.text(built)
+    rescue StandardError
+      nil
+    end
+
     def with_tail_declarations(prompt, chat:, layers:)
       chat || !gemma_tail_declarations? ? prompt : prompt.rstrip + tool_declarations(layers)
     end

data/lib/samagotchi/terminal_ui/attach_launcher.rb

@@ -87,9 +87,10 @@ module Samagotchi
                            toolkit_flags: toolkit_flags, settings: settings, parent_answers: parent_answers)
                  end
         commands = []
-        commands << "/model #{model}" if model && (attach || resume)
+        # --yes on /model and /thinking: typing the flag is the choice (no
+        # confirm step); its applied reply ends the launch's command.
+        commands << "/model #{model} --yes" if model && (attach || resume)
         commands << LLMContextOverride.command_line(llm_context) if (attach || resume) && !llm_context.empty?
-        # --yes: typing the flag is the choice (no confirm step).
         commands << "#{ThinkingCommand::NAME} #{thinking} --yes" if (attach || resume) && thinking
         first_command = commands.size > 1 ? commands : commands.first
         surface = open_surface

data/lib/samagotchi/terminal_ui/formatting.rb

@@ -728,6 +728,9 @@ module Samagotchi
         # The files whose text is in the prompt (SystemPrompt#prompt_files).
         files = prompt_files_text(snapshot[:prompt_files])
         lines << "prompt files:     #{files}" if files
+        # The plugins' prompt sections it holds (chi.prompt_section): name (bundle).
+        sections = Array(snapshot[:prompt_sections]).map { |item| "#{item[:name]} (#{item[:bundle]})" }
+        lines << "prompt sections:  #{sections.join(", ")}" unless sections.empty?
         # The toolkit's prompt text (Engine#stats_snapshot's kit_prompt).
         if (kit = snapshot[:kit_prompt])
           lines << "kit prompt:       #{kit[:kit]} (~#{kit[:tokens]} tokens)"

data/lib/samagotchi/testing/bundle.rb

@@ -101,7 +101,7 @@ module Samagotchi
           Plugin::Registries.new(
             commands: SessionCommands.register_builtins(Commands::Registry.new), tools: Tools::Builtins.registry,
             services: Plugin::Services.new, stage_tools: ->(*) {}, toolkits: [], tool_index: Tools::ToolIndex.new,
-            peer_sources: PeerSources.new, **fields
+            peer_sources: PeerSources.new, prompt_sections: Plugin::PromptSections.new, **fields
           )
         end
       end
@@ -138,6 +138,9 @@ module Samagotchi
       attr_reader :errors
       # @return [Integer] how often chi was told the tools changed
       attr_reader :tools_changes
+      # @return [Integer] how often chi was told the prompt sections changed
+      #   (chi.prompt_changed!)
+      attr_reader :prompt_changes
 
       def initialize(dir, settings: {}, host: {}, session_settings: {}, sandbox: nil)
         @dir = File.expand_path(dir)
@@ -163,6 +166,7 @@ module Samagotchi
         @errors = []
         @lenient = false
         @tools_changes = 0
+        @prompt_changes = 0
         @contexts = {}
         @registries = build_registries
       end
@@ -261,12 +265,16 @@ module Samagotchi
       # Run a command line ("/name args") as chi does: the first matching
       # command, given the text after its name. Returns the handler's value
       # (a raise propagates: chi would show it as an error result).
-      def command(line)
+      # @param confirm [Boolean] sent by a person at a web tab or a TUI, who
+      #   can answer ctx.cache_confirm (false: chi send, a delegate); a line
+      #   with --yes never asks, as in chi
+      def command(line, confirm: false)
         entry = commands.lookup(line)
         raise ArgumentError, "no command matches #{line.inspect}" unless entry
         raise ArgumentError, "#{entry.name} is chi's own command, not the bundle's" if entry.source == "core"
 
-        failing { entry.handler.call(line.to_s.strip.delete_prefix(entry.name).strip) }
+        args = line.to_s.strip.delete_prefix(entry.name).strip
+        failing { CacheConfirm.asking(confirm && !CacheConfirm.split(args).last) { entry.handler.call(args) } }
       end
 
       # Call a registered tool as chi's dispatch does: its handler gets the
@@ -324,6 +332,16 @@ module Samagotchi
       # @return [PeerSources]
       def peer_sources = @registries.peer_sources
 
+      # The prompt sections as chi's next prompt build runs them, for the
+      # session now (its id: a failure keeps that session's last good text).
+      # @return [Array<Plugin::PromptSections::Built>]
+      def prompt_sections = @registries.prompt_sections.render(@recorder[:session_id])
+
+      # The text they add to the system prompt, as chi puts it there; nil
+      # with none.
+      # @return [String, nil]
+      def prompt_text = Plugin::PromptSections.text(prompt_sections)
+
       # The bundle's own command entries.
       def bundle_commands = commands.entries.select { |entry| entry.source == @name }
       # The bundle's own tool entries.
@@ -401,6 +419,7 @@ module Samagotchi
                                                    env: ENV, sessions: @sessions, http_transport: @http)
           },
           tools_changed: -> { @tools_changes += 1 },
+          prompt_changed: -> { @prompt_changes += 1 },
           stage_tools: ->(_bundle, specs, context) { @staged_tools << StagedTools.new(specs: specs, context: context) },
           init: lambda { |_bundle, label, plugin_label, provides_tools:, quiet:, timeout:, failed: nil, &block|
             @inits << Init.new(label: label, plugin_label: plugin_label, provides_tools: provides_tools, quiet: quiet,

data/lib/samagotchi/testing/host.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require_relative "../cancellation_controller"
+require_relative "../cache_confirm"
 require_relative "../plugin/context"
 require_relative "../session_metrics/cost"
 require_relative "../session_metrics/usage"
@@ -12,6 +13,14 @@ module Samagotchi
     # with every member set, its values read from the Recorder at each call
     # and its actions landing in it.
     module Host
+      # What CacheConfirm.ask reads of an Engine, from the Recorder's
+      # history: and context_tokens:.
+      CacheEngine = Struct.new(:history, :tokens) do
+        def history? = history ? true : false
+        def cache_restart_tokens = tokens
+        def cache_restart_anthropic? = false
+      end
+
       module_function
 
       # @param recorder [Recorder]
@@ -37,6 +46,7 @@ module Samagotchi
           },
           model_name: -> { recorder[:model_name] },
           model_key: -> { recorder[:model_key] },
+          model_names: -> { recorder[:model_names] || model_names(recorder[:model_name]) },
           state_dir: -> { recorder[:state_dir] || Session.default_state_dir },
           scratch: -> { recorder[:scratch] },
           setup: -> { recorder[:setup] },
@@ -52,10 +62,21 @@ module Samagotchi
           cancel_controller: ->(handler: false) { recorder[:cancelled] ? stopped : nil },
           cost: -> { cost(recorder[:cost]) },
           usage: -> { usage(recorder[:usage]) },
-          turn_author: -> { recorder[:turn_author] }
+          turn_author: -> { recorder[:turn_author] },
+          cache_confirm: lambda { |line, changed|
+            CacheConfirm.ask(line: line, cost: :full, changed: changed,
+                             engine: CacheEngine.new(recorder[:history], recorder[:context_tokens]))
+          }
         )
       end
 
+      # ctx.model_names for a model ref when the test sets none: the ref,
+      # then its id without the host ("test:model" → test:model, model).
+      def model_names(ref)
+        ref = ref.to_s
+        [ref, ref.split(":", 2).last].reject(&:empty?).uniq
+      end
+
       # The parts a test may give bundle.set(cost: {...}).
       COST_PARTS = %i[reported estimated side known].freeze
 

data/lib/samagotchi/testing/recorder.rb

@@ -43,7 +43,12 @@ module Samagotchi
         # callable giving one.
         usage: nil,
         # ctx.turn_author and the hooks' author: (a participant's "p:<id>"), nil for the owner.
-        turn_author: nil
+        turn_author: nil,
+        # ctx.cache_confirm: whether the session has a model reply (a cache
+        # to restart), and the context size its confirm names (nil: none).
+        history: false, context_tokens: nil,
+        # ctx.model_names: nil gives model_name and its id without the host.
+        model_names: nil
       }.freeze
 
       attr_reader :notices, :cards, :steers, :stops, :questions, :model_requests, :toolkit_uses, :tool_loads, :answers,

data/lib/samagotchi/testing/recording_api.rb

@@ -11,7 +11,7 @@ module Samagotchi
     # The real Plugin::Api, also recording each declaration in order
     # (#declarations), for a spec of what #register declares as written.
     class RecordingApi < Plugin::Api
-      DECLARATIONS = %i[command annotation tool on service init toolkit tool_source peer_source].freeze
+      DECLARATIONS = %i[command annotation tool on service init toolkit tool_source peer_source prompt_section].freeze
 
       # @return [Array<Declaration>]
       def declarations = (@declarations ||= [])

data/lib/samagotchi/update_command.rb

@@ -2,6 +2,7 @@
 
 require_relative "cli/command"
 require_relative "cli/flags"
+require_relative "chi_home"
 require_relative "config"
 require_relative "desktop"
 require_relative "gem_update"
@@ -57,6 +58,10 @@ module Samagotchi
       # Hidden: the old version, passed by the chi that installed this one.
       f.value "--gem-from"
     end
+    # "1" in a chi update another chi exec'd into the chi home (#to_home):
+    # it doesn't exec again. An env marker, not a flag: the home's chi may
+    # be older than the one exec'ing it, and refuse a flag it doesn't know.
+    IN_HOME_ENV = "SAMAGOTCHI_UPDATE_IN_HOME"
     # The switches the newer gem's update gets again (hand_over).
     HANDED_OVER = { "--no-gem" => :no_gem, "--no-bundles" => :no_bundles, "--no-desktop" => :no_desktop,
                     "--no-register" => :no_register, "--to" => :to, "--json" => :json }.freeze
@@ -73,11 +78,16 @@ module Samagotchi
     # @param platform [#call] register: → a Desktop::MacOS-like object
     # @param exec [#call] argv → replaces this process (the new chi's update)
     # @param bundler [Boolean] running under Bundler (bundle exec)
+    # @param home [#current, #record_first!] the chi home (ChiHome)
+    # @param env [Hash] IN_HOME_ENV is taken out of it
     def initialize(argv, stdout: $stdout, stderr: $stderr, gem_spec: InstalledGem.spec,
                    shipped_dir: MemoryBundle::SourceNormalizer::SHIPPED_DIR, platform: nil,
                    supported: Desktop.supported?, state_dir: Session.default_state_dir, web: nil,
-                   gem_update: GemUpdate.new, exec: nil, bundler: nil)
-      @gem_update = gem_update
+                   gem_update: nil, exec: nil, bundler: nil, home: ChiHome, env: ENV)
+      @home = home
+      @in_home = env.delete(IN_HOME_ENV) == "1"
+      # Built after the home is known: its install env goes into the home.
+      @gem_update_given = gem_update
       @exec = exec || ->(argv) { Kernel.exec(*argv) }
       @bundler = bundler.nil? ? (defined?(::Bundler) || !ENV["BUNDLE_GEMFILE"].to_s.empty?) : bundler
       @argv = argv.dup
@@ -102,6 +112,11 @@ module Samagotchi
       end
       return usage_error("invalid version #{options[:to]}") if options[:to] && !Gem::Version.correct?(options[:to])
 
+      # The home's chi decides the rest (--to's floor included); never from
+      # a checkout (ChiHome.current is nil there).
+      @run_home = @gem_spec && @home.current(gem_spec: @gem_spec)
+      return to_home(options) if away_from_home?(options)
+
       if options[:to] && !options[:gem_from] && Gem::Version.new(options[:to]) <= Gem::Version.new(VERSION)
         @stderr.puts("chi update: #{options[:to]} is not newer than the running chi (#{VERSION})")
         return 1
@@ -113,6 +128,12 @@ module Samagotchi
         return 1
       end
 
+      # No home yet: the first record, once this chi's own checks passed.
+      @run_home ||= record_home(options)
+      return to_home(options) if away_from_home?(options)
+
+      @gem_update = @gem_update_given ||
+                    GemUpdate.new(gem_bin: ChiHome.gem_bin(@run_home), install_env: ChiHome.install_env(@run_home))
       @dry_run = options[:dry_run]
       gem = gem_row(options)
       rows = [gem, system_bundle_row, *bundle_rows(options), desktop_row(options), *live_rows].compact
@@ -130,6 +151,42 @@ module Samagotchi
 
     def command_name = "chi update"
 
+    # Whether this run is on another Ruby than the chi home's, and not one
+    # another chi exec'd or handed over to.
+    def away_from_home?(options) = @run_home && !@in_home && !options[:gem_from] && !@run_home.running_here?
+
+    # The first chi home (ChiHome.record_first!: the helper's Ruby or this
+    # one, whichever has the newer chi), said once. Not in a dry run, a run
+    # another chi exec'd or handed over to, nor under Bundler.
+    def record_home(options)
+      return nil if options[:dry_run] || @in_home || options[:gem_from] || @bundler
+
+      recorded = @home.record_first!(gem_spec: @gem_spec, launch_path: helper_launch_path, bundler: false)
+      notice(options, "chi home set to #{recorded.ruby} (chi home set to change)") if recorded
+      recorded
+    end
+
+    # A chi on another Ruby than the home's updates the home: exec its chi
+    # (newer?, --to and the bundle rows are then the home's), once
+    # (IN_HOME_ENV).
+    def to_home(options)
+      notice(options, "updating the chi home (#{@run_home.ruby})")
+      @stdout.flush
+      @exec.call([{ IN_HOME_ENV => "1" }, *@run_home.boot_argv(run: ChiHome::CHI_BOOT), "--", "update", *@argv])
+      0 # only when exec is a spec's stand-in
+    end
+
+    def notice(options, text) = (options[:json] ? @stderr : @stdout).puts(text)
+
+    def helper_launch_path
+      return nil unless @supported
+
+      helper = @platform.call(register: false)
+      helper.respond_to?(:launch_path) ? helper.launch_path : nil
+    rescue StandardError
+      nil
+    end
+
     # @return [Hash, Integer] the options, or the usage error's exit status
     #   (every error reads "unknown option", a --gem-from without its value too)
     def parse
@@ -181,16 +238,17 @@ module Samagotchi
       hand_over(options, row)
     end
 
-    # exec the wrapper, which activates the newest installed samagotchi.
-    # Without one (installed with --bindir), this version syncs.
+    # exec the newest installed samagotchi: the chi home's boot, else the
+    # wrapper. Without either (installed with --bindir), this version syncs.
     def hand_over(options, row)
-      wrapper = InstalledGem.wrapper(@gem_spec)
-      return done(row, :update, "run chi update again to sync with it") unless wrapper
+      wrapper = InstalledGem.wrapper(@gem_spec) unless @run_home
+      return done(row, :update, "run chi update again to sync with it") unless @run_home || wrapper
 
       passed = options[:to] ? ["--to", options[:to]] : []
       passed += HANDED_OVER.except("--to").select { |_, key| options[key] }.keys
+      args = ["update", "--no-gem", "--gem-from", VERSION, *passed]
       @stdout.flush
-      @exec.call([RbConfig.ruby, wrapper, "update", "--no-gem", "--gem-from", VERSION, *passed])
+      @exec.call(@run_home ? @run_home.boot_argv(run: ChiHome::CHI_BOOT) + ["--", *args] : [RbConfig.ruby, wrapper, *args])
       done(row, :update) # only when exec is a spec's stand-in
     end
 

data/lib/samagotchi/version.rb

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

data/lib/samagotchi/web/app.rb

@@ -78,6 +78,7 @@ require_relative "proxy_gate"
 require_relative "../log"
 require_relative "../paths"
 require_relative "../redacted_inspect"
+require_relative "../chi_home"
 require_relative "../child_env"
 require_relative "../installed_gem"
 require_relative "../live_versions"
@@ -759,8 +760,17 @@ module Samagotchi
         error_response(503, "update_start_failed", "couldn't start chi update")
       end
 
+      # The chi update child: with a chi home, the home's chi (its gem dirs
+      # are what new workers activate); else this Ruby and the wrapper.
+      def update_argv(version, home: ChiHome.current)
+        args = ["update", "--to", version, "--no-desktop", "--json"]
+        return home.boot_argv(run: ChiHome::CHI_BOOT) + ["--", *args] if home
+
+        [RbConfig.ruby, InstalledGem.wrapper, *args]
+      end
+
       def perform_update(version)
-        argv = [RbConfig.ruby, InstalledGem.wrapper, "update", "--to", version, "--no-desktop", "--json"]
+        argv = update_argv(version)
         said = nil
         output, success = @update_runner.call(argv, env: ChildEnv.unbundled,
                                               progress: lambda { |line|

data/lib/samagotchi/web/public/index.html

@@ -607,6 +607,10 @@ body.has-session #history{padding-bottom:calc(var(--dock-h,160px) + 32px)}
 #lightbox img{max-width:96vw;max-height:94vh;border-radius:6px}
 /* The model picker (the start page, and a fresh chain link: start_page.js syncModelPick): reads as a label, "host:model ▾", left of Start; a button under a drawn caret that opens a searchable list (model_picker.js). Its name ellipsizes within max-width. */
 #composer .actions-col .model-pick{order:0;position:relative;display:inline-block;max-width:min(50%,380px);height:28px;min-height:28px;padding:0 22px 0 8px;border-radius:8px;overflow:hidden;background:transparent;color:var(--text-muted);font-size:12px;line-height:28px;text-align:left;text-overflow:ellipsis;transition:background .12s ease,color .12s ease}
+/* The start page's row stays one row (Start never wraps): the model name gives way, the chips keep their whole text (on a phone, below, they ellipsize too). Scoped off the session composer and a fresh link's button. */
+body:not(.has-session) #composer .actions-col{flex-wrap:nowrap}
+body:not(.has-session) #composer .actions-col .model-pick{flex:0 1 auto;min-width:0}
+body:not(.has-session) #composer .actions-col .llmctx-new{flex-shrink:0}
 #composer .actions-col .model-pick:hover,#composer .actions-col .model-pick[aria-expanded="true"]{filter:none;background:color-mix(in srgb,var(--bg-hover) 75%,transparent);color:var(--text-2)}
 #composer .actions-col .model-pick[hidden],body.has-session #composer .actions-col .model-pick{display:none}
 .model-pick-name{display:block;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}
@@ -623,8 +627,8 @@ body.has-session.fresh-link #composer .actions-col .model-pick:not([hidden]){dis
 #composer .actions-col .llmctx-new[hidden],body.has-session #composer .actions-col .llmctx-new{display:none}
 /* The new session's thinking chip, after it: shorter text, so a smaller share of the row. */
 #composer .actions-col .think-new{max-width:min(25%,140px)}
-/* Phones (the key hint is gone there): the chips keep their whole text and the row wraps, Start staying right (its margin-left:auto) on the last line; only a model name wider than the row ellipsizes. */
-@media(max-width:600px){#composer .actions-col .model-pick{flex:0 1 auto;min-width:0;max-width:100%}#composer .actions-col .llmctx-new,#composer .actions-col .think-new{flex:0 0 auto;max-width:100%}}
+/* Phones (the key hint is gone there): still one row, with tighter gaps. The model name gives way first (20x the chips' shrink weight) down to a few characters (min-width), then the chips ellipsize too. */
+@media(max-width:600px){#composer .actions-col .model-pick{flex:0 1 auto;min-width:0;max-width:100%}body:not(.has-session) #composer .actions-col{gap:4px}body:not(.has-session) #composer .actions-col .model-pick{flex-shrink:20;min-width:min(84px,20vw)}body:not(.has-session) #composer .actions-col .llmctx-new{flex-shrink:1;max-width:100%}}
 /* The model search: opaque like #commandList (a list over the conversation
    must stay readable), above the composer, or below it (.down) when the
    start page leaves no room above, or over the composer (.over) when

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

@@ -85,14 +85,15 @@ export function chipTemplate(summary) {
 // the form opened with) only the fields the user changed go, so a value the
 // form can't show is never unset by a Set; null when nothing changed.
 // Without it every field goes, "default" for one left to the model, and all
-// of them default is a reset.
+// of them default is a reset. With --yes: the form states what a change
+// costs, so a Set is the choice (no confirm step), as level_chip.js's.
 export function commandLine({ strategy = DEFAULT, apply = DEFAULT, budget = "" } = {}, initial = null) {
   const words = { strategy, apply, budget: String(budget).trim() || DEFAULT };
   const was = initial && { strategy: initial.strategy, apply: initial.apply, budget: String(initial.budget).trim() || DEFAULT };
   const fields = Object.keys(words).filter((field) => !was || words[field] !== was[field]);
   if (!fields.length) return null;
-  if (!was && fields.every((field) => words[field] === DEFAULT)) return "/llm-context reset";
-  return `/llm-context ${fields.map((field) => `${field} ${words[field]}`).join(" ")}`;
+  if (!was && fields.every((field) => words[field] === DEFAULT)) return "/llm-context reset --yes";
+  return `/llm-context ${fields.map((field) => `${field} ${words[field]}`).join(" ")} --yes`;
 }
 
 // A budget as typed ("64000", "64k", "off", "0") in tokens, 0 for off;

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

@@ -58,6 +58,32 @@ export function modelRows(payload) {
     });
 }
 
+// A host-less server fallback may still carry "host:org/id".
+function shortNameCandidate(row) {
+  const name = String(row?.name || row?.id || "");
+  let host = row?.host ? String(row.host) : "";
+  let id = String(row?.id || name);
+  if (!host) {
+    const colon = name.indexOf(":");
+    const slash = name.indexOf("/");
+    if (colon > 0 && slash > colon) {
+      host = name.slice(0, colon);
+      id = name.slice(colon + 1);
+    }
+  }
+  const model = id.slice(id.lastIndexOf("/") + 1) || name;
+  const labelHost = host && (!row?.isDefaultHost || !row?.host) ? `${host} · ` : "";
+  return { name, label: `${labelHost}${model}` };
+}
+
+// A compact label for the chosen model; list rows and all stored/API names
+// remain full.
+export function shortName(row, rows = []) {
+  const candidate = shortNameCandidate(row);
+  const clashes = rows.filter((other) => shortNameCandidate(other).label === candidate.label).length;
+  return clashes > 1 ? candidate.name : candidate.label;
+}
+
 const byId = (a, b) => (b.configured === true) - (a.configured === true) ||
   a.id.localeCompare(b.id, "en", { sensitivity: "base" });
 

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

@@ -13,6 +13,7 @@ import { moveSelection } from "./command_complete.js";
 import { readStored, writeStored } from "./storage.js";
 import {
   MODEL_KEY, RECENT_KEY, groupRows, matchModels, modelRows, pickModel, pushRecent, recentRows, rowNote, rowTitle,
+  shortName,
 } from "./model_pick.js";
 import { html, nothing, render as draw } from "./vendor/lit-html.js";
 
@@ -63,7 +64,8 @@ export function createModelPicker({ button, panel, input, list, composer, center
   // app.js', carries the host's warning).
   function setChosen(name) {
     chosen = name;
-    button.querySelector(".model-pick-name").textContent = name;
+    const row = rows.find((item) => item.name === name);
+    button.querySelector(".model-pick-name").textContent = row ? shortName(row, rows) : name;
     button.classList.toggle("unavailable", rows.some((r) => r.name === name && r.unavailable === true));
   }
 

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

@@ -131,6 +131,7 @@ export function createStartPage({
       else {
         renderNewChatLlmContext();
         renderNewChatThinking();
+        syncStartPickLabel();
       }
       focusPrompt();
     },
@@ -154,6 +155,12 @@ export function createStartPage({
     pendingPickId = id;
     pickRanEarly = false;
   }
+  function syncStartPickLabel() {
+    const fullName = modelPicker.chosen() || "";
+    pickEl.title = fullName ? `${startPickTitle} · ${fullName}` : startPickTitle;
+    pickEl.setAttribute("aria-label", fullName
+      ? `Model for the new session: ${fullName}` : "Model for the new session");
+  }
   // The button's name, tooltip and label for what the page shows: a fresh
   // link's model, else the start page's (whose choice stays as it is).
   // Toggles the fresh-link class (the CSS shows the button in a session
@@ -179,8 +186,12 @@ export function createStartPage({
       pickEl.title = "The model this link starts on";
       pickEl.setAttribute("aria-label", "Model this link starts on");
     } else {
-      pickEl.title = startPickTitle;
-      pickEl.setAttribute("aria-label", "Model for the new session");
+      if (open) {
+        pickEl.title = startPickTitle;
+        pickEl.setAttribute("aria-label", "Model for the new session");
+      } else {
+        syncStartPickLabel();
+      }
     }
   }
   // A command_ran with a model (stream_handlers.js): while a pick is in
@@ -192,6 +203,7 @@ export function createStartPage({
   // Leaving a session: the start page's remembered model again (no fetch).
   function restoreStartPick() {
     modelPicker.restore(readStored(MODEL_KEY));
+    syncStartPickLabel();
     renderNewChatLlmContext();
     renderNewChatThinking();
   }

data/lib/samagotchi/web/server.rb

@@ -22,6 +22,7 @@ require_relative "update_check"
 require_relative "token"
 require_relative "tunnel"
 require_relative "../config"
+require_relative "../chi_home"
 require_relative "../child_env"
 require_relative "../installed_gem"
 require_relative "../paths"
@@ -219,25 +220,43 @@ module Samagotchi
       # No line before the exec: one on a hung-up terminal raises EIO, and
       # the restart would end in a dead chi web; the log says it.
       def self.reexec(argv, provider: nil, plan: nil, exec: nil)
-        program = reexec_program
-        raise ArgumentError, "RubyGems chi wrapper not found" if program.to_s.empty?
+        command = reexec_command(argv)
+        raise ArgumentError, "RubyGems chi wrapper not found" unless command
 
         env = ChildEnv.unbundled.merge(
           RESTARTED_ENV => "1",
           ADOPT_PIDS_ENV => SessionManager.live_spawn_pids.join(",")
         )
-        Samagotchi::Log.info(:web, "restart", program: program)
+        Samagotchi::Log.info(:web, "restart", program: command[1] == "-e" ? "home:#{command[0]}" : command[1])
         runner = exec || ->(environment, *args) { Kernel.exec(environment, *args) }
-        runner.call(env, RbConfig.ruby, program, *argv)
+        runner.call(env, *command)
       rescue SystemCallError, ArgumentError => e
         tunnel_down(provider, plan) if provider && plan
         warn "Error: couldn't restart chi web: #{e.message}"
         1
       end
 
-      # What a restart execs: the installed gem's wrapper (it activates the
-      # newest installed chi), this bin/chi in a checkout; nil for a gem
-      # installed without one (--bindir).
+      # A restart's argv: with a chi home, its boot (ChiHome::CHI_BOOT: the
+      # newest chi in the home; a bare wrapper would activate the newest in
+      # whatever GEM_* the env has, off the home); else this Ruby and
+      # #reexec_program. A home whose newest chi is older than this one is
+      # passed over (logged): the restart argv has this chi's flags, which
+      # an older one may not know. nil when there is nothing to exec.
+      # @return [Array<String>, nil]
+      def self.reexec_command(argv, home: ChiHome.current)
+        if home && home.newest_version && home.newest_version < Gem::Version.new(Samagotchi::VERSION)
+          Samagotchi::Log.warn(:web, "restart_home_older", home: home.newest_version.to_s, version: Samagotchi::VERSION)
+          home = nil
+        end
+        return home.boot_argv(run: ChiHome::CHI_BOOT) + ["--", *argv] if home
+
+        program = reexec_program
+        program.to_s.empty? ? nil : [RbConfig.ruby, program, *argv]
+      end
+
+      # What a restart execs without a chi home: the installed gem's wrapper
+      # (it activates the newest installed chi), this bin/chi in a checkout;
+      # nil for a gem installed without one (--bindir).
       def self.reexec_program
         gem_spec = InstalledGem.spec
         gem_spec ? InstalledGem.wrapper(gem_spec) : $PROGRAM_NAME
@@ -354,7 +373,7 @@ module Samagotchi
           app.restart_web = lambda do
             restart_mutex.synchronize do
               next false if restart_requested
-              next :no_wrapper if reexec_program.to_s.empty?
+              next :no_wrapper unless reexec_command([])
 
               restart_requested = true
               restart_thread = Thread.new do