samagotchi 0.83.0 → 0.85.0

data/lib/samagotchi/web/app.rb

@@ -166,6 +166,7 @@ module Samagotchi
         ["GET", %r{\A/api/sessions/([^/]+)/output\z}, :handle_output],
         ["POST", %r{\A/api/sessions/([^/]+)/cancel\z}, :handle_cancel],
         ["POST", %r{\A/api/sessions/([^/]+)/tasks/([^/]+)/stop\z}, :handle_task_stop],
+        ["POST", %r{\A/api/sessions/([^/]+)/turn/([^/]+)/dequeue\z}, :handle_dequeue_turn],
         ["POST", %r{\A/api/sessions/([^/]+)/stop\z}, :handle_stop],
         ["POST", %r{\A/api/sessions/([^/]+)/restart\z}, :handle_restart],
         ["POST", %r{\A/api/sessions/([^/]+)/archive\z}, :handle_archive],
@@ -649,6 +650,15 @@ module Samagotchi
         thinking, error = request_thinking(body["thinking"])
         return error if error
 
+        # bundle_settings: the session's own bundle settings (chi --set:
+        # {bundle => {key => scalar}}), checked against the installed
+        # bundles the same way.
+        begin
+          bundle_settings = BundleSessionSettings.from_request(body["bundle_settings"])
+        rescue BundleSessionSettings::Error => e
+          return error_response(400, "invalid_bundle_settings", e.message)
+        end
+
         folder = dir ? { working_directory: dir } : {}
         # model: the model the session starts on (the start page's picker,
         # spelled as GET /api/models lists it); blank means the default.
@@ -659,7 +669,7 @@ module Samagotchi
         # until that turn is saved.
         preview = idle ? body["preview"].to_s.strip : ""
         folder[:title] = preview unless preview.empty?
-        setup = SessionSetup.new(llm_context: llm_context, thinking: thinking)
+        setup = SessionSetup.new(llm_context: llm_context, thinking: thinking, bundle_settings: bundle_settings)
         folder[:setup] = setup unless setup.empty?
         begin
           session = @manager.spawn_session(prompt: idle ? nil : prompt.to_s, state_dir: @state_dir, **folder)
@@ -679,7 +689,7 @@ module Samagotchi
       # POST /api/sessions with continues: <id, prefix or last:id>: the next
       # link of that session's chain (SessionManager.continue_session), in its
       # folder and with its own setup (SessionSetup: llm_context, thinking
-      # and reasoning_history levels), so dir, llm_context and thinking are
+      # and reasoning_history levels, bundle settings), so dir, llm_context, thinking and bundle_settings are
       # refused beside it (a create takes no reasoning_history). It runs on
       # model (or model_name) when given, else on the previous link's: one
       # whose host is gone falls back to the default, and the 201's
@@ -694,9 +704,9 @@ module Samagotchi
         unless given.is_a?(String) && !given.strip.empty?
           return error_response(400, "invalid_continues", "continues is a session id")
         end
-        if (fields = %w[dir llm_context thinking].select { |key| body.key?(key) }).any?
+        if (fields = %w[dir llm_context thinking bundle_settings].select { |key| body.key?(key) }).any?
           return error_response(400, "invalid_continues",
-                                "continues takes the previous session's folder, llm_context and thinking; " \
+                                "continues takes the previous session's folder, llm_context, thinking and bundle_settings; " \
                                 "leave out #{fields.join(", ")}")
         end
 
@@ -1330,6 +1340,33 @@ module Samagotchi
         error_response(404, "not_found", e.message)
       end
 
+      # POST /api/sessions/:id/turn/:enqueued_id/dequeue {client_id?}: the ×
+      # on a queued bubble takes the message back before it runs
+      # (Bridge#handle_dequeue_turn). Straight to the live worker, never
+      # through deliver_turn: a removal must not wake one, and a stopped
+      # worker's queued file is the next worker's (503 not_live). 200
+      # {status, enqueued_id, prompt}; 409 already_started / not_queued and
+      # 404 unknown_enqueued_id pass through; the rest as every relay.
+      def handle_dequeue_turn(req, id, enqueued_id)
+        @session_class.load(id, state_dir: default_state_dir)
+        body = request_body(req)
+        parsed = body.nil? || body.strip.empty? ? nil : parse_json(body)
+        client_id = (parsed["client_id"] if parsed.is_a?(Hash))
+
+        request = ->(client) { client.dequeue(enqueued_id: enqueued_id, client_id: client_id) }
+        relay(id, bridge_client(id), request, what: "the message was not removed", cant: "remove queued messages") do |reply|
+          body = reply.json || {}
+          case reply.status
+          when 200 then json_response(200, { status: body["status"], enqueued_id: enqueued_id, prompt: body["prompt"].to_s, session_id: id })
+          when 409 then json_response(409, { error: body["error"] || "already_started", detail: body["detail"], enqueued_id: enqueued_id, session_id: id }.compact)
+          when 404
+            json_response(404, { error: "unknown_enqueued_id", enqueued_id: enqueued_id, session_id: id }) if body["error"] == "unknown_enqueued_id"
+          end
+        end
+      rescue ArgumentError => e
+        error_response(404, "not_found", e.message)
+      end
+
       def handle_stop(_req, id)
         # Bounded, so a Rack thread isn't held long; a worker still exiting
         # after it just means an immediate resume finds it (rare).

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

@@ -92,6 +92,7 @@ import { currentGen } from "./turn_model.js";
 import { toolName } from "./activity.js";
 import { toastBottom } from "./toast_place.js";
 import { createToasts } from "./toasts.js";
+import { createUnqueue } from "./unqueue.js";
 
 const $ = (s) => document.querySelector(s);
 const topStripEl = $("#topStrip");
@@ -1801,6 +1802,22 @@ composerEl.addEventListener("drop", (e) => {
   e.preventDefault();
   addImageFiles(files);
 });
+// The × on a message queued for after the turn takes it back (unqueue.js).
+const unqueue = createUnqueue({
+  sessionId: () => selected,
+  clientId,
+  toast: (text) => showToast(text),
+  // Edit: the removed text back into an empty composer (never over a draft).
+  putBack: (text) => {
+    if (promptEl.value.trim() || chips.length) return false;
+    openForVisit();
+    promptEl.value = text;
+    fitPrompt();
+    promptEl.focus();
+    return true;
+  },
+});
+turnRoots().forEach((root) => root.addEventListener("click", (e) => { unqueue.onClick(e); }));
 turnRoots().forEach((root) => root.addEventListener("click", (e) => {
   const img = e.target.closest("img.thumb");
   if (!img) return;

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

@@ -13,6 +13,13 @@ import { linkedLine } from "./notice_links.js";
 import { hookNoticeLabel, isReportClient, promptOps } from "./turn_events.js";
 import { drawCommandBubble } from "./commands.js";
 
+export function removeQueuedBubble(bubble) {
+  if (!bubble) return;
+  const slot = bubble.parentElement?.classList.contains("ts-queued") ? bubble.parentElement : null;
+  bubble.remove();
+  if (slot && slot.childElementCount === 0) slot.remove();
+}
+
 // A prompt that started a turn: not a line steered into a running one.
 export const TURN_PROMPT = ".bubble.user:not(.steered)";
 
@@ -205,6 +212,8 @@ export function createBubbles({
           setBubbleState(bubble, null);
           started = bubble;
         }
+      } else if (op.op === "remove") {
+        removeQueuedBubble(bubbleById(op.enqueuedId));
       } else if (op.op === "steer") {
         const bubble = bubbleById(op.enqueuedId);
         if (bubble) setBubbleState(bubble, "steered");

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

@@ -110,6 +110,7 @@ const WEB_LOCAL_REPLIES = {
   "/exit": "/exit: close the tab to leave; stop in the session bar stops the worker",
   "/quit": "/quit: close the tab to leave; stop in the session bar stops the worker",
   "/recap": "/recap: not in the web yet; a recap shows here by itself when you come back to an idle session, and /recap in a terminal (chi --attach) makes one now",
+  "/unqueue": "/unqueue: a terminal's command; here the × on a message queued for after the turn removes it",
   "/stats": "/stats: not in the web yet; each turn shows its time, the session bar the context use and speed (hover ctx for tokens and cost), and /stats in a terminal (chi --attach) has the rest",
 };
 

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

@@ -169,6 +169,17 @@ export function stopTask(id, taskId, opts = {}) {
   });
 }
 
+// Takes back a message queued for after the running turn (the × on its
+// bubble): 200 {status, enqueued_id, prompt}; 409 already_started /
+// not_queued, 404 unknown_enqueued_id, 503 no live worker.
+export function dequeueTurn(id, enqueuedId, { clientId = null } = {}, opts = {}) {
+  return api(`/api/sessions/${encodeURIComponent(id)}/turn/${encodeURIComponent(enqueuedId)}/dequeue`, {
+    method: "POST",
+    body: JSON.stringify(clientId ? { client_id: clientId } : {}),
+    ...opts,
+  });
+}
+
 // Hands the session to a new worker on the newest chi installed: 200
 // {status, from_version, version}, or 409 with the reason in words (detail).
 export function restartSession(id, opts = {}) {

data/lib/samagotchi/web/public/index.html

@@ -120,6 +120,12 @@ main{flex:1;display:flex;flex-direction:column;gap:16px;padding:16px;overflow:au
 .bubble.user.queued .state-badge::before{background:var(--accent);box-shadow:0 0 0 1px var(--accent-ring)}
 .bubble.user.steered .state-badge::before{background:var(--accent);box-shadow:0 0 0 1px var(--accent-ring)}
 .bubble.user.failed .state-badge::before{background:var(--danger);box-shadow:0 0 0 1px color-mix(in srgb,var(--danger) 40%,transparent)}
+/* The × on a message queued for after the turn (unqueue.js): only once the bubble has its enqueued_id; a 32px tap target around a small mark */
+.bubble.user .state-badge button.unqueue{position:relative;display:inline-flex;align-items:center;justify-content:center;width:16px;height:16px;margin:0 -3px 0 0;padding:0;border:0;border-radius:50%;background:transparent;color:var(--text-muted);font-size:14px;line-height:1;cursor:pointer}
+.bubble.user .state-badge button.unqueue::before{content:"\00d7"}
+.bubble.user .state-badge button.unqueue::after{content:"";position:absolute;inset:-8px}
+.bubble.user .state-badge button.unqueue:hover:not(:disabled){background:var(--danger-bg-dim);color:var(--danger-text);filter:none}
+.bubble.user:not([data-enqueued-id]) .state-badge button.unqueue{display:none}
 .bubble.user .origin-label{font-size:11px;color:var(--text-3);text-transform:uppercase;letter-spacing:.04em;flex-shrink:0}
 .bubble.user .user-message{flex:1;min-width:0}
 .bubble.user blockquote{border-left:3px solid var(--border-strong);padding-left:10px;color:var(--text-3);margin:2px 0 6px}
@@ -847,6 +853,9 @@ body.stage-view .turn-stage{position:absolute;left:0;right:0;bottom:100%;margin-
 .turn-stage .turn-work.outline>.gen.folded{display:block}
 .turn-stage .ts-cloud-body .gen:first-of-type{margin-top:0;border-top:0}
 @media(max-width:600px){
+  .bubble.user.queued[data-delivery="queue"]{flex-wrap:wrap}
+  .bubble.user.queued[data-delivery="queue"] .origin-label,.bubble.user.queued[data-delivery="queue"] .state-badge{order:0}
+  .bubble.user.queued[data-delivery="queue"] .user-message{order:1;flex-basis:100%}
   .ts-status{padding-left:10px}
   .ts-scroll{padding:8px 10px 10px}
   .ts-foot{padding:0 10px 10px}

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

@@ -410,6 +410,10 @@ export function createStageView({
     }
   }
 
+  function ensureQueuedSlot() {
+    if (!queuedSlot.isConnected) stage.appendChild(queuedSlot);
+  }
+
   function emptySlots() {
     for (const slot of [promptSlot, extras, answer, tail, cloudBody, queuedSlot, timingSlot]) slot.replaceChildren();
     slotsView.reset();
@@ -535,6 +539,7 @@ export function createStageView({
       // The lines still queued behind this turn went into the history with
       // the turn before (the hand-off at this turn_started, or an earlier
       // one): back below this turn's card, as a reload places them.
+      ensureQueuedSlot();
       queuedSlot.append(...waiting.filter((el) => !el.isConnected), ...historyEl.querySelectorAll(QUEUED_CHILDREN));
       view.turnStarted(data || {});
       show();
@@ -616,6 +621,7 @@ export function createStageView({
       const where = placeFor({ live: holding, handingOff: false, kind: placeKind(el) });
       if (where === "history") return false;
       if (where === "queued") {
+        ensureQueuedSlot();
         queuedSlot.appendChild(el);
         scheduleRefresh();
         return true;

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

@@ -116,6 +116,9 @@ export function createStreamHandlers(deps) {
       showSteers(data.steers);
     },
     turn_enqueued: (data) => applyPromptOps(data),
+    // A queued message taken back before it ran (the × here or in another
+    // tab, /unqueue in a terminal): its bubble goes, in every tab.
+    turn_dequeued: (data) => applyPromptOps(data),
     turn_started: (data) => keepFollowing(historyEl, () => {
       if (stream.takeGuess()) {
         // A replay of a turn the render drew: re-read and stream from there.

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

@@ -247,6 +247,8 @@ export function initWaitLine({ tasks } = {}) {
 //   tag   — this tab's own local echo gets its enqueued_id
 //   start — the bubble's turn started (drops the "queued" badge)
 //   steer — the bubble was merged into the running turn
+//   remove — the queued message was taken back before it ran (turn_dequeued,
+//           whoever removed it): its bubble goes
 //   report — the merge brought a delegate child's report (origin
 //           child:<id8>, no bubble anywhere): its text gets a labelled one
 // `known(enqueuedId)` says whether a bubble carries that id already;
@@ -276,6 +278,8 @@ export function promptOps(event, { myId, known, unmatchedMerge = false, wakeStar
       }
       return [withImages({ op: "add", enqueuedId: id, prompt: event.prompt, state: "started", label: clientLabel(origin.client_id) }, event.images)];
     }
+    case "turn_dequeued":
+      return event.enqueued_id ? [{ op: "remove", enqueuedId: event.enqueued_id }] : [];
     case "input_merged": {
       const ops = (event.origins || []).filter((o) => o && o.enqueued_id).map((o) =>
         known(o.enqueued_id) ? { op: "steer", enqueuedId: o.enqueued_id } : { op: "steer", enqueuedId: o.enqueued_id, unmatched: true },

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

@@ -184,9 +184,17 @@ export function badgeText(state, delivery = null) {
   return (state === "queued" && QUEUED_BADGES[delivery]) || BADGES[state];
 }
 
+// A message queued for after the turn (delivery queue) can be taken back
+// while it waits: the badge carries its ×, shown once the bubble has its
+// enqueued_id (style.css; an echo before its ack has none) and handled by
+// unqueue.js. Not a next-step line: a step boundary may merge it any moment.
 export function stateBadgeTemplate(state, delivery = null) {
   const text = badgeText(state, delivery);
-  return text ? html`<span class="state-badge">${text}</span>` : nothing;
+  if (!text) return nothing;
+  const remove = state === "queued" && delivery === "queue"
+    ? html`<button type="button" class="unqueue" title="Remove from queue" aria-label="Remove from queue"></button>`
+    : nothing;
+  return html`<span class="state-badge">${text}${remove}</span>`;
 }
 
 // A `!cmd`'s saved user message (the worker appends "!(<command>)\n<output>"

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

@@ -0,0 +1,56 @@
+// The × on a message queued for after the running turn (its badge,
+// turn_html.js stateBadgeTemplate): POST …/turn/:enqueued_id/dequeue
+// (Bridge#handle_dequeue_turn) takes it back before it runs. The bubble
+// goes with the turn_dequeued every tab gets (bubbles.js op "remove"), and
+// here at the 200 already. Its text comes back (edit): into an empty
+// composer, to change and send again; over a draft only in a toast (the
+// draft stays). Its images don't come back. A refusal keeps it and says why
+// in a toast. No confirm: nothing is lost. Pure but for the
+// injected calls, so `node --test` covers it; app.js binds onClick to the
+// turn roots.
+import { dequeueTurn as postDequeue } from "./data.js";
+import { removeQueuedBubble } from "./bubbles.js";
+
+// Why a removal didn't happen, in words.
+export function unqueueFailureText(error) {
+  if (error?.code === "already_started") return "Not removed: it already started";
+  if (error?.code === "not_queued") return "Not removed: it goes in at the running turn's next step";
+  if (error?.status === 404 && error?.code === "unknown_enqueued_id") return "Not removed: it is already gone";
+  return `Not removed: ${error?.message || "the worker did not answer"}`;
+}
+
+// The removed text in a toast, clipped.
+const SHOWN = 200;
+function clipped(text) {
+  const line = String(text || "").replace(/\s+/g, " ").trim();
+  return line.length > SHOWN ? `${line.slice(0, SHOWN)}\u2026` : line;
+}
+
+// +sessionId+ is read at each click (the open session); +clientId+ is this
+// tab's (the turn_dequeued names who removed it); +putBack(text)+ fills the
+// composer when it is empty and says whether it did.
+export function createUnqueue({ sessionId, clientId = null, dequeue = postDequeue, toast = () => {}, putBack = () => false }) {
+  // A click on a queued bubble's ×; any other click is left alone.
+  async function onClick(e) {
+    const button = e.target?.closest?.("button.unqueue");
+    if (!button || button.disabled) return null;
+    const bubble = button.closest(".bubble.user");
+    const enqueuedId = bubble?.dataset.enqueuedId;
+    const id = sessionId();
+    if (!enqueuedId || !id) return null;
+    e.stopPropagation?.();
+    button.disabled = true;
+    try {
+      const result = await dequeue(id, enqueuedId, { clientId });
+      removeQueuedBubble(bubble);
+      const text = String(result?.prompt || "");
+      if (text.trim() && !putBack(text)) toast(`Removed (your draft stays): ${clipped(text)}`);
+      return result;
+    } catch (error) {
+      if (button.isConnected) button.disabled = false;
+      toast(unqueueFailureText(error));
+      return null;
+    }
+  }
+  return { onClick };
+}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: samagotchi
 version: !ruby/object:Gem::Version
-  version: 0.83.0
+  version: 0.85.0
 platform: ruby
 authors:
 - Dmitry Dedov
@@ -180,6 +180,7 @@ files:
 - lib/samagotchi/broadcast_command.rb
 - lib/samagotchi/bundle_command.rb
 - lib/samagotchi/bundle_needs.rb
+- lib/samagotchi/bundle_session_settings.rb
 - lib/samagotchi/bundles/agents-md/manifest.yml
 - lib/samagotchi/bundles/agents-md/plugin.rb
 - lib/samagotchi/bundles/btw/manifest.yml
@@ -690,6 +691,7 @@ files:
 - 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/unqueue.js
 - lib/samagotchi/web/public/update_notice.js
 - lib/samagotchi/web/public/vendor/directive-helpers.js
 - lib/samagotchi/web/public/vendor/directive.js