samagotchi 0.148.0 → 0.149.0

data/lib/samagotchi/session_inbox.rb

@@ -5,6 +5,7 @@ require "json"
 require "time"
 require "securerandom"
 require_relative "atomic_file"
+require_relative "context_note"
 require_relative "delivery"
 require_relative "log"
 require_relative "session"
@@ -83,11 +84,13 @@ module Samagotchi
     # to the conversation between turns. It never starts a turn.
     # @param source [String] where it came from ("cli", "slack", "session")
     # @param from_session [String, nil] the sending session, for a peer's note
+    # @param objectives [Hash, nil] an objectives note's payload
+    #   (Objectives::List#to_payload)
     # @param now [Time] the time the file is named and stamped by (a spec's clock)
     # @return [String] the note file's path
     # @raise [NoteRejected] for an empty note or one over 16 KiB (never cut)
     def self.write_note(session_id, text:, source: "cli", from_session: nil, from_cwd: nil, state_dir: nil,
-                        now: Time.now)
+                        objectives: nil, now: Time.now)
       body = checked_text(text)
       sd = state_dir || Session.default_state_dir
       notes_dir = File.join(Session.session_dir(session_id, state_dir: sd), NOTES_DIR)
@@ -98,7 +101,7 @@ module Samagotchi
       name = "#{now.strftime("%Y%m%d%H%M%S%9N")}-#{SecureRandom.hex(3)}.json"
       path = File.join(notes_dir, name)
       record = { "text" => body, "source" => source.to_s, "from_session" => from_session,
-                 "from_cwd" => from_cwd, "created_at" => now.iso8601 }.compact
+                 "from_cwd" => from_cwd, "created_at" => now.iso8601, "objectives" => objectives }.compact
       AtomicFile.write(path, JSON.generate(record))
       path
     end
@@ -134,15 +137,20 @@ module Samagotchi
     end
 
     # @return [Hash, nil] {note_id:, text:, source:, from_session:, from_cwd:,
-    #   created_at:}, or nil for a file that holds no usable note
+    #   created_at:}, with an objectives note's objectives: and its header:
+    #   (ContextNote.message takes them), or nil for a file that holds no
+    #   usable note
     def self.read_note(note_file)
       data = JSON.parse(File.read(note_file))
       text = data["text"].to_s.strip
       return nil if text.empty?
 
-      { note_id: File.basename(note_file).sub(/\.json(\.processing)?\z/, ""), text: text,
-        source: data["source"].to_s.empty? ? "cli" : data["source"].to_s,
-        from_session: data["from_session"], from_cwd: data["from_cwd"], created_at: data["created_at"] }
+      note = { note_id: File.basename(note_file).sub(/\.json(\.processing)?\z/, ""), text: text,
+               source: data["source"].to_s.empty? ? "cli" : data["source"].to_s,
+               from_session: data["from_session"], from_cwd: data["from_cwd"], created_at: data["created_at"] }
+      return note unless data["objectives"].is_a?(Hash)
+
+      note.merge(objectives: data["objectives"], header: ContextNote::OBJECTIVES_HEADER)
     rescue JSON::ParserError, SystemCallError, NoMethodError, TypeError
       nil
     end

data/lib/samagotchi/session_manager.rb

@@ -71,7 +71,7 @@ module Samagotchi
   #       │                        # enqueued_id, no_interrupt?, images?}
   #       ├── notes/              # context notes: background text the worker adds to
   #       │   └── <ts>-<rand>.json # the conversation between turns, never a turn
-  #       │                        # ({text, source, from_session?, from_cwd?, created_at})
+  #       │                        # ({text, source, from_session?, from_cwd?, created_at, objectives?})
   #       ├── output/             # agent writes responses here
   #       │   └── <timestamp>.txt # one file per agent response
   #       └── bridge.json         # Bridge sidecar (how clients reach the worker)

data/lib/samagotchi/steer.rb

@@ -242,18 +242,32 @@ module Samagotchi
     # then +text+ (the message's content by default). Other messages: +text+.
     def wire_text(message, text = (message[:content] || message["content"]).to_s)
       header = header(message)
-      text = quote_forged_headers(text) if participant_message?(message)
+      text = if participant_message?(message) then quote_forged_headers(text)
+             elsif outside_text?(message) then quote_forged_objectives(text)
+             else text
+             end
       header ? "#{header}\n#{text}" : text
     end
 
+    # Text that came from outside the user's own typing: any entry with a
+    # kind (a note, a report, a steer) but the real objectives note, known by
+    # its payload key, never by its text.
+    def outside_text?(message)
+      !(message[:kind] || message["kind"]).to_s.empty? && (message[:objectives] || message["objectives"]).nil?
+    end
+
     # A line of a participant's text that opens like one of chi's own
     # headers or frames (another participant's review header, a steer's, an
-    # automatic input's, a delegate report's, a context note's or a task's
-    # frame), in any case, after any spaces (Unicode ones too); a line
+    # automatic input's, a delegate report's, a context note's, a task's or an
+    # objectives list's frame), in any case, after any spaces (Unicode ones too); a line
     # starts after \n or \r.
     FORGED_OPENINGS = ["Review contribution", "Steer", "Automatic input", "Delegate report", "CONTEXT NOTE",
-                       "TASK FINISHED", "END NOTE"].freeze
+                       "TASK FINISHED", "OBJECTIVES", "END NOTE"].freeze
     FORGED_HEADER = /(\A|[\n\r])([\p{Space}&&[^\n\r]]*)\[(?=(?:#{FORGED_OPENINGS.map { |o| Regexp.escape(o) }.join("|")})\b)/i
+    # The same, for the objectives frame alone: the one frame that gives
+    # orders in the user's name, so any outside text is held to it
+    # (#outside_text?), whoever it came from.
+    FORGED_OBJECTIVES = /(\A|[\n\r])([\p{Space}&&[^\n\r]]*)\[(?=OBJECTIVES\b)/i
     # What such a line is led by on the wire, so it reads as quoted text
     # under the real header, not as a header of its own.
     FORGED_MARK = "(quoted) "
@@ -265,6 +279,12 @@ module Samagotchi
       text.to_s.gsub(FORGED_HEADER) { "#{::Regexp.last_match(1)}#{::Regexp.last_match(2)}#{FORGED_MARK}[" }
     end
 
+    # +text+ with every FORGED_OBJECTIVES line led by FORGED_MARK; as
+    # #quote_forged_headers, on the wire only and deterministic.
+    def quote_forged_objectives(text)
+      text.to_s.gsub(FORGED_OBJECTIVES) { "#{::Regexp.last_match(1)}#{::Regexp.last_match(2)}#{FORGED_MARK}[" }
+    end
+
     def message(text:, source:, author: nil, author_name: nil)
       { role: "user", kind: KIND, source: source.to_s, content: text.to_s, **author_fields(author, author_name) }
     end

data/lib/samagotchi/testing/boundary.rb

@@ -43,6 +43,7 @@ module Samagotchi
         Allowed.new(name: "Samagotchi::Log.debug", file: "samagotchi/log"),
         Allowed.new(name: "Samagotchi::Config.get", file: "samagotchi/config"),
         Allowed.new(name: "Samagotchi::VERSION", file: "samagotchi/version"),
+        Allowed.new(name: "Samagotchi::CancellationController", file: "samagotchi/cancellation_controller"),
         # The kit itself, for a bundle's own specs.
         Allowed.new(name: "Samagotchi::Testing", file: "samagotchi/testing")
       ].freeze

data/lib/samagotchi/testing/host.rb

@@ -39,6 +39,7 @@ module Samagotchi
           notify: ->(text, level, label, fallback_for: nil) { recorder.notify(text, level, label, fallback_for) },
           ask_user: ->(question) { recorder.ask_user(question) },
           cancelled: -> { recorder[:cancelled] },
+          turn_running: -> { recorder[:running] },
           card: ->(**card) { recorder.card(**card) },
           ask_model: lambda { |request, timeout:, max_tokens:, cancel_controller:, model: nil, source: nil|
             recorder.ask_model(request, timeout: timeout, max_tokens: max_tokens, cancel_controller: cancel_controller,

data/lib/samagotchi/tool_activity.rb

@@ -23,6 +23,7 @@ require_relative "tools/context_read"
 require_relative "tools/delegate"
 require_relative "tools/delegate_result"
 require_relative "tools/forget_outputs"
+require_relative "tools/objectives_tool"
 
 module Samagotchi
   # The one-line summary of a tool call that the UIs show ("reading file",
@@ -85,6 +86,15 @@ module Samagotchi
       event
     end
 
+    def objectives_proposal?(call) = call[:action].to_s.strip.downcase == Tools::ObjectivesTool::PROPOSE
+
+    # An objectives row's words: "O2 note · evidence", or "propose done O2 note".
+    def objectives_title(call)
+      return "#{Tools::ObjectivesTool::PROPOSE} #{call[:change]} #{call[:id]} #{call[:text]} · #{call[:note]}".squeeze(" ") if objectives_proposal?(call)
+
+      "#{call[:id]} #{call[:note]}#{" · #{call[:evidence]}" unless call[:evidence].to_s.strip.empty?}"
+    end
+
     # An execute's description, cut as a row's title; nil for the rest.
     def command_description(tool_name, call)
       return nil unless call.is_a?(Hash) && ToolView::TOOLS.include?(tool_name)
@@ -112,6 +122,7 @@ module Samagotchi
              when Tools::Read::NAME, Tools::MemoryRead::NAME then call[:content]
              when Tools::Write::NAME, Tools::Edit::NAME, Tools::MemoryWrite::NAME then call[:path]
              when Tools::Execute::NAME, Tools::TaskCreate::NAME then command_title(call[:content])
+             when Tools::ObjectivesTool::NAME then objectives_title(call)
              end
       text = text.to_s.strip
       return nil if text.empty?
@@ -205,6 +216,7 @@ module Samagotchi
       when Tools::Delegate::NAME then "delegating"
       when Tools::DelegateResult::NAME then "waiting for a delegate"
       when Tools::ForgetOutputs::NAME then forget_outputs_action(call)
+      when Tools::ObjectivesTool::NAME then objectives_proposal?(call) ? "proposing a change" : "recording a move"
       else registry_entry(registry, tool_name)&.label || "calling tool"
       end
     end
@@ -430,6 +442,11 @@ module Samagotchi
         parts << "restore=#{preview_tool_param(request.restore.join(","))}" if request.restore?
         parts << "note=#{preview_tool_param(request.note)}" unless request.note.empty?
         parts.empty? ? nil : parts.join(" ")
+      when Tools::ObjectivesTool::NAME
+        parts = ["id=#{preview_tool_param(call[:id])}", "note=#{preview_tool_param(call[:note])}"]
+        parts.unshift("change=#{preview_tool_param(call[:change])}") if objectives_proposal?(call)
+        parts << "evidence=#{preview_tool_param(call[:evidence])}" unless call[:evidence].to_s.strip.empty?
+        parts.join(" ")
       when Tools::AskUserQuestion::NAME
         parts = ["question=#{preview_tool_param(call[:question] || call[:content])}"]
         opts = call[:options]

data/lib/samagotchi/tool_declarations.rb

@@ -440,6 +440,40 @@ module Samagotchi
           },
           required: %w[question options]
         }
+      },
+      {
+        name: "objectives",
+        description: "Record a move on one of the objectives in the OBJECTIVES note: in a line, what you did or found that moves it, so the user can follow. One when an objective really moved, not per step. Or propose a change to the list (action propose): the user sees a card and applies it or not. This tool doesn't edit the list, change a status or mark anything done, and it approves nothing; the user edits the list with /objectives. Asked to change it, propose it or say so, instead of saying you changed it.",
+        parameters: {
+          type: "object",
+          properties: {
+            action: {
+              type: "string",
+              description: "move or propose"
+            },
+            id: {
+              type: "string",
+              description: "The objective's id, e.g. O2 (not for a proposed add)"
+            },
+            note: {
+              type: "string",
+              description: "A move: what moved, in a line. A proposal: why, in a line"
+            },
+            evidence: {
+              type: "string",
+              description: "Optional, a move's: what shows it (a commit, a test count, a file)"
+            },
+            change: {
+              type: "string",
+              description: "A proposal's: add, reword, done or drop"
+            },
+            text: {
+              type: "string",
+              description: "A proposed add's or reword's new text"
+            }
+          },
+          required: %w[action note]
+        }
       }
     ].freeze
 

data/lib/samagotchi/tools/builtin_calls.rb

@@ -53,7 +53,8 @@ module Samagotchi
         "delegate" => { content: "task", fallback: :prefix_or_raw },
         "ask_user_question" => { content: "question", also: %w[question], verbatim: %w[options], options: true,
                                  fallback: :raw },
-        "forget_outputs" => { content: "note", also: %w[note], verbatim: %w[ids keep restore] }
+        "forget_outputs" => { content: "note", also: %w[note], verbatim: %w[ids keep restore] },
+        "objectives" => { content: "note", also: %w[note] }
       }.freeze
 
       # A name the model uses for a built-in, mapped to that built-in (a model

data/lib/samagotchi/tools/builtins.rb

@@ -25,6 +25,7 @@ require_relative "delegate"
 require_relative "delegate_result"
 require_relative "ask_user_question"
 require_relative "forget_outputs"
+require_relative "objectives_tool"
 require_relative "../guardrails/parent_approvals"
 require_relative "../guardrails/pair_boundary"
 require_relative "../model_profile"
@@ -58,7 +59,8 @@ module Samagotchi
         ContextRead,
         Delegate,
         DelegateResult,
-        AskUserQuestion
+        AskUserQuestion,
+        ObjectivesTool
       ].freeze
       # The built-ins an LLM context layer adds (offered only under it).
       LAYER_CLASSES = [ForgetOutputs].freeze
@@ -115,6 +117,7 @@ module Samagotchi
           DelegateResult.call(call[:content], session: call[:session], timeout: call[:timeout], peers: kctx.peers)
         end,
         AskUserQuestion::NAME => ->(call, kctx) { kctx.ask_user_question(call) },
+        ObjectivesTool::NAME => ->(call, kctx) { ObjectivesTool.call(call, peers: kctx.peers) },
         ForgetOutputs::NAME => ->(call, kctx) { kctx.forget_outputs(call) }
       }.freeze
 

data/lib/samagotchi/tools/objectives_tool.rb

@@ -0,0 +1,75 @@
+# frozen_string_literal: true
+
+require_relative "../tool_response"
+
+module Samagotchi
+  # Read at a call only: the builtins' file list loads this, Session not with it.
+  autoload :Objectives, File.expand_path("../objectives", __dir__)
+
+  module Tools
+    # The objectives tool's two actions. A move: what the model did or found for
+    # an objective. Information only: it never changes a status or the list
+    # (the user does, /objectives), and nothing is written here: the call in
+    # history is the record, which Objectives.build reads back. A proposal: a
+    # change to the list the user applies from a card with one tap, the card's
+    # action being the /objectives line; the model never changes the list by
+    # itself. See docs/internals/objectives.md.
+    class ObjectivesTool
+      NAME = "objectives"
+      MOVE = "move"
+      PROPOSE = "propose"
+      PROPOSED = "Proposed %s. The list is unchanged: the user sees a card and applies it or not."
+      RECORDED = "Recorded a move on %s."
+      EDITED_BY_USER = "The user edits the list with /objectives."
+      NONE = "There are no objectives here, so nothing was recorded. #{EDITED_BY_USER}".freeze
+
+      def self.name = NAME
+
+      # Whether +output+, a saved run, is this tool's answer that it recorded a
+      # move on +id+ (Objectives.moves_in). Positive: a run that recorded
+      # nothing (no list, a refusal, a denial, an interrupt) has no such answer.
+      def self.recorded?(output, id)
+        output.to_s.sub(ToolResponse::LEAD, "").start_with?(RECORDED % id)
+      end
+
+      # @param call [Hash] the internal call (BuiltinCalls: action:, id:,
+      #   note:, evidence:)
+      # @param peers [#objectives, nil] the session's list
+      # @return [String] the tool result
+      def self.call(call, peers:)
+        action = call[:action].to_s.strip.downcase
+        unless action.empty? || [MOVE, PROPOSE].include?(action)
+          return "Error: this tool records a move (action: move) or proposes a change (action: propose); it edits nothing. #{EDITED_BY_USER}"
+        end
+
+        list = peers&.objectives
+        return NONE if list.nil? || list.empty?
+        return propose(list, call, peers) if action == PROPOSE
+
+        id = Objectives.move_id(call)
+        refusal(list, id, call) || "#{RECORDED % id} The list is unchanged: this tool doesn't edit it. #{EDITED_BY_USER}"
+      end
+
+      def self.propose(list, call, peers)
+        proposal = Objectives::Proposal.against(list, change: call[:change].to_s.strip.downcase, id: Objectives.move_id(call),
+                                                      text: Objectives.clean(call[:text]), note: Objectives.clean(call[:note]))
+        refused = proposal.refusal(list)
+        return "Error: #{refused}. Nothing was proposed." if refused
+
+        return "Error: at most #{Objectives::PROPOSALS_PER_TURN} proposals a turn. Nothing more was proposed." unless peers.propose_objective(proposal)
+
+        format(PROPOSED, proposal.line.delete_prefix("/objectives "))
+      end
+      private_class_method :propose
+
+      def self.refusal(list, id, call)
+        item = list.find(id)
+        return "Error: no objective #{id} (this session's: #{list.items.map(&:id).join(", ")}). Nothing was recorded." unless item
+        return "Error: #{id} was dropped, so nothing was recorded." if item.status == Objectives::DROPPED
+
+        "Error: a move needs a note: what moved, in a line." if Objectives.clean(call[:note]).empty?
+      end
+      private_class_method :refusal
+    end
+  end
+end

data/lib/samagotchi/tools/peers.rb

@@ -27,6 +27,9 @@ module Samagotchi
       # A person's message waits for the turn's next boundary: never here
       # (Engine::PeerView asks the running turn).
       def input_waiting? = false
+
+      # The session's objectives: none here (Engine::PeerView reads them).
+      def objectives = nil
     end
   end
 end

data/lib/samagotchi/version.rb

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

data/lib/samagotchi/web/message_display.rb

@@ -7,6 +7,7 @@ require_relative "../context_note"
 require_relative "../image_store"
 require_relative "../message_parts"
 require_relative "../message_time"
+require_relative "../objectives"
 require_relative "../output_formatter"
 require_relative "../recap_store"
 require_relative "../ref"
@@ -95,11 +96,19 @@ module Samagotchi
         list = Array(msgs)
         # The outputs' ✂ marks (LLM context edits), by id, for the parts.
         marks = parts ? MessageParts.edit_marks(list) : {}
+        # The list before each objectives note, for what its entry says changed.
+        objectives = nil
         list.each_with_index do |m, index|
           role = (m[:role] || m["role"]).to_s
           content = (m[:content] || m["content"]).to_s
           if Samagotchi::ContextNote.note?(m)
             note = { role: "note", content: Samagotchi::ContextNote.text_of(m), label: Samagotchi::ContextNote.label_of(m), **time_of(m) }
+            payload = Samagotchi::ContextNote.fetch(m, :objectives)
+            entry = payload && Samagotchi::Objectives.entry(payload, before: objectives)
+            if entry
+              note[:objectives] = entry
+              objectives = Samagotchi::Objectives.from_payload(payload)
+            end
             # 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)

data/lib/samagotchi/web/participant_view.rb

@@ -82,7 +82,7 @@ module Samagotchi
         after_generation after_tool_call after_turn answer_display before_generation before_tool_call before_turn
         card command_output command_queued command_ran context_added context_status empty_answer_retry
         generation_cancelled generation_completed generation_progress generation_started guardrail_warning hook_notice
-        llm_context_edited merged_input participants_changed pending_input_merged plugin_init_finished
+        llm_context_edited merged_input objectives_updated participants_changed pending_input_merged plugin_init_finished
         plugin_init_started plugin_init_wait prompt_restored question question_relay reasoning_history_refused
         recap_ready reminder_injected sampling_refused session_end session_start side_usage steer_cut thinking_dropped
         thinking_refused tool_dispatch_completed tool_dispatch_started used_memories_updated working_set_updated

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

@@ -54,6 +54,7 @@ import { createBubbles, hintEl, outputBubbleTemplate } from "./bubbles.js";
 import { createCardsPlace } from "./cards_place.js";
 import { createStageView } from "./stage_view.js";
 import { createWorkingSet, groupItems } from "./working_set_view.js";
+import { createObjectives } from "./objectives_wiring.js";
 import { turnGroups } from "./timing.js";
 import { createGapClock, lastActivity } from "./time_gaps.js";
 import { createMarkdownPlace } from "./markdown_place.js";
@@ -421,6 +422,10 @@ const deliveryControl = createDeliveryControl({
 // This tab's id in the session's events: tells its own prompts from the
 // ones other clients (an attached TUI, another tab, reminders) sent.
 const clientId = newClientId();
+const objectives = createObjectives({
+  el: $("#objectivesStrip"), historyEl, session: () => store.selected, running: () => liveTurn.running, holding: () => turnDom.holds(), commands: () => store.current.commands,
+  clientId, sendCommand, sendTurn, follow: () => followWokenWorker(), toast: (...args) => showToast(...args),
+});
 // The question and continue cards in the history (question_cards.js).
 const questionCards = createQuestionCards({
   sessionId: () => store.selected,
@@ -1017,6 +1022,7 @@ function forgetSession({ keepVerify = false } = {}) {
   });
   commandList.close();
   resetTurnView();
+  objectives.reset();
   seedInitTasks(initTasks, []);
   renderInitRow();
   setMarkdownWarning(null);
@@ -1178,6 +1184,7 @@ function renderSessionView(data, { kept = [] } = {}) {
   if (data.messages && data.messages.length) renderHistory(data.messages);
   else renderHistory(data.history || []);
   seedWorkingSet(data);
+  objectives.seed(data.objectives);
   restoreCommandBubbles(historyEl, kept);
   // A failed turn's prompt went back to the user: shown after the
   // conversation, marked failed, as it was live (prompt_restored).
@@ -1761,6 +1768,8 @@ const streamHandlers = createStreamHandlers({
   // cards_place.js
   upsertCard, refreshCardBodies,
   syncModelPick: startPage.commandRan,
+  objectivesUpdated: (data) => objectives.update(data),
+  cardActionFailed: cards.actionFailed,
 });
 
 async function refreshTimingFromSession() {
@@ -2204,6 +2213,7 @@ store.on("settingsPanel", () => settingsControl.refresh());
 store.on("workingSetStrategy", () => workingSet?.strategyChanged());
 store.on("featureGates", () => featureGates.check(store.current));
 store.on("composer", updateComposerMode);
+store.on("composer", () => objectives.redraw());
 // The answers' Revise buttons follow liveTurn.running too (none on the
 // running turn's answer), which touches the composer.
 store.on("composer", () => reviseStacks.decorate());

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

@@ -48,6 +48,8 @@ export function turnAnswerEl(turnEls) {
 // @param api {getSession, sendCommand} (data.js)
 // @return {cardElement(id), upsertCard(card, {before}), placeSnapshotCards(entries),
 //   refreshCardBodies(), onCardAction(event)}
+const HELD_UNTIL_ANSWERED = /^\/objectives --card /;
+
 export function createCardsPlace({
   historyEl, turnDom, findInTurnRoots, selected, clientId, questionCards, bubbles,
   followWokenWorker, api = { getSession, sendCommand },
@@ -162,7 +164,18 @@ export function createCardsPlace({
     }, 150);
   }
 
-  // A card's action button (a click anywhere in the turn roots).
+  // Its command line's card is back in play: the worker refused the action.
+  function actionFailed(line) {
+    for (const button of findInTurnRoots(".plugin-card .card-action")) {
+      if (button.dataset.command === line) {
+        button.closest(".plugin-card").querySelectorAll(".card-action").forEach((b) => { b.disabled = false; });
+      }
+    }
+  }
+
+  // A card's action button (a click anywhere in the turn roots). A proposal
+  // card's buttons stay off until its folded card replaces them or the
+  // action fails (actionFailed): a second tap has nothing to do.
   function onCardAction(e) {
     const button = e.target.closest(".plugin-card .card-action");
     const id = selected();
@@ -170,7 +183,9 @@ export function createCardsPlace({
     const card = button.closest(".plugin-card");
     const err = card.querySelector(".card-error");
     err.classList.add("hidden");
-    button.disabled = true;
+    const held = HELD_UNTIL_ANSWERED.test(button.dataset.command);
+    const off = held ? [...card.querySelectorAll(".card-action")] : [button];
+    off.forEach((b) => { b.disabled = true; });
     api.sendCommand(id, button.dataset.command, { clientId, card: true })
       .then(() => {
         // The command woke the worker: follow its stream if none is open
@@ -180,9 +195,10 @@ export function createCardsPlace({
       .catch((error) => {
         err.textContent = error.message;
         err.classList.remove("hidden");
+        off.forEach((b) => { b.disabled = false; });
       })
-      .finally(() => { button.disabled = false; });
+      .finally(() => { if (!held) button.disabled = false; });
   }
 
-  return { cardElement, upsertCard, placeSnapshotCards, refreshCardBodies, onCardAction };
+  return { cardElement, upsertCard, placeSnapshotCards, refreshCardBodies, onCardAction, actionFailed };
 }

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

@@ -163,6 +163,8 @@ export function continueLine(choice, reason = "") {
 const QUEUED_TEXT = "queued: runs after this turn";
 const APPLY_TEXT = "Apply (restarts the cache)";
 
+const OBJECTIVES_LINE = /^\/objectives\b/;
+
 export function commandView(event, myId) {
   const own = isOwn(event.client_id, myId);
   const waiting = event.waits === "turn_end";
@@ -181,7 +183,8 @@ export function commandView(event, myId) {
     commandId: event.command_id || null,
     confirm: typeof event.confirm?.line === "string" ? event.confirm.line : null,
     // A card's action (Nudge…): no bubble unless it says something back.
-    hidden: event.card === true && !event.output && event.status !== "error",
+    // A tap's /objectives edit: the strip and the entry are its answer.
+    hidden: event.card === true && event.status !== "error" && (!event.output || OBJECTIVES_LINE.test(event.line || "")),
   };
 }
 

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

@@ -14,6 +14,7 @@
 <link rel="stylesheet" href="/assets/annotate_bar.css">
 <link rel="stylesheet" href="/assets/composer.css">
 <link rel="stylesheet" href="/assets/forms.css">
+<link rel="stylesheet" href="/assets/objectives.css">
 <style>
 /* Icon masks shared by the phone info bar and the all view's cards (the stroke only shapes the mask; the icon takes currentColor); the image icon is composer.css's. */
 :root{--icon-archive:url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16' fill='none' stroke='black' stroke-width='1.5' stroke-linecap='round' stroke-linejoin='round'%3E%3Crect x='2' y='2.75' width='12' height='3.5' rx='1'/%3E%3Cpath d='M3.25 6.25v6a1 1 0 0 0 1 1h7.5a1 1 0 0 0 1-1v-6M6.5 9h3'/%3E%3C/svg%3E");--icon-unarchive:url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16' fill='none' stroke='black' stroke-width='1.5' stroke-linecap='round' stroke-linejoin='round'%3E%3Crect x='2' y='2.75' width='12' height='3.5' rx='1'/%3E%3Cpath d='M3.25 6.25v6a1 1 0 0 0 1 1h7.5a1 1 0 0 0 1-1v-6M8 11.5V8.25M6.5 9.75 8 8.25l1.5 1.5'/%3E%3C/svg%3E")}
@@ -1788,6 +1789,7 @@ a{color:var(--accent)}
     <div id="stage">
       <div id="markdownWarning" class="markdown-warning" hidden></div>
       <div id="markdownTip" class="markdown-tip" hidden><span class="markdown-tip-text"></span><button type="button" class="markdown-tip-close" aria-label="Dismiss tip" title="Dismiss tip">×</button></div>
+      <div id="objectivesStrip" hidden></div>
       <div id="history"></div>
       <div id="empty"></div>
       <div id="notice" role="status" hidden></div>

data/lib/samagotchi/web/public/objectives.css

@@ -0,0 +1,80 @@
+/* The session's objectives (objectives_strip.js, objectives_entry.js). Colours are tokens.css's only. */
+#objectivesStrip{flex:none;padding:6px max(16px,calc((100% - 960px)/2));border-bottom:1px solid var(--border);background:color-mix(in srgb,var(--bg-panel) 60%,transparent)}
+#objectivesStrip[hidden]{display:none}
+.obj-strip{display:flex;align-items:center;gap:8px;min-height:32px}
+.obj-chips{display:flex;flex-wrap:wrap;gap:6px;min-width:0;flex:1}
+.obj-chip{display:inline-flex;align-items:baseline;gap:6px;max-width:280px;min-width:0;padding:3px 10px;border-radius:999px;border:1px solid var(--accent-border);background:var(--accent-bg);color:var(--text-2);font-size:13px;line-height:1.4}
+.obj-chip.done{background:transparent;border-color:var(--border-strong);color:var(--text-muted)}
+.obj-id{flex:none;font:700 12px ui-monospace,SFMono-Regular,Menlo,monospace;color:var(--accent)}
+.obj-chip.done .obj-id{color:var(--text-muted)}
+.obj-text{min-width:0;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}
+.obj-count{flex:none;color:var(--text-muted);font-size:12px;font-variant-numeric:tabular-nums}
+/* An objectives note in the conversation: pills for a list, a line for an edit. */
+.bubble.note.objectives-entry{display:flex;flex-wrap:wrap;align-items:center;gap:6px;background:transparent;border:0;padding:2px 0;white-space:normal}
+.obj-entry-label{color:var(--text-muted);font-size:12px;margin-right:2px}
+.obj-pill{display:inline-block;padding:2px 10px;border-radius:999px;border:1px solid var(--accent-border);background:var(--accent-bg);color:var(--text-2);font-size:13px;line-height:1.45}
+.obj-pill.done{background:transparent;border-color:var(--border-strong);color:var(--text-muted)}
+.bubble.note.objectives-entry.change{flex-wrap:nowrap;gap:10px;color:var(--text-muted);font-size:13px}
+.obj-rule{flex:1 1 16px;min-width:16px;height:1px;background:var(--border-strong)}
+.obj-change{min-width:0;text-align:center;overflow-wrap:anywhere}
+/* The strip's chips open the edit list. */
+button.obj-chip{cursor:pointer;font:inherit;font-size:13px;line-height:1.4;text-align:left}
+@media(hover:hover){button.obj-chip:hover:not(:disabled){filter:none;border-color:var(--accent)}}
+.obj-edit{flex:none;background:transparent;color:var(--text-muted);padding:3px 8px;font-size:12px}
+@media(hover:hover){.obj-edit:hover:not(:disabled){filter:none;color:var(--text-bright)}}
+.obj-waiting{flex:none;color:var(--warn-text);font-size:12px}
+/* The edit list (chip_popover.js's shell, .ctx-popover; a bottom sheet on a phone). */
+.obj-panel{display:flex;flex-direction:column;gap:10px;overflow:auto}
+.obj-rows{display:flex;flex-direction:column;gap:2px}
+.obj-row{display:flex;align-items:flex-start;gap:8px;padding:6px 0;border-top:1px solid var(--border)}
+.obj-row:first-child{border-top:0}
+.obj-row .obj-id{padding-top:3px}
+.obj-row-main{flex:1;min-width:0;display:flex;flex-direction:column;gap:2px}
+.obj-row-text{display:block;width:100%;padding:2px 0;background:transparent;color:var(--text);text-align:left;font-size:14px;line-height:1.4;border-radius:4px;white-space:normal;overflow-wrap:anywhere}
+@media(hover:hover){.obj-row-text:hover:not(:disabled){filter:none;text-decoration:underline dotted var(--text-muted)}}
+.obj-row.done .obj-row-text{color:var(--text-muted)}
+.obj-row.dropped .obj-row-text{color:var(--text-faint);text-decoration:line-through}
+.obj-row.done .obj-id,.obj-row.dropped .obj-id{color:var(--text-muted)}
+.obj-row-sub{display:flex;flex-direction:column;gap:1px;color:var(--text-muted);font-size:12px;overflow-wrap:anywhere}
+.obj-row-acts{flex:none;display:flex;gap:4px}
+.obj-check.refuted{color:var(--warn-text)}
+.obj-check.confirmed{color:var(--text-2)}
+.obj-act{padding:3px 10px;font-size:12px;border-radius:6px}
+.obj-act.ghost{background:var(--bg-raised);color:var(--text-2)}
+form.obj-row{align-items:center}
+.obj-input{flex:1;min-width:0;padding:5px 8px;border-radius:6px;border:1px solid var(--border-strong);background:var(--bg-inset);color:var(--text);font-size:14px}
+.obj-add{display:flex;gap:6px;align-items:center}
+.obj-note{color:var(--text-muted);font-size:12px}
+/* A phone: one line, the objective being worked on and how far along, and the whole list a tap away in a bottom sheet (chip_popover.js), never pushing the conversation down. */
+@media(max-width:600px){
+  #objectivesStrip{padding:4px 12px}
+  .obj-strip{min-height:36px}
+  .obj-chips{flex-wrap:nowrap}
+  .obj-chip:not(.first){display:none}
+  .obj-chip.first{flex:1;max-width:none;min-height:36px;align-items:center;border-radius:10px}
+  .obj-edit{padding:8px;min-height:36px}
+  .obj-waiting{max-width:90px;font-size:11px;line-height:1.2}
+  .obj-pill{font-size:12.5px}
+  .bubble.note.objectives-entry.change{font-size:12.5px;gap:6px}
+}
+.obj-panel.sheet{font-size:15px;max-height:85dvh}
+.obj-panel.sheet .obj-row{align-items:flex-start;flex-wrap:wrap;padding:8px 0}
+.obj-panel.sheet form.obj-row{align-items:center;flex-wrap:nowrap}
+/* The text keeps the row's width and the buttons get their own line: a phone reads a reason. */
+.obj-panel.sheet .obj-row-main{flex:1 1 calc(100% - 40px)}
+.obj-panel.sheet .obj-row-text{font-size:15px;min-height:32px}
+.obj-panel.sheet .obj-row-acts{flex:1 1 100%;flex-wrap:wrap;justify-content:flex-end;gap:6px}
+.obj-panel.sheet .obj-act{min-height:44px;min-width:56px;padding:0 8px;font-size:14px;border-radius:10px}
+.obj-panel.sheet .obj-input{min-height:44px;font-size:16px;border-radius:10px}
+.obj-panel.sheet .obj-note{font-size:12px}
+@media (prefers-reduced-motion:reduce){.obj-chip,.obj-act{transition:none}}
+/* A move: a turn's line above its answer, a tool row's chip, a decision card's "Concerns". */
+.obj-pill.obj-mark{padding:0 7px;font:700 11.5px/1.5 ui-monospace,SFMono-Regular,Menlo,monospace;color:var(--accent)}
+.obj-moves{display:flex;flex-direction:column;gap:2px;margin-bottom:-4px;font-size:13px}
+.obj-move-line{display:flex;align-items:baseline;gap:8px;color:var(--text-2);flex-wrap:wrap}
+.obj-move-note{min-width:0;flex:1 1 200px;overflow-wrap:anywhere}
+.obj-concerns .obj-pill{margin-right:4px}
+.obj-notyet{flex:none}
+.obj-moves:not(.newest) .obj-notyet{display:none}
+@media (pointer:coarse){.obj-notyet{min-height:36px}}
+.obj-short{display:flex;justify-content:flex-end;margin-top:-6px}