samagotchi 0.30.0 → 0.32.0

data/lib/samagotchi/tools/delegate_wait.rb

@@ -6,18 +6,18 @@ require_relative "../parent_report"
 require_relative "output_guardrails"
 require_relative "peers"
 require_relative "delegate_relay"
+require_relative "delegate_cursor"
 
 module Samagotchi
   module Tools
     # Waiting for a delegated session's next reply, shared by delegate and
     # delegate_result: ReplyWait in the tools' words, with the status words
-    # `chi send --wait` and `chi answer` use (ParentReport.status), with a cursor per
-    # child (the newest reply this parent was already given) and the child
-    # as it was before the message went in (ReplyWait's baseline), so a turn
-    # that ends before the wait's first look (a fast failure) still ends it.
-    # Both live in this process (a worker runs one session), keyed by parent
-    # and child; a worker respawn loses them, which only repeats the newest
-    # reply once or waits for a later turn.
+    # `chi send --wait` and `chi answer` use (ParentReport.status), with a
+    # DelegateCursor per child: the newest reply this parent was already
+    # given, and the child as it was when the parent last heard from it or
+    # sent it a message (ReplyWait's baseline), so a turn that ends before
+    # the wait's first look (a fast failure) still ends it. The cursors are
+    # on disk (DelegateCursors), so a respawned worker doesn't repeat a reply.
     module DelegateWait
       TIMEOUT_DEFAULT = 600
       POLL_INTERVAL = 0.5
@@ -32,16 +32,6 @@ module Samagotchi
 
       module_function
 
-      # @return [Hash{Array(String, String) => String}] [parent id, child id] → newest reply filename given
-      def seen
-        @seen ||= {}
-      end
-
-      # @return [Hash{Array(String, String) => Hash}] [parent id, child id] → ReplyWait baseline taken before sending
-      def baselines
-        @baselines ||= {}
-      end
-
       # @return [Hash{Array(String, String) => Array<String>}] [parent id,
       #   child id] → outcome lines of that child's approvals relayed while
       #   the parent waited on another child, for its next result
@@ -69,18 +59,20 @@ module Samagotchi
         cancelled = -> { peers.cancelled? }
         relay = peers.respond_to?(:relay) ? peers.relay : nil
         others = relay && others_for(peers.session_id, child_id, relay, sd)
-        baseline = baselines[key]
+        cursor = DelegateCursors.get(peers.session_id, child_id, state_dir: sd)
+        baseline = cursor.baseline
         left = timeout.to_i
         outcomes = relayed_outcomes.delete(key) || []
         loop do
           started = monotonic
-          wait = ReplyWait.call(child_id, state_dir: sd, cursor: seen[key], timeout: [left, 0].max,
+          wait = ReplyWait.call(child_id, state_dir: sd, cursor: cursor.reply_file, timeout: [left, 0].max,
                                           poll_interval: poll_interval, cancelled: cancelled, baseline: baseline,
                                           owner_grace: owner_grace, interject: others && -> { others.poll })
           left -= monotonic - started
           unless wait.status == :waiting_for_answer && DelegateRelay.relayable?(relay, wait.question)
             outcomes.concat(relayed_outcomes.delete(key) || [])
-            return with_outcomes(finish(wait, child_id, key: key, timeout: timeout), outcomes)
+            advance(peers.session_id, child_id, wait, state_dir: sd)
+            return with_outcomes(finish(wait, child_id, timeout: timeout), outcomes)
           end
 
           outcome = DelegateRelay.call(child_id, wait.question, relay: relay, state_dir: sd, more: others&.count.to_i)
@@ -118,24 +110,43 @@ module Samagotchi
 
       def monotonic = Process.clock_gettime(Process::CLOCK_MONOTONIC)
 
+      REPORT_NEXT_REPLY = "chi brings the child's next reply here by itself; don't wait for it with delegate_result."
+
+      # Outcomes that tell the parent something about the child's state.
+      REPORTED = %i[done no_reply error stopped waiting_for_answer worker_gone].freeze
+
+      # Move the parent's cursor past what +wait+ reported: the reply it
+      # gave, and the child as that same look loaded it (a fresh load could
+      # swallow a turn that ended in between), so a later wait looks for a
+      # later turn and a question already reported isn't reported again.
+      # Nothing moves on a timeout or a cancel.
+      # @param wait [ReplyWait::Result]
+      # @return [DelegateCursor, nil] the new cursor
+      def advance(parent_id, child_id, wait, state_dir:)
+        return nil unless REPORTED.include?(wait.status) && wait.session
+
+        DelegateCursors.update(parent_id, child_id, state_dir: state_dir) do |cursor|
+          cursor = cursor.with(reply_file: wait.file) if wait.status == :done
+          cursor.with_baseline(ReplyWait.baseline_of(wait.session))
+        end
+      end
+
       # The tool result for how the wait ended.
       # @param wait [ReplyWait::Result]
-      # @param key [Array(String, String)] [parent id, child id]
+      # @param report [Boolean] a delegate report's text (ChildReports), not
+      #   the tool's: a question's last line says chi brings the next reply
       # @return [String]
-      def finish(wait, child_id, key:, timeout:)
-        # The turn sent to is handed over: a later wait looks for a later one.
-        baselines.delete(key) if %i[done no_reply].include?(wait.status)
+      def finish(wait, child_id, timeout:, report: false)
         status = ParentReport.status(wait)
         case wait.status
         when :done
-          seen[key] = wait.file
           reply_result(child_id, status, wait.text)
         when :error
           result(child_id, status, "the child's worker failed: #{wait.text}; its session shows what happened")
         when :stopped
           result(child_id, status, "the child was stopped (chi sessions stop); delegate with session: #{child_id} starts it again with a message")
         when :waiting_for_answer
-          result(child_id, status, waiting_text(child_id, wait.question))
+          result(child_id, status, waiting_text(child_id, wait.question, report: report))
         when :canceled
           canceled_result(child_id)
         when :no_reply
@@ -153,14 +164,18 @@ module Samagotchi
       # child's baseline before the follow-up goes in.
       # @param child [Session] the child as loaded before sending
       def mark_seen(parent_id, child, state_dir:)
-        seen[[parent_id, child.id]] = ReplyWait.newest_reply(child.id, state_dir: state_dir)
-        baselines[[parent_id, child.id]] = ReplyWait.baseline_of(child)
+        newest = ReplyWait.newest_reply(child.id, state_dir: state_dir)
+        DelegateCursors.update(parent_id, child.id, state_dir: state_dir) do |cursor|
+          cursor.with(reply_file: newest).with_baseline(ReplyWait.baseline_of(child))
+        end
       end
 
       # A new child's baseline: as spawned, before its first turn ran.
       # @param child [Session] the session spawn_session returned
-      def mark_started(parent_id, child)
-        baselines[[parent_id, child.id]] = ReplyWait.baseline_of(child, question_id: nil)
+      def mark_started(parent_id, child, state_dir:)
+        DelegateCursors.update(parent_id, child.id, state_dir: state_dir) do |cursor|
+          cursor.with_baseline(ReplyWait.baseline_of(child, question_id: nil))
+        end
       end
 
       def reply_result(child_id, status, text)
@@ -188,13 +203,17 @@ module Samagotchi
       # decide (it isn't relayed: Continue grants no permission): continue
       # it with chi answer through execute, send a follow-up instead, or
       # report back.
-      def waiting_text(child_id, pending)
+      # A report's last line differs (+report+): "waits again" made models
+      # call delegate_result right after answering Continue.
+      def waiting_text(child_id, pending, report: false)
         text = "Child #{child_id} is #{ParentReport.question_text(pending, session_id: child_id)}"
         if ParentReport.continue?(pending)
           text += "The child ran out of steps before it answered. Decide: continue it (run the chi answer command " \
                   "above with execute) if it is getting somewhere; send it a narrower follow-up with delegate " \
                   "session: #{child_id} (that drops the question); or stop it and report back to your user.\n"
         end
+        return "#{text}#{REPORT_NEXT_REPLY}" if report
+
         "#{text}delegate_result #{child_id} waits again once it is answered."
       end
 

data/lib/samagotchi/tools/task_runtime.rb

@@ -154,7 +154,7 @@ module Samagotchi
 
       def get_record(task_id)
         record = load_record(task_id)
-        return [nil, "Error: task not found: #{task_id}"] unless record
+        return [nil, not_found(task_id)] unless record
 
         [refresh_record(record), nil]
       rescue StandardError => e
@@ -180,7 +180,7 @@ module Samagotchi
       # @param by [String] "model" (task_stop) or "user" (the web's button)
       def stop_task(task_id, by:)
         record = load_record(task_id)
-        return [nil, "Error: task not found: #{task_id}"] unless record
+        return [nil, not_found(task_id)] unless record
 
         refreshed = refresh_record(record)
         return [refreshed, nil] unless refreshed["status"] == "running"
@@ -223,7 +223,26 @@ module Samagotchi
         record
       end
 
+      # A session id (a uuid) is never a task's: task ids are a timestamp
+      # and hex (20261005093000-1a2b3c4d).
+      SESSION_ID_SHAPE = /\A\h{8}-\h{4}-\h{4}-\h{4}-\h{12}\z/
+
+      # A model mixing up ids (Qwen passes session ids to task_get and
+      # task_stop) is told which kind it passed and where task ids come from.
+      def not_found(task_id)
+        error = "Error: task not found: #{task_id}"
+        return error unless SESSION_ID_SHAPE.match?(task_id.to_s)
+
+        "#{error} (that is a session id; task ids come from task_create, and task_list lists them)"
+      end
+
+      # Exactly the shape generate_task_id makes. Anything else (../x, an
+      # absolute path) is no task, so a model's id never leaves tmp/tasks.
+      TASK_ID_SHAPE = /\A\d{14}-\h{8}\z/
+
       def load_record(task_id)
+        return nil unless TASK_ID_SHAPE.match?(task_id.to_s)
+
         path = metadata_path(task_id)
         return nil unless File.exist?(path)
 

data/lib/samagotchi/tools/task_wait.rb

@@ -34,7 +34,7 @@ module Samagotchi
 
         loop do
           record, error = TaskRuntime.get_record(task_id)
-          return "Error: #{error}" if error
+          return error if error
 
           status = record.fetch("status")
           return finished_response(record, tail_lines) unless status == "running"
@@ -64,7 +64,7 @@ module Samagotchi
       # normal finished result. Only a task still running says so.
       def self.cancelled_response(task_id, tail_lines, started)
         record, error = TaskRuntime.get_record(task_id)
-        return "Error: #{error}" if error
+        return error if error
         return finished_response(record, tail_lines) unless record.fetch("status") == "running"
 
         note = [

data/lib/samagotchi/version.rb

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

data/lib/samagotchi/web/app.rb

@@ -29,6 +29,8 @@ require_relative "../config"
 require_relative "../output_formatter"
 require_relative "../image_store"
 require_relative "../context_note"
+require_relative "../context_sources"
+require_relative "../context_providers"
 require_relative "../recap_store"
 require_relative "markdown_renderer"
 require_relative "message_parts"
@@ -150,6 +152,10 @@ module Samagotchi
         ["POST", %r{\A/api/sessions/([^/]+)/command\z}, :handle_command],
         ["POST", %r{\A/api/sessions/([^/]+)/images\z}, :handle_image_upload],
         ["GET", %r{\A/api/sessions/([^/]+)/images/([^/]+)\z}, :handle_image],
+        ["GET", %r{\A/api/sessions/([^/]+)/context\z}, :handle_context_list],
+        ["GET", %r{\A/api/sessions/([^/]+)/context/([^/]+)\z}, :handle_context_show],
+        ["POST", %r{\A/api/sessions/([^/]+)/context\z}, :handle_context_add],
+        ["DELETE", %r{\A/api/sessions/([^/]+)/context/([^/]+)\z}, :handle_context_delete],
         ["GET", %r{\A/api/sessions/([^/]+)\z}, :handle_show],
         ["DELETE", %r{\A/api/sessions/([^/]+)\z}, :handle_delete]
       ].freeze
@@ -1117,6 +1123,101 @@ module Samagotchi
         error_response(404, "not_found", e.message)
       end
 
+      # ── Attached context (ContextSources): the session bar's chips ───────
+      # A source's command isn't shown (the page may be on a phone over the
+      # LAN), and the web adds a URL only, through an installed bundle's
+      # provider (ContextProviders): never a command.
+
+      # GET /api/sessions/:id/context: the sources this session sees, muted
+      # ones marked, with what the chips show.
+      def handle_context_list(_req, id)
+        session = @session_class.load(id, state_dir: default_state_dir)
+        own = ContextSources.session_location(id, state_dir: default_state_dir)
+        subs = own.subscriptions
+        rows = attached_context(session).map { |attached| context_row(attached, own, subs) }
+        json_response(200, { session_id: id, sources: rows, can_add_url: ContextProviders.any? })
+      rescue ArgumentError => e
+        error_response(404, "not_found", e.message)
+      end
+
+      # GET /api/sessions/:id/context/:name: one source with its text.
+      def handle_context_show(_req, id, name)
+        session = @session_class.load(id, state_dir: default_state_dir)
+        attached = find_context(session, name) or return error_response(404, "not_found", "no source #{name[0, 40]}")
+        own = ContextSources.session_location(id, state_dir: default_state_dir)
+        json_response(200, context_row(attached, own, own.subscriptions).merge(text: attached.snapshot.text))
+      rescue ArgumentError => e
+        error_response(404, "not_found", e.message)
+      end
+
+      # POST /api/sessions/:id/context {url, why}: the source an installed
+      # bundle's provider makes of +url+, attached to this session.
+      def handle_context_add(req, id)
+        session = @session_class.load(id, state_dir: default_state_dir)
+        body = parse_json(request_body(req))
+        return error_response(400, "invalid_json", "give {url, why}") unless body.is_a?(Hash) && body["url"].is_a?(String)
+
+        url = body["url"].strip
+        return error_response(422, "not_a_url", "give an http(s) URL") unless url.match?(%r{\Ahttps?://\S+\z})
+
+        resolved = ContextProviders.resolve(url)
+        return error_response(422, "no_provider", "no installed bundle resolves #{url[0, 200]}") unless resolved
+
+        own = ContextSources.session_location(session.id, state_dir: default_state_dir)
+        own.add(web_source(resolved, body["why"], own.scope))
+        json_response(201, { status: "attached", name: resolved.name })
+      rescue ContextProviders::Invalid => e
+        error_response(422, "no_provider", e.message)
+      rescue ContextSources::Invalid => e
+        error_response(409, "exists", e.message)
+      rescue ArgumentError => e
+        error_response(404, "not_found", e.message)
+      end
+
+      def web_source(resolved, why, scope)
+        why = ContextSources.one_line(why.is_a?(String) ? why : nil, ContextSources::LINE_MAX_CHARS) || resolved.why
+        ContextSources::Source.new(name: resolved.name, cmd: resolved.cmd, every_seconds: resolved.every_seconds, why: why,
+                                   hint: resolved.hint, scope: scope, added_by: "web", created_at: Time.now.utc.iso8601,
+                                   provider: resolved.bundle)
+      end
+
+      # DELETE /api/sessions/:id/context/:name: the session's own source is
+      # detached; a project's is muted for this session only.
+      def handle_context_delete(_req, id, name)
+        session = @session_class.load(id, state_dir: default_state_dir)
+        attached = find_context(session, name) or return error_response(404, "not_found", "no source #{name[0, 40]}")
+        if attached.location.session?
+          attached.location.remove(attached.name)
+          json_response(200, { status: "detached", name: attached.name })
+        else
+          ContextSources.session_location(id, state_dir: default_state_dir).mute(attached.name)
+          json_response(200, { status: "muted", name: attached.name })
+        end
+      rescue ArgumentError => e
+        error_response(404, "not_found", e.message)
+      end
+
+      def attached_context(session)
+        ContextSources.attached(session.id, project_root: session.project_root, state_dir: default_state_dir)
+      end
+
+      # @return [ContextSources::Attached, nil]
+      def find_context(session, name)
+        ContextSources.check_name!(name)
+        attached_context(session).find { |attached| attached.name == name }
+      rescue ContextSources::Invalid
+        nil
+      end
+
+      def context_row(attached, own, subs)
+        source = attached.source
+        snapshot = attached.snapshot
+        { name: source.name, scope: source.scope, kind: source.push? ? "push" : "cmd", every_seconds: source.every_seconds,
+          why: source.why, hint: snapshot.hint || source.hint, summary: snapshot.summary, error: snapshot.error,
+          fetched_at: snapshot.fetched_at, has_text: snapshot.text?, muted: own.muted?(source.name),
+          unread: snapshot.text? && subs[source.name]&.read != snapshot.revision }
+      end
+
       def handle_stream(req, id)
         # Validate session exists
         begin
@@ -1491,7 +1592,14 @@ module Samagotchi
           role = (m[:role] || m["role"]).to_s
           content = (m[:content] || m["content"]).to_s
           if Samagotchi::ContextNote.note?(m)
-            filtered << { role: "note", content: Samagotchi::ContextNote.text_of(m), label: Samagotchi::ContextNote.label_of(m) }
+            note = { role: "note", content: Samagotchi::ContextNote.text_of(m), label: Samagotchi::ContextNote.label_of(m) }
+            # A context wake turn's note starts that turn (Steer.turn_prompt?):
+            # the page opens the turn with it and pairs it with its record.
+            if Samagotchi::Steer.turn_prompt?(m)
+              note[:turn_start] = true
+              note[:turn_id] = (m[:turn_id] || m["turn_id"]).to_s
+            end
+            filtered << note
             next
           end
           # A plugin's steer: a row of the step that answered it, which the
@@ -1522,8 +1630,14 @@ module Samagotchi
 
           message = { role: norm_role, content: stripped }
           # Merged into the running turn (Steer::INPUT_KIND): part of it,
-          # read by step +step+.
-          message.merge!(merged: true, step: steer_step(list, index)) if norm_role == "user" && Samagotchi::Steer.input?(m)
+          # read by step +step+; a wake turn's report starts its turn
+          # (Steer.turn_prompt?). Its sender (a delegate report, chi send):
+          # the page's label.
+          if norm_role == "user" && Samagotchi::Steer.input?(m)
+            message.merge!(merged: true, step: steer_step(list, index)) unless Samagotchi::Steer.turn_prompt?(m)
+            source = (m[:source] || m["source"]).to_s
+            message[:source] = source unless source.empty?
+          end
           # The turn it started (Engine): the page pairs it with that turn's
           # record by this, not by its place.
           turn_id = m[:turn_id] || m["turn_id"]

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

@@ -15,7 +15,12 @@ import {
   uploadImage,
   listModels,
   fetchHistory,
+  listContext,
+  getContext,
+  detachContext,
+  addContext,
 } from "./data.js";
+import { createContextChips } from "./context_chips.js";
 import { MODEL_KEY } from "./model_pick.js";
 import { emptySessionState } from "./session_state.js";
 import { createModelPicker } from "./model_picker.js";
@@ -32,7 +37,7 @@ import { routeChunk } from "./chunk_router.js";
 import { extractCtxPct, savedCtxPct, cardCtxText, generationTokens, lastSpeedText, speedText, tokensTipText } from "./ctx.js";
 import { createQuestionCards } from "./question_cards.js";
 import { cardClass, cardInnerHtml, cardPlace, isCard, isNoticeCard, noticeInnerHtml, splitSnapshotCards, turnNoticePlace } from "./card.js";
-import { gripFloor, promptHeight } from "./composer_size.js";
+import { PROMPT_LINE_PX, PROMPT_MIN_PX, gripFloor, promptHeight } from "./composer_size.js";
 import { createCommandList } from "./command_list.js";
 import { createPromptHistory } from "./prompt_history.js";
 import { ALL_SESSIONS_HASH, sessionHash, sessionIdFromHash } from "./route.js";
@@ -46,7 +51,7 @@ import {
   appendAboveLiveTiming, cancelLineText, elapsedSince, formatDuration, mergeTiming, normalizeTiming, STOPPED_LINE_CLASS, turnTimingText,
 } from "./timing.js";
 import { DONE_MS, applyInitEvent, dropDone, initRowHtml, newInitTasks, seedInitTasks } from "./init_row.js";
-import { clientLabel, commandView, displayWait, dropEarlyRestores, emptyAnswerLine, emptyRetryLine, hookNoticeLabel, initWaitLine, isOwn, sessionCommandLine, keepEarlyRestore, newClientId, noticeLine, promptOps, reminderText, restoreAction, composerAfterAck, restoreOnAck, replaysDrawnTurn, retryStatusLine, snapshotEvents, steerCutLine, startPageReplyOrHint, turnOutput, unknownCommandHint, webLocalReply, workerGoneText } from "./turn_events.js";
+import { clientLabel, commandView, isReportClient, displayWait, dropEarlyRestores, emptyAnswerLine, emptyRetryLine, hookNoticeLabel, initWaitLine, isOwn, sessionCommandLine, keepEarlyRestore, newClientId, noticeLine, promptOps, reminderText, restoreAction, composerAfterAck, restoreOnAck, replaysDrawnTurn, retryStatusLine, snapshotEvents, steerCutLine, startPageReplyOrHint, turnOutput, unknownCommandHint, webLocalReply, workerGoneText } from "./turn_events.js";
 
 const $ = (s) => document.querySelector(s);
 const topStripEl = $("#topStrip");
@@ -57,6 +62,14 @@ const composerEl = $("#composer");
 const infoBarEl = $("#infoBar");
 const firstPeekEl = $("#firstPeek");
 const infoTextEl = $("#infoText");
+// The open session's attached context, in its own row of the session bar
+// (updateInfoBar rewrites #infoText every tick; the chips keep their popover).
+const contextChips = createContextChips({
+  el: $("#contextChips"),
+  api: { list: listContext, show: getContext, detach: detachContext, add: addContext },
+  escapeHtml,
+  toast: (text) => showToast(text),
+});
 const markdownWarningEl = $("#markdownWarning");
 const promptEl = $("#prompt");
 const actionBtn = $("#actionBtn");
@@ -142,8 +155,11 @@ let selectSeq = null;
 // new turn has started on it yet: see followWokenWorker.
 let streamFromGuess = false;
 // The last input_merged had an origin with no bubble: its merged text
-// (pending_input_merged) gets one.
+// (pending_input_merged) gets one ("report": a delegate report's).
 let unmatchedMerge = false;
+// The running turn is one chi ran for delegate reports and its report
+// bubble isn't drawn yet: that bubble starts the turn.
+let wakeStart = false;
 // The enqueued_ids this page sent (from the /turn acks): only these come back
 // into the composer when their turn fails.
 const sentIds = new Set();
@@ -549,18 +565,24 @@ function setPlaceholder(long, short) {
   promptEl.placeholder = narrowScreen.matches ? short : long;
 }
 
-// The key hint under the composer (shown while it has focus).
+// The key hint under the composer (shown while it has focus; on the start
+// page only: in a session the placeholder carries it, the hint row is gone).
 const SEND_HINT = "Enter to send · Shift+Enter for a newline · ↑ history";
 
+let hadSession = false;
 // While a turn runs, Send still sends: the prompt merges into the turn at
 // its next step (steering). Cancel is its own button then.
 function updateComposerMode() {
-  document.body.classList.toggle("has-session", !!selected);
+  // In a session the box is one line: its minimum follows the class.
+  if (document.body.classList.toggle("has-session", !!selected) !== hadSession) {
+    hadSession = !hadSession;
+    fitPrompt();
+  }
   if (selected) modelPicker.close();
   const running = turnRunning && !!selected;
   cancelBtn.style.display = running ? "" : "none";
   if (running) {
-    setPlaceholder("Running… a message now steers this turn (Enter to send)", "Running… a message steers it");
+    setPlaceholder("Running… a message now steers this turn · Enter to send · Shift+Enter newline", "Steer the turn…");
     composeHintEl.textContent = SEND_HINT;
     actionBtn.textContent = "Send";
     emptyEl.classList.add("hidden");
@@ -575,13 +597,13 @@ function updateComposerMode() {
     historyEl.innerHTML = "";
     updateInfoBar();
   } else if (current.owner === "tui") {
-    setPlaceholder("A terminal chi owns this session and doesn't share it — run it with chi --shared to send from here", "A terminal chi owns this session");
+    setPlaceholder("A terminal chi owns this session · run it with chi --shared to send from here", "A terminal chi owns this session");
     composeHintEl.textContent = "";
     actionBtn.textContent = "Send";
     actionBtn.disabled = true;
     emptyEl.classList.add("hidden");
   } else {
-    setPlaceholder("Message chi…", "Message chi…");
+    setPlaceholder("Message chi… · Enter to send · Shift+Enter newline · ↑ history", "Message chi…");
     composeHintEl.textContent = SEND_HINT;
     actionBtn.textContent = "Send";
     actionBtn.disabled = false;
@@ -650,6 +672,7 @@ function clearSelection() {
   setSessionHash(null);
   document.querySelectorAll(".card").forEach((el) => el.classList.remove("active"));
   resetSessionState();
+  contextChips.clear();
   clearTimingInterval();
   liveTurnTimingEl = null;
   liveTurnId = null;
@@ -696,6 +719,7 @@ async function select(id) {
   resetTurnView();
   updateFirstPeek();
   updateInfoBar();
+  contextChips.load(id);
   updateComposerMode();
   await resync();
   promptEl.focus();
@@ -710,6 +734,7 @@ function resetTurnView() {
   questionCards.removeQuestion();
   questionCards.forgetContinue();
   unmatchedMerge = false;
+  wakeStart = false;
   setTurnRunning(false);
   releaseDisplayWait();
 }
@@ -1067,14 +1092,18 @@ function untaggedOwnBubble(prompt) {
 // Returns the bubble of the turn a turn_started starts (the stage takes it
 // into its prompt line), else null.
 function applyPromptOps(event) {
-  const ops = promptOps(event, { myId: clientId, known: (id) => !!bubbleById(id), unmatchedMerge });
+  if (event.type === "turn_started") wakeStart = !!event.continue && isReportClient(event.origin?.client_id);
+  const ops = promptOps(event, { myId: clientId, known: (id) => !!bubbleById(id), unmatchedMerge, wakeStart });
   if (event.type === "input_merged") unmatchedMerge = false;
   if (event.type === "pending_input_merged") unmatchedMerge = false;
   let started = null;
   for (const op of ops) {
-    if (op.op === "add") {
+    if (op.op === "report") {
+      unmatchedMerge = "report";
+    } else if (op.op === "add") {
       const bubble = makeUserBubble(op.prompt, { state: op.state, label: op.label, enqueuedId: op.enqueuedId, images: op.images });
       if (op.state === "started") started = bubble;
+      if (event.type === "pending_input_merged") wakeStart = false;
     } else if (op.op === "tag") {
       if (bubbleById(op.enqueuedId)) continue;
       const echo = untaggedOwnBubble(op.prompt);
@@ -1459,7 +1488,7 @@ function updateInfoBar() {
   const attachCmd = `chi --attach ${selected}`;
   const copied = Date.now() - attachCopiedAt < 2000;
   const copyHtml = `<button type="button" class="copy-attach" title="Copy &quot;${escapeHtml(attachCmd)}&quot; to attach a terminal">${copied ? "copied ✓" : "copy chi --attach"}</button>`;
-  const metaHtml = `<div class="meta"><span class="id" title="${escapeHtml(selected)}">${escapeHtml(idShort)}</span>${copyHtml}<span class="${statusClass}">${escapeHtml(current.status||"")}</span><span class="model${label.mismatch ? " served-mismatch" : ""}" title="${escapeHtml(label.title)}">${escapeHtml(label.text)}</span>${parentHtml}${current.usedMemories.length ? `<span class="model mem-chip" title="${escapeHtml(memChipTitle(current.usedMemories))}">${escapeHtml(memChipText(current.usedMemories))}</span>` : ""}<span class="dir" title="${escapeHtml(current.dir||"")}">${escapeHtml((current.dir||"").slice(0,48))}</span>${ctxText ? `<span class="model ctx" title="${escapeHtml(ctxTip)}">${escapeHtml(ctxText)}</span>` : ""}${speedTextNow ? `<span class="model speed" title="${escapeHtml(speedTip)}">${escapeHtml(speedTextNow)}</span>` : ""}${timingText ? `<span class="model">${escapeHtml(timingText)}</span>` : ""}${workerBadgeHtml()}</div>`;
+  const metaHtml = `<div class="meta"><span class="id" title="${escapeHtml(selected)}">${escapeHtml(idShort)}</span>${copyHtml}<span class="${statusClass}">${escapeHtml(current.status||"")}</span><span class="model${label.mismatch ? " served-mismatch" : ""}" title="${escapeHtml(label.title)}">${escapeHtml(label.text)}</span>${parentHtml}${current.usedMemories.length ? `<span class="model mem-chip" title="${escapeHtml(memChipTitle(current.usedMemories))}">${escapeHtml(memChipText(current.usedMemories))}</span>` : ""}<span class="dir" title="${escapeHtml(current.dir||"")}"><bdi>${escapeHtml(current.dir||"")}</bdi></span>${ctxText ? `<span class="model ctx" title="${escapeHtml(ctxTip)}">${escapeHtml(ctxText)}</span>` : ""}${speedTextNow ? `<span class="model speed" title="${escapeHtml(speedTip)}">${escapeHtml(speedTextNow)}</span>` : ""}${timingText ? `<span class="model">${escapeHtml(timingText)}</span>` : ""}${workerBadgeHtml()}</div>`;
   const previewHtml = `<div class="preview-line"><span class="preview">${escapeHtml(current.firstPreview || "—")}</span> · <span class="mem" title="${escapeHtml(current.usedMemories.join(", "))}">mem: ${escapeHtml(memText)}</span></div>`;
   infoTextEl.innerHTML = metaHtml + previewHtml;
   infoTextEl.title = memoriesTooltip(current.usedMemories, current.preloadedMemories, current.mutedMemories);
@@ -1836,7 +1865,11 @@ const streamHandlers = {
   // Due reminders went into the turn (a reminder turn has no prompt bubble).
   reminder_injected: (data) => addCommandBubble({ label: null, line: reminderText(data), text: "" }),
   // A context note joined the conversation (between turns; no turn runs).
-  context_added: (data) => addNoteBubble({ label: data.label, content: data.text || "" }),
+  context_added: (data) => {
+    addNoteBubble({ label: data.label, content: data.text || "" });
+    // An attached context source's note: its chip changed.
+    if (data.context_source) contextChips.refresh();
+  },
   continue_offered: (data) => questionCards.renderContinue(data),
   continue_resolved: (data) => questionCards.resolveContinue(data),
   tool_call_started: (data) => turnDom.toolStarted(data),
@@ -2230,10 +2263,15 @@ const GRIP_KEY = "chi_composer_floor";
 let promptFloor = null;
 try { promptFloor = Number(localStorage.getItem(GRIP_KEY)) || null; } catch (_) {}
 
+// The empty box: one line in a session, three on the start page.
+function promptMinPx() {
+  return document.body.classList.contains("has-session") ? PROMPT_LINE_PX : PROMPT_MIN_PX;
+}
+
 function fitPrompt() {
   const borders = promptEl.offsetHeight - promptEl.clientHeight;
   promptEl.style.height = "0px";
-  const { height, scrolls } = promptHeight({ contentPx: promptEl.scrollHeight + borders, floorPx: promptFloor, viewportPx: window.innerHeight });
+  const { height, scrolls } = promptHeight({ contentPx: promptEl.scrollHeight + borders, floorPx: promptFloor, viewportPx: window.innerHeight, minPx: promptMinPx() });
   promptEl.style.height = `${height}px`;
   promptEl.style.overflowY = scrolls ? "auto" : "hidden";
 }
@@ -2246,7 +2284,7 @@ composeGrip.addEventListener("pointerdown", (e) => {
   const startY = e.clientY;
   const startH = promptEl.offsetHeight;
   const move = (ev) => {
-    promptFloor = gripFloor(startH + (startY - ev.clientY), window.innerHeight);
+    promptFloor = gripFloor(startH + (startY - ev.clientY), window.innerHeight, promptMinPx());
     fitPrompt();
   };
   const up = () => {

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

@@ -1,19 +1,20 @@
 // The composer's height. It grows with its text up to a cap; the grip on
 // its top edge sets a taller floor (the cap then is at least that floor).
-export const PROMPT_MIN_PX = 72; // about three lines of the 15 px field
+export const PROMPT_MIN_PX = 72; // about three lines of the 15 px field: the start page
+export const PROMPT_LINE_PX = 26; // one line (15 px × 1.45 + 4 padding): in a session
 export const PROMPT_CAP_SHARE = 0.35; // of the window's height, for growing with text
 export const PROMPT_GRIP_SHARE = 0.5; // of the window's height, for the grip
 
 // contentPx: the text's height (scrollHeight plus borders); floorPx: the
-// grip's height, or null.
-export function promptHeight({ contentPx, floorPx = null, viewportPx }) {
-  const floor = Math.max(PROMPT_MIN_PX, floorPx || 0);
+// grip's height, or null; minPx: the empty box's height.
+export function promptHeight({ contentPx, floorPx = null, viewportPx, minPx = PROMPT_MIN_PX }) {
+  const floor = Math.max(minPx, floorPx || 0);
   const cap = Math.max(floor, Math.round(viewportPx * PROMPT_CAP_SHARE));
   return { height: Math.min(Math.max(contentPx, floor), cap), scrolls: contentPx > cap };
 }
 
 // A grip drag: the floor it asks for, kept between the minimum and the
 // grip's share of the window.
-export function gripFloor(px, viewportPx) {
-  return Math.round(Math.min(Math.max(px, PROMPT_MIN_PX), viewportPx * PROMPT_GRIP_SHARE));
+export function gripFloor(px, viewportPx, minPx = PROMPT_MIN_PX) {
+  return Math.round(Math.min(Math.max(px, minPx), viewportPx * PROMPT_GRIP_SHARE));
 }