samagotchi 0.131.0 → 0.133.0

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

@@ -7,10 +7,9 @@
 // worker's snapshot, a command_ran, or the server's own reading of the
 // session file).
 //
-// The start page has one too (kind "new session"): it shows the picked
-// model's values (GET /api/models' llm_context) and its form keeps a
-// choice for the next create only (POST /api/sessions' llm_context), never
-// remembered: nothing is sent unless the user sets one.
+// The start page's new session sets its strategy in the ⚙ panel instead
+// (start_settings.js): mergeChoice and choiceWords are its, a choice in the
+// session file's shape sent as POST /api/sessions' llm_context words.
 
 import { createChipPopover } from "./chip_popover.js";
 import { html, nothing, render } from "./vendor/lit-html.js";
@@ -22,7 +21,6 @@ const STRATEGIES = [
 ];
 export const APPLIES = ["payoff", "next_request", "turn_end"];
 export const SESSION = "session";
-export const NEW_SESSION = "new session";
 
 const DEFAULT = "default";
 const LAYER_ORDER = ["stale", "forget"];
@@ -43,34 +41,15 @@ export function ownValues(summary) {
   return { strategy, apply: own.apply || DEFAULT, budget };
 }
 
-// The start page's choice for the new session ({strategy: [layers], apply,
-// budget_tokens}, the session file's shape; 0 is off) laid over the
-// model's summary: what the chip shows, with the chosen fields' source
-// "session" ("the new session"). The model's own summary without a choice.
-export function withChoice(summary, choice) {
-  if (!summary || !choice) return summary;
-  const merged = { ...summary, own: choice };
-  // (the budget's source and where are budget_source / budget_where)
-  const set = (field, key, value) => Object.assign(merged, { [key]: value, [`${field}_source`]: SESSION,
-                                                            [`${field}_where`]: "the new session" });
-  if (Array.isArray(choice.strategy)) set("strategy", "strategy", strategyValue(choice.strategy));
-  if (choice.apply) set("apply", "apply", choice.apply);
-  if (typeof choice.budget_tokens === "number") {
-    set("budget", "budget_tokens", choice.budget_tokens > 0 ? choice.budget_tokens : null);
-  }
-  return merged;
-}
-
-// The chip: its text, tooltip and whether the session (or the new session)
-// set its own; null without a summary (an older worker).
-export function chipModel(summary, { kind = SESSION } = {}) {
+// The chip: its text, tooltip and whether the session set its own; null
+// without a summary (an older worker).
+export function chipModel(summary) {
   if (!summary || !summary.strategy) return null;
   const own = summary.strategy_source === "session" || !!summary.own;
   const budget = summary.budget_tokens ? `${summary.budget_tokens} tokens` : "off";
-  const what = kind === NEW_SESSION ? "the new session" : "this session";
   const title = `LLM context strategy: ${summary.strategy} (${summary.strategy_where}); apply ${summary.apply} ` +
-    `(${summary.apply_where}); budget ${budget} (${summary.budget_where}). Click to change it for ${what}.`;
-  return { text: `llm ctx ${summary.strategy}${own ? ` · ${kind}` : ""}`, title, own };
+    `(${summary.apply_where}); budget ${budget} (${summary.budget_where}). Click to change it for this session.`;
+  return { text: `llm ctx ${summary.strategy}${own ? ` · ${SESSION}` : ""}`, title, own };
 }
 
 // The session bar's chip (a lit-html template; info_bar.js), nothing
@@ -85,14 +64,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;
@@ -107,10 +87,10 @@ export function parseBudget(text) {
   return tokens >= 4000 && tokens <= 10_000_000 ? tokens : null;
 }
 
-// The new session's choice after a Set: +choice+ with the fields the user
-// changed (vs +initial+, the values the form opened with) applied, a field
-// set back to default dropped; null when nothing is left. Throws on a
-// budget that isn't one.
+// The new session's choice (start_settings.js) after a pick or a Set:
+// +choice+ with the fields the user changed (vs +initial+, the values
+// before) applied, a field set back to default dropped; null when nothing
+// is left. Throws on a budget that isn't one.
 export function mergeChoice(choice, { strategy = DEFAULT, apply = DEFAULT, budget = "" } = {}, initial = null) {
   const next = { ...(choice || {}) };
   const words = { strategy, apply, budget: String(budget).trim() || DEFAULT };
@@ -160,23 +140,18 @@ export function nowText(summary) {
     `budget ${budget} (${summary.budget_where})`;
 }
 
-// The popover's form (a lit-html template). For the new session (kind
-// NEW_SESSION), +summary+ is the model's and +choice+ the values the form
-// shows; +now+ is the summary its "Now:" line reads (refresh passes a newer
-// one, the rest stays as the form opened, so lit leaves what the user typed
-// alone); +error+ a failed Set's message. The selects take their value as
-// a property (.value), set after their options: +unset+ draws the options
-// alone, the first pass renderForm makes.
-export function formTemplate(summary, { running = false, kind = SESSION, choice = null, now = summary, error = null,
-                                        unset = false } = {}) {
-  const fresh = kind === NEW_SESSION;
-  const own = fresh ? ownValues({ own: choice }) : ownValues(summary);
+// 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,
+// so lit leaves what the user typed alone); +error+ a failed Set's message.
+// The selects take their value as a property (.value), set after their
+// options: +unset+ draws the options alone, the first pass renderForm makes.
+export function formTemplate(summary, { running = false, now = summary, error = null, unset = false } = {}) {
+  const own = ownValues(summary);
   const follow = (field) => (summary[`${field}_source`] === "session" ? "follow the model" : `follow the model (${summary[field]})`);
-  const when = fresh ? "For the new session's first turn on; not remembered for the next one."
-    : "From the next turn's start. Turning forget on or off re-reads the whole prompt once.";
+  const when = "From the next turn's start. Turning forget on or off re-reads the whole prompt once.";
   const chosen = (value) => (unset ? nothing : value);
   return html`<form class="llmctx-form"><div class="ctx-pop-head"><strong>LLM context</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 llmctx-now">${nowText(now)}</div
     ><label class="llmctx-field"><span>Strategy</span><span class="select-wrap"><select name="strategy" .value=${chosen(own.strategy)}>${
@@ -205,16 +180,11 @@ export function renderForm(target, summary, opts = {}) {
 // The chip's popover (chip_popover.js' shell). el: where the chip is drawn
 // (#infoText, info_bar.js: clicks are delegated); summary(): the open
 // session's llm_context; session(): the open session's 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 choice, and choose(next) takes a Set's (null for
-// "follow the model") instead of a command running. id and anchor (the
-// chip's selector) keep the two controls apart.
+// turn runs; run(line): sends the command. id and anchor: the popover's id
+// and the chip's selector.
 export function createLlmContextControl({ el, summary, session = () => null, running = () => false, run,
-                                          kind = SESSION, choice = () => null, choose = null,
                                           id = "llmContextPopover", anchor = ".llmctx-chip",
                                           doc = document, win = window }) {
-  const fresh = kind === NEW_SESSION;
   // The values the form opened with.
   let initial = null;
   // What the open form was drawn from: the summary, the form's options and
@@ -230,26 +200,14 @@ export function createLlmContextControl({ el, summary, session = () => null, run
   // line alone).
   function show(data, opening) {
     if (!opening) return draw({ now: data });
-    initial = fresh ? ownValues({ own: choice() }) : ownValues(data);
-    shown = { data, opts: { running: running(), kind, choice: choice() } };
+    initial = ownValues(data);
+    shown = { data, opts: { running: running() } };
     draw({ now: data, error: null });
   }
 
   function submit(form) {
     const values = { strategy: form.elements.strategy.value, apply: form.elements.apply.value,
                      budget: form.elements.budget.value };
-    if (fresh) {
-      let next;
-      try {
-        next = mergeChoice(choice(), values, initial);
-      } catch (err) {
-        draw({ error: err.message });
-        return;
-      }
-      shell.close();
-      choose(next);
-      return;
-    }
     const line = commandLine(values, initial);
     shell.close();
     if (line) run(line);
@@ -258,8 +216,7 @@ export function createLlmContextControl({ el, summary, session = () => null, run
   function act(name) {
     if (name !== "reset") return;
     shell.close();
-    if (fresh) choose(null);
-    else run(commandLine());
+    run(commandLine());
   }
 
   const shell = createChipPopover({

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/review_start.js

@@ -1,10 +1,10 @@
 // Start review (the web's entry points to a review session, docs/sessions.md
-// Review sessions): the start page's review chip, whose files make the new
-// session a review session (POST /api/sessions {review: {subjects}}), and the
-// session bar's review button, a review fork of the open session
-// ({review: {from}}): its recap, not its transcript; it keeps running.
-import { html, nothing, render } from "./vendor/lit-html.js";
-import { createChipPopover } from "./chip_popover.js";
+// Review sessions): the start page's review files (the ⚙ panel's review
+// view, start_settings.js), which make the new session a review session
+// (POST /api/sessions {review: {subjects}}), and the session bar's review
+// button, a review fork of the open session ({review: {from}}): its recap,
+// not its transcript; it keeps running.
+import { html, nothing } from "./vendor/lit-html.js";
 
 // The files typed: split on commas, spaces and new lines, no repeats; a
 // path with a space (or a comma) in double quotes ("docs/my plan.md").
@@ -25,7 +25,7 @@ export function formatSubjects(subjects) {
   return (subjects || []).map((s) => (/[\s,"]/.test(s) ? `"${s}"` : s)).join(", ");
 }
 
-// The start page's chip: "review…" with none, else the files' names.
+// The start page's override chip: "review…" with none, else the files' names.
 export function reviewChipModel(subjects) {
   const list = subjects || [];
   if (!list.length) {
@@ -37,9 +37,12 @@ export function reviewChipModel(subjects) {
 }
 
 // +error+: why the files weren't taken (a quote left open, the server's
-// refusal at Start), shown above Set; +text+ the form's text as typed.
-export function reviewFormTemplate(subjects, { error = null, text = null } = {}) {
-  return html`<div class="ctx-pop-head"><strong>Review</strong><span class="ctx-pop-kind">new session</span
+// refusal at Start), shown above Set; +text+ the form's text as typed;
+// +back+: a ‹ before the heading (data-act="back": the start page's ⚙
+// panel, start_settings.js, whose view this is).
+export function reviewFormTemplate(subjects, { error = null, text = null, back = false } = {}) {
+  return html`<div class="ctx-pop-head">${back ? html`<button type="button" class="ss-back" data-act="back"
+    aria-label="Back to the settings" title="Back to the settings">‹</button>` : nothing}<strong>Review</strong><span class="ctx-pop-kind">new session</span
     ><button type="button" class="ctx-pop-close" data-act="close" aria-label="Close">×</button></div>
     <div class="ctx-pop-meta" id="reviewNewHelp">The files participants read beside the thread: project paths, relative to this folder,
       a path with a space in quotes. Secrets (.env, keys) and files outside the project are refused.</div>
@@ -50,50 +53,3 @@ export function reviewFormTemplate(subjects, { error = null, text = null } = {})
       <div class="ctx-pop-actions">${subjects?.length ? html`<button type="button" data-act="clear">No review</button>` : nothing}<button
         type="submit">Set</button></div></form>`;
 }
-
-// The start page's chip and its form. +el+ the chip; +choose(subjects)+.
-// refuse(message): Start's refusal of the files (400 invalid_review), said
-// in the form, opened again at the files chosen.
-export function createReviewStartControl({ el, choice, choose, doc = document, win = window }) {
-  let error = null;
-  let text = null;
-  const draw = () => {
-    render(reviewFormTemplate(choice(), { error, text }), shell.pop);
-    shell.replace();
-  };
-  const shell = createChipPopover({
-    id: "reviewNewPopover", className: "ctx-popover review-popover", width: 360, el, anchor: `#${el.id}`,
-    summary: () => ({}), sheet: true, label: "Review files", doc, win,
-    show: () => {
-      draw();
-      shell.pop.querySelector("textarea")?.focus();
-    },
-    onClose: () => { error = null; text = null; },
-    onSubmit: (form) => {
-      const typed = form.elements.subjects?.value || "";
-      const read = readSubjects(typed);
-      if (read.error) {
-        error = read.error;
-        text = typed;
-        return draw();
-      }
-      choose(read.subjects);
-      shell.close();
-    },
-    onAct: (name) => {
-      if (name === "clear") {
-        choose([]);
-        shell.close();
-      }
-    },
-  });
-  return {
-    close: () => shell.close(),
-    refuse: (message) => {
-      error = message;
-      text = null;
-      if (shell.isOpen()) draw();
-      else shell.open(el);
-    },
-  };
-}

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

@@ -54,10 +54,11 @@ export function createSendTurn({
     }
   }
 
-  // A create's refusal: the review files' in the review form (the start
-  // page's chip), else an alert.
+  // A create's refusal: the review files' in the ⚙ panel's review view, a
+  // picked kit's in the 🧰 list, else an alert.
   function refused(e) {
     if (e?.code === "invalid_review" && startPage.reviewRefused?.(e.message)) return;
+    if (e?.code === "toolkit_refused" && startPage.toolkitRefused?.(e.message)) return;
     alert(e.message);
   }