samagotchi 0.3.0 → 0.4.0

data/lib/samagotchi/desktop/macos/Panel.swift

@@ -1,7 +1,8 @@
-// The Spotlight-like panel: a message line on top, the text (selection or
-// clipboard) below it as quoted context, then a "New session" row and the
-// sessions. ⏎ sends a message (`chi send`, or `chi send --new` on the new
-// row), ⌘⏎ a note (`chi note`), ⇧⏎ is a newline.
+// The Spotlight-like panel: a message line on top, the images (a screenshot,
+// Finder files, drops) as thumbnails, the text (selection or clipboard)
+// below as quoted context, then a "New session" row and the sessions. ⏎
+// sends a message (`chi send`, or `chi send --new` on the new row, with
+// `--image` per image), ⌘⏎ a note (`chi note`, text only), ⇧⏎ a newline.
 import AppKit
 import SwiftUI
 
@@ -15,6 +16,8 @@ final class PanelModel: ObservableObject {
   /// The selection or clipboard: the quoted context of a message, or a note.
   @Published var text = ""
   @Published var source = ""
+  /// Sent as `--image` with a message; notes are text only.
+  @Published var images: [PanelImage] = []
   @Published var sessions: [LiveSession] = []
   @Published var selected: Set<String> = []
   /// The "New session" row; never together with sessions (`--new` takes no ids).
@@ -34,6 +37,19 @@ final class PanelModel: ObservableObject {
     canSend && (newSelected || !selected.isEmpty) && (!trimmedPrompt.isEmpty || hasContext)
   }
   var live: [LiveSession] { sessions.filter { !$0.recent } }
+
+  /// Up to maxImages; the rest is dropped (and its temp files deleted).
+  func add(_ new: [PanelImage]) {
+    let room = max(0, maxImages - images.count)
+    images += new.prefix(room)
+    ImageIntake.delete(Array(new.dropFirst(room)))
+    if new.count > room { message = "At most \(maxImages) images" }
+  }
+
+  func remove(_ image: PanelImage) {
+    images.removeAll { $0 == image }
+    ImageIntake.delete([image])
+  }
   var recent: [LiveSession] { sessions.filter(\.recent) }
 
   /// The last choice, where still live; else the only live session; else,
@@ -87,13 +103,16 @@ struct PanelView: View {
 
   var body: some View {
     VStack(spacing: 0) {
-      TextField("Ask chi…", text: $model.prompt, axis: .vertical)
+      // The message is required with images, as in the web.
+      TextField(model.images.isEmpty ? "Ask chi…" : "Say something about the image…", text: $model.prompt, axis: .vertical)
         .textFieldStyle(.plain)
         .font(.system(size: 17))
         .lineLimit(1...4)
         .focused($promptFocused)
         .padding(.horizontal, 19).padding(.top, 14).padding(.bottom, 8)
 
+      imageStrip
+
       ZStack(alignment: .topLeading) {
         if model.text.isEmpty {
           Text("Context, quoted above the message (or the note)…")
@@ -121,6 +140,21 @@ struct PanelView: View {
     .onAppear { promptFocused = true }
   }
 
+  @ViewBuilder var imageStrip: some View {
+    if !model.images.isEmpty {
+      ScrollView(.horizontal, showsIndicators: false) {
+        HStack(spacing: 8) {
+          ForEach(model.images) { image in
+            Thumbnail(image: image, removable: model.phase != .sending) { model.remove(image) }
+          }
+        }
+        .padding(.horizontal, 19).padding(.vertical, 2)
+      }
+      .frame(height: 52)
+      .padding(.bottom, 8)
+    }
+  }
+
   @ViewBuilder var sessionList: some View {
     VStack(alignment: .leading, spacing: 2) {
       switch model.phase {
@@ -242,6 +276,43 @@ struct PanelView: View {
   }
 }
 
+/// One image in the strip: 48 px high, its name as a tooltip, ✕ on hover.
+struct Thumbnail: View {
+  let image: PanelImage
+  let removable: Bool
+  let remove: () -> Void
+  @State private var hover = false
+
+  var body: some View {
+    Group {
+      if let thumb = image.thumbnail {
+        Image(nsImage: thumb).resizable().aspectRatio(contentMode: .fit)
+      } else {
+        Image(systemName: "photo").font(.system(size: 20)).foregroundColor(.secondary).frame(width: 48)
+      }
+    }
+    .frame(height: 48)
+    .frame(maxWidth: 120)
+    .clipShape(RoundedRectangle(cornerRadius: 6))
+    .overlay(RoundedRectangle(cornerRadius: 6).stroke(Color.primary.opacity(0.15), lineWidth: 0.5))
+    .overlay(alignment: .topTrailing) {
+      if hover && removable {
+        Button(action: remove) {
+          Image(systemName: "xmark.circle.fill")
+            .font(.system(size: 14))
+            .symbolRenderingMode(.palette)
+            .foregroundStyle(.white, Color.black.opacity(0.55))
+        }
+        .buttonStyle(.plain)
+        .padding(3)
+        .help("remove")
+      }
+    }
+    .onHover { hover = $0 }
+    .help(image.name)
+  }
+}
+
 final class KeyPanel: NSPanel {
   var onKey: ((NSEvent) -> Bool)?
   /// Return with these modifiers; true when handled.
@@ -273,6 +344,8 @@ final class PanelController: NSObject, NSWindowDelegate {
   let runner = ChiRunner()
   private var panel: KeyPanel!
   private var returnTo: NSRunningApplication?
+  /// Images a running `chi send` still reads: not deleted on close.
+  private var inFlight: Set<UUID> = []
 
   override init() {
     super.init()
@@ -290,7 +363,7 @@ final class PanelController: NSObject, NSWindowDelegate {
     panel.backgroundColor = .clear
     panel.delegate = self
 
-    let effect = NSVisualEffectView()
+    let effect = DropEffectView()
     effect.material = .popover
     effect.blendingMode = .behindWindow
     effect.state = .active
@@ -303,6 +376,7 @@ final class PanelController: NSObject, NSWindowDelegate {
       hosting.topAnchor.constraint(equalTo: effect.topAnchor),
       hosting.bottomAnchor.constraint(equalTo: effect.bottomAnchor),
     ])
+    effect.onDrop = { [weak self] images in self?.model.add(images) }
     panel.contentView = effect
     panel.onKey = { [weak self] event in self?.handleKey(event) ?? false }
     panel.onReturn = { [weak self] flags in self?.handleReturn(flags) ?? false }
@@ -330,9 +404,13 @@ final class PanelController: NSObject, NSWindowDelegate {
   }
 
   /// @param returnTo the app to give focus back to on close
-  func show(text: String, source: String, returnTo app: NSRunningApplication?) {
+  func show(text: String, images: [PanelImage] = [], source: String, returnTo app: NSRunningApplication?) {
     returnTo = app
+    // A show on an open panel resets it without a close.
+    dropImages()
     model.prompt = ""
+    model.images = []
+    model.add(images)
     model.text = text
     model.source = source
     model.message = ""
@@ -371,6 +449,11 @@ final class PanelController: NSObject, NSWindowDelegate {
   func send(_ kind: SendKind) {
     let ids = model.selectedIds
     let new = model.newSelected
+    if kind == .note, !model.images.isEmpty {
+      NSSound.beep()
+      model.message = "Notes are text only: ⏎ sends the image as a message"
+      return
+    }
     // A note into a session that doesn't exist yet makes no sense.
     guard model.sendEnabled, new ? kind == .message : !ids.isEmpty else { NSSound.beep(); return }
     model.phase = .sending
@@ -388,6 +471,7 @@ final class PanelController: NSObject, NSWindowDelegate {
       command = "chi send"
       args = new ? ["send", "--new", "--dir", model.newSessionDir] : ["send"]
       if !prompt.isEmpty { args += ["-m", prompt] }
+      args += model.images.flatMap { ["--image", $0.url.path] }
       stdin = model.hasContext ? Data(model.text.utf8) : nil
     case .note:
       command = "chi note"
@@ -398,8 +482,19 @@ final class PanelController: NSObject, NSWindowDelegate {
       stdin = Data(parts.joined(separator: "\n\n").utf8)
     }
     if !new { args += ids }
-    runner.run(args, stdin: stdin) { [weak self] result in
+    let images = kind == .message ? model.images : []
+    inFlight.formUnion(images.map(\.id))
+    // Reading, converting and a new worker's start take longer than text.
+    let timeout = images.isEmpty ? runner.timeout : 30
+    runner.run(args, stdin: stdin, timeout: timeout) { [weak self] result in
       guard let self else { return }
+      self.inFlight.subtract(images.map(\.id))
+      // Sent: the temp files go (and the thumbnails). Else they stay for
+      // another try, unless the panel was closed or reopened meanwhile.
+      var sent = false
+      if case .success(let r) = result { sent = r.status == 0 && !r.timedOut }
+      if sent { self.model.images.removeAll { images.contains($0) } }
+      ImageIntake.delete(images.filter { !self.model.images.contains($0) })
       switch result {
       case .failure(let error):
         self.model.phase = .failed
@@ -410,7 +505,7 @@ final class PanelController: NSObject, NSWindowDelegate {
         if r.timedOut {
           self.model.phase = .failed
           let what = kind == .note ? "the note may be partly delivered" : "the message may not have been sent"
-          self.model.message = "\(command) took over \(Int(self.runner.timeout)) s and was stopped; \(what). \(out)"
+          self.model.message = "\(command) took over \(Int(timeout)) s and was stopped; \(what). \(out)"
         } else if r.status == 0 {
           self.model.phase = .sent
           // --new prints "<full id>  started".
@@ -429,7 +524,15 @@ final class PanelController: NSObject, NSWindowDelegate {
   }
 
   func windowWillClose(_ notification: Notification) {
+    dropImages()
     returnTo?.activate()
     returnTo = nil
   }
+
+  /// The panel's images leave it; their temp files go unless a send still
+  /// reads them (its completion deletes them).
+  private func dropImages() {
+    ImageIntake.delete(model.images.filter { !inFlight.contains($0.id) })
+    model.images = []
+  }
 }

data/lib/samagotchi/desktop/macos.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require "digest"
 require "erb"
 require "fileutils"
 require "json"
@@ -81,7 +82,42 @@ module Samagotchi
       def launch_config
         env = { "LANG" => LANG }
         ENV_ALLOWLIST.each { |name| env[name] = @env[name] unless @env[name].to_s.empty? }
-        { "version" => @version, "argv" => [@ruby, @chi_path], "env" => env }
+        { "version" => @version, "argv" => [@ruby, @chi_path], "env" => env, "sources_sha" => sources_sha }
+      end
+
+      # A digest of what a build compiles: the Swift sources and the
+      # Info.plist template. The launch file records the one it was built
+      # from, so a new chi rebuilds only when these changed.
+      def sources_sha
+        files = Dir[File.join(@sources_dir, "*.swift")].sort + [File.join(SOURCES_DIR, "Info.plist.erb")]
+        Digest::SHA256.hexdigest(files.map { |f| "#{File.basename(f)}\0#{File.binread(f)}" }.join("\0"))
+      end
+
+      # Whether the installed app needs a rebuild (chi desktop upgrade): its
+      # sources changed since the build (a launch file without a digest
+      # counts as changed), or the launch file's ruby or chi is gone (a Ruby
+      # upgrade moved them).
+      def stale?
+        return false unless installed?
+
+        launch = read_launch
+        launch["sources_sha"] != sources_sha || !launch_ok?(launch)
+      end
+
+      # The launch file names another chi version or path than this one:
+      # refresh_launch_file fixes that without a rebuild.
+      def launch_outdated?
+        launch = read_launch
+        launch["version"] != @version || Array(launch["argv"]) != launch_config["argv"]
+      end
+
+      # Rewrite the launch file for this chi, keeping the env it was
+      # installed with. The app reads it at each send: no restart.
+      def refresh_launch_file
+        config = launch_config
+        env = read_launch["env"]
+        config["env"] = env if env.is_a?(Hash)
+        write_launch_file(config)
       end
 
       def warnings
@@ -155,9 +191,9 @@ module Samagotchi
         result = { installed: installed?, app_path: app_path, chi_version: @version }
         return result unless result[:installed]
 
-        launch = (JSON.parse(File.read(launch_path)) rescue nil)
-        argv = launch.is_a?(Hash) ? Array(launch["argv"]) : []
-        env = launch.is_a?(Hash) && launch["env"].is_a?(Hash) ? launch["env"] : {}
+        launch = read_launch
+        argv = Array(launch["argv"])
+        env = launch["env"].is_a?(Hash) ? launch["env"] : {}
         dump, = @runner.run([PBS, "-dump"])
         _, running = @runner.run(["pgrep", "-x", EXECUTABLE])
         hotkey = (JSON.parse(File.read(hotkey_path)) rescue nil)
@@ -166,7 +202,8 @@ module Samagotchi
           login: login,
           hotkey: hotkey.is_a?(Hash) ? hotkey : nil,
           launch_argv: argv,
-          launch_ok: !argv.empty? && argv.all? { |path| File.exist?(path) },
+          launch_ok: launch_ok?(launch),
+          stale: stale?,
           baked_dirs: env.select { |name, _| name.start_with?("XDG_") },
           service: dump.include?(BUNDLE_ID),
           running: running
@@ -232,18 +269,32 @@ module Samagotchi
         @arch ||= RbConfig::CONFIG["host_cpu"] == "arm64" ? "arm64" : `uname -m`.strip
       end
 
-      def write_launch_file
+      def read_launch
+        launch = JSON.parse(File.read(launch_path))
+        launch.is_a?(Hash) ? launch : {}
+      rescue SystemCallError, JSON::ParserError
+        {}
+      end
+
+      def launch_ok?(launch)
+        argv = Array(launch["argv"])
+        !argv.empty? && argv.all? { |path| File.exist?(path) }
+      end
+
+      def write_launch_file(config = launch_config)
         FileUtils.mkdir_p(@support_dir)
         tmp = "#{launch_path}.tmp"
-        File.write(tmp, JSON.pretty_generate(launch_config) + "\n")
+        File.write(tmp, JSON.pretty_generate(config) + "\n")
         File.rename(tmp, launch_path)
       end
 
       def register_app
         return unless @register
 
-        @runner.run([PBS, "-update"])
+        # The app first, so pbs reads the Service types it has now (a new
+        # type may otherwise show only after a re-login).
         @runner.run([LSREGISTER, "-f", app_path])
+        @runner.run([PBS, "-update"])
         @runner.run(["open", "-g", app_path])
       end
 

data/lib/samagotchi/desktop_command.rb

@@ -13,7 +13,8 @@ module Samagotchi
                            and start it: Services > "Send to chi", or ⌃⌥⌘N with the clipboard,
                            sends text to a live session as a context note. --login: start it
                            at login too (else it runs until you log out)
-        upgrade            rebuild it for this chi and restart it
+        upgrade            rebuild it for this chi and restart it (chi update does this only
+                           when its sources changed)
         uninstall          remove it, its settings and its launch file
         status             installed version, how it runs chi, Service and process state
     TEXT
@@ -96,11 +97,13 @@ module Samagotchi
 
       version = if s[:app_version] == s[:chi_version]
                   "#{s[:app_version]} (matches chi)"
+                elsif s[:stale]
+                  "#{s[:app_version] || "?"} (chi is #{s[:chi_version]}: chi update)"
                 else
-                  "#{s[:app_version] || "?"} (chi is #{s[:chi_version]}: chi desktop upgrade)"
+                  "#{s[:app_version] || "?"} (up to date: chi #{s[:chi_version]} changed nothing in it)"
                 end
       launch = s[:launch_argv].empty? ? "(none)" : s[:launch_argv].join(" ")
-      launch += s[:launch_ok] ? " (ok)" : " (missing: chi desktop upgrade)"
+      launch += s[:launch_ok] ? " (ok)" : " (missing: chi update)"
       dirs = s[:baked_dirs].empty? ? "(defaults)" : s[:baked_dirs].map { |name, value| "#{name}=#{value}" }.join(" ")
       service = s[:service] ? "registered" : "not registered (try chi desktop upgrade, or log out and back in)"
       running = s[:running] ? "running" : "not running (open -g \"#{s[:app_path]}\")"

data/lib/samagotchi/edit_preview.rb

@@ -0,0 +1,82 @@
+# frozen_string_literal: true
+
+require_relative "text_diff"
+require_relative "tools/edit"
+require_relative "tools/tool_path"
+
+module Samagotchi
+  # What chi's own edit/write tools change, as a TextDiff. Used twice:
+  #
+  # - EditPreview.for(call): a dry run before the call runs (the approval
+  #   card). It reads the file once and never writes.
+  # - EditPreview.snapshot + change: the file before and after the call ran
+  #   (the tool row), so the row shows what really happened.
+  #
+  # A diff is {text:, added:, removed:, truncated:, new_file:}; a preview can
+  # also be {error: "old text not found in …"} (the call would fail) or
+  # {skipped: "binary file" | "file over 1 MB"}.
+  module EditPreview
+    TOOLS = %w[edit write].freeze
+    MAX_FILE_BYTES = 1024 * 1024
+    SNIFF_BYTES = 8 * 1024
+
+    module_function
+
+    def tool?(name) = TOOLS.include?(name.to_s)
+
+    # @return [Hash, nil] nil for a tool that isn't edit/write
+    def for(call)
+      return nil unless tool?(call[:name])
+
+      path = Tools::ToolPath.normalize(call[:path])
+      before = snapshot(path)
+      return before if before.is_a?(Hash)
+
+      if call[:name].to_s == "edit"
+        result = Tools::Edit.apply(call[:content], path: path, start_line: call[:start_line],
+                                                   end_line: call[:end_line], read: ->(_) { before })
+        return { error: result.delete_prefix("Error: ") } if result.is_a?(String)
+
+        after = result.first
+      else
+        after = call[:content]
+        return { error: "missing content" } unless after.is_a?(String)
+
+        skip = skip_reason(after)
+        return { skipped: skip } if skip
+      end
+      # Unlike change, a no-op still gets a (0/0) diff: nil means "not edit/write".
+      TextDiff.unified(before.to_s, after).merge(new_file: before.nil?)
+    end
+
+    # The file as the tools read it: nil when it doesn't exist, the text, or
+    # {skipped:} / {error:} when it can't be diffed.
+    def snapshot(path)
+      return nil unless File.file?(path)
+      return { skipped: "file over 1 MB" } if File.size(path) > MAX_FILE_BYTES
+
+      text = File.read(path)
+      skip = skip_reason(text)
+      skip ? { skipped: skip } : text
+    rescue SystemCallError, IOError => e
+      { error: e.message }
+    end
+
+    # @param before [String, nil] nil for a file that didn't exist
+    # @return [Hash, nil] nil when there's nothing to show (same text, or
+    #   the after side isn't a readable text file)
+    def change(before, after)
+      return nil unless after.is_a?(String)
+      return nil unless before.nil? || before.is_a?(String)
+      return nil if before == after
+
+      TextDiff.unified(before.to_s, after).merge(new_file: before.nil?)
+    end
+
+    def skip_reason(text)
+      return "file over 1 MB" if text.bytesize > MAX_FILE_BYTES
+
+      "binary file" if text.byteslice(0, SNIFF_BYTES).include?("\0")
+    end
+  end
+end