samagotchi 0.9.0 → 0.10.0

data/lib/samagotchi/bridge_client.rb

@@ -17,7 +17,8 @@ module Samagotchi
   # exactly what the Bridge's minimal server expects.
   class BridgeClient
     HOST = "127.0.0.1"
-    PROBE_TIMEOUT = 0.2
+    # A reply's status line; its code is group 1.
+    STATUS_LINE = %r{\AHTTP/1\.[01] (\d{3})}
     STREAM_CONNECT_ATTEMPTS = 3
     # Seconds #stream waits for bytes before it asks `running` again.
     STREAM_POLL = 0.5
@@ -59,24 +60,7 @@ module Samagotchi
     # @param session_dir [String]
     # @return [Integer, nil]
     def self.sidecar_port(session_dir, host: HOST)
-      port = WorkerSidecar.read(session_dir)&.port
-      return nil unless port&.positive?
-
-      # Validate liveness: stale sidecar after worker death causes ECONNREFUSED
-      # which surfaces as WEBrick ERROR. Probe quickly and clean up if dead.
-      begin
-        Socket.tcp(host, port, connect_timeout: PROBE_TIMEOUT).close
-      rescue Errno::ECONNREFUSED, Errno::EHOSTUNREACH, Errno::ETIMEDOUT, SocketError, IOError, StandardError
-        begin
-          File.unlink(WorkerSidecar.path(session_dir))
-        rescue StandardError
-          nil
-        end
-        return nil
-      end
-      port
-    rescue StandardError
-      nil
+      WorkerSidecar.live_port(session_dir, unlink: true, host: host)
     end
 
     # @return [BridgeClient, nil] a client for the live Bridge in +session_dir+
@@ -184,10 +168,11 @@ module Samagotchi
       post("recap", {}, read_body: true)
     end
 
-    # POST /session/:id/cancel. 202 = requested, 409 = no active turn.
-    # @return [Response] (status only)
+    # POST /session/:id/cancel. 202 = requested (body names the reason the
+    # Bridge took), 409 = no active turn.
+    # @return [Response]
     def cancel(reason:)
-      post("cancel", { reason: reason }, read_body: false)
+      post("cancel", { reason: reason }, read_body: true)
     end
 
     # GET /session/:id/<path> as JSON.
@@ -197,10 +182,8 @@ module Samagotchi
       sock.write("GET /session/#{@session_id}/#{path} HTTP/1.1\r\nHost: #{@host}:#{@port}\r\nConnection: close\r\n\r\n")
       response = read_reply(sock, path)
       sock.close rescue nil
-      return nil unless response
-
-      status_line = response.lines.first.to_s
-      return nil unless status_line.include?("200")
+      # A 500 whose text has "200" in it is not a 200.
+      return nil unless response && response[STATUS_LINE, 1] == "200"
 
       body = response.split("\r\n\r\n", 2)[1] || ""
       JSON.parse(body)
@@ -278,7 +261,7 @@ module Samagotchi
       sock.write("GET /session/#{@session_id}/stream#{query} HTTP/1.1\r\nHost: #{@host}:#{@port}\r\nAccept: text/event-stream\r\n#{last_event_line}Connection: keep-alive\r\n\r\n")
       raise Errno::ETIMEDOUT if timeout && !sock.wait_readable(timeout)
 
-      status = sock.gets.to_s[/\AHTTP\/1\.[01] (\d{3})/, 1].to_i
+      status = sock.gets.to_s[STATUS_LINE, 1].to_i
       while (line = sock.gets)
         break if line.strip.empty?
       end
@@ -301,7 +284,7 @@ module Samagotchi
       sock.write("POST /session/#{@session_id}/#{path} HTTP/1.1\r\nHost: #{@host}:#{@port}\r\nContent-Type: application/json\r\nContent-Length: #{json_body.bytesize}\r\nConnection: close\r\n\r\n#{json_body}")
       reply = read_reply(sock, path, whole: read_body)
       body = read_body ? reply.split("\r\n\r\n", 2)[1] : nil
-      Response.new(status: reply[/\AHTTP\/1\.[01] (\d{3})/, 1].to_i, body: body)
+      Response.new(status: reply[STATUS_LINE, 1].to_i, body: body)
     ensure
       sock&.close rescue nil
     end

data/lib/samagotchi/bundle_command.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require_relative "cli/flags"
 require_relative "memory_bundle"
 
 module Samagotchi
@@ -49,6 +50,38 @@ module Samagotchi
     TEXT
     UPGRADE_HELP = "Usage: chi bundle upgrade <source> [--scope system|project] [--force] [--dry-run] [--agent|--no-agent]"
     UNINSTALL_HELP = "Usage: chi bundle uninstall <bundle> [--scope system|project] [--force]"
+    BUILD_HELP = <<~TEXT
+      Usage: chi bundle build [--scope system|project] [--name NAME] [--version VER] [--description DESC] [--out PATH] [FILES...]
+
+        build [--scope system|project] [--name NAME] [--version VER] [--description DESC] [--out PATH] [FILES...]
+          Build local memories and installed hooks into a shareable bundle (dir or zip).
+          --scope selects source dir (default: system). --out inferred from extension; default <name>.zip.
+          FILES... optional allowlist of *.md basenames to include (default: all).
+
+        Examples:
+          chi bundle build --scope system
+          chi bundle build --scope project --name my-bundle --version 1.0.0 --out bundle.zip
+          chi bundle build --scope system --out ./my-bundle/ identity.md work.md
+    TEXT
+
+    # The subcommands' flags: --help only; a word not starting with -- is
+    # a positional (install's source, -h included). --scope takes whatever
+    # follows it; build's value flags not a --flag.
+    INSTALL_FLAGS = CLI::Flags.new(help: %w[--help], flag_pattern: /\A--/) do |f|
+      f.value "--scope"
+      f.switch "--force"
+    end
+    UNINSTALL_FLAGS = INSTALL_FLAGS
+    UPGRADE_FLAGS = CLI::Flags.new(help: %w[--help], flag_pattern: /\A--/) do |f|
+      f.value "--scope"
+      f.switch "--force"
+      f.switch "--dry-run"
+      f.switch "--agent"
+      f.switch "--no-agent", key: :agent, set: false
+    end
+    BUILD_FLAGS = CLI::Flags.new(help: %w[--help], flag_pattern: /\A--/, dash_values: false) do |f|
+      %w[--scope --name --version --description --out].each { |name| f.value name }
+    end
 
     # @param argv [Array<String>] the arguments after "bundle"
     def initialize(argv, stdin: $stdin, stdout: $stdout, stderr: $stderr)
@@ -76,174 +109,157 @@ module Samagotchi
       when "build" then build(@argv[1..])
       else
         @stderr.puts "Unknown bundle subcommand: #{sub}. Use: install, upgrade, uninstall, status, diff, list, build"
-        return 1
+        return 2
       end
     end
 
     private
 
     def install(rest)
-      parsed = parse_flags(rest, "install", help: INSTALL_HELP, bools: { "--force" => [:force, true] })
+      parsed = parse_flags(INSTALL_FLAGS, rest, "install", help: INSTALL_HELP)
       return parsed if parsed.is_a?(Integer)
 
-      opts, source = parsed
+      opts, source = parsed.options, parsed.args.last
       scope = opts[:scope]
       force = opts.fetch(:force, false)
       if source.nil? || source.empty?
         @stderr.puts "Usage: chi bundle install <source> [--scope system|project] [--force]"
-        return 1
+        return 2
       end
       expanded_source = expand_source(source)
       if Samagotchi::MemoryBundle::Profile.shipped_meta?(expanded_source)
         return install_profile(expanded_source, scope: scope, force: force, dry_run: false, word: "Install")
       end
-      bundle_name = begin
-        bundle_name_for(expanded_source)
-      rescue Samagotchi::MemoryBundle::SourceNormalizer::UnknownSourceError => e
-        @stderr.puts "Install failed: #{e.message}"
-        return 1
-      end
-      installer = Samagotchi::MemoryBundle::Installer.new(
-        source: expanded_source,
-        name: bundle_name,
-        scope: scope,
-        force: force,
-        strict: true
-      )
-      begin
-        _nd, manifest = installer.run
-        @stdout.puts installer.summary
-        if manifest && manifest.hooks && !manifest.hooks.empty?
-          hook_cnt = manifest.hooks.size
-          @stdout.puts "Hooks: #{hook_cnt} hook(s) (#{manifest.hooks.keys.join(', ')})"
-        end
-        @stdout.puts "Plugin: #{manifest.plugin[:file]} (loads at the next chi start)" if manifest&.plugin
-        @stdout.puts "Provenance written to: #{Samagotchi::MemoryBundle::Provenance.bundles_dir}/#{bundle_name}/" if manifest
-        return 0
-      rescue Samagotchi::MemoryBundle::Installer::InstallError => e
-        @stderr.puts "Install failed: #{e.message}"
-        return 1
+      bundle_name = bundle_name_or_fail(expanded_source, "Install") or return 1
+      run_installer(installer_for(expanded_source, bundle_name, scope: scope, force: force), failed: "Install") do |manifest|
+        print_hooks_and_plugin(manifest)
+        print_provenance(bundle_name, manifest)
       end
     end
 
     def upgrade(rest)
-      parsed = parse_flags(rest, "upgrade", help: UPGRADE_HELP,
-                                            bools: { "--force" => [:force, true], "--dry-run" => [:dry_run, true],
-                                                     "--agent" => [:agent, true], "--no-agent" => [:agent, false] })
+      parsed = parse_flags(UPGRADE_FLAGS, rest, "upgrade", help: UPGRADE_HELP)
       return parsed if parsed.is_a?(Integer)
 
-      opts, source = parsed
+      opts, source = parsed.options, parsed.args.last
       scope = opts[:scope]
       force = opts.fetch(:force, false)
       dry_run = opts.fetch(:dry_run, false)
       agent = opts[:agent]
       if source.nil? || source.empty?
         @stderr.puts "Usage: chi bundle upgrade <source> [--scope system|project] [--force] [--dry-run]"
-        return 1
+        return 2
       end
       expanded_source = expand_source(source)
       if Samagotchi::MemoryBundle::Profile.shipped_meta?(expanded_source)
         return install_profile(expanded_source, scope: scope, force: force, dry_run: dry_run, word: "Upgrade")
       end
-      bundle_name = begin
-        bundle_name_for(expanded_source)
-      rescue Samagotchi::MemoryBundle::SourceNormalizer::UnknownSourceError => e
-        @stderr.puts "Upgrade failed: #{e.message}"
-        return 1
-      end
-      provenance = Samagotchi::MemoryBundle::Provenance.new(name: bundle_name)
-      unless provenance.installed?
+      bundle_name = bundle_name_or_fail(expanded_source, "Upgrade") or return 1
+      unless Samagotchi::MemoryBundle::Provenance.new(name: bundle_name).installed?
         @stderr.puts "Bundle '#{bundle_name}' not installed — falling back to install"
-        installer = Samagotchi::MemoryBundle::Installer.new(source: expanded_source, name: bundle_name, scope: scope, force: force,
-                                                            strict: true, dry_run: dry_run)
-        begin
-          _nd, manifest = installer.run
-          @stdout.puts installer.summary
-          if dry_run
-            @stdout.puts "(dry-run: no changes written)"
-            return 0
-          end
-          @stdout.puts "Provenance written to: #{Samagotchi::MemoryBundle::Provenance.bundles_dir}/#{bundle_name}/" if manifest
-          return 0
-        rescue Samagotchi::MemoryBundle::Installer::InstallError => e
-          @stderr.puts "Install failed: #{e.message}"; return 1
+        # (no Hooks/Plugin lines here)
+        installer = installer_for(expanded_source, bundle_name, scope: scope, force: force, dry_run: dry_run)
+        return run_installer(installer, failed: "Install") do |manifest|
+          next dry_run_done if dry_run
+
+          print_provenance(bundle_name, manifest)
         end
       end
-      installer = Samagotchi::MemoryBundle::Installer.new(
-        source: expanded_source,
-        name: bundle_name,
-        scope: scope,
-        force: force,
-        strict: true,
-        upgrade: true,
-        dry_run: dry_run
-      )
-      begin
-        _nd, manifest = installer.run
-        @stdout.puts installer.summary
-        if manifest && manifest.hooks && !manifest.hooks.empty?
-          @stdout.puts "Hooks: #{manifest.hooks.size} hook(s) (#{manifest.hooks.keys.join(', ')})"
-        end
-        @stdout.puts "Plugin: #{manifest.plugin[:file]} (loads at the next chi start)" if manifest&.plugin && !dry_run
-        if dry_run
-          @stdout.puts "(dry-run: no changes written)" 
-          return 0
-        end
-        if installer.conflicts.any? && !force
-          @stdout.puts "\n#{installer.conflicts.size} conflict(s) need resolution."
-          installer.conflicts.each { |k, _| @stdout.puts "  conflict: #{k}" }
-          # Decide whether to launch agent
-          launch = false
-          if agent == false
-            launch = false
-          elsif agent == true
-            launch = true
-          elsif @stdin.tty?
-            @stdout.print "Conflicts detected — launch interactive agent to resolve? [y/N] "
-            ans = begin; @stdin.gets; rescue => _e; nil; end
-            launch = ans && ans.strip.downcase.start_with?("y")
-          else
-            @stdout.puts "Non-interactive terminal: kept your edits in the file(s) above; the rest is upgraded. Re-run with --force to take the bundle's version, or --agent in a TTY to merge."
-            return 2
-          end
-          if launch
-            prompt = build_conflict_prompt(bundle_name, installer.conflicts, expanded_source)
-            @stdout.puts "Launching interactive session for conflict resolution… (/exit when done)"
-            require "samagotchi/terminal_ui"
-            Samagotchi::TerminalUI.new(prompt: prompt).run
-            # The installer already recorded the upgrade (conflicted files
-            # kept their old base); the resolved files now start from the
-            # bundle's version.
-            Samagotchi::MemoryBundle::Provenance.new(name: bundle_name).resolve_conflicts(installer.conflicts)
-            @stdout.puts "Provenance updated after interactive resolution."
-            @stdout.puts "Upgrade resolved interactively."
-            return 0
-          else
-            @stdout.puts "Kept your edits in the file(s) above; the rest is upgraded. chi bundle diff #{bundle_name} FILE shows the base; re-run with --force to take the bundle's version."
-            return 2
-          end
-        end
-        @stdout.puts "Provenance written to: #{Samagotchi::MemoryBundle::Provenance.bundles_dir}/#{bundle_name}/" if manifest
-        return 0
-      rescue Samagotchi::MemoryBundle::Installer::InstallError => e
-        @stderr.puts "Upgrade failed: #{e.message}"; return 1
+      installer = installer_for(expanded_source, bundle_name, scope: scope, force: force, upgrade: true, dry_run: dry_run)
+      run_installer(installer, failed: "Upgrade") do |manifest|
+        print_hooks_and_plugin(manifest, plugin: !dry_run)
+        next dry_run_done if dry_run
+        next upgrade_conflicts(installer, bundle_name, expanded_source, agent) if installer.conflicts.any? && !force
+
+        print_provenance(bundle_name, manifest)
+      end
+    end
+
+    # The bundle's name, or nil after "<word> failed: …".
+    def bundle_name_or_fail(expanded_source, word)
+      bundle_name_for(expanded_source)
+    rescue Samagotchi::MemoryBundle::SourceNormalizer::UnknownSourceError => e
+      @stderr.puts "#{word} failed: #{e.message}"
+      nil
+    end
+
+    def installer_for(source, name, scope:, force:, **options)
+      Samagotchi::MemoryBundle::Installer.new(source: source, name: name, scope: scope, force: force, strict: true, **options)
+    end
+
+    # Runs +installer+, prints its summary, then yields the manifest.
+    # @return [Integer] the block's exit status, or 1 after "<failed> failed: …"
+    def run_installer(installer, failed:)
+      _nd, manifest = installer.run
+      @stdout.puts installer.summary
+      yield manifest
+    rescue Samagotchi::MemoryBundle::Installer::InstallError => e
+      @stderr.puts "#{failed} failed: #{e.message}"
+      1
+    end
+
+    def print_hooks_and_plugin(manifest, plugin: true)
+      @stdout.puts "Hooks: #{manifest.hooks.size} hook(s) (#{manifest.hooks.keys.join(', ')})" if manifest&.hooks&.any?
+      @stdout.puts "Plugin: #{manifest.plugin[:file]} (loads at the next chi start)" if plugin && manifest&.plugin
+    end
+
+    # @return [Integer] 0
+    def print_provenance(bundle_name, manifest)
+      @stdout.puts "Provenance written to: #{Samagotchi::MemoryBundle::Provenance.bundles_dir}/#{bundle_name}/" if manifest
+      0
+    end
+
+    # @return [Integer] 0
+    def dry_run_done
+      @stdout.puts "(dry-run: no changes written)"
+      0
+    end
+
+    # An upgrade that kept edited files: launch an agent to merge them
+    # (--agent, or yes on a terminal), or say how to take the bundle's.
+    # @return [Integer] 0 resolved, 2 kept the edits
+    def upgrade_conflicts(installer, bundle_name, expanded_source, agent)
+      @stdout.puts "\n#{installer.conflicts.size} conflict(s) need resolution."
+      installer.conflicts.each { |k, _| @stdout.puts "  conflict: #{k}" }
+      launch = if agent.nil? && @stdin.tty?
+                 @stdout.print "Conflicts detected — launch interactive agent to resolve? [y/N] "
+                 ans = begin; @stdin.gets; rescue => _e; nil; end
+                 ans && ans.strip.downcase.start_with?("y")
+               elsif agent.nil?
+                 @stdout.puts "Non-interactive terminal: kept your edits in the file(s) above; the rest is upgraded. Re-run with --force to take the bundle's version, or --agent in a TTY to merge."
+                 return 2
+               else
+                 agent
+               end
+      unless launch
+        @stdout.puts "Kept your edits in the file(s) above; the rest is upgraded. chi bundle diff #{bundle_name} FILE shows the base; re-run with --force to take the bundle's version."
+        return 2
       end
+
+      prompt = build_conflict_prompt(bundle_name, installer.conflicts, expanded_source)
+      @stdout.puts "Launching interactive session for conflict resolution… (/exit when done)"
+      require "samagotchi/terminal_ui"
+      Samagotchi::TerminalUI.new(prompt: prompt).run
+      # The installer already recorded the upgrade (conflicted files kept
+      # their old base); the resolved files now start from the bundle's
+      # version.
+      Samagotchi::MemoryBundle::Provenance.new(name: bundle_name).resolve_conflicts(installer.conflicts)
+      @stdout.puts "Provenance updated after interactive resolution."
+      @stdout.puts "Upgrade resolved interactively."
+      0
     end
 
     def uninstall(rest)
-      parsed = parse_flags(rest, "uninstall", help: UNINSTALL_HELP, bools: { "--force" => [:force, true] })
+      parsed = parse_flags(UNINSTALL_FLAGS, rest, "uninstall", help: UNINSTALL_HELP)
       return parsed if parsed.is_a?(Integer)
 
-      opts, bundle_name = parsed
+      opts, bundle_name = parsed.options, parsed.args.last
       scope = opts[:scope]
       force = opts.fetch(:force, false)
       if bundle_name.nil? || bundle_name.empty?
         @stderr.puts "Usage: chi bundle uninstall <bundle> [--scope system|project] [--force]"
-        return 1
+        return 2
       end
-      # Propagate overrides
-      Samagotchi::MemoryBundle::Uninstaller.system_dir_override = Samagotchi::MemoryBundle::Installer.system_dir_override
-      Samagotchi::MemoryBundle::Uninstaller.project_dir_base_override = Samagotchi::MemoryBundle::Installer.project_dir_base_override
       data = Samagotchi::MemoryBundle::Provenance.new(name: bundle_name).read
       return uninstall_profile(bundle_name, force: force) if Samagotchi::MemoryBundle::Profile.installed_meta?(bundle_name, data)
 
@@ -377,7 +393,7 @@ module Samagotchi
       bname = args[0]
       file_arg = args[1]
       if bname.nil? || bname.empty?
-        @stderr.puts "Usage: chi bundle diff <bundle> [file]"; return 1
+        @stderr.puts "Usage: chi bundle diff <bundle> [file]"; return 2
       end
       prov = Samagotchi::MemoryBundle::Provenance.new(name: bname)
       data = prov.read
@@ -509,65 +525,17 @@ module Samagotchi
     end
 
     def build(rest)
-      scope = nil
-      name = nil
-      version = nil
-      description = ""
-      out = nil
-      filter_files = []
-      i = 0
-      while i < rest.size
-        arg = rest[i]
-        if arg.start_with?("--")
-          nxt = rest[i + 1]
-          if %w[-h --help help].include?(arg)
-            @stdout.puts "Usage: chi bundle build [--scope system|project] [--name NAME] [--version VER] [--description DESC] [--out PATH] [FILES...]"
-            @stdout.puts ""
-            @stdout.puts "  build [--scope system|project] [--name NAME] [--version VER] [--description DESC] [--out PATH] [FILES...]"
-            @stdout.puts "    Build local memories and installed hooks into a shareable bundle (dir or zip)."
-            @stdout.puts "    --scope selects source dir (default: system). --out inferred from extension; default <name>.zip."
-            @stdout.puts "    FILES... optional allowlist of *.md basenames to include (default: all)."
-            @stdout.puts ""
-            @stdout.puts "  Examples:"
-            @stdout.puts "    chi bundle build --scope system"
-            @stdout.puts "    chi bundle build --scope project --name my-bundle --version 1.0.0 --out bundle.zip"
-            @stdout.puts "    chi bundle build --scope system --out ./my-bundle/ identity.md work.md"
-            return 0
-          elsif arg == "--scope" && nxt && !nxt.start_with?("--")
-            scope = nxt; i += 2
-          elsif arg.start_with?("--scope=")
-            scope = arg.split("=", 2).last; i += 1
-          elsif arg == "--name" && nxt && !nxt.start_with?("--")
-            name = nxt; i += 2
-          elsif arg.start_with?("--name=")
-            name = arg.split("=", 2).last; i += 1
-          elsif arg == "--version" && nxt && !nxt.start_with?("--")
-            version = nxt; i += 2
-          elsif arg.start_with?("--version=")
-            version = arg.split("=", 2).last; i += 1
-          elsif arg == "--description" && nxt && !nxt.start_with?("--")
-            description = nxt; i += 2
-          elsif arg.start_with?("--description=")
-            description = arg.split("=", 2).last; i += 1
-          elsif arg == "--out" && nxt && !nxt.start_with?("--")
-            out = nxt; i += 2
-          elsif arg.start_with?("--out=")
-            out = arg.split("=", 2).last; i += 1
-          else
-            @stderr.puts "Unknown bundle build flag: #{arg}"
-            return 1
-          end
-        else
-          filter_files << arg
-          i += 1
-        end
-      end
+      parsed = parse_flags(BUILD_FLAGS, rest, "build", help: BUILD_HELP)
+      return parsed if parsed.is_a?(Integer)
+
+      scope, name, version, out = parsed.options.values_at(:scope, :name, :version, :out)
+      description = parsed.options.fetch(:description, "")
+      filter_files = parsed.args.empty? ? nil : parsed.args
       # Validate scope if given
       if scope && !%w[system project].include?(scope.to_s.strip.downcase)
         @stderr.puts "Invalid scope '#{scope}', expected system or project"
-        return 1
+        return 2
       end
-      filter_files = nil if filter_files.empty?
       begin
         builder = Samagotchi::MemoryBundle::Builder.new(
           scope: scope,
@@ -592,44 +560,22 @@ module Samagotchi
       end
     end
 
-    # The install/upgrade/uninstall flags, in argv order, stopping at the
-    # first --help or unknown --flag: --scope V (whatever V is) or
-    # --scope=V, and the +bools+ ("--flag" => [key, value]). Anything not
-    # starting with -- is the positional; the last one wins.
+    # +rest+ through +flags+, stopping at the first --help or error.
     #
-    # @return [Array(Hash, String), Integer] the flags and the positional
-    #   (nil when none), or the exit status after --help or an unknown flag
-    def parse_flags(rest, sub, help:, bools:)
-      opts = {}
-      positional = nil
-      i = 0
-      while i < rest.size
-        arg = rest[i]
-        if arg.start_with?("--")
-          nxt = rest[i + 1]
-          if arg == "--help"
-            @stdout.puts help
-            return 0
-          elsif arg == "--scope" && nxt
-            opts[:scope] = nxt
-            i += 2
-          elsif arg.start_with?("--scope=")
-            opts[:scope] = arg.split("=", 2).last
-            i += 1
-          elsif bools.key?(arg)
-            key, value = bools[arg]
-            opts[key] = value
-            i += 1
-          else
-            @stderr.puts "Unknown bundle #{sub} flag: #{arg}"
-            return 1
-          end
-        else
-          positional = arg
-          i += 1
-        end
+    # @return [CLI::Flags::Result, Integer] the result, or the exit status
+    #   after the help or an unknown flag (a value flag without its value
+    #   reads as one)
+    def parse_flags(flags, rest, sub, help:)
+      parsed = flags.parse(rest)
+      if parsed.help
+        @stdout.puts help
+        return 0
+      end
+      if parsed.error
+        @stderr.puts "Unknown bundle #{sub} flag: #{parsed.error.arg}"
+        return 2
       end
-      [opts, positional]
+      parsed
     end
 
     # helpers for bundle_name derivation

data/lib/samagotchi/bundles/check-in/manifest.yml

@@ -1,10 +1,10 @@
 ---
 name: check-in
-version: 0.1.1
+version: 0.1.3
 scope: system
 description: "Checks on a long turn: after N tool calls with no answer, a card asks the user (Nudge / Keep going / Stop), or the model is nudged to say what it has found"
 trust_level: reviewed
 plugin:
   file: plugin.rb
-  sha256: sha256:b2ca10c949734ef3d31df9ff775cf136d7f86f185e875a4c16259e8f871bfb82
+  sha256: sha256:c5aa4c49989723ec2370184cee36f4c8515d9df818b2c45422a5efb6c4ba31a7
 requires_chi: ">= 0.3.0"

data/lib/samagotchi/bundles/check-in/plugin.rb

@@ -32,7 +32,6 @@ class Plugin
   USAGE = "usage: /checkin [on|off|<calls>|mode ask|nudge|notify|nudge|later|stop]"
 
   def initialize(settings = {})
-    settings = {} unless settings.is_a?(Hash)
     @after = positive(settings["after"]) || 50
     @every = positive(settings["every"]) || @after
     @mode = MODES.include?(settings["mode"].to_s) ? settings["mode"].to_s : "ask"
@@ -85,13 +84,13 @@ class Plugin
       @next_at = @count + @every
       [@count, @mode]
     end
-    check_in(event, ctx, *due) if due
+    check_in(ctx, *due) if due
   end
 
-  def check_in(event, ctx, count, mode)
+  def check_in(ctx, count, mode)
     case mode
     when "nudge"
-      ctx.notify("nudged the model after #{count} tool calls") if event[:steer]&.call(message(count))
+      ctx.notify("nudged the model after #{count} tool calls") if ctx.steer(message(count))
     when "notify"
       ctx.notify("#{count} tool calls in this turn, no answer yet")
     else

data/lib/samagotchi/bundles/known-names/hooks/known_names.rb

@@ -25,7 +25,6 @@ class KnownNames
   ASK_OPTIONS = ["Correct it and run", "Run as is", "Deny"].freeze
 
   def initialize(settings = {})
-    settings = {} unless settings.is_a?(Hash)
     @names = list(settings["names"])
     @ignore = list(settings["ignore"]).map(&:downcase)
     @mode = MODES.include?(settings["mode"].to_s) ? settings["mode"].to_s : "reject"
@@ -175,13 +174,18 @@ class KnownNames
     event[:notify]&.call("rejected #{tool}: \"#{hit[:miss]}\" looks like \"#{hit[:name]}\"")
   end
 
+  # Tools whose content is file text: it is left as written.
+  FILE_TEXT_TOOLS = %w[write memory_write].freeze
+
   # The same call with the near miss replaced (whole tokens, everywhere it
-  # appears in the content, path and cwd).
+  # appears in the command or read path (content), the path and the cwd).
+  # Not in file text: a write's content, an edit's old and new text.
   def correct(event, hit)
     call = event[:call]
     pattern = /(?<![A-Za-z0-9])#{Regexp.escape(hit[:miss])}(?![A-Za-z0-9])/
     fixed = call.dup
-    %i[content path cwd].each do |key|
+    keys = FILE_TEXT_TOOLS.include?(call[:name].to_s) ? %i[path cwd] : %i[content path cwd]
+    keys.each do |key|
       next unless fixed[key].is_a?(String)
 
       fixed[key] = fixed[key].gsub(pattern, hit[:name])

data/lib/samagotchi/bundles/known-names/manifest.yml

@@ -1,6 +1,6 @@
 ---
 name: known-names
-version: 0.1.1
+version: 0.1.2
 scope: system
 description: Catches a near-miss of a protected name (home folder, login, git name, repo name, names from config) in a tool call and rejects it with the right spelling; mode ask / correct optional
 trust_level: reviewed
@@ -8,7 +8,7 @@ files:
   known_names.md: sha256:d5348b95b6c655017b541910b36e384220da280818160201f6ec9a50e1e4287c
 hooks:
   known_names.rb:
-    sha256: sha256:2ccfe9124133d6d12499cb41ad7bdfd4ba59492c067efbf60eaa1400a7cc2504
+    sha256: sha256:f62bc72a64bb8b36d03374b0e9152a0492cc066e04f76129ae50d8cda9467f15
     event: before_tool_call
     on_error: log
     priority: 50

data/lib/samagotchi/bundles/loop-guard/manifest.yml

@@ -1,10 +1,10 @@
 ---
 name: loop-guard
-version: 0.2.0
+version: 0.2.2
 scope: system
 description: "Breaks loops: the same tool call with the same result again and again in one turn is denied with advice (after a few denies the turn stops with a card), and thinking that repeats itself while it streams is cut and the model asked again"
 trust_level: reviewed
 plugin:
   file: plugin.rb
-  sha256: sha256:5a0dc653a654e73d881767c8b7b9486d4ac02cfc7823a150132593ffa2cbba04
+  sha256: sha256:e62c68d1a2280adf55b150488d0d85bbbc35ffce54dfed387a86adceb85e4d34
 requires_chi: ">= 0.6.0"