samagotchi 0.2.0 → 0.4.0

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

@@ -0,0 +1,113 @@
+// Images for the panel: what a pasteboard (the clipboard, the Service's,
+// a drop) carries, as files `chi send --image` can read. Image files are
+// passed as they are; image data (a ⌃⇧⌘4 screenshot, Preview, Safari's
+// Copy Image) is written to a temp file first, deleted after the send.
+import AppKit
+import UniformTypeIdentifiers
+
+/// The Bridge's cap on one turn's images.
+let maxImages = 20
+
+struct PanelImage: Identifiable, Equatable {
+  let id = UUID()
+  let url: URL
+  /// Written by the helper (image data), so the helper deletes it.
+  let temp: Bool
+  let thumbnail: NSImage?
+
+  var name: String { url.lastPathComponent }
+
+  init(url: URL, temp: Bool) {
+    self.url = url
+    self.temp = temp
+    thumbnail = NSImage(contentsOf: url)
+  }
+
+  static func == (a: PanelImage, b: PanelImage) -> Bool { a.id == b.id }
+}
+
+enum ImageIntake {
+  static let tempDir = URL(fileURLWithPath: NSTemporaryDirectory()).appendingPathComponent("chi-helper", isDirectory: true)
+
+  /// A pasteboard's content for the panel, in this order: image files
+  /// (Finder ⌘C, a Service on files) with no text; else its text, as before
+  /// (an office app's copy carries a picture of the cells too: the text
+  /// wins); else image data (png, then tiff). A non-image file is skipped.
+  static func read(_ pb: NSPasteboard) -> (text: String, images: [PanelImage]) {
+    let files = imageFiles(pb)
+    if !files.isEmpty { return ("", files) }
+    if let text = pb.string(forType: .string), !text.isEmpty { return (text, []) }
+    return ("", imageData(pb))
+  }
+
+  /// A drop adds images only: text dropped on the fields is theirs.
+  static func dropped(_ pb: NSPasteboard) -> [PanelImage] {
+    let files = imageFiles(pb)
+    return files.isEmpty ? imageData(pb) : files
+  }
+
+  static func imageFiles(_ pb: NSPasteboard) -> [PanelImage] {
+    let urls = pb.readObjects(forClasses: [NSURL.self], options: [.urlReadingFileURLsOnly: true]) as? [URL] ?? []
+    return urls.filter(isImage).prefix(maxImages).map { PanelImage(url: $0, temp: false) }
+  }
+
+  static func isImage(_ url: URL) -> Bool {
+    (try? url.resourceValues(forKeys: [.contentTypeKey]))?.contentType?.conforms(to: .image) == true
+  }
+
+  static func imageData(_ pb: NSPasteboard) -> [PanelImage] {
+    for (type, ext) in [(NSPasteboard.PasteboardType.png, "png"), (.tiff, "tiff")] {
+      guard let data = pb.data(forType: type) else { continue }
+      // A folder per image, so the name chi shows is "clipboard.png".
+      let dir = tempDir.appendingPathComponent(UUID().uuidString, isDirectory: true)
+      do {
+        try FileManager.default.createDirectory(at: dir, withIntermediateDirectories: true)
+        let url = dir.appendingPathComponent("clipboard.\(ext)")
+        try data.write(to: url)
+        return [PanelImage(url: url, temp: true)]
+      } catch {
+        return []
+      }
+    }
+    return []
+  }
+
+  static func delete(_ images: [PanelImage]) {
+    for image in images where image.temp {
+      try? FileManager.default.removeItem(at: image.url.deletingLastPathComponent())
+    }
+  }
+
+  /// At launch: what a helper that quit mid-send left.
+  static func sweep() {
+    try? FileManager.default.removeItem(at: tempDir)
+  }
+}
+
+/// The panel's background, taking dropped images anywhere on the panel.
+final class DropEffectView: NSVisualEffectView {
+  var onDrop: (([PanelImage]) -> Void)?
+
+  override init(frame: NSRect) {
+    super.init(frame: frame)
+    registerForDraggedTypes([.fileURL, .png, .tiff])
+  }
+
+  required init?(coder: NSCoder) { fatalError("init(coder:) is not used") }
+
+  override func draggingEntered(_ sender: NSDraggingInfo) -> NSDragOperation {
+    carriesImages(sender.draggingPasteboard) ? .copy : []
+  }
+
+  override func performDragOperation(_ sender: NSDraggingInfo) -> Bool {
+    let images = ImageIntake.dropped(sender.draggingPasteboard)
+    guard !images.isEmpty else { return false }
+    onDrop?(images)
+    return true
+  }
+
+  private func carriesImages(_ pb: NSPasteboard) -> Bool {
+    let urls = pb.readObjects(forClasses: [NSURL.self], options: [.urlReadingFileURLsOnly: true]) as? [URL] ?? []
+    return urls.contains(where: ImageIntake.isImage) || pb.availableType(from: [.png, .tiff]) != nil
+  }
+}

data/lib/samagotchi/desktop/macos/Info.plist.erb

@@ -33,6 +33,12 @@
       <key>NSSendTypes</key>
       <array>
         <string>public.utf8-plain-text</string>
+        <string>public.png</string>
+        <string>public.tiff</string>
+      </array>
+      <key>NSSendFileTypes</key>
+      <array>
+        <string>public.image</string>
       </array>
       <key>NSRequiredContext</key>
       <dict/>

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

@@ -1,6 +1,8 @@
-// The Spotlight-like panel: a message line on top, the text (selection or
-// clipboard) below it as quoted context, then the sessions. ⏎ sends a
-// message (`chi send`), ⌘⏎ 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
 
@@ -14,8 +16,12 @@ 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).
+  @Published var newSelected = false
   @Published var phase: Phase = .loading
   @Published var message = ""
 
@@ -28,21 +34,58 @@ final class PanelModel: ObservableObject {
   var trimmedPrompt: String { prompt.trimmingCharacters(in: .whitespacesAndNewlines) }
   var hasContext: Bool { !text.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty }
   var sendEnabled: Bool {
-    canSend && !selected.isEmpty && (!trimmedPrompt.isEmpty || hasContext)
+    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. A
-  /// recent (stopped) one is never preselected: a message would wake it.
+  /// The last choice, where still live; else the only live session; else,
+  /// with none live, the new row. A recent (stopped) one is never
+  /// preselected: a message would wake it.
   func preselect() {
     let last = Set(UserDefaults.standard.stringArray(forKey: Self.lastChoiceKey) ?? [])
     selected = last.intersection(Set(live.map(\.id)))
     if selected.isEmpty, live.count == 1 { selected = [live[0].id] }
+    newSelected = live.isEmpty
   }
 
   func toggle(_ id: String) {
-    if selected.contains(id) { selected.remove(id) } else { selected.insert(id) }
+    if selected.contains(id) { selected.remove(id) } else { selected.insert(id); newSelected = false }
+  }
+
+  func toggleNew() {
+    newSelected.toggle()
+    if newSelected { selected = [] }
+  }
+
+  /// Where a new session starts: the helper runs in $HOME, which is in no
+  /// project, so the folder of the most recently updated live session, else
+  /// of the newest recent one, else home.
+  var newSessionDir: String {
+    let exists = { (s: LiveSession) -> Bool in
+      var dir: ObjCBool = false
+      return s.cwd.map { FileManager.default.fileExists(atPath: $0, isDirectory: &dir) && dir.boolValue } ?? false
+    }
+    let newest = { (list: [LiveSession]) in list.filter(exists).max { ($0.updated ?? .distantPast) < ($1.updated ?? .distantPast) } }
+    return (newest(live) ?? newest(recent))?.cwd ?? NSHomeDirectory()
+  }
+
+  var newSessionFolder: String {
+    let dir = newSessionDir
+    return dir == NSHomeDirectory() ? "~" : (dir as NSString).lastPathComponent
   }
 
   /// In list order, only ids that are live and UUID-shaped.
@@ -60,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)…")
@@ -94,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 {
@@ -103,10 +164,7 @@ struct PanelView: View {
           Text("Looking for live sessions…").foregroundColor(.secondary)
         }.padding(10)
       default:
-        if model.sessions.isEmpty {
-          Text(model.phase == .failed && !model.message.isEmpty ? "" : "No live or recent sessions. Start one with `chi` in a terminal.")
-            .foregroundColor(.secondary).padding(10)
-        }
+        newRow
         ForEach(Array(model.sessions.prefix(9).enumerated()), id: \.element.id) { index, session in
           if session.recent && index == model.live.count {
             HStack(spacing: 6) {
@@ -123,6 +181,28 @@ struct PanelView: View {
     .frame(maxWidth: .infinity, alignment: .leading)
   }
 
+  var newRow: some View {
+    let on = model.newSelected
+    return Button(action: { model.toggleNew() }) {
+      HStack(spacing: 10) {
+        Image(systemName: on ? "plus.circle.fill" : "plus.circle")
+          .font(.system(size: 16))
+          .foregroundColor(on ? .accentColor : .secondary)
+        VStack(alignment: .leading, spacing: 1) {
+          Text("New session in \(model.newSessionFolder)").font(.system(size: 13, weight: .medium)).lineLimit(1)
+          Text(LiveSession.shorten(model.newSessionDir)).font(.system(size: 11)).foregroundColor(.secondary).lineLimit(1)
+        }
+        Spacer()
+        Text("⌘0").font(.system(size: 11, design: .rounded)).foregroundColor(.secondary)
+      }
+      .padding(.horizontal, 8).padding(.vertical, 6)
+      .background(RoundedRectangle(cornerRadius: 7).fill(on ? Color.accentColor.opacity(0.14) : Color.clear))
+      .contentShape(Rectangle())
+    }
+    .buttonStyle(.plain)
+    .help("start a session with the message, as the web does (chi send --new); a note needs a session")
+  }
+
   func row(_ session: LiveSession, index: Int) -> some View {
     let on = model.selected.contains(session.id)
     return Button(action: { model.toggle(session.id) }) {
@@ -196,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.
@@ -227,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()
@@ -244,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
@@ -257,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 }
@@ -274,22 +394,27 @@ final class PanelController: NSObject, NSWindowDelegate {
     return true
   }
 
-  /// ⌘1…⌘9 toggle a session.
+  /// ⌘1…⌘9 toggle a session, ⌘0 the new row.
   private func handleKey(_ event: NSEvent) -> Bool {
     guard event.modifierFlags.intersection(.deviceIndependentFlagsMask) == .command,
-          let chars = event.charactersIgnoringModifiers, let n = Int(chars), (1...9).contains(n),
+          let chars = event.charactersIgnoringModifiers, let n = Int(chars),
           n <= model.sessions.count else { return false }
-    model.toggle(model.sessions[n - 1].id)
+    if n == 0 { model.toggleNew() } else { model.toggle(model.sessions[n - 1].id) }
     return true
   }
 
   /// @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 = ""
+    model.newSelected = false
     model.phase = .loading
     placeOnActiveScreen()
     panel.makeKeyAndOrderFront(nil)
@@ -323,10 +448,19 @@ final class PanelController: NSObject, NSWindowDelegate {
 
   func send(_ kind: SendKind) {
     let ids = model.selectedIds
-    guard model.sendEnabled, !ids.isEmpty else { NSSound.beep(); return }
+    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
     model.message = ""
-    UserDefaults.standard.set(ids.filter { id in model.live.contains { $0.id == id } }, forKey: PanelModel.lastChoiceKey)
+    if !new {
+      UserDefaults.standard.set(ids.filter { id in model.live.contains { $0.id == id } }, forKey: PanelModel.lastChoiceKey)
+    }
     let prompt = model.trimmedPrompt
     let command: String
     var args: [String]
@@ -335,8 +469,9 @@ final class PanelController: NSObject, NSWindowDelegate {
     case .message:
       // stdin is the quoted context; without -m, chi takes it as the message.
       command = "chi send"
-      args = ["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"
@@ -346,9 +481,20 @@ final class PanelController: NSObject, NSWindowDelegate {
       let parts = [prompt, model.hasContext ? model.text : ""].filter { !$0.isEmpty }
       stdin = Data(parts.joined(separator: "\n\n").utf8)
     }
-    args += ids
-    runner.run(args, stdin: stdin) { [weak self] result in
+    if !new { args += ids }
+    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
@@ -359,12 +505,13 @@ 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
-          self.model.message = out.isEmpty ? "Sent." : out
+          // --new prints "<full id>  started".
+          self.model.message = out.isEmpty ? "Sent." : new ? "started \(out.prefix(8))…" : out
           // Long enough to read a "waits for the session's next start" line.
-          let linger = out.contains("waits for") || out.contains("started its worker") ? 3.0 : 1.0
+          let linger = out.contains("waits for") || out.contains("started") ? 3.0 : 1.0
           DispatchQueue.main.asyncAfter(deadline: .now() + linger) { [weak self] in
             if self?.model.phase == .sent { self?.panel.close() }
           }
@@ -377,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]}\")"