slk 0.5.0 → 0.6.0

data/lib/slk/services/profile_resolver.rb

@@ -0,0 +1,138 @@
+# frozen_string_literal: true
+
+module Slk
+  module Services
+    # Orchestrates the API calls needed to assemble a Models::Profile.
+    # Memoizes within the instance — one resolver per command run.
+    class ProfileResolver
+      SCHEMA_TTL = 86_400 # 24h
+      PROFILE_TTL = 3_600 # 1h
+      EMPTY_SCHEMA = { 'ok' => false, 'profile' => { 'fields' => [], 'sections' => [] } }.freeze
+
+      attr_accessor :refresh
+
+      def initialize(users_api:, team_api:, cache_store: nil, workspace_name: nil, on_debug: nil)
+        @users_api = users_api
+        @team_api = team_api
+        @cache_store = cache_store
+        @workspace_name = workspace_name
+        @on_debug = on_debug
+        @refresh = false
+        @profile_cache = {}
+        @home_team_names = {}
+      end
+
+      # Resolve a user ID to a Profile. Memoized per resolver instance.
+      def resolve(user_id)
+        return @profile_cache[user_id] if @profile_cache.key?(user_id)
+
+        @profile_cache[user_id] = build_profile(user_id)
+      end
+
+      # Resolve a profile and one level of type:user custom fields, populating
+      # `resolved_users` so the formatter can render the People section.
+      def resolve_with_people(user_id)
+        profile = resolve(user_id)
+        return profile if profile.external?
+
+        profile.people_fields.flat_map(&:user_ids).uniq.each do |ref_id|
+          profile.resolved_users[ref_id] ||= resolve(ref_id)
+        end
+        profile
+      end
+
+      # Walks Supervisor (or first non-inverse type:user field) upward.
+      # Returns Array<Profile> from immediate supervisor to top, capped by depth.
+      def resolve_chain_up(user_id, depth: 5)
+        chain = []
+        seen = Set.new([user_id])
+        current = resolve(user_id)
+        depth.times { current = step_up(current, seen, chain) or break }
+        chain
+      end
+
+      private
+
+      def step_up(current, seen, chain)
+        parent_id = current.supervisor_ids.first
+        return nil unless parent_id && !seen.include?(parent_id)
+
+        parent = resolve(parent_id)
+        chain << parent
+        seen << parent.user_id
+        parent
+      end
+
+      def build_profile(user_id)
+        profile = ProfileBuilder.build(
+          profile_response: fetch_profile_response(user_id),
+          info_response: cache_or_fetch("ui_#{user_id}", ttl: PROFILE_TTL) { @users_api.info(user_id) },
+          schema_response: schema,
+          workspace_team_id: workspace_team_id
+        )
+        attach_extras(profile, user_id)
+      rescue ApiError => e
+        @on_debug&.call("Profile resolve failed for #{user_id}: #{e.message}")
+        raise
+      end
+
+      # Only swallow `user_not_found` (Slack Connect); other errors propagate.
+      def fetch_profile_response(user_id)
+        key = "up_#{user_id}"
+        cached = MetaCache.read(@cache_store, @workspace_name, key, ttl: PROFILE_TTL) unless @refresh
+        return cached if cached
+
+        response = @users_api.profile_for(user_id)
+        MetaCache.write(@cache_store, @workspace_name, key, response)
+        response
+      rescue ApiError => e
+        raise unless e.code == :user_not_found
+
+        @on_debug&.call("#{key}: #{e.message} (falling back to users.info)")
+        nil
+      end
+
+      def attach_extras(profile, user_id)
+        profile = attach_home_team_name(profile)
+        presence = fetch_presence(user_id)
+        presence ? Models::Profile.new(**profile.to_h, presence: presence) : profile
+      end
+
+      def fetch_presence(user_id)
+        @users_api.get_presence_for(user_id)&.dig('presence')
+      rescue ApiError => e
+        @on_debug&.call("get_presence_for(#{user_id}) failed: #{e.message}")
+        nil
+      end
+
+      def schema
+        @schema ||= cache_or_fetch('team_profile_schema', ttl: SCHEMA_TTL,
+                                                          empty: EMPTY_SCHEMA) { @team_api.profile_schema }
+      end
+
+      def workspace_team_id
+        @workspace_team_id ||= cache_or_fetch('workspace_team_id') { @team_api.info.dig('team', 'id') }
+      end
+
+      def cache_or_fetch(key, ttl: nil, empty: nil, &)
+        MetaCache.fetch(@cache_store, @workspace_name, key, ttl: ttl, refresh: @refresh, &)
+      rescue ApiError => e
+        @on_debug&.call("#{key} fetch failed: #{e.message}")
+        empty
+      end
+
+      def attach_home_team_name(profile)
+        return profile unless profile.external? && profile.team_id && (name = home_team_name(profile.team_id))
+
+        Models::Profile.new(**profile.to_h, home_team_name: name)
+      end
+
+      def home_team_name(team_id)
+        @home_team_names[team_id] ||= @team_api.info(team_id).dig('team', 'name')
+      rescue ApiError => e
+        @on_debug&.call("team.info(#{team_id}) failed: #{e.message}")
+        @home_team_names[team_id] = nil
+      end
+    end
+  end
+end

data/lib/slk/services/user_lookup.rb

@@ -52,6 +52,14 @@ module Slk
         fetch_id_by_name(name)
       end
 
+      # @return [Array<Hash>] raw users.list-shaped hashes for all matches
+      def find_all_by_name(name)
+        UserMatcher.new(
+          api_client: @api, workspace: @workspace,
+          cache_store: @cache, on_debug: @on_debug
+        ).find_all(name)
+      end
+
       private
 
       def fetch_and_cache_name(user_id)
@@ -88,11 +96,7 @@ module Slk
       end
 
       def fetch_id_by_name(name)
-        return nil unless @api
-
-        users_api = Api::Users.new(@api, @workspace, on_debug: @on_debug)
-        users = users_api.list['members'] || []
-        user = find_user_by_name(users, name)
+        user = find_all_by_name(name).first
         cache_user_from_api(user) if user
         user&.dig('id')
       rescue ApiError => e
@@ -100,14 +104,6 @@ module Slk
         nil
       end
 
-      def find_user_by_name(users, name)
-        users.find do |u|
-          u['name'] == name ||
-            u.dig('profile', 'display_name') == name ||
-            u.dig('profile', 'real_name') == name
-        end
-      end
-
       def cache_user_from_api(user_data)
         user = Models::User.from_api(user_data)
         @cache.set_user(@workspace.name, user.id, user.best_name, persist: true)

data/lib/slk/services/user_matcher.rb

@@ -0,0 +1,64 @@
+# frozen_string_literal: true
+
+module Slk
+  module Services
+    # Finds all users whose name/display/real/first+last matches a query
+    # (case-insensitive). Combines users.list with previously-resolved profiles
+    # cached locally — Slack Connect external users don't appear in users.list
+    # but do show up in the meta cache once users.info has been fetched.
+    class UserMatcher
+      def initialize(api_client:, workspace:, cache_store:, on_debug: nil)
+        @api = api_client
+        @workspace = workspace
+        @cache = cache_store
+        @on_debug = on_debug
+      end
+
+      # Returns users.list-shaped hashes (deduped by id). Raises ApiError on
+      # network/auth failures so callers don't conflate them with "no matches".
+      def find_all(name)
+        return [] if name.to_s.empty? || @api.nil?
+
+        target = name.downcase
+        candidates = list_members + cached_profile_users
+        unique_by_id(candidates.select { |u| matches?(u, target) })
+      end
+
+      def matches?(user, target_lower)
+        name_candidates(user).any? { |c| c.downcase == target_lower }
+      end
+
+      def name_candidates(user)
+        profile = user['profile'] || {}
+        full = [profile['first_name'], profile['last_name']].compact.join(' ').strip
+        [user['name'], profile['display_name'], profile['real_name'], full]
+          .map(&:to_s).reject(&:empty?)
+      end
+
+      private
+
+      def list_members
+        Api::Users.new(@api, @workspace, on_debug: @on_debug).list['members'] || []
+      end
+
+      # Reshape cached `ui_<uid>` meta entries (raw users.info responses) into
+      # users.list-shaped hashes so the matcher can compare them uniformly.
+      def cached_profile_users
+        return [] unless @cache.respond_to?(:each_meta)
+
+        @cache.each_meta(@workspace.name).filter_map do |key, value|
+          next unless key.start_with?('ui_')
+
+          user = value.is_a?(Hash) ? value.dig('value', 'user') : nil
+          user if user.is_a?(Hash) && user['id']
+        end
+      end
+
+      def unique_by_id(users)
+        seen = {}
+        users.each { |u| seen[u['id']] ||= u }
+        seen.values
+      end
+    end
+  end
+end

data/lib/slk/services/user_picker.rb

@@ -0,0 +1,68 @@
+# frozen_string_literal: true
+
+module Slk
+  module Services
+    # Disambiguates between multiple matching users. Prompts at a TTY; raises
+    # ApiError in non-interactive contexts so callers don't silently get the
+    # wrong user when name resolution is ambiguous.
+    class UserPicker
+      def initialize(stdin: $stdin, prompt_io: $stderr)
+        @stdin = stdin
+        @prompt_io = prompt_io
+      end
+
+      def pick(matches)
+        return matches.first['id'] if matches.size == 1
+
+        unless interactive?
+          raise ApiError,
+                "Ambiguous match (#{matches.size} users): #{ids(matches).join(', ')}. " \
+                'Use --pick N or --all to disambiguate non-interactively.'
+        end
+
+        list(matches)
+        matches[read_index(matches.size)]['id']
+      end
+
+      private
+
+      def interactive?
+        @stdin.respond_to?(:tty?) && @stdin.tty?
+      end
+
+      def list(matches)
+        @prompt_io.puts('Multiple users match — pick one:')
+        matches.each_with_index { |u, i| @prompt_io.puts("  [#{i + 1}] #{describe(u)}") }
+      end
+
+      def describe(user)
+        profile = user['profile'] || {}
+        name = profile['real_name'] || profile['display_name'] || user['name']
+        suffix = profile['title'].to_s.empty? ? '' : " — #{profile['title']}"
+        "#{name} (#{user['id']})#{suffix}#{flag_suffix(user)}"
+      end
+
+      def flag_suffix(user)
+        flags = []
+        flags << 'deactivated' if user['deleted']
+        flags << 'bot' if user['is_bot']
+        flags.empty? ? '' : " [#{flags.join(', ')}]"
+      end
+
+      def ids(matches)
+        matches.map { |u| u['id'] }
+      end
+
+      def read_index(count)
+        loop do
+          @prompt_io.print("Choice [1-#{count}]: ")
+          choice = @stdin.gets&.strip
+          raise ApiError, 'No selection made' if choice.nil? || choice.empty?
+
+          n = Integer(choice, exception: false)
+          return n - 1 if n&.between?(1, count)
+        end
+      end
+    end
+  end
+end

data/lib/slk/services/who_target_resolver.rb

@@ -0,0 +1,64 @@
+# frozen_string_literal: true
+
+module Slk
+  module Services
+    # Resolves the positional target for `slk who` into one or more user_ids.
+    class WhoTargetResolver
+      def initialize(workspace:, cache_store:, api_client:, output:, options:)
+        @workspace = workspace
+        @cache_store = cache_store
+        @api_client = api_client
+        @output = output
+        @options = options
+      end
+
+      def resolve(target)
+        return [self_user_id] if target.nil? || target == 'me'
+        return [target] if target.match?(/\A[UW][A-Z0-9]+\z/)
+
+        ids = resolve_by_name(target.delete_prefix('@'))
+        ids || (raise ApiError, "Could not resolve user: #{target}")
+      end
+
+      private
+
+      def resolve_by_name(name)
+        matches = lookup.find_all_by_name(name)
+        return select(matches) if matches.any?
+
+        cached = @cache_store.get_user_id_by_name(@workspace.name, name)
+        cached ? [cached] : nil
+      end
+
+      def select(matches)
+        return matches.map { |u| u['id'] } if @options[:all]
+        return [pick_by_index(matches)] if @options[:pick]
+
+        [UserPicker.new.pick(matches)]
+      end
+
+      def pick_by_index(matches)
+        idx = @options[:pick]
+        raise ApiError, "--pick #{idx} out of range (got #{matches.size} matches)" unless idx&.between?(1, matches.size)
+
+        matches[idx - 1]['id']
+      end
+
+      def lookup
+        UserLookup.new(
+          cache_store: @cache_store, workspace: @workspace,
+          api_client: @api_client, on_debug: ->(msg) { @output.debug(msg) }
+        )
+      end
+
+      def self_user_id
+        cached = @cache_store.get_meta(@workspace.name, 'self_user_id')
+        return cached if cached
+
+        user_id = Api::Client.new(@api_client, @workspace).auth_test['user_id']
+        @cache_store.set_meta(@workspace.name, 'self_user_id', user_id) if user_id
+        user_id
+      end
+    end
+  end
+end

data/lib/slk/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Slk
-  VERSION = '0.5.0'
+  VERSION = '0.6.0'
 end

data/lib/slk.rb

@@ -11,7 +11,35 @@ require 'io/console'
 # Slack CLI - A command-line interface for Slack
 module Slk
   class Error < StandardError; end
-  class ApiError < Error; end
+
+  # Errors from any Slack-API-shaped failure: HTTP errors, network errors,
+  # logical Slack errors (user_not_found, missing_scope, etc.), JSON parse
+  # failures. The optional `code` symbol lets callers match specific cases
+  # (e.g. `e.code == :user_not_found`) without parsing message strings.
+  #
+  # Codes used:
+  #   :network_error, :http_error, :unauthorized, :invalid_json,
+  #   :ratelimited, plus any literal Slack `error` value (`:user_not_found`,
+  #   `:missing_scope`, `:account_inactive`, etc.).
+  class ApiError < Error
+    attr_reader :code
+
+    def initialize(message, code: nil)
+      super(message)
+      @code = code
+    end
+  end
+
+  # Slack rate-limit error. Carries Retry-After in seconds when present.
+  class RateLimitError < ApiError
+    attr_reader :retry_after
+
+    def initialize(message, retry_after: nil)
+      super(message, code: :ratelimited)
+      @retry_after = retry_after
+    end
+  end
+
   class ConfigError < Error; end
   class EncryptionError < Error; end
   class TokenStoreError < Error; end
@@ -34,6 +62,8 @@ module Slk
     autoload :Preset, 'slk/models/preset'
     autoload :SearchResult, 'slk/models/search_result'
     autoload :SavedItem, 'slk/models/saved_item'
+    autoload :Profile, 'slk/models/profile'
+    autoload :ProfileField, 'slk/models/profile_field'
   end
 
   # Application services for configuration, caching, and API communication
@@ -56,7 +86,13 @@ module Slk
     autoload :TargetResolver, 'slk/services/target_resolver'
     autoload :SetupWizard, 'slk/services/setup_wizard'
     autoload :UserLookup, 'slk/services/user_lookup'
+    autoload :UserMatcher, 'slk/services/user_matcher'
+    autoload :UserPicker, 'slk/services/user_picker'
+    autoload :WhoTargetResolver, 'slk/services/who_target_resolver'
     autoload :MessageResolver, 'slk/services/message_resolver'
+    autoload :ProfileBuilder, 'slk/services/profile_builder'
+    autoload :ProfileResolver, 'slk/services/profile_resolver'
+    autoload :MetaCache, 'slk/services/meta_cache'
   end
 
   # Output formatters for messages, durations, and emoji
@@ -75,6 +111,9 @@ module Slk
     autoload :SearchFormatter, 'slk/formatters/search_formatter'
     autoload :SavedItemFormatter, 'slk/formatters/saved_item_formatter'
     autoload :TextProcessor, 'slk/formatters/text_processor'
+    autoload :ProfileFormatter, 'slk/formatters/profile_formatter'
+    autoload :ProfileFieldRenderer, 'slk/formatters/profile_field_renderer'
+    autoload :ProfileRows, 'slk/formatters/profile_rows'
   end
 
   # CLI commands implementing user-facing functionality
@@ -96,6 +135,9 @@ module Slk
     autoload :Config, 'slk/commands/config'
     autoload :Help, 'slk/commands/help'
     autoload :Later, 'slk/commands/later'
+    autoload :Debug, 'slk/commands/debug'
+    autoload :Who, 'slk/commands/who'
+    autoload :Org, 'slk/commands/org'
   end
 
   # Thin wrappers around Slack API endpoints
@@ -111,6 +153,7 @@ module Slk
     autoload :Activity, 'slk/api/activity'
     autoload :Search, 'slk/api/search'
     autoload :Saved, 'slk/api/saved'
+    autoload :Team, 'slk/api/team'
   end
 
   # Utility classes for paths, parsing, and helpers

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: slk
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Eric Boehs
@@ -34,6 +34,7 @@ files:
 - lib/slk/api/emoji.rb
 - lib/slk/api/saved.rb
 - lib/slk/api/search.rb
+- lib/slk/api/team.rb
 - lib/slk/api/threads.rb
 - lib/slk/api/usergroups.rb
 - lib/slk/api/users.rb
@@ -43,11 +44,13 @@ files:
 - lib/slk/commands/cache.rb
 - lib/slk/commands/catchup.rb
 - lib/slk/commands/config.rb
+- lib/slk/commands/debug.rb
 - lib/slk/commands/dnd.rb
 - lib/slk/commands/emoji.rb
 - lib/slk/commands/help.rb
 - lib/slk/commands/later.rb
 - lib/slk/commands/messages.rb
+- lib/slk/commands/org.rb
 - lib/slk/commands/presence.rb
 - lib/slk/commands/preset.rb
 - lib/slk/commands/search.rb
@@ -55,6 +58,7 @@ files:
 - lib/slk/commands/status.rb
 - lib/slk/commands/thread.rb
 - lib/slk/commands/unread.rb
+- lib/slk/commands/who.rb
 - lib/slk/commands/workspaces.rb
 - lib/slk/formatters/activity_formatter.rb
 - lib/slk/formatters/attachment_formatter.rb
@@ -66,6 +70,9 @@ files:
 - lib/slk/formatters/mention_replacer.rb
 - lib/slk/formatters/message_formatter.rb
 - lib/slk/formatters/output.rb
+- lib/slk/formatters/profile_field_renderer.rb
+- lib/slk/formatters/profile_formatter.rb
+- lib/slk/formatters/profile_rows.rb
 - lib/slk/formatters/reaction_formatter.rb
 - lib/slk/formatters/saved_item_formatter.rb
 - lib/slk/formatters/search_formatter.rb
@@ -74,6 +81,8 @@ files:
 - lib/slk/models/duration.rb
 - lib/slk/models/message.rb
 - lib/slk/models/preset.rb
+- lib/slk/models/profile.rb
+- lib/slk/models/profile_field.rb
 - lib/slk/models/reaction.rb
 - lib/slk/models/saved_item.rb
 - lib/slk/models/search_result.rb
@@ -91,7 +100,10 @@ files:
 - lib/slk/services/file_downloader.rb
 - lib/slk/services/gemoji_sync.rb
 - lib/slk/services/message_resolver.rb
+- lib/slk/services/meta_cache.rb
 - lib/slk/services/preset_store.rb
+- lib/slk/services/profile_builder.rb
+- lib/slk/services/profile_resolver.rb
 - lib/slk/services/reaction_enricher.rb
 - lib/slk/services/setup_wizard.rb
 - lib/slk/services/target_resolver.rb
@@ -100,6 +112,9 @@ files:
 - lib/slk/services/token_store.rb
 - lib/slk/services/unread_marker.rb
 - lib/slk/services/user_lookup.rb
+- lib/slk/services/user_matcher.rb
+- lib/slk/services/user_picker.rb
+- lib/slk/services/who_target_resolver.rb
 - lib/slk/support/date_parser.rb
 - lib/slk/support/error_logger.rb
 - lib/slk/support/help_formatter.rb