samagotchi 0.131.0 → 0.133.0

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.133.0"
   # Sent as the User-Agent of every HTTP request chi makes.
   USER_AGENT = "chi/#{VERSION}"
 end

data/lib/samagotchi/web/app.rb

@@ -48,6 +48,8 @@ require_relative "../context_sources"
 require_relative "../context_providers"
 require_relative "../recap_store"
 require_relative "../toolkit"
+require_relative "../toolkit_suggest"
+require_relative "../system_one/client"
 require_relative "../turn_flow"
 require_relative "../session_chain"
 require_relative "../session_access"
@@ -78,6 +80,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 +762,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|
@@ -1209,9 +1221,57 @@ module Samagotchi
         add_sampling(models, registry)
         payload = { default: default, models: models }
         payload[:warning] = warnings.join("; ") unless warnings.empty?
+        toolkits = toolkits_listing(registry)
+        payload[:toolkits] = toolkits if toolkits
         json_response(200, payload)
       end
 
+      # Kits the web never offers: the participants' boundary, a delegate
+      # child's, and ToolkitSuggest's defer sentinel.
+      PICKER_HIDDEN_KITS = [Toolkit::REVIEW, Toolkit::CHILD, "undecided"].freeze
+
+      # The start page's toolkit picker: {default:, suggest:, kits: [{name,
+      # description?}]}. Built-in and config kits only (a bundle's load in
+      # the worker), less PICKER_HIDDEN_KITS and any kit a new session would
+      # refuse (Toolkit.check_new!) or that doesn't resolve (a base that is a
+      # bundle kit); the configured default always listed, first when it
+      # isn't one of them. +suggest+: "on" only when the worker would ask
+      # (toolkit.suggest.mode on, a System 1 host, at least 2 described
+      # candidates), else the mode ("audit") or "off". nil when it can't be
+      # read: the picker stays hidden.
+      def toolkits_listing(registry)
+        default = Toolkit.configured.name
+        config = Toolkit.config_kits
+        kits = Toolkit.kits(config: config)
+        listed = kits.values.filter_map do |kit|
+          next if PICKER_HIDDEN_KITS.include?(kit.name) || !ToolkitSuggest.resolves?(kit.name, kits)
+          next unless new_session_kit?(kit.name, config)
+
+          kit.description.to_s.empty? ? { name: kit.name } : { name: kit.name, description: kit.description }
+        end
+        listed.unshift({ name: default }) if listed.none? { |kit| kit[:name] == default }
+        { default: default, suggest: toolkit_suggest_mode(registry, kits, default), kits: listed }
+      rescue StandardError => e
+        Log.warn(:web, "toolkits_listing_failed", error: e.class.name, msg: e.message)
+        nil
+      end
+
+      def new_session_kit?(name, config)
+        Toolkit.check_new!(Toolkit.new(name: name), config: config)
+        true
+      rescue Toolkit::Refused
+        false
+      end
+
+      def toolkit_suggest_mode(registry, kits, default)
+        mode = Config.get("toolkit.suggest.mode").to_s.strip.downcase
+        return mode == "audit" ? "audit" : "off" unless mode == "on"
+        return "off" if ToolkitSuggest.candidates(kits, default_name: default).size < 2
+        return "off" unless SystemOne::Client.from_config(host_registry: registry, mode: "on", tag: :toolkit)
+
+        "on"
+      end
+
       # Each model's configured sampling as /model words it ("temperature=0.6
       # (hosts.work)"), on the models that have some: the picker's tooltip;
       # and each model's LLM context (LLMContextStrategy::Explained#summary).

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

@@ -194,7 +194,7 @@ const participantsControl = createParticipantsControl({
   onChange: () => updateInfoBar(),
   toast: (text, action, options) => showToast(text, action, options),
 });
-// The start page's model picker and its LLM context and thinking chips
+// The start page's model picker, its ⚙ panel and 🧰 list with the override chips
 // (start_page.js); a fresh chain link's picker too.
 const startPage = createStartPage({
   pickEl: $("#modelPick"),
@@ -203,9 +203,12 @@ const startPage = createStartPage({
   listEl: $("#modelList"),
   composerEl: $("#composer"),
   centerEl: $("#center"),
+  settingsEl: $("#settingsNew"),
   llmContextEl: $("#llmContextNew"),
   thinkingEl: $("#thinkingNew"),
   reviewEl: $("#reviewNew"),
+  toolkitBtnEl: $("#toolkitBtn"),
+  toolkitEl: $("#toolkitNew"),
   selected: () => selected,
   state: () => current,
   running: () => liveTurn.running,

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

@@ -45,10 +45,12 @@ export function sheetPlace({ innerWidth, innerHeight }) {
 // open, else a refresh with a newer summary); onClose(): the caller forgets
 // its open state; onSubmit(form); onAct(name): a data-act other than close.
 // sheet: a bottom sheet in a narrow window (sheetPlace). label: the
-// dialog's accessible name (aria-label), none by default.
+// dialog's accessible name (aria-label), none by default. onOpen(): after
+// an open has shown and placed it (where focus can go into it: show runs
+// while it is still hidden).
 // @return {pop, open, close, refresh, isOpen, opener}
 export function createChipPopover({ id, className, width: widest, el, anchor: anchorSel, openers = anchorSel, summary,
-                                    session = () => null, show, onClose = () => {}, onSubmit, onAct = () => {},
+                                    session = () => null, show, onClose = () => {}, onSubmit, onAct = () => {}, onOpen = () => {},
                                     sheet = false, label = null, doc = document, win = window }) {
   const pop = doc.createElement("div");
   pop.id = id;
@@ -93,6 +95,7 @@ export function createChipPopover({ id, className, width: widest, el, anchor: an
     show(data, true);
     pop.hidden = false;
     place(anchor);
+    onOpen();
   }
 
   // A closed popover is empty, so each open draws a fresh form (unsent

data/lib/samagotchi/web/public/composer.css

@@ -5,7 +5,7 @@
    the / list, and the 16px text fields for iOS. */
 /* The image button's icon mask (the stroke only shapes the mask; the icon takes currentColor); index.html's phone info
    bar and all view's cards use it too. */
-:root{--icon-image:url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16' fill='none' stroke='black' stroke-width='1.5' stroke-linecap='round' stroke-linejoin='round'%3E%3Crect x='2' y='2.75' width='12' height='10.5' rx='1.5'/%3E%3Ccircle cx='5.75' cy='6.25' r='1.1'/%3E%3Cpath d='m2.5 12.5 3.75-3.75 2.5 2.5 1.75-1.75 3 3'/%3E%3C/svg%3E")}
+:root{--icon-toolkit:url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16' fill='none' stroke='black' stroke-width='1.4' stroke-linecap='round' stroke-linejoin='round'%3E%3Crect x='1.75' y='5.25' width='12.5' height='8' rx='1.5'/%3E%3Cpath d='M5.75 5.25v-1.5a1 1 0 0 1 1-1h2.5a1 1 0 0 1 1 1v1.5M1.75 8.75h12.5M7 8.75v1.5h2v-1.5'/%3E%3C/svg%3E");--icon-settings:url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16' fill='none' stroke='black' stroke-width='1.4' stroke-linejoin='round'%3E%3Cpath d='M12.75 6.14L14.45 6.59L14.45 9.41L12.75 9.86L12.67 10.04L13.56 11.56L11.56 13.56L10.04 12.67L9.86 12.75L9.41 14.45L6.59 14.45L6.14 12.75L5.96 12.67L4.44 13.56L2.44 11.56L3.33 10.04L3.25 9.86L1.55 9.41L1.55 6.59L3.25 6.14L3.33 5.96L2.44 4.44L4.44 2.44L5.96 3.33L6.14 3.25L6.59 1.55L9.41 1.55L9.86 3.25L10.04 3.33L11.56 2.44L13.56 4.44L12.67 5.96Z'/%3E%3Ccircle cx='8' cy='8' r='2.1'/%3E%3C/svg%3E");--icon-image:url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16' fill='none' stroke='black' stroke-width='1.5' stroke-linecap='round' stroke-linejoin='round'%3E%3Crect x='2' y='2.75' width='12' height='10.5' rx='1.5'/%3E%3Ccircle cx='5.75' cy='6.25' r='1.1'/%3E%3Cpath d='m2.5 12.5 3.75-3.75 2.5 2.5 1.75-1.75 3 3'/%3E%3C/svg%3E")}
 /* The composer card: the glass card both pages' composers sit in (the owner's #dock, the stage view's .dock-card, the
    participant page's .p-card), with its focus ring; its footer (the owner's info bar, the participant's usage) under
    a hairline; and the composer's line, the quiet row above the text field (the owner's delivery line, the
@@ -73,6 +73,16 @@ body.has-session.composer-folded #composeGrip::after{opacity:1;width:48px;margin
 #composer .actions-col .attach-btn::before{content:"";display:block;width:16px;height:16px;margin:auto;background:currentColor;-webkit-mask:var(--icon-image) center/contain no-repeat;mask:var(--icon-image) center/contain no-repeat}
 #composer .actions-col .attach-btn:hover{filter:none;color:var(--text);background:color-mix(in srgb,var(--bg-hover) 75%,transparent)}
 #composer .actions-col .attach-btn[hidden]{display:none}
+/* An icon button on the row (the start page's ⚙ and 🧰, start_settings.js and start_toolkit.js): quiet like the image button, its icon a mask in --icon; before it (order 2, earlier in the markup).
+   .set: something under it is set, an accent dot on a phone (the override chips say it on a wider row). */
+#composer .actions-col .icon-btn{order:2;position:relative;flex:none;width:28px;padding:0;border:1px solid transparent;border-radius:8px;background:transparent;color:var(--text-muted)}
+#composer .actions-col .icon-btn::before{content:"";display:block;width:16px;height:16px;margin:auto;background:currentColor;-webkit-mask:var(--icon) center/contain no-repeat;mask:var(--icon) center/contain no-repeat}
+#composer .actions-col .icon-btn:hover,#composer .actions-col .icon-btn[aria-expanded="true"]{filter:none;color:var(--text);background:color-mix(in srgb,var(--bg-hover) 75%,transparent)}
+#composer .actions-col .icon-btn[hidden],body.has-session #composer .actions-col .icon-btn{display:none}
+#composer .actions-col .settings-btn{--icon:var(--icon-settings)}
+#composer .actions-col .toolkit-btn{--icon:var(--icon-toolkit)}
+@media(max-width:600px){#composer .actions-col .icon-btn.set{color:var(--accent)}#composer .actions-col .icon-btn.set::after{content:"";position:absolute;top:3px;right:3px;width:6px;height:6px;border-radius:50%;background:var(--accent)}}
+@media(pointer:coarse){#composer .actions-col .icon-btn{width:36px;height:36px;min-height:36px}}
 /* In a session the composer is one row: the text field (one line, growing with its text; fitPrompt sets its height)
    and Cancel · Send at its bottom right. The key hint is in the placeholder there, so its row goes. */
 body.has-session #composer{flex-direction:row;align-items:flex-end;padding:10px}

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

@@ -57,13 +57,17 @@ export function listSessions(sort, order, { dir, ...opts } = {}) {
 // it); either left out means the server's default. preview: that message,
 // which names the session until its turn is saved. llm_context: the
 // session's own LLM context words ({strategy, apply, budget}), when the
-// start page's chip set some; thinking: its own level ("low"), when the
-// start page's think chip set one.
+// start page's ⚙ panel set some; thinking: its own level ("low"), when the
+// start page's ⚙ panel set one; toolkit: the kit it starts on, when the
+// start page's 🧰 list picked one (none: config's default, maybe suggested).
 // review: {subjects} makes it a review session (it starts idle; no preview).
-export function createIdleSession({ dir, model, preview, llm_context: llmContext, thinking, review, ...opts } = {}) {
+// The other fields are api()'s fetch options.
+export function createIdleSession({ dir, model, preview, llm_context: llmContext, thinking, toolkit, review,
+                                    ...opts } = {}) {
   const start = review ? { review } : { idle: true, ...(preview ? { preview } : {}) };
   const body = { ...start, ...(dir ? { dir } : {}), ...(model ? { model } : {}),
-                 ...(llmContext ? { llm_context: llmContext } : {}), ...(thinking ? { thinking } : {}) };
+                 ...(llmContext ? { llm_context: llmContext } : {}), ...(thinking ? { thinking } : {}),
+                 ...(toolkit ? { toolkit } : {}) };
   return api("/api/sessions", { method: "POST", body: JSON.stringify(body), ...opts });
 }
 

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 first, down to its min-width, then the override chips ellipsize (100000x their shrink weight: at 1000x their share of the shrink was still a fraction of a pixel, enough for an ellipsis). 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 100000 auto;min-width:min(84px,20vw)}
+body:not(.has-session) #composer .actions-col .llmctx-new{flex:0 1 auto;min-width:40px}
 #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}
@@ -616,15 +620,12 @@ body.has-session #history{padding-bottom:calc(var(--dock-h,160px) + 32px)}
 /* A fresh link's (body.fresh-link): the session composer is one row and .actions-col is content-sized there, so a px cap keeps the text field's room and Send in view. :not([hidden]) keeps a failed /api/models' hide (this selector outranks the [hidden] one). */
 body.has-session.fresh-link #composer .actions-col .model-pick:not([hidden]){display:inline-block;flex:0 1 auto;min-width:0;max-width:200px}
 @media(max-width:600px){body.has-session.fresh-link #composer .actions-col .model-pick:not([hidden]){max-width:100px}}
-/* The new session's LLM context chip, after the picker: as quiet as it; accent once a choice is set (the info bar chip's .own). */
-#composer .actions-col .llmctx-new{order:0;flex:0 1 auto;min-width:0;max-width:min(40%,260px);height:24px;min-height:24px;line-height:22px;padding:0 6px;border-radius:6px;border:1px solid transparent;background:transparent;color:var(--text-muted);font-size:11px;font-weight:400;overflow:hidden;text-overflow:ellipsis}
-#composer .actions-col .llmctx-new:hover{filter:none;color:var(--text);border-color:var(--accent-border);background:var(--accent-bg)}
-#composer .actions-col .llmctx-new.own{color:var(--accent);border-color:var(--accent-border)}
+/* The new session's override chips (start_page.js: what the ⚙ panel has set, only then), right of the key hint next to ⚙: accent; a click opens the panel. A phone has ⚙'s dot instead (below). */
+#composer .actions-col .llmctx-new{order:1;flex:0 1 auto;min-width:0;max-width:min(30%,220px);height:24px;min-height:24px;line-height:22px;padding:0 6px;border-radius:6px;border:1px solid var(--accent-border);background:transparent;color:var(--accent);font-size:11px;font-weight:400;overflow:hidden;text-overflow:ellipsis}
+#composer .actions-col .llmctx-new:hover{filter:none;color:var(--accent);background:var(--accent-bg)}
 #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 override chips go (⚙'s dot and label say what is set). */
+@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)}#composer .actions-col .llmctx-new{display:none}}
 /* 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
@@ -1120,6 +1121,44 @@ body.has-session.composer-folded #infoBar{border-top-color:transparent}
 .pp-working button{font:inherit;font-size:12px;padding:3px 10px;border-radius:6px;cursor:pointer;background:var(--accent-bg);color:var(--accent);border:1px solid var(--accent-border)}
 .pp-working button:disabled{opacity:.7;cursor:progress}
 .pp-link{display:flex;gap:4px}
+/* The start page's ⚙ panel (start_settings.js): rows of segments (a label, then pill buttons with aria-pressed), the context's Apply and budget disclosure, the review row; a bottom sheet on a phone. */
+.start-settings{gap:10px}
+.start-settings .ctx-pop-head strong{font-family:inherit}
+.ss-row{display:flex;align-items:flex-start;gap:10px}
+.ss-label{flex:0 0 64px;font-size:12px;line-height:26px;color:var(--text-muted)}
+.ss-seg{flex:1;min-width:0;display:flex;flex-wrap:wrap;gap:4px}
+.ss-seg button{height:26px;min-height:26px;padding:0 9px;border:1px solid var(--border-strong);border-radius:7px;background:transparent;color:var(--text-2);font-size:12px;line-height:24px;white-space:nowrap}
+.ss-seg button:hover{filter:none;color:var(--text);border-color:var(--accent-border)}
+.ss-seg button[aria-pressed="true"]{background:var(--accent-bg);color:var(--accent);border-color:var(--accent-border)}
+.ss-seg button:focus-visible,.ss-link:focus-visible,.ss-back:focus-visible{outline:2px solid var(--accent);outline-offset:1px}
+.ss-more{margin:-4px 0 0 74px}
+.ss-link{padding:2px 4px;border:0;border-radius:5px;background:transparent;color:var(--accent);font-size:12px}
+.ss-link:hover{filter:none;background:var(--accent-bg)}
+.ss-ctx-form{display:flex;flex-direction:column;gap:8px;margin:0 0 0 74px}
+.ss-anyway{display:flex;align-items:baseline;flex-wrap:wrap;gap:4px}
+.ss-rule{width:100%;margin:0;border:0;border-top:1px solid var(--border)}
+.ss-review{display:flex;align-items:baseline;flex-wrap:wrap;gap:6px}
+.ss-review>.ss-link:first-child{margin-left:-4px}
+.ss-review-set{min-width:0;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;color:var(--text);font-size:12.5px}
+.ss-back{margin:0 2px 0 -6px;padding:0 6px;border:0;border-radius:5px;background:transparent;color:var(--text-muted);font-size:18px;line-height:1}
+.ss-back:hover{filter:none;color:var(--text);background:var(--bg-hover)}
+.start-settings.sheet{border-radius:14px;padding:14px 16px}
+@media(max-width:400px){.ss-row{flex-direction:column;gap:4px}.ss-label{flex:none;line-height:1.4}.ss-more,.ss-ctx-form{margin-left:0}}
+@media(pointer:coarse){.ss-seg button{height:36px;min-height:36px;line-height:34px;padding:0 12px;font-size:13px}.ss-link,.ss-back{min-height:36px}.ss-label{line-height:36px}}
+/* The start page's 🧰 list (start_toolkit.js): a row per kit (a check, its name, a muted detail), the checked one accent; a bottom sheet on a phone. */
+.start-toolkit{gap:8px}
+.start-toolkit .ctx-pop-head strong{font-family:inherit}
+.st-rows{display:flex;flex-direction:column;gap:2px;margin:0 -6px}
+.st-row{display:flex;align-items:baseline;gap:8px;width:100%;min-height:30px;padding:5px 8px 5px 6px;border:1px solid transparent;border-radius:8px;background:transparent;color:var(--text-2);font-size:13px;text-align:left}
+.st-row:hover{filter:none;color:var(--text);background:var(--bg-hover)}
+.st-row[aria-pressed="true"]{color:var(--accent);background:var(--accent-bg);border-color:var(--accent-border)}
+.st-row:focus-visible{outline:2px solid var(--accent);outline-offset:-1px}
+.st-check{flex:0 0 14px;text-align:center}
+.st-name{flex:none;font-weight:600}
+.st-detail{flex:1;min-width:0;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;color:var(--text-muted);font-size:12px}
+.start-toolkit.sheet{border-radius:14px;padding:14px 16px}
+.start-toolkit.sheet .st-detail{white-space:normal}
+@media(pointer:coarse){.st-row{min-height:40px;align-items:center}}
 .rs-form{display:flex;flex-direction:column;gap:6px;margin-top:6px}
 .rs-form textarea{width:100%;resize:vertical;min-height:52px;font-family:ui-monospace,monospace;font-size:12px;color:var(--text);background:var(--bg-inset);border:1px solid var(--border-strong);border-radius:6px;padding:6px 8px}
 .rs-form textarea:focus{outline:none;border-color:var(--accent);box-shadow:0 0 0 3px var(--accent-ring)}
@@ -1604,11 +1643,14 @@ a{color:var(--accent)}
         </div>
         <div class="actions-col">
           <button type="button" id="modelPick" class="model-pick" title="The model the new session starts on" aria-label="Model for the new session" aria-haspopup="listbox" aria-expanded="false" hidden><span class="model-pick-name"></span></button>
+          <div id="composeHint">Enter to start · Shift+Enter for a newline</div>
           <button type="button" id="thinkingNew" class="llmctx-new think-new" aria-haspopup="dialog" hidden></button>
           <button type="button" id="llmContextNew" class="llmctx-new" aria-haspopup="dialog" hidden></button>
-          <button type="button" id="reviewNew" class="llmctx-new review-new" aria-haspopup="dialog">review…</button>
-          <div id="composeHint">Enter to start · Shift+Enter for a newline</div>
+          <button type="button" id="reviewNew" class="llmctx-new review-new" aria-haspopup="dialog" hidden></button>
+          <button type="button" id="toolkitNew" class="llmctx-new toolkit-new" aria-haspopup="dialog" hidden></button>
           <button id="cancelBtn" title="Cancel the running turn, whoever sent it" style="display:none">Stop turn</button>
+          <button type="button" id="settingsNew" class="icon-btn settings-btn" title="Session settings" aria-label="Session settings" aria-haspopup="dialog" hidden></button>
+          <button type="button" id="toolkitBtn" class="icon-btn toolkit-btn" title="Toolkit" aria-label="Toolkit" aria-haspopup="dialog" hidden></button>
           <button type="button" id="attachBtn" class="attach-btn" title="Add images (or paste or drop them here)" aria-label="Add images" hidden></button>
           <input type="file" id="attachInput" accept="image/*" multiple hidden>
           <div class="split">

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

@@ -16,29 +16,22 @@
 //            element as the other chips')
 //   formClass, popoverClass, nowClass   the form's, popover's and "Now:"
 //            line's own classes
-//   when(fresh)   the form's note on when it applies (fresh: the start
-//            page's new session, thinking only)
-//
-// The start page's new session (kind NEW_SESSION) has a thinking chip only
-// (thinking_chip.js keeps its choice): the form shows the model's level and
-// takes a choice for the next create.
+//   when()   the form's note on when it applies
 
 import { createChipPopover } from "./chip_popover.js";
-import { NEW_SESSION, SESSION } from "./llm_context_chip.js";
 import { html, render } from "./vendor/lit-html.js";
 
 export const DEFAULT = "default";
 
-// The chip: its text, tooltip and whether the session (or the new session)
-// set its own; null without a summary (an older worker, or a host the
-// setting means nothing on).
-export function chipModel(cfg, summary, { kind = SESSION } = {}) {
+// The chip: its text, tooltip and whether the session set its own; null
+// without a summary (an older worker, or a host the setting means nothing
+// on).
+export function chipModel(cfg, summary) {
   if (!summary || !summary.level) return null;
   const own = !!summary.own;
-  const what = kind === NEW_SESSION ? "the new session" : "this session";
-  const from = own ? what : summary.source || "the model's own";
-  const title = `${cfg.name}: ${summary.level} (${from}). Click to change it for ${what}.`;
-  return { text: `${cfg.prefix} ${summary.level}${own ? ` · ${kind}` : ""}`, title, own };
+  const from = own ? "this session" : summary.source || "the model's own";
+  const title = `${cfg.name}: ${summary.level} (${from}). Click to change it for this session.`;
+  return { text: `${cfg.prefix} ${summary.level}${own ? " · session" : ""}`, title, own };
 }
 
 // The command line for a select value ("default" unsets the session's own),
@@ -57,41 +50,33 @@ export function nowText(summary) {
 
 const option = (value, label, chosen) => html`<option value=${value} ?selected=${value === chosen}>${label}</option>`;
 
-// The popover's form (a lit-html template). For the new session (kind
-// NEW_SESSION), +summary+ is the model's and +choice+ the level the form
-// shows; +now+ is the summary its "Now:" line reads (refresh passes a
-// newer one, the rest stays as the form opened).
-export function formTemplate(cfg, summary, { running = false, kind = SESSION, choice = null, now = summary } = {}) {
-  const fresh = kind === NEW_SESSION;
-  const chosen = (fresh ? choice : summary.own) || DEFAULT;
-  const follow = summary.own && !fresh ? "follow the model" : `follow the model (${summary.level})`;
+// The popover's form (a lit-html template); +now+ is the summary its "Now:"
+// line reads (refresh passes a newer one, the rest stays as the form opened).
+export function formTemplate(cfg, summary, { running = false, now = summary } = {}) {
+  const chosen = summary.own || DEFAULT;
+  const follow = summary.own ? "follow the model" : `follow the model (${summary.level})`;
   return html`<form class=${`${cfg.formClass} llmctx-form`}><div class="ctx-pop-head"><strong>${cfg.name}</strong
-    ><span class="ctx-pop-kind">${fresh ? NEW_SESSION : "this session"}</span
+    ><span class="ctx-pop-kind">this session</span
     ><button type="button" class="ctx-pop-close" data-act="close" aria-label="Close">×</button></div
     ><div class=${`ctx-pop-meta ${cfg.nowClass}`}>${nowText(now)}</div
     ><label class="llmctx-field"><span>Level</span><span class="select-wrap"><select name="level">${option(DEFAULT, follow, chosen)}${
       cfg.levels.map((level) => option(level, level, chosen))}</select></span></label
-    ><div class="ctx-pop-meta">${cfg.when(fresh)}${running ? " A turn is running: it applies after this turn." : ""}</div
+    ><div class="ctx-pop-meta">${cfg.when()}${running ? " A turn is running: it applies after this turn." : ""}</div
     ><div class="ctx-pop-actions"><button type="submit" class="llmctx-set">Set</button></div></form>`;
 }
 
 // The chip's popover (chip_popover.js' shell), as createLlmContextControl's:
 // el is where the chip is drawn (clicks are delegated: #infoText,
 // info_bar.js); summary(): the open session's summary; session(): its id;
-// running(): a turn runs; run(line): sends the command. The start page's
-// (kind NEW_SESSION): summary() is the picked model's, choice() the pending
-// level and choose(next) takes a Set's (null for "follow the model"). id
-// and anchor (the chip's selector, by default its data attribute) keep it
-// apart from the other controls on the same element (the anchor defaults
-// to the config's).
+// running(): a turn runs; run(line): sends the command. id and anchor (the
+// chip's selector, by default the config's data attribute) keep it apart
+// from the other controls on the same element.
 export function createLevelControl({ cfg, el, summary, session = () => null, running = () => false, run,
-                                     kind = SESSION, choice = () => null, choose = null,
                                      id, anchor = cfg.anchor,
                                      doc = document, win = window }) {
-  const fresh = kind === NEW_SESSION;
   let initial = null;
-  // What the open form was drawn from: the model's or session's summary
-  // and the form's options.
+  // What the open form was drawn from: the session's summary and the form's
+  // options.
   let shown = null;
   const draw = (now) => render(formTemplate(cfg, shown.data, { ...shown.opts, now }), shell.pop);
 
@@ -99,8 +84,8 @@ export function createLevelControl({ cfg, el, summary, session = () => null, run
   // "Now:" follows (the same template again: lit writes that line alone).
   function show(data, opening) {
     if (opening) {
-      initial = (fresh ? choice() : data.own) || DEFAULT;
-      shown = { data, opts: { running: running(), kind, choice: choice() } };
+      initial = data.own || DEFAULT;
+      shown = { data, opts: { running: running() } };
     }
     draw(data);
   }
@@ -109,7 +94,6 @@ export function createLevelControl({ cfg, el, summary, session = () => null, run
     const level = form.elements.level.value;
     const was = initial;
     shell.close();
-    if (fresh) return choose(level === DEFAULT ? null : level);
     const line = commandLine(cfg, level, was);
     if (line) run(line);
   }