samagotchi 0.140.0 → 0.141.0

data/lib/samagotchi/session_access.rb

@@ -173,9 +173,12 @@ module Samagotchi
     # over, the server's word on a --parent-answers looser than its
     # config.yml's (capped), and the id the prompt it started with gets for
     # its first turn (nil for one created idle).
-    Created = Data.define(:id, :model_warning, :continues, :moved_children, :parent_answers_warning, :first_turn_id) do
+    # +moved_context+: the attached context a continue took
+    # (ContextSources::Moved; nil from an older chi web).
+    Created = Data.define(:id, :model_warning, :continues, :moved_children, :parent_answers_warning, :first_turn_id,
+                          :moved_context) do
       def initialize(id:, model_warning: nil, continues: nil, moved_children: [], parent_answers_warning: nil,
-                     first_turn_id: nil) = super
+                     first_turn_id: nil, moved_context: nil) = super
     end
 
     # A session's worker as an attach finds it (Local#worker, chi web's GET
@@ -255,16 +258,33 @@ module Samagotchi
     # "declined".
     ContextCandidate = Data.define(:candidate, :status)
 
+    # chi context add's outcome: the source's +name+, and
+    # +movable_dropped+ when a movable flag was given and the remote's chi
+    # web didn't keep it (its answer has no movable: older than the flag).
+    ContextAdded = Data.define(:name, :movable_dropped) do
+      def initialize(name:, movable_dropped: false) = super
+    end
+
     # chi context push's outcome: :pushed (+before+ the revision it had,
-    # +revision+ the new one), :missing (no such source) or :not_push (a
-    # command source, whose text is its command's).
-    ContextPush = Data.define(:status, :before, :revision) do
-      def initialize(status:, before: nil, revision: nil) = super
+    # +revision+ the new one), :missing (no such source), :not_push (a
+    # command source, whose text is its command's) or :continued (the
+    # session was continued, as +next_id+: nothing was written).
+    ContextPush = Data.define(:status, :before, :revision, :next_id) do
+      def initialize(status:, before: nil, revision: nil, next_id: nil) = super
 
       # Why a push to +name+ was refused as :not_push: a command source's
       # text is its command's, and a push between two fetches would read
       # as a change and then vanish.
       def self.not_push_message(name) = "#{name} runs a command, which writes its text: push goes to a --push source"
+
+      # Why a push to +name+ in session +id+ was refused as :continued: its
+      # writer holds the old id, and nothing reads a continued session.
+      # Generic (the CLI and chi web load no plugins): a peer's skill owns
+      # its re-pair.
+      def self.continued_message(name, id, next_id)
+        "#{id.to_s[0, 8]} was continued as #{next_id}: #{name} stays with the session it was attached to; " \
+          "attach it to #{next_id} (or pair again with #{next_id}) and push there"
+      end
     end
   end
 end

data/lib/samagotchi/session_continue.rb

@@ -6,6 +6,7 @@ require_relative "session_setup"
 require_relative "session_inbox"
 require_relative "session_chain"
 require_relative "child_move"
+require_relative "context_move"
 require_relative "archive_store"
 require_relative "recap_store"
 require_relative "bridge_client"
@@ -76,7 +77,8 @@ module Samagotchi
     # running, a prompt queued or the step-limit question refuse; an idle
     # worker is stopped), so a refusal starts nothing. Its open delegates
     # (running, waiting, live, an unreported reply, at any depth below them)
-    # move to the new link instead (ChildMove): their reports reach it.
+    # move to the new link instead (ChildMove): their reports reach it. So
+    # does its movable attached context (ContextMove).
     # Before that its live worker is asked for a recap and given up to
     # +recap_wait+ seconds to write it.
     # One continue of a session at a time (a lock in its folder): a double
@@ -87,7 +89,8 @@ module Samagotchi
     # @param preview [String, nil] what the lists show before the first turn;
     #   by default the prompt, else the previous link's preview
     # @return [Session] the new link (#model_warning as spawn_session's,
-    #   #moved_children: the delegates it took over, #opener:
+    #   #moved_children: the delegates it took over, #moved_context: the
+    #   attached context it took (ContextMove), #opener:
     #   SessionChain.opener_for the previous link)
     # @raise [ArgumentError] no such session (Session::AmbiguousId for a prefix of several)
     # @raise [Refused] continued already, delegates open that can't
@@ -199,9 +202,12 @@ module Samagotchi
       recap = RecapStore.read(Session.session_dir(previous.id, state_dir: state_dir))
       start = prompt.to_s.strip.empty? ? nil : prompt
       preview = previous.first_preview if preview.to_s.strip.empty? && start.nil?
+      moved_context = nil
       before_spawn = lambda do |link|
         ChildMove.mark_starting(link.id, state_dir: state_dir)
         ChildMove.apply(move, from: previous.id, to: link.id, state_dir: state_dir)
+        # Its movable context too, with a note saying what moved and stayed.
+        moved_context = ContextMove.call(from: previous.id, to: link.id, mode: :continue, state_dir: state_dir)
       end
       link = SessionManager.spawn_session(
         prompt: start, preview: preview, title: previous.title, working_directory: previous.working_directory,
@@ -210,6 +216,7 @@ module Samagotchi
         note_source: SessionChain::NOTE_SOURCE, state_dir: state_dir, before_spawn: before_spawn
       )
       link.moved_children = move
+      link.moved_context = moved_context
       link.opener = SessionChain.opener_for(previous)
       # The fallback's warning first: spawn_session set its own.
       warnings = [choice.warning, link.model_warning].compact

data/lib/samagotchi/testing/boundary.rb

@@ -69,7 +69,11 @@ module Samagotchi
           'require "samagotchi/guardrails/context"' => "for GitInfo: a ctx helper for the checkout's files could replace it",
           "Samagotchi::Guardrails::GitInfo.new" => "the work tree's top for the AGENTS.md chain (ctx.repo_root covers the top only)"
         },
-        "claude-peer" => PEER_SPEC,
+        # Both bundles' goldens live in claude-peer's spec/.
+        "claude-peer" => PEER_SPEC.merge(
+          "Samagotchi::ContextSources.move" => "spec: a continue leaving the pairing behind, as SessionContinue " \
+                                               "moves it: needs a kit helper that continues a session"
+        ),
         "codex-peer" => PEER_SPEC,
         "coordinator" => {
           "Samagotchi::MemoryPaths.scope_dir" => "where the coordinator's memories live: needs a ctx memory-path API",

data/lib/samagotchi/version.rb

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

data/lib/samagotchi/web/app.rb

@@ -1428,13 +1428,18 @@ module Samagotchi
       # +url+ (the page's only kind). As chi context add: {name, push: true,
       # why, hint}, a source chi context push fills, or {name, cmd, every,
       # why, hint}, a command chi runs every so often. added_by: "cli" or
-      # "agent" (chi context's), else "web". 201 {status: "attached", name};
-      # 400 invalid_json or invalid_source (a bad name or every), 422
-      # not_a_url or no_provider, 409 exists.
+      # "agent" (chi context's), else "web". movable (any kind; optional):
+      # whether a continue or a fork takes it (Source#movable?). 201
+      # {status: "attached", name, movable: the source's, derived when not
+      # given}; 400 invalid_json or invalid_source (a bad name, every or
+      # movable), 422 not_a_url or no_provider, 409 exists.
       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", CONTEXT_ADD_BODIES) unless body.is_a?(Hash)
+        unless [nil, true, false].include?(body["movable"])
+          return error_response(400, "invalid_source", "movable is true or false")
+        end
         return context_add_named(id, body) if body.key?("name")
         return error_response(400, "invalid_json", CONTEXT_ADD_BODIES) unless body["url"].is_a?(String)
 
@@ -1445,8 +1450,8 @@ module Samagotchi
         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, own.scope))
-        json_response(201, { status: "attached", name: resolved.name })
+        source = own.add(web_source(resolved, body, own.scope))
+        json_response(201, { status: "attached", name: resolved.name, movable: source.movable? })
       rescue ContextProviders::Invalid => e
         error_response(422, "no_provider", e.message)
       rescue ContextSources::Invalid => e
@@ -1469,12 +1474,13 @@ module Samagotchi
           ContextSources.check_name!(name)
           ContextSources::Source.new(name: name, cmd: cmd, every_seconds: ContextSources.check_every!(every),
                                      why: context_line(body["why"]), hint: context_line(body["hint"]), scope: nil,
-                                     added_by: context_added_by(body), created_at: Time.now.utc.iso8601)
+                                     added_by: context_added_by(body), created_at: Time.now.utc.iso8601,
+                                     movable: body["movable"])
         rescue ContextSources::Invalid => e
           return error_response(400, "invalid_source", e.message)
         end
         session_access.context_add(context_target(id), source)
-        json_response(201, { status: "attached", name: name })
+        json_response(201, { status: "attached", name: name, movable: source.movable? })
       end
 
       def context_line(value) = ContextSources.one_line(value.is_a?(String) ? value : nil, ContextSources::LINE_MAX_CHARS)
@@ -1485,7 +1491,7 @@ module Samagotchi
                                    why: context_line(body["why"]) || resolved.why,
                                    hint: context_line(body["hint"]) || resolved.hint, scope: scope,
                                    added_by: context_added_by(body), created_at: Time.now.utc.iso8601,
-                                   provider: resolved.bundle)
+                                   provider: resolved.bundle, movable: body["movable"])
       end
 
       # DELETE /api/sessions/:id/context/:name: the session's own source is

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

@@ -318,14 +318,22 @@ export function openChildrenTemplate(prevId, children, hrefFor) {
 
 // The toast after a continue: the new link, the previous one archived (when
 // the page shows the new one), how many open delegates moved to it (the
-// answer's moved), and the model fallback's warning (model_warning: the
-// previous link's host is gone, the link starts on the default).
+// answer's moved), the attached context that moved and stayed (its
+// moved_context; none from an older chi web), and the model fallback's
+// warning (model_warning: the previous link's host is gone, the link starts
+// on the default).
 export function continuedText(prevId, created, { opened = true } = {}) {
   const short = String(prevId).slice(0, 8);
   const moved = Array.isArray(created?.moved) ? created.moved.length : 0;
   const parts = [`Continued ${short} in ${String(created?.id || "").slice(0, 8)}`];
   if (opened) parts.push(`${short} is archived`);
   if (moved) parts.push(`${moved} open ${moved === 1 ? "delegate" : "delegates"} moved`);
+  const context = created?.moved_context;
+  const names = (list) => (Array.isArray(list) ? list : []).map((item) => (typeof item === "string" ? item : item?.name)).filter(Boolean);
+  const contextMoved = names(context?.moved);
+  const contextStayed = names(context?.stayed);
+  if (contextMoved.length) parts.push(`context moved: ${contextMoved.join(", ")}`);
+  if (contextStayed.length) parts.push(`context stayed with ${short}: ${contextStayed.join(", ")}`);
   const warning = typeof created?.model_warning === "string" ? created.model_warning.trim() : "";
   if (warning) parts.push(warning);
   return parts.join("; ");

data/lib/samagotchi/web/session_access_routes.rb

@@ -450,8 +450,10 @@ module Samagotchi
       # hint}: new text for the session's --push source (chi context push;
       # the fields as a source's JSON output gives them, checked the same
       # way). 200 {status: "pushed", name, before, revision, changed}; 404
-      # context_missing (no such source); 409 not_push (a command source); 400
-      # invalid_text.
+      # context_missing (no such source); 409 not_push (a command source); 410
+      # context_continued (the session was continued, as next_id: never 409,
+      # which an older Remote reads as not_push, nor "continued", which it
+      # reads as a continue's refusal); 400 invalid_text.
       def handle_context_push(req, id, name)
         body = body_hash(req) or return error_response(400, "invalid_json", "invalid JSON body")
         return error_response(400, "missing_fields", "text is required") unless body["text"].is_a?(String)
@@ -465,6 +467,9 @@ module Samagotchi
         case pushed.status
         when :missing then error_response(404, "context_missing", "no source #{name[0, 40]}")
         when :not_push then error_response(409, "not_push", SessionAccess::ContextPush.not_push_message(name))
+        when :continued
+          json_response(410, { error: "context_continued", next_id: pushed.next_id,
+                               detail: SessionAccess::ContextPush.continued_message(name, id, pushed.next_id) })
         else json_response(200, { status: "pushed", name: name, before: pushed.before, revision: pushed.revision,
                                   changed: pushed.before != pushed.revision })
         end

data/lib/samagotchi/web/session_create.rb

@@ -180,6 +180,7 @@ module Samagotchi
         json_response(201, session_to_json(session).merge(bridge_port: port, moved: moved,
                                                           model_warning: session.model_warning,
                                                           opener: session.opener,
+                                                          moved_context: session.moved_context&.to_h,
                                                           first_turn_id: session.first_turn_id))
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: samagotchi
 version: !ruby/object:Gem::Version
-  version: 0.140.0
+  version: 0.141.0
 platform: ruby
 authors:
 - Dmitry Dedov
@@ -304,6 +304,7 @@ files:
 - lib/samagotchi/context_command.rb
 - lib/samagotchi/context_fetch.rb
 - lib/samagotchi/context_judge.rb
+- lib/samagotchi/context_move.rb
 - lib/samagotchi/context_note.rb
 - lib/samagotchi/context_poller.rb
 - lib/samagotchi/context_providers.rb