samagotchi 0.2.0 → 0.4.0

data/bin/chi

@@ -38,16 +38,18 @@ if ARGV[0] == "sessions"
   sessions_args = ARGV[1..] || []
   sub = sessions_args[0]
   if sub.nil? || %w[-h --help help].include?(sub)
-    puts "Usage: chi sessions <list|stop|delete|prune|clean> [options]"
+    puts "Usage: chi sessions <list|stop|archive|unarchive|delete|prune|clean> [options]"
     puts "  list [--sort updated_at|created_at] [--order desc|asc] [--limit N]"
-    puts "       [--live] [--cwd PATH] [--format text|json|tsv]"
+    puts "       [--live] [--cwd PATH] [--format text|json|tsv] [--archived]"
     puts "       --live: sessions a worker runs now (the ones chi note reaches), 10 unless --limit"
     puts "       --cwd PATH: sessions in PATH or below; json/tsv (id<TAB>description) are for scripts"
     puts "       [--scope=all]: every project's sessions; by default only this git project's (all outside a repo)"
+    puts "       --archived: archived sessions too (marked [archived]; json: archived: true)"
     puts "  stop ID...   # stop each session's worker (IDs or unique prefixes); chi --resume ID then starts a fresh one"
+    puts "  archive ID...   # hide sessions (and their delegates) from every list and keep them for good; unarchive ID... brings them back"
     puts "  delete [--force] ID...   # delete sessions for good (IDs or unique prefixes); --force stops a live worker first"
     puts "  prune [--dry-run] [--days N] [--keep N] [--keep-status running,...] [--test-only]"
-    puts "  clean [--dry-run] [--days N]   # test sessions (SAMAGOTCHI_ENV=test, CI): all of them, or those older than N days"
+    puts "  clean [--dry-run] [--days N]   # test sessions (SAMAGOTCHI_ENV=test, CI) and leftover chi scratch ones: all of them, or those older than N days"
     puts "Defaults: days=14 keep=500 keep_status=running (env overrides: SAMAGOTCHI_SESSION_RETENTION_DAYS etc.)"
     exit 0
   end
@@ -60,6 +62,7 @@ if ARGV[0] == "sessions"
   order = nil
   limit = nil
   live = sessions_args.include?("--live")
+  include_archived = sessions_args.include?("--archived")
   cwd = nil
   format = nil
   scope = nil
@@ -89,6 +92,9 @@ if ARGV[0] == "sessions"
   when "delete"
     require "samagotchi/session_delete_command"
     exit Samagotchi::SessionDeleteCommand.new(sessions_args[1..]).run
+  when "archive", "unarchive"
+    require "samagotchi/session_archive_command"
+    exit Samagotchi::SessionArchiveCommand.new(sub, sessions_args[1..]).run
   when "list"
     unless format.nil? || %w[text json tsv].include?(format)
       warn "Unknown format #{format.inspect}: use --format text|json|tsv"
@@ -107,7 +113,8 @@ if ARGV[0] == "sessions"
     # and test runs stay out.
     if live || cwd || (format && format != "text")
       summaries = Samagotchi::SessionManager.session_summaries(
-        live: live, cwd: cwd, limit: limit || (live ? 10 : nil), include_tests: false, project_root: project
+        live: live, cwd: cwd, limit: limit || (live ? 10 : nil), include_tests: false, project_root: project,
+        include_archived: include_archived
       )
       case format
       when "json"
@@ -115,7 +122,11 @@ if ARGV[0] == "sessions"
         # or nil; recap: the saved recap's first sentence, or nil; project:
         # its git project's root, or nil
         # parent_id: the session that delegated it (the delegate tool), or nil
-        keys = %i[id short_id desc cwd project updated_at live busy owner recap parent_id]
+        # archived: hidden from the lists (only with --archived can it be true)
+        # scratch: a `chi scratch` session (deleted when its REPL ends, a
+        # leftover one at the next sweep)
+        # ctx_pct: how full the context was after the last turn, or nil
+        keys = %i[id short_id desc cwd project updated_at live busy owner recap parent_id archived scratch ctx_pct]
         puts JSON.generate(summaries.map { |summary| summary.slice(*keys) })
       when "tsv"
         summaries.each { |summary| puts "#{summary[:id]}\t#{summary[:desc]}" }
@@ -131,7 +142,10 @@ if ARGV[0] == "sessions"
           end
           # A delegated session points at its parent.
           child = summary[:parent_short_id] ? "  ↳ #{summary[:parent_short_id]}" : ""
-          puts "#{summary[:id]}  #{state.ljust(8)}  #{summary[:updated_at]}  #{desc}#{child}"
+          flag = summary[:scratch] ? " [scratch]" : ""
+          flag += " [archived]" if summary[:archived]
+          ctx = Samagotchi::SessionMetrics.context_label(summary[:ctx_pct])
+          puts "#{summary[:id]}  #{state.ljust(8)}  #{ctx.ljust(8)}  #{summary[:updated_at]}  #{desc}#{flag}#{child}"
         end
         if project
           puts "#{summaries.empty? ? "" : "\n"}#{scope_note.call(summaries.size)}"
@@ -143,7 +157,8 @@ if ARGV[0] == "sessions"
     end
     sort ||= "updated_at"
     order ||= "desc"
-    sessions = Samagotchi::SessionManager.list_sessions(sort: sort, order: order, limit: limit, project_root: project)
+    sessions = Samagotchi::SessionManager.list_sessions(sort: sort, order: order, limit: limit, project_root: project,
+                                                        include_archived: include_archived)
     # The saved recap's first sentence, else the last prompt, cut as before.
     state_dir = Samagotchi::Session.default_state_dir
     list_text = lambda do |s|
@@ -152,9 +167,14 @@ if ARGV[0] == "sessions"
     end
     # A delegated session points at its parent: ↳ <parent's short id>.
     row = lambda do |s|
-      flag = s.test_run ? " [test]" : ""
+      flag = s.scratch ? " [scratch]" : (s.test_run ? " [test]" : "")
+      flag += " [archived]" if s.archived
       child = s.parent_id ? "  ↳ #{s.parent_id[0, 8]}" : ""
-      "#{s.id}  #{s.status.ljust(8)}  #{s.updated_at}  #{list_text.call(s)}#{flag}#{child}"
+      # How full the context was after the last turn: "ctx 12%", blank when unknown.
+      ctx = Samagotchi::SessionMetrics.context_label(
+        Samagotchi::SessionMetrics.saved_context_pct(Samagotchi::Session.session_dir(s.id, state_dir: state_dir))
+      )
+      "#{s.id}  #{s.status.ljust(8)}  #{ctx.ljust(8)}  #{s.updated_at}  #{list_text.call(s)}#{flag}#{child}"
     end
     if project
       sessions.each { |s| puts row.call(s) }
@@ -214,7 +234,7 @@ if ARGV[0] == "sessions"
     end
     exit 0
   else
-    warn "Unknown sessions subcommand: #{sub}. Use: list, stop, delete, prune, clean"
+    warn "Unknown sessions subcommand: #{sub}. Use: list, stop, archive, unarchive, delete, prune, clean"
     exit 1
   end
 end
@@ -231,6 +251,18 @@ if ARGV[0] == "send"
   exit Samagotchi::SendCommand.new(ARGV[1..] || []).run
 end
 
+# `chi bootstrap`: find a model server and write config.yml, before OptionParser (--model, --name are its own)
+if ARGV[0] == "bootstrap"
+  require "samagotchi/bootstrap_command"
+  exit Samagotchi::BootstrapCommand.new(ARGV[1..] || []).run
+end
+
+# `chi update`: bring an installed chi up to date, before OptionParser (its own flags)
+if ARGV[0] == "update"
+  require "samagotchi/update_command"
+  exit Samagotchi::UpdateCommand.new(ARGV[1..] || []).run
+end
+
 # `chi desktop`: the native "Send to chi" helper, before OptionParser (its own flags)
 if ARGV[0] == "desktop"
   require "samagotchi/desktop_command"
@@ -346,7 +378,7 @@ if ARGV[0] == "bundle"
     lines << ""
     lines << "Your task: resolve each conflict by editing the file in place using the memory_write tool."
     lines << "Use memory_read to inspect current content if needed. The correct scope for memory_write is the bundle's scope."
-    lines << "When all conflicts are resolved, type /exit to finish. If you abort, the upgrade will not be applied."
+    lines << "When all conflicts are resolved, type /exit to finish. If you stop early, the files stay as they are (the rest of the upgrade is already applied)."
     lines.join("\n")
   end
 
@@ -503,7 +535,7 @@ if ARGV[0] == "bundle"
           ans = begin; $stdin.gets; rescue => _e; nil; end
           launch = ans && ans.strip.downcase.start_with?("y")
         else
-          puts "Non-interactive terminal — aborting. Re-run with --force to overwrite or --agent in a TTY."
+          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."
           exit 2
         end
         if launch
@@ -511,37 +543,15 @@ if ARGV[0] == "bundle"
           puts "Launching interactive session for conflict resolution… (/exit when done)"
           require "samagotchi/terminal_ui"
           Samagotchi::TerminalUI.new(prompt: prompt).run
-          # After session, re-check if conflicts resolved by re-reading current files vs incoming
-          # Simple heuristic: if user edited files, current != base now but we assume resolved if file exists
-          # Re-run upgrade without conflicts? User already edited in place, so we need to write provenance now
-          # Update provenance to reflect resolved state
-          if manifest
-            # Re-collect provenance files from target dir for this bundle
-            prov_files = {}
-            target_scope = scope || provenance.read[:scope]&.to_s || "system"
-            target_dir = Samagotchi::MemoryBundle::Installer.new(source: expanded_source, name: bundle_name, scope: target_scope).send(:resolve_target_dir, target_scope)
-            # Actually reuse provenance write with current target files for bundle keys
-            bundle_files = installer.conflicts.keys + installer.results.select { |_, r| %w[installed updated].include?(r[:status]) }.keys
-            # Fallback: collect all md that exist and were in installer results
-            all_keys = installer.results.keys
-            all_keys.each do |k|
-              p = File.join(target_dir, k)
-              prov_files[k] = p if File.exist?(p)
-            end
-            if prov_files.any?
-              Samagotchi::MemoryBundle::Provenance.new(name: bundle_name).write(
-                files: prov_files,
-                scope: target_scope,
-                version: manifest.version,
-                source_path: expanded_source
-              )
-              puts "Provenance updated after interactive resolution."
-            end
-          end
+          # 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)
+          puts "Provenance updated after interactive resolution."
           puts "Upgrade resolved interactively."
           exit 0
         else
-          puts "Upgrade aborted due to conflicts. Resolve manually or re-run with --force."
+          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."
           exit 2
         end
       end
@@ -611,6 +621,7 @@ if ARGV[0] == "bundle"
       puts "Target: #{st[:target_dir]}"
       st[:files].each do |k, info|
         mods = []
+        mods << "conflict (kept your edits over v#{st[:provenance][:version]}: chi bundle diff #{name} #{k})" if info[:conflict]
         mods << "modified" if info[:modified]
         mods << "missing" if info[:missing]
         mods << "no-index" unless info[:index_present]
@@ -780,6 +791,7 @@ if ARGV[0] == "bundle"
         line += "  (shipped v#{b.upgrade.version}: chi bundle upgrade #{b.upgrade.source})" if b.upgrade
         puts line
       end
+      puts "  (or all at once: chi update)" if installed.any?(&:upgrade)
     end
     unless available.empty?
       puts ""
@@ -881,7 +893,13 @@ if ARGV[0] == "bundle"
   exit 0
 end
 
-options = { verbose: false, no_interrupt: false, non_interactive: false, no_default_input: false, web: false, web_port: nil, web_open: false, web_markdown: nil, web_turn_view: nil }
+# `chi scratch`: the run options below, for a session that leaves nothing
+# behind (TerminalUI scratch:). The word goes before OptionParser sees it.
+scratch = ARGV[0] == "scratch"
+ARGV.shift if scratch
+
+# no_interrupt / no_default_input start from config.yml or the env; the flags below turn them on.
+options = { verbose: false, no_interrupt: Samagotchi::Config.get("no_interrupt"), non_interactive: false, no_default_input: Samagotchi::Config.get("no_default_input"), web: false, web_port: nil, web_open: false, web_markdown: nil, web_turn_view: nil }
 cli_overrides = {}
 
 if ARGV.any? { |arg| arg == "--backend" || arg.start_with?("--backend=") }
@@ -898,7 +916,7 @@ ARGV.each do |arg|
   base = arg.split("=", 2).first
   # If dashed version is a known flag (registry or hardcoded), reject underscore variant
   dashed = base.tr("_", "-")
-  known = %w[--prompt --resume --attach --shared --no-shared --model --memory --mute --no-interrupt --non-interactive --verbose --no-default-input --port --open] + Samagotchi::Config.cli_entries.map(&:cli_flag)
+  known = %w[--prompt --resume --attach --shared --no-shared --model --thinking --memory --mute --no-interrupt --non-interactive --verbose --no-default-input --port --open] + Samagotchi::Config.cli_entries.map(&:cli_flag)
   if known.include?(dashed) || known.include?(base)
     warn "Unknown option: #{arg} (did you mean #{dashed}?)"
     exit 1
@@ -908,13 +926,16 @@ end
 parser = OptionParser.new do |opts|
   opts.banner = <<~BANNER
     Usage: chi [options]
+           chi bootstrap [HOST[:PORT]|URL]  first setup: find the model server, write config.yml
+           chi scratch [options]            a one-time session in this terminal: nothing is kept
            chi web [--port PORT] [--open] [--scope=all]   the web UI
-           chi sessions <list|stop|delete|prune|clean>
+           chi sessions <list|stop|archive|unarchive|delete|prune|clean>
            chi note [--source NAME] [-m TEXT] ID...|--all   background context for sessions
-           chi send [-m TEXT] ID...         a message into sessions, as if typed there
+           chi send [-m TEXT] ID...|--new   a message into sessions, as if typed there
            chi bundle <install|upgrade|uninstall|status|diff|list|build>
            chi desktop <install|upgrade|uninstall|status>   macOS "Send to chi" helper
            chi self                         version, paths, model and bundles
+           chi update [--dry-run]           update this chi, its bundles and the desktop helper
     (each subcommand takes --help)
 
   BANNER
@@ -925,6 +946,8 @@ parser = OptionParser.new do |opts|
   opts.on("--model NAME", "Model selector (runtime only, overrides --resume) [alias for --default-model]") { |m| options[:model] = m; cli_overrides["default.model"] = m }
   opts.on("--profile NAME", Samagotchi::ModelProfile::NAMES,
           "Prompt profile for every model in this run (#{Samagotchi::ModelProfile::NAMES.join('|')}) [alias for --model-profile]") { |p| cli_overrides["model.profile"] = p }
+  opts.on("--thinking LEVEL", Samagotchi::Thinking::LEVELS.map(&:to_s), "How much the model thinks this run: off|low|medium|high|default (outranks config.yml; " \
+                              "sessions already running keep theirs) [env SAMAGOTCHI_THINKING_LEVEL]") { |l| cli_overrides["thinking.level"] = l }
   opts.on("--memory NAME", "Preload a memory entry into the system prompt (repeatable; a comma list too)") { |m| (options[:memories] ||= []) << m }
   opts.on("--mute NAME", "Hide a memory from this session: not in the prompt, refused by memory_read (repeatable; a comma list too)") { |m| (options[:muted] ||= []) << m }
   opts.on("--no-interrupt", "Raise the tool call limit to 1000 iterations (useful for long tasks)") { options[:no_interrupt] = true; cli_overrides["no_interrupt"] = true }
@@ -938,7 +961,8 @@ parser = OptionParser.new do |opts|
           "every session outside a repo) or all") { |v| options[:scope] = v }
   # Accepted values of string entries that the registry doesn't type as enums.
   value_hints = { "thinking.ui" => "spinner|off", "status.line" => "on|off", "status.width_mode" => "terminal_cap|fixed",
-                  "web.host" => "127.0.0.1|::1|localhost", "recap.sentences" => "N|N-M" }
+                  "web.host" => "127.0.0.1|::1|localhost", "recap.sentences" => "N|N-M",
+                  "web.annotate_presets" => "text|text" }
   # Universal config flags (implicit convention: ENV SAMAGOTCHI_* ↔ YAML dotted ↔ CLI --kebab)
   # Generated from Samagotchi::Config registry — Option A: snake leaf in YAML, kebab in CLI.
   Samagotchi::Config.cli_entries.each do |entry|
@@ -981,12 +1005,22 @@ end
 # The subcommands with their own parsers ran above; what parse! leaves is
 # `web` or nothing. Anything else is a typo, not a prompt: refuse it rather
 # than start a session.
-stray = ARGV.first == "web" ? ARGV[1] : ARGV.first
+web = ARGV.first == "web" && !scratch
+stray = web ? ARGV[1] : ARGV.first
 if stray
-  warn "Error: #{ARGV.first == "web" ? "unexpected argument" : "unknown command"} #{stray} (see chi --help)"
+  warn "Error: #{web || scratch ? "unexpected argument" : "unknown command"} #{stray} (see chi --help)"
   exit 1
 end
 
+# A scratch session is new, runs here and goes when it ends.
+if scratch
+  flag = { resume: "--resume", attach: "--attach", shared: "--shared" }.find { |key, _flag| options[key] }&.last
+  if flag
+    warn "Error: chi scratch starts a new session in this terminal and keeps nothing; it can't take #{flag}"
+    exit 1
+  end
+end
+
 # Apply CLI precedence: CLI > ENV > file
 unless cli_overrides.empty?
   Samagotchi::Config.reload!(cli_overrides: cli_overrides)
@@ -1029,7 +1063,18 @@ when "web"
   end
 end
 
+# The first interactive start of a new installed chi says what `chi update` would update.
+chi_update_hint = lambda do
+  require "samagotchi/installed_gem"
+  require "samagotchi/update_hint"
+  if Samagotchi::UpdateHint.wanted?(prompt: options[:prompt], non_interactive: options[:non_interactive],
+                                    tty: $stdin.tty? && $stdout.tty?, installed: Samagotchi::InstalledGem.spec)
+    Samagotchi::UpdateHint.show
+  end
+end
+
 if options[:web]
+  chi_update_hint.call
   require "samagotchi/web/server"
   port = options[:web_port] || Samagotchi::Config.get("web.port") || 4567
   # legacy env fallback
@@ -1039,7 +1084,8 @@ if options[:web]
   turn_view = options[:web_turn_view]
   turn_view = Samagotchi::Config.get("web.turn_view") if turn_view.nil?
   exit Samagotchi::Web::Server.launch(port: port, scope: options[:scope] || "project", open_browser: options[:web_open],
-                                      markdown: markdown, turn_view: turn_view)
+                                      markdown: markdown, turn_view: turn_view,
+                                      annotate_presets: Samagotchi::Config.get("web.annotate_presets"))
 end
 
 # --resume and --attach take a unique id prefix too, like git.
@@ -1050,6 +1096,22 @@ rescue Samagotchi::Session::AmbiguousId => e
   exit 1
 end
 
+# A `chi scratch` session a killed REPL left behind would turn into a kept
+# one if opened again; the next sweep deletes it.
+%i[resume attach].each do |key|
+  next unless options[key]
+
+  leftover = begin
+    Samagotchi::Session.load(options[key]).scratch
+  rescue ArgumentError
+    false # no such session: the launch says so
+  end
+  next unless leftover
+
+  warn "Error: that's a leftover scratch session; it is deleted at the next sweep (chi sessions clean)"
+  exit 1
+end
+
 # --memory and --mute names are checked here, before the launch: a worker's
 # stderr goes nowhere, so its engine's warnings would not be seen. Warnings
 # only; the session starts either way.
@@ -1081,8 +1143,13 @@ if options[:memories] || options[:muted]
   end
 end
 
+chi_update_hint.call
 require "samagotchi/launch_mode"
-launch, launch_note = Samagotchi::LaunchMode.resolve(options, shared_config: Samagotchi::Config.get("session.shared"))
+launch, launch_note = if scratch
+                        [:repl, nil]
+                      else
+                        Samagotchi::LaunchMode.resolve(options, shared_config: Samagotchi::Config.get("session.shared"))
+                      end
 warn launch_note if launch_note
 
 if launch == :attached
@@ -1124,7 +1191,8 @@ begin
     memories: options[:memories] || [],
     muted_memories: options[:muted] || [],
     non_interactive: options[:non_interactive],
-    model_name: options[:model]
+    model_name: options[:model],
+    scratch: scratch
   ).run
 rescue Samagotchi::TerminalUI::SessionBusy, Samagotchi::TerminalUI::SessionNotFound, Samagotchi::ModelProfile::MissingModel => e
   warn "Error: #{e.message}"