samagotchi 0.67.0 → 0.69.0

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

@@ -0,0 +1,65 @@
+// The stage view's in-use watch (stage_view.js): the stage is in use while
+// the pointer is over it (tracked on the stage itself: :hover goes stale
+// when children change), after a touch or wheel in the last 4 s (phones
+// have no hover), with keyboard focus or a selection in it. While an ended
+// turn waits for its hand-off it ticks every WATCH_MS: the stage wears
+// `in-use`, and the stage's +onTick+ (stage_model.js handOffDue) says when
+// the hand-off is due, with the quiet clock this watch keeps.
+import { inUseFrom } from "./stage_model.js";
+
+const WATCH_MS = 200;
+
+// +watching()+: the stage still holds an ended turn (else a tick stops the
+// watch). +onTick({ inUse, quietSinceMs, nowMs })+ returns { due,
+// quietSinceMs }; +onDue()+ hands off.
+export function createInUseWatch({ stage, watching, onTick, onDue }) {
+  let watchTimer = null;
+  let quietSince = null;
+  let pointerIn = false;
+  let lastTouch = 0;
+
+  stage.addEventListener("pointerenter", (e) => { if (e.pointerType === "mouse") pointerIn = true; });
+  stage.addEventListener("pointermove", (e) => { if (e.pointerType === "mouse") pointerIn = true; });
+  stage.addEventListener("pointerleave", () => { pointerIn = false; });
+  // Scrolling needs the pointer over it, a touch or keyboard focus; the
+  // stage's own scrolls (follow, the answer's top) are no use.
+  for (const type of ["touchstart", "touchmove", "wheel"]) {
+    stage.addEventListener(type, () => { lastTouch = Date.now(); }, { passive: true, capture: true });
+  }
+
+  function inUse(nowMs) {
+    const active = document.activeElement;
+    const sel = window.getSelection();
+    return inUseFrom({
+      pointerIn,
+      lastTouchMs: lastTouch,
+      // A clicked button keeps the focus in Chrome: only keyboard focus and
+      // a field being typed in count.
+      focusInside: !!active && stage.contains(active) && active.matches(":focus-visible"),
+      selectionInside: !!sel && !sel.isCollapsed && stage.contains(sel.anchorNode),
+      nowMs,
+    });
+  }
+
+  function stopWatch() {
+    clearInterval(watchTimer);
+    watchTimer = null;
+    quietSince = null;
+    stage.classList.remove("in-use");
+  }
+
+  function startWatch() {
+    stopWatch();
+    watchTimer = setInterval(() => {
+      if (!watching()) return stopWatch();
+      const nowMs = Date.now();
+      const busy = inUse(nowMs);
+      stage.classList.toggle("in-use", busy);
+      const r = onTick({ inUse: busy, quietSinceMs: quietSince, nowMs });
+      quietSince = r.quietSinceMs;
+      if (r.due) onDue();
+    }, WATCH_MS);
+  }
+
+  return { start: startWatch, stop: stopWatch };
+}

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

@@ -31,7 +31,7 @@
 //   addCommandBubble(view), addNoteBubble(note), findInTurnRoots(selector),
 //   setUsedMemories(names), showRecap(text), showGuardrailWarning(text, label),
 //   showHookNotice(data), onInitEvent(type, data), upsertCard(card),
-//   refreshCardBodies()   the page's hooks
+//   refreshCardBodies(), syncModelPick()   the page's hooks
 
 import { routeChunk } from "./chunk_router.js";
 import { extractCtxPct, generationTokens } from "./ctx.js";
@@ -55,7 +55,7 @@ export function createStreamHandlers(deps) {
     resync, updateInfoBar, applyPromptOps, showSteers, markRecapStale, setTurnRunning, setLiveStatus, endTurnView,
     appendChunk, readTurnEnd, applyFinalMarkdown, refreshTimingFromSession, makeUserBubble, addEndBubble,
     commandBubble, addCommandBubble, addNoteBubble, findInTurnRoots, setUsedMemories, showRecap,
-    showGuardrailWarning, showHookNotice, onInitEvent, upsertCard, refreshCardBodies,
+    showGuardrailWarning, showHookNotice, onInitEvent, upsertCard, refreshCardBodies, syncModelPick,
   } = deps;
 
   return {
@@ -210,6 +210,9 @@ export function createStreamHandlers(deps) {
         state().served = null;
         updateInfoBar();
       }
+      // A fresh link's picker shows the model the worker kept, a refused
+      // /model too (its pick set the button before the answer).
+      if (view.modelName) syncModelPick?.();
       // /llm-context changed what the next turn runs under.
       if (data.llm_context) {
         state().llmContext = data.llm_context;

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

@@ -258,12 +258,14 @@ function canceledSteps(g, record, tools) {
 }
 
 // A call's row from its tool record alone (no saved parts): the record's
-// called_as too, so "(called as bash)" shows after a reload, as live, and
+// called_as and via too, so "(called as bash)" and "(via call_tool)" show
+// after a reload, as live, and
 // its no_match ("no match" on a grep that found nothing).
 function recordRows(tools, iteration) {
   return tools.filter((r) => Number(r.iteration) === iteration).map((r) => ({
     key: `${iteration}:${r.call_index ?? 0}`, tool: r.tool, status: r.status, duration_ms: r.duration_ms,
     ...(r.called_as ? { called_as: r.called_as } : {}),
+    ...(r.via ? { via: r.via } : {}),
     ...noMatch(r),
   }));
 }

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

@@ -0,0 +1,16 @@
+// Where the toast sits (app.js placeToast measures, this decides): in a
+// session, +gap+ above the highest of the composer card and what opens
+// over it (the stage while it shows, a fresh link's open model panel), so
+// it covers none of them; null elsewhere (the CSS's 24 px from the bottom).
+// When that leaves the toast no room on screen it stays +gap+ from the top
+// (covering what's under it rather than going off screen).
+// @param tops the tops (px from the viewport's top) of what shows over the
+//   card; null for one that doesn't
+// @return {number|null} the toast's bottom offset in px
+export function toastBottom({ inSession, viewportHeight, dockTop, tops = [], toastHeight = 0, gap = 12 }) {
+  if (!inSession) return null;
+  const top = Math.min(dockTop, ...tops.filter((t) => Number.isFinite(t)));
+  const bottom = viewportHeight - top + gap;
+  const cap = viewportHeight - toastHeight - gap;
+  return Math.round(Math.max(0, Math.min(bottom, cap)));
+}

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

@@ -1,9 +1,11 @@
 // The session bar's tools chip: the session's toolkit when it isn't full
 // ("tools lean"), with the tools it leaves out and how to change them in
 // its tooltip. The summary is the session's toolkit ({name, label,
-// left_out, fallback}: Toolkit::Explained#summary; the worker's snapshot or
-// a command_ran; the server's own reading of the session file has no
-// left_out). Changing it is /toolkit (no popover yet).
+// left_out, reachable, removed, fallback}: Toolkit::Explained#summary; the
+// worker's snapshot or a command_ran; the server's own reading of the
+// session file has no lists). Left out is reachable (find_tools and
+// call_tool reach them) and removed (only /toolkit add brings one back).
+// Changing it is /toolkit (no popover yet).
 
 import { html, nothing } from "./vendor/lit-html.js";
 
@@ -13,7 +15,12 @@ export function chipModel(summary) {
   const label = summary.label || summary.name;
   const parts = [`Toolkit: ${label}, the tools this session declares.`];
   if (summary.fallback) parts.push(`${summary.fallback}: every tool is declared (full) until it resolves.`);
-  if (Array.isArray(summary.left_out)) {
+  const reachable = Array.isArray(summary.reachable) ? summary.reachable : [];
+  const removed = Array.isArray(summary.removed) ? summary.removed : [];
+  if (reachable.length) {
+    parts.push(`Reachable with find_tools: ${reachable.join(", ")}.`);
+    if (removed.length) parts.push(`Removed: ${removed.join(", ")}.`);
+  } else if (Array.isArray(summary.left_out)) {
     parts.push(summary.left_out.length ? `Not loaded: ${summary.left_out.join(", ")}.` : "Nothing left out.");
   }
   parts.push("/toolkit lists them; /toolkit NAME, add TOOL or remove TOOL changes them from the next turn.");

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

@@ -100,8 +100,10 @@ export function toolRowInnerTemplate(row, { thumbs = () => nothing, stop = nothi
   const params = shown
     ? html`<span class=${`activity-params${ref?.kind ? " ref" : ""}`} title=${hover || nothing} data-ref-kind=${attr(ref?.kind)} data-ref-path=${attr(ref?.kind && ref.path)} data-ref-line=${attr(ref?.kind && ref.line)} data-ref-end-line=${attr(ref?.kind && ref.end_line)}>${shown}</span>`
     : nothing;
-  // The name the model called the tool by when it was an alias's, dim.
-  const alias = row.called_as ? html`<span class="activity-alias">(called as ${row.called_as})</span>` : nothing;
+  // The name the model called the tool by when it was an alias's, or the
+  // tool it was reached through (call_tool), dim.
+  const alias = row.called_as ? html`<span class="activity-alias">(called as ${row.called_as})</span>`
+    : row.via ? html`<span class="activity-alias">(via ${row.via})</span>` : nothing;
   const duration = formatDuration(row.duration_ms);
   const full = row.status === "running" ? "" : String(row.output || "").replace(/^\[[^\]]*\]\s*/, "");
   const output = full

data/lib/samagotchi/web/public/vendor/directive-helpers.js

@@ -0,0 +1,8 @@
+// lit-html 3.3.3 (npm tarball lit-html-3.3.3.tgz, directive-helpers.js: the minified production build,
+// unmodified but for this line and the dropped sourceMappingURL). BSD-3-Clause.
+import{_$LH as o}from"./lit-html.js";
+/**
+ * @license
+ * Copyright 2020 Google LLC
+ * SPDX-License-Identifier: BSD-3-Clause
+ */const{I:t}=o,i=o=>o,n=o=>null===o||"object"!=typeof o&&"function"!=typeof o,e={HTML:1,SVG:2,MATHML:3},l=(o,t)=>void 0===t?void 0!==o?._$litType$:o?._$litType$===t,d=o=>null!=o?._$litType$?.h,c=o=>void 0!==o?._$litDirective$,f=o=>o?._$litDirective$,r=o=>void 0===o.strings,s=()=>document.createComment(""),v=(o,n,e)=>{const l=o._$AA.parentNode,d=void 0===n?o._$AB:n._$AA;if(void 0===e){const i=l.insertBefore(s(),d),n=l.insertBefore(s(),d);e=new t(i,n,o,o.options)}else{const t=e._$AB.nextSibling,n=e._$AM,c=n!==o;if(c){let t;e._$AQ?.(o),e._$AM=o,void 0!==e._$AP&&(t=o._$AU)!==n._$AU&&e._$AP(t)}if(t!==d||c){let o=e._$AA;for(;o!==t;){const t=i(o).nextSibling;i(l).insertBefore(o,d),o=t}}}return e},u=(o,t,i=o)=>(o._$AI(t,i),o),m={},p=(o,t=m)=>o._$AH=t,M=o=>o._$AH,h=o=>{o._$AR(),o._$AA.remove()},j=o=>{o._$AR()};export{e as TemplateResultType,j as clearPart,M as getCommittedValue,f as getDirectiveClass,v as insertPart,d as isCompiledTemplateResult,c as isDirectiveResult,n as isPrimitive,r as isSingleExpression,l as isTemplateResult,h as removePart,u as setChildPartValue,p as setCommittedValue};

data/lib/samagotchi/web/public/vendor/directives/repeat.js

@@ -0,0 +1,9 @@
+// lit-html 3.3.3 (npm tarball lit-html-3.3.3.tgz, directives/repeat.js: the minified production build,
+// unmodified but for this line and the dropped sourceMappingURL). BSD-3-Clause.
+import{noChange as e}from"../lit-html.js";import{directive as s,Directive as t,PartType as r}from"../directive.js";import{getCommittedValue as l,setChildPartValue as o,insertPart as i,removePart as n,setCommittedValue as f}from"../directive-helpers.js";
+/**
+ * @license
+ * Copyright 2017 Google LLC
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+const u=(e,s,t)=>{const r=new Map;for(let l=s;l<=t;l++)r.set(e[l],l);return r},c=s(class extends t{constructor(e){if(super(e),e.type!==r.CHILD)throw Error("repeat() can only be used in text expressions")}dt(e,s,t){let r;void 0===t?t=s:void 0!==s&&(r=s);const l=[],o=[];let i=0;for(const s of e)l[i]=r?r(s,i):i,o[i]=t(s,i),i++;return{values:o,keys:l}}render(e,s,t){return this.dt(e,s,t).values}update(s,[t,r,c]){const d=l(s),{values:p,keys:a}=this.dt(t,r,c);if(!Array.isArray(d))return this.ut=a,p;const h=this.ut??=[],v=[];let m,y,x=0,j=d.length-1,k=0,w=p.length-1;for(;x<=j&&k<=w;)if(null===d[x])x++;else if(null===d[j])j--;else if(h[x]===a[k])v[k]=o(d[x],p[k]),x++,k++;else if(h[j]===a[w])v[w]=o(d[j],p[w]),j--,w--;else if(h[x]===a[w])v[w]=o(d[x],p[w]),i(s,v[w+1],d[x]),x++,w--;else if(h[j]===a[k])v[k]=o(d[j],p[k]),i(s,d[x],d[j]),j--,k++;else if(void 0===m&&(m=u(a,k,w),y=u(h,x,j)),m.has(h[x]))if(m.has(h[j])){const e=y.get(a[k]),t=void 0!==e?d[e]:null;if(null===t){const e=i(s,d[x]);o(e,p[k]),v[k]=e}else v[k]=o(t,p[k]),i(s,d[x],t),d[e]=null;k++}else n(d[j]),j--;else n(d[x]),x++;for(;k<=w;){const e=i(s,v[w+1]);o(e,p[k]),v[k++]=e}for(;x<=j;){const e=d[x++];null!==e&&n(e)}return this.ut=a,f(s,v),e}});export{c as repeat};

data/lib/samagotchi/worker.rb

@@ -22,6 +22,7 @@ require_relative "llm/errors"
 require_relative "continue_offer"
 require_relative "iteration_limit"
 require_relative "session_commands"
+require_relative "session_setting"
 require_relative "queued_command"
 require_relative "model_profile"
 require_relative "child_reports"
@@ -153,9 +154,6 @@ module Samagotchi
       # The running turn has ended (its end event) and its after_turn hooks
       # run: a signal's grace waits for them (#signalled).
       @turn_ending = false
-      # The worker's own saves and a signal's (#signal_grace_expired), one
-      # at a time.
-      @save_mutex = Mutex.new
     end
 
     # Whether the session was empty as the worker left it, so the caller
@@ -460,7 +458,7 @@ module Samagotchi
       return unless mark
 
       Log.info(:worker, "interrupted_turn_settled", turn_id: mark.id, iteration: mark.iteration, at: mark.at)
-      save_or_log(:interrupted_turn) { @session.save(state_dir: @state_dir) }
+      save_or_log(:interrupted_turn) { save_session }
     end
 
     # A question saved by a worker that died while it waited (an
@@ -473,7 +471,7 @@ module Samagotchi
       return unless id
 
       Log.info(:worker, "dead_question_dropped", id: id)
-      save_or_log(:dead_question) { @session.save(state_dir: @state_dir) }
+      save_or_log(:dead_question) { save_session }
     end
 
     # The attached context's notes (WorkerInbound#absorb_context), and the
@@ -873,15 +871,10 @@ module Samagotchi
       event[:anytime] = true if anytime
       # Its line was shown at its command_queued (waits: turn_end).
       event[:queued] = true if command.waits_for_turn_end?
-      # /llm-context or /model: what the next turn runs under now (the web's chip).
-      event[:llm_context] = @engine.llm_context_summary if changed.intersect?(%i[llm_context model])
-      # /thinking or /model: the level the next turn runs at (the web's chip).
-      event[:thinking] = @engine.thinking_explained&.summary if changed.intersect?(%i[thinking model])
-      # /reasoning-history or /model: the level the next turn runs under
-      # (the web's chip); nil on a native host, which ignores it.
-      event[:reasoning_history] = @engine.reasoning_history_explained&.summary if changed.intersect?(%i[reasoning_history model])
-      # /toolkit: what the next turn declares (the web's chip; nil on full).
-      event[:toolkit] = @engine.toolkit_summary if changed.include?(:toolkit)
+      # The chips the command moved (SessionSetting#changed_by): what the next
+      # turn runs under now (/llm-context, /thinking, /reasoning-history,
+      # /toolkit, and /model for the model's).
+      SessionSetting::ALL.each { |setting| event[setting.key] = setting.summary(@engine) if setting.changed_by?(changed) }
       event[:confirm] = confirm.to_h if confirm
       event[:output_truncated] = true if text.length > COMMAND_OUTPUT_LIMIT
       @engine.announce(event)
@@ -910,7 +903,7 @@ module Samagotchi
         # the new parent beside it (Session::PARENT_FILE): this turn's
         # status, its rings and every save from here on say so.
         @session.parent_id = Session.parent_override(@session_id, state_dir: @state_dir) || @session.parent_id
-        @session.save(state_dir: @state_dir)
+        save_session
         result = @engine.run_turn(@session, prompt, pending_input: pending_input_drain, **turn_args)
       rescue StandardError => e
         error = e
@@ -1238,8 +1231,10 @@ module Samagotchi
     # Save the session, a stopped one too: a stop is the marker file
     # (Session.mark_stopped), which every load reads over the saved status,
     # so this save can't hide it, and the turn the stop canceled is kept.
+    # Session#save serializes it with every other save of @session (Bridge
+    # threads, the turn's checkpoints, a signal's thread).
     def save_session
-      @save_mutex.synchronize { @session.save(state_dir: @state_dir) }
+      @session.save(state_dir: @state_dir)
     end
 
     def signalled? = !@signals.signal.nil?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: samagotchi
 version: !ruby/object:Gem::Version
-  version: 0.67.0
+  version: 0.69.0
 platform: ruby
 authors:
 - Dmitry Dedov
@@ -275,6 +275,7 @@ files:
 - lib/samagotchi/desktop/macos/Tmux.swift
 - lib/samagotchi/desktop_command.rb
 - lib/samagotchi/edit_preview.rb
+- lib/samagotchi/effective_model.rb
 - lib/samagotchi/empty_answer_retry.rb
 - lib/samagotchi/engine.rb
 - lib/samagotchi/engine_peers.rb
@@ -330,6 +331,7 @@ files:
 - lib/samagotchi/kernel_loop.rb
 - lib/samagotchi/last_turn.rb
 - lib/samagotchi/launch_mode.rb
+- lib/samagotchi/level_setting_command.rb
 - lib/samagotchi/live_versions.rb
 - lib/samagotchi/llm/adapter_common.rb
 - lib/samagotchi/llm/adapters.rb
@@ -459,6 +461,7 @@ files:
 - lib/samagotchi/session_metrics.rb
 - lib/samagotchi/session_observer.rb
 - lib/samagotchi/session_retention.rb
+- lib/samagotchi/session_setting.rb
 - lib/samagotchi/session_setup.rb
 - lib/samagotchi/sessions_command.rb
 - lib/samagotchi/setting_explained.rb
@@ -492,6 +495,7 @@ files:
 - lib/samagotchi/text_diff.rb
 - lib/samagotchi/thinking.rb
 - lib/samagotchi/thinking_command.rb
+- lib/samagotchi/thinking_notices.rb
 - lib/samagotchi/thinking_tails.rb
 - lib/samagotchi/thinking_ticker.rb
 - lib/samagotchi/thought_stream_splitter.rb
@@ -569,8 +573,11 @@ files:
 - lib/samagotchi/web/public/annotations.js
 - lib/samagotchi/web/public/answer_refs.js
 - lib/samagotchi/web/public/app.js
+- lib/samagotchi/web/public/bubbles.js
 - lib/samagotchi/web/public/card.js
+- lib/samagotchi/web/public/cards_place.js
 - lib/samagotchi/web/public/chains.js
+- lib/samagotchi/web/public/chip_popover.js
 - lib/samagotchi/web/public/chunk_router.js
 - lib/samagotchi/web/public/command_complete.js
 - lib/samagotchi/web/public/command_list.js
@@ -591,6 +598,7 @@ files:
 - lib/samagotchi/web/public/images.js
 - lib/samagotchi/web/public/index.html
 - lib/samagotchi/web/public/info_bar.js
+- lib/samagotchi/web/public/info_bar_model.js
 - lib/samagotchi/web/public/init_row.js
 - lib/samagotchi/web/public/keep_focus.js
 - lib/samagotchi/web/public/kept_commands.js
@@ -620,8 +628,11 @@ files:
 - lib/samagotchi/web/public/session_title.js
 - lib/samagotchi/web/public/sessions_list.js
 - lib/samagotchi/web/public/shown_texts.js
+- lib/samagotchi/web/public/stage_frame.js
 - lib/samagotchi/web/public/stage_model.js
+- lib/samagotchi/web/public/stage_slots.js
 - lib/samagotchi/web/public/stage_view.js
+- lib/samagotchi/web/public/stage_watch.js
 - lib/samagotchi/web/public/stream_handlers.js
 - lib/samagotchi/web/public/strip.js
 - lib/samagotchi/web/public/tally.js
@@ -629,13 +640,16 @@ files:
 - lib/samagotchi/web/public/thinking_chip.js
 - lib/samagotchi/web/public/thinking_ticker.js
 - lib/samagotchi/web/public/timing.js
+- lib/samagotchi/web/public/toast_place.js
 - lib/samagotchi/web/public/toolkit_chip.js
 - lib/samagotchi/web/public/turn_events.js
 - lib/samagotchi/web/public/turn_html.js
 - lib/samagotchi/web/public/turn_model.js
 - lib/samagotchi/web/public/turn_view.js
 - lib/samagotchi/web/public/update_notice.js
+- lib/samagotchi/web/public/vendor/directive-helpers.js
 - lib/samagotchi/web/public/vendor/directive.js
+- lib/samagotchi/web/public/vendor/directives/repeat.js
 - lib/samagotchi/web/public/vendor/directives/unsafe-html.js
 - lib/samagotchi/web/public/vendor/lit-html.js
 - lib/samagotchi/web/qr.rb