samagotchi 0.148.0 → 0.150.0

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

@@ -95,17 +95,18 @@ function footTag(label) {
   return html` <button type="button" class="ws-step p" data-ws="jump" data-at=${atAttr(first.at)} title=${title}>${text}</button>`;
 }
 
-// The footprint line of a finished turn's +items+ (turn +ordinal+), nothing
-// for a turn that touched nothing: "touched web/public/ · 9 files · ◆ 3
-// memories s1–5 · +1 url · edited 2". A click opens the expanded view at
-// that turn; a step tag jumps to its call.
+// The footprint of a finished turn's +items+ (turn +ordinal+), nothing for a
+// turn that touched nothing: "touched web/public/ · 9 files · ◆ 3 memories
+// s1–5 · +1 url · edited 2". It sits in the turn block's summary line, so a
+// span (phrasing content). A click opens the expanded view at that turn; a
+// step tag jumps to its call.
 export function footprintTemplate(items, ordinal) {
   const fp = footprint(items, BUDGETS.footprint);
   if (!fp) return nothing;
   const sep = html` <span class="sep">·</span> `;
   const parts = fp.labels.map((l, i) => html`${i ? sep : nothing}<span class=${`l ${l.kind}${l.state && l.state !== "live" ? ` ${l.state}` : ""}`} title=${labelTitle(l)}>${l.glyph ? html`<span class="k">${l.glyph}</span> ` : nothing}${labelText({ ...l, glyph: "" })}</span>${footTag(l)}`);
   const text = footprintText(items, BUDGETS.footprint);
-  return html`<div class="ws-foot" role="button" tabindex="0" aria-haspopup="dialog" aria-expanded="false" data-ws-turn=${ordinal} data-ws-sig=${footSig(items)} aria-label=${`Working set of this turn: ${text.replace(/^touched /, "")}. Open the list.`}><span class="w">touched</span> ${parts}${fp.tail ? html`${sep}<span class="w">${fp.tail}</span>` : nothing}${fp.edited ? html`${sep}<span class="e">edited ${fp.edited}</span>` : nothing}${fp.stale ? html`${sep}<span class="s">${fp.stale} stale</span>` : nothing}${fp.forgotten ? html`${sep}<span class="f">${fp.forgotten} forgotten</span>` : nothing}${fp.dropped ? html`${sep}<span class="f">${fp.dropped} dropped</span>` : nothing}</div>`;
+  return html`<span class="ws-foot" role="button" tabindex="0" aria-haspopup="dialog" aria-expanded="false" data-ws-turn=${ordinal} data-ws-sig=${footSig(items)} aria-label=${`Working set of this turn: ${text.replace(/^touched /, "")}. Open the list.`}><span class="w">touched</span> ${parts}${fp.tail ? html`${sep}<span class="w">${fp.tail}</span>` : nothing}${fp.edited ? html`${sep}<span class="e">edited ${fp.edited}</span>` : nothing}${fp.stale ? html`${sep}<span class="s">${fp.stale} stale</span>` : nothing}${fp.forgotten ? html`${sep}<span class="f">${fp.forgotten} forgotten</span>` : nothing}${fp.dropped ? html`${sep}<span class="f">${fp.dropped} dropped</span>` : nothing}</span>`;
 }
 
 // What a footprint shows that can change after it is drawn: its items'
@@ -418,10 +419,12 @@ export function createWorkingSet({ historyEl, stageRoot = () => null, state, ses
     }
   });
 
-  // A footprint: its step tag jumps, the rest opens that turn's view.
+  // A footprint: its step tag jumps, the rest opens that turn's view. Inside
+  // a <summary>, the click is cancelled so it doesn't toggle the block.
   function footClick(e) {
     const foot = e.target.closest?.(".ws-foot");
     if (!foot) return;
+    if (foot.closest("summary")) e.preventDefault();
     const tag = e.target.closest(".ws-step[data-at]");
     if (tag) {
       const at = parseAt(tag.dataset.at);
@@ -563,7 +566,7 @@ export function createWorkingSet({ historyEl, stageRoot = () => null, state, ses
     // The rail's first-sight times, for the popover's fresh rows.
     setSeen(fn) { seenAt = fn; },
     // The running turn hands off: its set joins the turns; its footprint
-    // line (null: it touched nothing) goes after its block.
+    // (null: it touched nothing) goes into its block's summary.
     handOff(turn, prompt = "") {
       const ordinal = turns.length;
       const items = itemsOfTurn(turn, ordinal);

data/lib/samagotchi/web/push/notifier.rb

@@ -5,6 +5,7 @@ require "uri"
 require "time"
 require_relative "attention"
 require_relative "../../log"
+require_relative "../../memory_bundle/file_standing"
 
 module Samagotchi
   module Web
@@ -52,10 +53,10 @@ module Samagotchi
         AUTO_NOTICES = {
           "installed" => lambda do |version, notes|
             ["installed", "chi #{version} is installed",
-             "chi web and its sessions switch over when you restart them.#{kept_words(notes[:kept])}"]
+             "chi web and its sessions switch over when you restart them.#{file_words(notes)}"]
           end,
           "updated" => lambda do |version, notes|
-            ["updated", "chi updated to #{version}", "#{restarted_words(notes[:restarted], notes[:left])}#{kept_words(notes[:kept])}"]
+            ["updated", "chi updated to #{version}", "#{restarted_words(notes[:restarted], notes[:left])}#{file_words(notes)}"]
           end,
           "restart_failed" => lambda do |version, notes|
             ["restart_failed", "chi #{version} is installed; chi web didn't restart",
@@ -79,13 +80,10 @@ module Samagotchi
           "#{words}."
         end
 
-        # " Kept your edits in 2 files." ("" for none).
-        def self.kept_words(count)
-          if count.to_i.positive?
-            " Kept your edits in #{count} #{count == 1 ? "file" : "files"}."
-          else
-            ""
-          end
+        # " Merged the update into 1 file you edited. 2 files stay behind." ("" for none).
+        def self.file_words(notes)
+          words = MemoryBundle::FileStanding.counts_sentence(merged: notes[:merged].to_i, behind: notes[:kept].to_i)
+          words.empty? ? "" : " #{words}"
         end
 
         # A show carries +open+ only while its JSON stays this small: one

data/lib/samagotchi/web/session_hub.rb

@@ -216,7 +216,8 @@ module Samagotchi
       # `chi_update` frames are the page's), and not kept for a snapshot.
       # @param kind [String] installed, updated or failed
       # @param version [String] the release it is about
-      # @param notes [Hash] detail:, kept: (a count), restarted:, left:
+      # @param notes [Hash] detail:, kept:, merged: (counts of edited files that
+      #   stayed behind and that took the update), restarted:, left:
       def publish_notice(kind:, version:, **notes)
         @monitor.synchronize { emit("chi_notice", { kind: kind, version: version, **notes }) }
         nil

data/lib/samagotchi/web/session_show.rb

@@ -6,6 +6,7 @@ require "uri"
 require_relative "../analytics_file"
 require_relative "../answer_refs"
 require_relative "../answer_tail"
+require_relative "../objectives"
 require_relative "../output_formatter"
 require_relative "../question_asked"
 require_relative "../guardrails/approvals"
@@ -91,10 +92,20 @@ module Samagotchi
           # The stream cursor `<seq>-<epoch>`: a later worker resets it
           # instead of taking the seq as its own. Only the snapshot has it.
           last_event_id: turn_snapshot && turn_snapshot["event_id"],
-          timing: timing
+          timing: timing,
+          **objectives_field(id, raw_messages)
         })
       end
 
+      # The session's list (the page's strip), and no key with no list: a
+      # session without one reads as it always did. A snapshot's entries have
+      # string keys (paired_runs reads symbols).
+      def objectives_field(id, messages)
+        symbols = Array(messages).map { |message| message.is_a?(Hash) ? message.transform_keys(&:to_sym) : message }
+        view = Samagotchi::Objectives.view(id, symbols, state_dir: default_state_dir)
+        view ? { objectives: view } : {}
+      end
+
       # A list in the worker's turn +snapshot+ (queued prompts, commands,
       # init tasks); [] without a worker.
       def snapshot_list(snapshot, key) = Array(snapshot&.[](key))

data/lib/samagotchi/web/update_ops.rb

@@ -175,7 +175,8 @@ module Samagotchi
       def perform_install(version, auto)
         argv = update_argv(version)
         said = nil
-        output, success = @runner.call(argv, env: ChildEnv.unbundled,
+        env = auto ? ChildEnv.unbundled.merge(ChildEnv::UNATTENDED_UPDATE => "1") : ChildEnv.unbundled
+        output, success = @runner.call(argv, env: env,
                                              progress: lambda { |line|
                                                said = line unless line.strip.empty?
                                                @hub.publish_update(state: "running", rows: [], progress: line,

data/lib/samagotchi/worker.rb

@@ -1203,6 +1203,9 @@ module Samagotchi
         save_or_log(:command) { save_session } unless Array(result.changed).empty?
         announce_command(command, status: result.status.to_s, output: result.output, changed: Array(result.changed),
                                   anytime: true, confirm: result.confirm)
+        # It may have left a note (/objectives): an idle loop takes it now, not
+        # at the fallback tick. Harmless otherwise: one more pass.
+        @waker.wake
       rescue StandardError => e
         Log.warn(:worker, "anytime_command_failed", line: command.line, error: e.class.name, msg: e.message)
       end

data/lib/samagotchi/worker_inbound.rb

@@ -9,6 +9,7 @@ require_relative "client_id"
 require_relative "config"
 require_relative "context_note"
 require_relative "log"
+require_relative "objectives"
 require_relative "session"
 require_relative "session_inbox"
 require_relative "steer"
@@ -113,19 +114,26 @@ module Samagotchi
     # note the saved conversation already holds. A failed save keeps the
     # files too: the next pass claims them again, finds them in the
     # conversation and saves again. Not activity: a note alone neither
-    # starts a turn nor keeps an idle worker up.
+    # starts a turn nor keeps an idle worker up. Of the objectives notes in
+    # a batch only the newest goes in: each is a whole list, so the older
+    # ones (edits made during a turn) would only be sent for nothing.
     def absorb_notes
       files = SessionInbox.find_new_note_files(@session_dir)
       return if files.empty? || @stopped.call
 
-      claimed = files.filter_map { |file| SessionInbox.claim_note_file(file) }
-      claimed.each do |file|
-        note = SessionInbox.read_note(file)
-        @engine.add_context_note(@session, note) if note
+      # Under the objectives' lock: an edit reads the conversation and then the
+      # pending file, so it must see this whole step or none of it.
+      Objectives.with_lock(@session_dir) do
+        claimed = files.filter_map { |file| SessionInbox.claim_note_file(file) }
+        notes = claimed.filter_map { |file| SessionInbox.read_note(file) }
+        newest_list = notes.reverse.find { |note| note[:objectives] }
+        notes.each do |note|
+          @engine.add_context_note(@session, note) if !note[:objectives] || note.equal?(newest_list)
+        end
+        next unless save(:notes)
+
+        claimed.each { |file| FileUtils.rm_f(file) }
       end
-      return unless save(:notes)
-
-      claimed.each { |file| FileUtils.rm_f(file) }
     end
 
     # The attached context's notes (ContextAbsorber), between turns. Not

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: samagotchi
 version: !ruby/object:Gem::Version
-  version: 0.148.0
+  version: 0.150.0
 platform: ruby
 authors:
 - Dmitry Dedov
@@ -163,6 +163,7 @@ files:
 - docs/internals/llm-context-bench.md
 - docs/internals/llm-context-forget.md
 - docs/internals/llm-context-live.md
+- docs/internals/objectives.md
 - docs/internals/participants.md
 - docs/internals/prompt-caching.md
 - docs/internals/remote-sessions.md
@@ -225,6 +226,7 @@ files:
 - lib/samagotchi/bundle_command/try/trace.rb
 - lib/samagotchi/bundle_needs.rb
 - lib/samagotchi/bundle_settings_check.rb
+- lib/samagotchi/bundler_env.rb
 - lib/samagotchi/bundles/agents-md/manifest.yml
 - lib/samagotchi/bundles/agents-md/plugin.rb
 - lib/samagotchi/bundles/btw/manifest.yml
@@ -248,6 +250,8 @@ files:
 - lib/samagotchi/bundles/core/manifest.yml
 - lib/samagotchi/bundles/cost-cap/manifest.yml
 - lib/samagotchi/bundles/cost-cap/plugin.rb
+- lib/samagotchi/bundles/decision-card/manifest.yml
+- lib/samagotchi/bundles/decision-card/plugin.rb
 - lib/samagotchi/bundles/dev/manifest.yml
 - lib/samagotchi/bundles/github-pr/manifest.yml
 - lib/samagotchi/bundles/github-pr/plugin.rb
@@ -356,6 +360,7 @@ files:
 - lib/samagotchi/file_ref.rb
 - lib/samagotchi/gem_update.rb
 - lib/samagotchi/generation_phase.rb
+- lib/samagotchi/git_env.rb
 - lib/samagotchi/git_head.rb
 - lib/samagotchi/guardrail_wiring.rb
 - lib/samagotchi/guardrails.rb
@@ -464,6 +469,7 @@ files:
 - lib/samagotchi/memory_bundle/builder.rb
 - lib/samagotchi/memory_bundle/bundle_hook.rb
 - lib/samagotchi/memory_bundle/entry_size.rb
+- lib/samagotchi/memory_bundle/file_standing.rb
 - lib/samagotchi/memory_bundle/index_size.rb
 - lib/samagotchi/memory_bundle/index_sync.rb
 - lib/samagotchi/memory_bundle/index_updater.rb
@@ -478,11 +484,14 @@ files:
 - lib/samagotchi/memory_bundle/plugin_ref.rb
 - lib/samagotchi/memory_bundle/profile.rb
 - lib/samagotchi/memory_bundle/provenance.rb
+- lib/samagotchi/memory_bundle/remerge.rb
 - lib/samagotchi/memory_bundle/shas.rb
+- lib/samagotchi/memory_bundle/shipped_history.rb
 - lib/samagotchi/memory_bundle/shipped_update.rb
 - lib/samagotchi/memory_bundle/source.rb
 - lib/samagotchi/memory_bundle/status.rb
 - lib/samagotchi/memory_bundle/system_bundle.rb
+- lib/samagotchi/memory_bundle/text_merge.rb
 - lib/samagotchi/memory_bundle/trash.rb
 - lib/samagotchi/memory_bundle/uninstaller.rb
 - lib/samagotchi/memory_command.rb
@@ -505,6 +514,10 @@ files:
 - lib/samagotchi/muted_memories.rb
 - lib/samagotchi/note_command.rb
 - lib/samagotchi/note_delivery.rb
+- lib/samagotchi/objectives.rb
+- lib/samagotchi/objectives_audit.rb
+- lib/samagotchi/objectives_check.rb
+- lib/samagotchi/objectives_command.rb
 - lib/samagotchi/output_formatter.rb
 - lib/samagotchi/owner_lock.rb
 - lib/samagotchi/owner_prompt.rb
@@ -743,6 +756,7 @@ files:
 - lib/samagotchi/tools/list_reminders.rb
 - lib/samagotchi/tools/list_sessions.rb
 - lib/samagotchi/tools/memory.rb
+- lib/samagotchi/tools/objectives_tool.rb
 - lib/samagotchi/tools/output_guardrails.rb
 - lib/samagotchi/tools/peers.rb
 - lib/samagotchi/tools/read.rb
@@ -814,6 +828,7 @@ files:
 - lib/samagotchi/web/public/app.js
 - lib/samagotchi/web/public/apple-touch-icon.png
 - lib/samagotchi/web/public/auth_lost.js
+- lib/samagotchi/web/public/block_open.js
 - lib/samagotchi/web/public/bubbles.js
 - lib/samagotchi/web/public/card.js
 - lib/samagotchi/web/public/cards_place.js
@@ -872,6 +887,12 @@ files:
 - lib/samagotchi/web/public/notice_links.js
 - lib/samagotchi/web/public/notifications.js
 - lib/samagotchi/web/public/notify.js
+- lib/samagotchi/web/public/objectives.css
+- lib/samagotchi/web/public/objectives_entry.js
+- lib/samagotchi/web/public/objectives_model.js
+- lib/samagotchi/web/public/objectives_moves.js
+- lib/samagotchi/web/public/objectives_strip.js
+- lib/samagotchi/web/public/objectives_wiring.js
 - lib/samagotchi/web/public/participant.html
 - lib/samagotchi/web/public/participant.js
 - lib/samagotchi/web/public/participant_annotate.js