samagotchi 0.131.0 → 0.133.0

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

@@ -0,0 +1,157 @@
+// The start page's 🧰 list: the toolkit the next new session starts on
+// (GET /api/models' toolkits: {default, suggest, kits: [{name,
+// description?}]}), a choice for that create only (start_page.js keeps it;
+// never remembered). Auto, the everyday path, sends nothing: with
+// toolkit.suggest.mode on, the first message may get a suggested kit, else
+// the default. A kit picked is sent (the session is "chosen" and gets no
+// suggestion), the default too while Auto is offered; without Auto the
+// default's row is Auto's and sends nothing. A pick closes the list.
+//
+// Beside 🧰 on the row an override chip names the kit ("tools: web");
+// on a phone 🧰 carries a dot instead (toolkitLabel()).
+
+import { createChipPopover } from "./chip_popover.js";
+import { html, nothing, render } from "./vendor/lit-html.js";
+
+export const AUTO = "auto";
+export const LIST_LABEL = "Toolkit";
+export const NOTE = "Change it later with /toolkit.";
+// The built-ins carry no description (one would make them System 1
+// candidates): the page words them.
+const BUILTIN_WORDS = { full: "every tool", lean: "core tools; find_tools reaches the rest" };
+
+// Whether the first message may get a suggested kit (the Auto row).
+export const offersAuto = (toolkits) => toolkits?.suggest === "on";
+
+// The list's rows, each {value (AUTO or a kit's name), label, detail,
+// title, pressed}. +choice+: the kit picked, null for none (Auto; the
+// default's row without Auto).
+export function toolkitRows(toolkits, choice) {
+  if (!toolkits) return [];
+  const auto = offersAuto(toolkits);
+  const fallback = toolkits.default;
+  const rows = auto ? [{
+    value: AUTO, label: "Auto", detail: `may be picked on the first message, else ${fallback}`,
+    title: `A described kit may be suggested on the first message; else the session starts on ${fallback}`,
+  }] : [];
+  for (const kit of toolkits.kits || []) {
+    const own = kit.description || BUILTIN_WORDS[kit.name] || "";
+    const isDefault = kit.name === fallback;
+    rows.push({
+      value: kit.name, label: kit.name,
+      detail: isDefault ? [own, "default"].filter(Boolean).join(" · ") : own,
+      title: isDefault && auto ? `${kit.name}, picked: the session starts on it and gets no suggestion`
+        : kit.description || null,
+    });
+  }
+  const pressed = choice || (auto ? AUTO : fallback);
+  return rows.map((r) => ({ ...r, pressed: r.value === pressed }));
+}
+
+// What a row's pick sends: a kit's name, or null (Auto; the default's row
+// without Auto).
+export function pickValue(toolkits, value) {
+  if (value === AUTO) return null;
+  if (!offersAuto(toolkits) && value === toolkits?.default) return null;
+  return value;
+}
+
+// The row's override chip for +choice+, {text, title}, or null.
+export function toolkitOverride(choice) {
+  if (!choice) return null;
+  return { text: `tools: ${choice}`, title: `Toolkit: ${choice} for the new session (no suggestion). Click to change it.` };
+}
+
+// 🧰's state: whether a kit is picked (its dot on a phone) and its tooltip
+// and accessible name.
+export function toolkitLabel(choice) {
+  return { set: !!choice, label: choice ? `${LIST_LABEL}: ${choice}` : LIST_LABEL };
+}
+
+// +state+: {toolkits, choice, review: review files set (with Auto checked
+// a note says a review gets no suggestion), error: Start's refusal}.
+export function listTemplate({ toolkits, choice, review = false, error = null }) {
+  const rows = toolkitRows(toolkits, choice);
+  return html`<div class="ctx-pop-head"><strong>Toolkit · new session</strong
+    ><button type="button" class="ctx-pop-close" data-act="close" aria-label="Close">×</button></div
+    ><div class="st-rows" role="group" aria-label="Toolkit">${rows.map((r) => html`<button type="button" class="st-row"
+      data-act=${`kit:${r.value}`} aria-pressed=${r.pressed ? "true" : "false"} title=${r.title || nothing}
+      ><span class="st-check" aria-hidden="true">${r.pressed ? "✓" : ""}</span><span class="st-name">${r.label}</span
+      ><span class="st-detail">${r.detail}</span></button>`)}</div
+    >${review && !choice && offersAuto(toolkits) ? html`<div class="ctx-pop-meta">A review session gets no suggestion: it starts on ${
+      toolkits.default} unless you pick a kit.</div>` : nothing
+    }<div class="ctx-pop-error" role="alert" ?hidden=${!error}>${error || ""}</div
+    ><div class="ctx-pop-meta">${NOTE}</div>`;
+}
+
+// The list on chip_popover.js' shell, a bottom sheet on a phone. +el+:
+// where 🧰 is; +button+: 🧰 (the list opens at it; focus goes back to it);
+// +openers+: the selector of every element that opens it (🧰 and the
+// override chip). Hooks: +toolkits()+ the payload's toolkits (null: nothing
+// opens), +choice()+, +choose(next)+, +review()+ whether review files are
+// set.
+// @return {open, toggle, close, refresh, refuse(message), isOpen}
+export function createStartToolkit({ el, button, openers = `#${button.id}`, toolkits, choice, choose,
+                                     review = () => false, doc = document, win = window }) {
+  // Start's refusal of the picked kit (400 toolkit_refused), until a pick.
+  let error = null;
+
+  function draw() {
+    render(listTemplate({ toolkits: toolkits(), choice: choice(), review: review(), error }), shell.pop);
+    shell.replace();
+  }
+
+  const rowsOf = () => [...shell.pop.querySelectorAll(".st-row")];
+  // Focus on the checked row (the list sits at the end of <body>).
+  function focusInside() {
+    (shell.pop.querySelector(".st-row[aria-pressed=true]") || rowsOf()[0])?.focus();
+  }
+
+  const shell = createChipPopover({
+    id: "startToolkitPopover", className: "ctx-popover start-toolkit", width: 380, el, anchor: `#${button.id}`, openers,
+    summary: () => toolkits(), sheet: true, label: LIST_LABEL, doc, win,
+    show: () => draw(),
+    onOpen: focusInside,
+    onClose: () => { error = null; },
+    onAct: (name) => {
+      const [what, value] = name.split(/:(.*)/s);
+      if (what !== "kit") return;
+      error = null;
+      choose(pickValue(toolkits(), value));
+      shell.close({ refocus: true });
+    },
+  });
+  // ↑/↓ between the rows (Enter is the button's own click).
+  shell.pop.addEventListener("keydown", (e) => {
+    if (e.key !== "ArrowDown" && e.key !== "ArrowUp") return;
+    const rows = rowsOf();
+    const at = rows.indexOf(doc.activeElement);
+    if (at < 0) return;
+    e.preventDefault();
+    rows[Math.max(0, Math.min(rows.length - 1, at + (e.key === "ArrowDown" ? 1 : -1)))].focus();
+  });
+
+  function open() {
+    if (shell.isOpen()) {
+      draw();
+      focusInside();
+    } else {
+      shell.open(button);
+    }
+  }
+
+  return {
+    open,
+    // The override chip's click: opens the list, or closes it.
+    toggle: () => (shell.isOpen() ? shell.close() : open()),
+    close: () => shell.close(),
+    isOpen: () => shell.isOpen(),
+    refresh: () => { if (shell.isOpen()) draw(); },
+    // Start refused the picked kit (400 toolkit_refused): said in the list,
+    // opened again.
+    refuse: (message) => {
+      error = message;
+      open();
+    },
+  };
+}

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

@@ -6,12 +6,9 @@
 // {level, source, own}; the worker's snapshot, a command_ran, or the
 // server's own reading of the session file). A config on level_chip.js.
 //
-// The start page has one too (kind "new session"): it shows the picked
-// model's level (GET /api/models' thinking) and keeps a choice for the
-// next create only (POST /api/sessions' thinking), never remembered:
-// nothing is sent unless the user sets one.
+// The start page's new session sets its level in the ⚙ panel instead
+// (start_settings.js, over LEVELS).
 
-import { SESSION } from "./llm_context_chip.js";
 import * as level from "./level_chip.js";
 import { html, nothing } from "./vendor/lit-html.js";
 
@@ -26,25 +23,16 @@ export const CONFIG = Object.freeze({
   formClass: "think-form",
   popoverClass: "think-popover",
   nowClass: "think-now",
-  when: (fresh) => (fresh ? "For the new session's first turn on; not remembered for the next one."
-    : "From the next turn's start. On Gemma the whole prompt is read again; a hosted API reads the whole conversation again."),
+  when: () => "From the next turn's start. On Gemma the whole prompt is read again; a hosted API reads the whole conversation again.",
 });
 
 export const { nowText } = level;
 
-// The new session's choice (a level, or null) laid over the model's summary:
-// what the chip shows. The model's own summary without a choice.
-export function withChoice(summary, choice) {
-  if (!summary || !choice) return summary;
-  return { ...summary, level: choice, source: SESSION, own: choice };
-}
-
-// The chip: its text, tooltip and whether the session (or the new session)
-// set its own; null without a summary (an older worker). The default with
-// nothing set anywhere shows too ("think default"): the chip is where the
-// level is set.
-export function chipModel(summary, opts) {
-  return level.chipModel(CONFIG, summary, opts);
+// The chip: its text, tooltip and whether the session set its own; null
+// without a summary (an older worker). The default with nothing set
+// anywhere shows too ("think default"): the chip is where the level is set.
+export function chipModel(summary) {
+  return level.chipModel(CONFIG, summary);
 }
 
 // The session bar's chip (a lit-html template; info_bar.js), nothing
@@ -66,8 +54,7 @@ export function formTemplate(summary, opts) {
   return level.formTemplate(CONFIG, summary, opts);
 }
 
-// The chip's popover (level_chip.js createLevelControl); the start page's
-// passes kind NEW_SESSION, choice and choose.
+// The chip's popover (level_chip.js createLevelControl).
 export function createThinkingControl({ id = "thinkingPopover", ...opts }) {
   return level.createLevelControl({ cfg: CONFIG, id, ...opts });
 }

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

data/lib/samagotchi/web/update_check.rb

@@ -4,6 +4,7 @@ require "fileutils"
 require "json"
 require "time"
 require_relative "../atomic_file"
+require_relative "../chi_home"
 require_relative "../config"
 require_relative "../gem_update"
 require_relative "../installed_gem"
@@ -27,7 +28,7 @@ module Samagotchi
                      min_age_hours: Config.get("update.min_age_hours"),
                      fetcher: -> { GemUpdate.new.releases }, clock: -> { Time.now },
                      state_file: File.join(Paths.state_dir, "update_check.json"),
-                     gem_spec: InstalledGem.spec, bundler: nil, gem_dir: Gem.dir,
+                     gem_spec: InstalledGem.spec, bundler: nil, gem_dir: ChiHome.gem_dir(gem_spec: gem_spec),
                      installed_versions: InstalledVersions.new)
         @hub = hub
         @enabled = enabled
@@ -97,7 +98,7 @@ module Samagotchi
       # one answer), or nil: a source checkout, a Bundler run, a gem dir it
       # can't write.
       # @return [String, nil]
-      def self.blocked_reason(gem_spec: InstalledGem.spec, bundler: nil, gem_dir: Gem.dir)
+      def self.blocked_reason(gem_spec: InstalledGem.spec, bundler: nil, gem_dir: ChiHome.gem_dir(gem_spec: gem_spec))
         bundler = defined?(::Bundler) || !ENV["BUNDLE_GEMFILE"].to_s.empty? if bundler.nil?
         return "checkout" unless gem_spec
         return "bundler" if bundler

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: samagotchi
 version: !ruby/object:Gem::Version
-  version: 0.131.0
+  version: 0.133.0
 platform: ruby
 authors:
 - Dmitry Dedov
@@ -256,6 +256,7 @@ files:
 - lib/samagotchi/bundles/mcp/plugin.rb
 - lib/samagotchi/bundles/model-notes/manifest.yml
 - lib/samagotchi/bundles/model-notes/model_notes_deepseek.md
+- lib/samagotchi/bundles/model-notes/model_notes_tone.md
 - lib/samagotchi/bundles/model-notes/notes/README.md
 - lib/samagotchi/bundles/ruby/manifest.yml
 - lib/samagotchi/bundles/ruby/plugin.rb
@@ -276,7 +277,9 @@ files:
 - lib/samagotchi/bundles/work-cap/plugin.rb
 - lib/samagotchi/cache_confirm.rb
 - lib/samagotchi/cancellation_controller.rb
+- lib/samagotchi/chi_home.rb
 - lib/samagotchi/chi_invocation.rb
+- lib/samagotchi/chi_shim.rb
 - lib/samagotchi/child_env.rb
 - lib/samagotchi/child_move.rb
 - lib/samagotchi/child_reports.rb
@@ -371,6 +374,9 @@ files:
 - lib/samagotchi/guardrails/verdict.rb
 - lib/samagotchi/guardrails_command.rb
 - lib/samagotchi/hold_stop.rb
+- lib/samagotchi/home_command.rb
+- lib/samagotchi/home_doctor.rb
+- lib/samagotchi/home_notice.rb
 - lib/samagotchi/hook_question.rb
 - lib/samagotchi/hook_routes.rb
 - lib/samagotchi/hooks.rb
@@ -497,6 +503,7 @@ files:
 - lib/samagotchi/plugin/http_transport.rb
 - lib/samagotchi/plugin/loader.rb
 - lib/samagotchi/plugin/peer.rb
+- lib/samagotchi/plugin/prompt_sections.rb
 - lib/samagotchi/plugin/service.rb
 - lib/samagotchi/plugin/sessions.rb
 - lib/samagotchi/plugin/side_question.rb
@@ -505,6 +512,7 @@ files:
 - lib/samagotchi/plugin_session_state.rb
 - lib/samagotchi/plugin_tasks.rb
 - lib/samagotchi/process_group.rb
+- lib/samagotchi/project_env.rb
 - lib/samagotchi/project_scope.rb
 - lib/samagotchi/prompt.rb
 - lib/samagotchi/prompt_files.rb
@@ -858,6 +866,8 @@ files:
 - lib/samagotchi/web/public/stage_view.js
 - lib/samagotchi/web/public/stage_watch.js
 - lib/samagotchi/web/public/start_page.js
+- lib/samagotchi/web/public/start_settings.js
+- lib/samagotchi/web/public/start_toolkit.js
 - lib/samagotchi/web/public/stop_sheet.js
 - lib/samagotchi/web/public/storage.js
 - lib/samagotchi/web/public/stream_handlers.js