slk 0.15.0 → 0.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '080abcf262e2c943cb01e3fe6fc5619ee0921d93d4418deeb5f42d6fc4154a92'
-  data.tar.gz: 762989ed0de46ef13372d550a80517bf2c3c7ce73eaf916c8d78fafd5d6e6f57
+  metadata.gz: 5edea2fd65213e0875f06f53729966f8658ae880bd38321bd9a9d8980200c07a
+  data.tar.gz: 7a532e0e1991807962aae21099ad2e9c2c98b03a364dc3e6db90ebf7f2fdabf6
 SHA512:
-  metadata.gz: bc5bc2aafe45a6ab8a20fac51086e426d2586012be06b82d87fa3560597386b6d0a504a1489b8b75cf9af5c00627dd7b10a2714af8479fee37202408963e10b8
-  data.tar.gz: a835b18a0a8155c73d2618fa484393dcfaf9b11fbbd0583530209b810e0cadd09ddf45fa5618c54a75f9581dfd0a165d35257cd6faa0add128c08a51d03b0047
+  metadata.gz: 256c73b33433f9488bfcd1333c14f57e953e80fea54a07500239933cdf2129e682beb5d18cc3ab6f730d77570fd103ea77ab2b2ad7f2f8386d80924e6240f5e1
+  data.tar.gz: 388ffeef9e34949a549fb4cc7bcd8560e7132ad9ebde68b189c7dccfac5b749e3e21445c41fea2f614e5a3f1f179101b45b15727a219a3ab289d916aa0cb4f8a

data/CHANGELOG.md

@@ -7,6 +7,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.16.0] - 2026-10-29
+
+### Added
+
+- `slk debug huddle <call id|user>` (hidden command) prints the raw `huddles.get` response. A user is resolved to the call in their profile's `huddle_state_call_id`.
+
+### Fixed
+
+- `slk huddles` and `slk who` show the huddle's channel again. Slack stopped sending `huddle_state_channel_id` on profiles, so every huddle read "channel unknown". The call id is now looked up with `huddles.get`, which also adds Slack Connect guests missing from `users.list`. Huddles in conversations you can't see still show "channel unknown". Room and guest-name lookups run on four connections per workspace, about 3× faster than one at a time.
+
 ## [0.15.0] - 2026-10-13
 
 ### Added

data/README.md

@@ -232,9 +232,11 @@ slk huddles --json     # Call id, channel, and participants
 ```
 
 Slack has no huddle list. `slk huddles` reads `huddle_state` from `users.list`
-and groups people who share a call id. A huddle with no channel is one Slack
-did not attach to a conversation. People outside the workspace, including some
-Slack Connect guests, are not in the roster and will not appear. The roster is
+and groups people who share a call id. Profiles no longer say which channel a
+huddle is in, so each call id is looked up with `huddles.get` (undocumented),
+which also lists Slack Connect guests missing from the roster. That only works
+for conversations you can see; any other huddle shows "channel unknown" and
+only its roster members. The roster is
 fetched live and is not cached. `--all` scans every workspace at the same time.
 One connection can only read one roster, so each workspace gets its own.
 People who are not in a huddle are dropped as each page arrives. `slk who`

data/lib/slk/api/huddles.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module Slk
+  module Api
+    # Wrapper for Slack's undocumented huddles.* endpoints (the web client's).
+    class Huddles
+      def initialize(api_client, workspace)
+        @api = api_client
+        @workspace = workspace
+      end
+
+      # The room for one call id: channels, live participants, has_ended.
+      # Raises not_authorized for a huddle in a conversation the token
+      # cannot see.
+      def get(huddle_id)
+        info(huddle_id)['huddle'] || {}
+      end
+
+      # The whole response, for `slk debug huddle`.
+      def info(huddle_id)
+        @api.post(@workspace, 'huddles.get', { huddle_id: huddle_id })
+      end
+    end
+  end
+end

data/lib/slk/commands/debug.rb

@@ -25,12 +25,13 @@ module Slk
         in ['profile'] then dump_profile(nil)
         in ['team'] then dump_team
         in ['schema'] then dump_schema
-        in ['thread', url] then dump_thread(url)
-        in ['channel', target] then dump_channel(target)
+        in [action, target] if TARGET_ACTIONS.key?(action) then send(TARGET_ACTIONS[action], target)
         else unknown_action
         end
       end
 
+      TARGET_ACTIONS = { 'thread' => :dump_thread, 'channel' => :dump_channel, 'huddle' => :dump_huddle }.freeze
+
       private
 
       def dump_profile(user_input)
@@ -79,6 +80,26 @@ module Slk
         0
       end
 
+      # Raw huddles.get for a call id (R...), or for the call a user is in
+      # now. Profiles carry only the call id; this is where the channel and
+      # the full participant list (Slack Connect guests too) come from.
+      def dump_huddle(target)
+        workspace = runner.workspace(@options[:workspace])
+        call_id = huddle_call_id(workspace, target)
+        output.puts(JSON.pretty_generate(Api::Huddles.new(api_client, workspace).info(call_id)))
+        0
+      end
+
+      def huddle_call_id(workspace, target)
+        return target if target.match?(/\AR[A-Z0-9]+\z/)
+
+        user_id = resolve_user_id(workspace, target)
+        call_id = runner.users_api(workspace.name).info(user_id).dig('user', 'profile', 'huddle_state_call_id')
+        raise ApiError, "#{target} is not in a huddle" if call_id.to_s.empty?
+
+        call_id
+      end
+
       def resolve_target(target)
         Services::TargetResolver.new(runner: runner, cache_store: cache_store)
                                 .resolve(target, default_workspace: runner.workspace(@options[:workspace]))
@@ -128,7 +149,7 @@ module Slk
 
       def unknown_action
         error("Unknown debug action: #{positional_args.first.inspect}")
-        error('Valid actions: profile [user], team, schema, thread <url>, channel <id|url>')
+        error('Valid actions: profile [user], team, schema, thread <url>, channel <id|url>, huddle <call|user>')
         1
       end
 
@@ -146,6 +167,7 @@ module Slk
             schema           Dump team.profile.get
             thread <url>     Dump thread parent + subscriptions.thread.get
             channel <id|url> Dump conversations.info (also #name)
+            huddle <call|user> Dump huddles.get for a call id (R...) or a user's current call
 
           USER
             (none) | me      Self

data/lib/slk/commands/huddles.rb

@@ -25,7 +25,8 @@ module Slk
         help.note('Slack has no huddle list. This reads huddle_state from users.list')
         help.note('and groups people who share a call id. The roster is fetched live.')
         help.note('Primary workspace only. --all scans every workspace at the same time.')
-        help.note('A Slack Connect guest not in the roster is omitted.')
+        help.note('Channels and Slack Connect guests come from huddles.get, so only')
+        help.note('huddles in conversations you can see get them.')
         add_options_section(help)
         add_examples_section(help)
         help.render

data/lib/slk/commands/who.rb

@@ -89,12 +89,13 @@ module Slk
       # Channel ids are useless on a card. A failed lookup still leaves the
       # state, which is the part Slack always sends.
       def attach_huddle_channel(workspace, profile)
-        return profile if profile.huddle_channel_id.to_s.empty?
+        channel_id = Services::HuddleRoom.new(api_client: api_client, workspace: workspace).channel_for(profile)
+        return profile if channel_id.to_s.empty?
 
-        label = huddle_channels.label(workspace, profile.huddle_channel_id)
+        label = huddle_channels.label(workspace, channel_id)
         return profile unless label
 
-        Models::Profile.new(**profile.to_h, huddle_channel: label)
+        Models::Profile.new(**profile.to_h, huddle_channel_id: channel_id, huddle_channel: label)
       end
 
       def huddle_channels

data/lib/slk/services/api_client.rb

@@ -45,7 +45,7 @@ module Slk
         child.on_response = @on_response
         child.on_request_body = @on_request_body
         child.on_response_body = @on_response_body
-        child.share_counter(self)
+        child.share_counter(@counter || self)
         child
       end
 

data/lib/slk/services/huddle_fetch.rb

@@ -13,6 +13,7 @@ module Slk
         @output = output
         @counts = {}
         @mutex = Mutex.new
+        @cache_mutex = Mutex.new
       end
 
       def call(workspaces)
@@ -30,7 +31,8 @@ module Slk
       def fetch(workspace)
         client = scan_client
         users = Api::Users.new(client, workspace, on_debug: debug_logger)
-        HuddleScanner.group(collect(workspace, users))
+        huddles = HuddleScanner.group(collect(workspace, users))
+        enricher(workspace, client).call(huddles)
       ensure
         close_client(client)
       end
@@ -49,6 +51,13 @@ module Slk
         Models::WorkspaceHuddles.new(workspace: workspace.name, huddles: labeled)
       end
 
+      def enricher(workspace, client)
+        HuddleRoomEnricher.new(
+          workspace: workspace, client: client, cache_store: @runner.cache_store,
+          cache_mutex: @cache_mutex, on_debug: debug_logger
+        )
+      end
+
       def scan_client
         return @runner.api_client.isolated if @parallel
 

data/lib/slk/services/huddle_room.rb

@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+module Slk
+  module Services
+    # Fills in what a profile no longer says about a huddle.
+    #
+    # Slack stopped sending huddle_state_channel_id; profiles carry only the
+    # state and the call id. huddles.get maps the call id to its channel and
+    # the full participant list, which includes Slack Connect guests who are
+    # missing from users.list. A huddle the token cannot see is left as is.
+    class HuddleRoom
+      Room = Data.define(:channel_id, :participant_ids)
+
+      def initialize(api_client:, workspace:, on_debug: nil)
+        @api = Api::Huddles.new(api_client, workspace)
+        @on_debug = on_debug
+      end
+
+      # @return [Room, nil]
+      def lookup(call_id)
+        return nil if call_id.to_s.empty?
+
+        room = @api.get(call_id)
+        return nil if room.empty? || room['has_ended']
+
+        Room.new(channel_id: single_channel(room), participant_ids: Array(room['participants']))
+      rescue ApiError => e
+        @on_debug&.call("huddles.get #{call_id} failed: #{e.message}")
+        nil
+      end
+
+      # A profile's channel id if Slack sent one, else the room's.
+      def channel_for(profile)
+        return profile.huddle_channel_id unless profile.huddle_channel_id.to_s.empty?
+
+        lookup(profile.huddle_call_id)&.channel_id
+      end
+
+      private
+
+      def single_channel(room)
+        channels = Array(room['channels']).reject { |id| id.to_s.empty? }.uniq
+        channels.first if channels.one?
+      end
+    end
+  end
+end

data/lib/slk/services/huddle_room_enricher.rb

@@ -0,0 +1,88 @@
+# frozen_string_literal: true
+
+module Slk
+  module Services
+    # Adds what profiles no longer say to one workspace's huddles: the
+    # channel, and Slack Connect guests missing from users.list.
+    #
+    # huddles.get runs once per call id, and users.info once per guest whose
+    # name is not cached, both on a small worker pool so a busy workspace
+    # does not wait on dozens of requests in a row. Workspaces are scanned
+    # concurrently too, so cache reads and writes go through cache_mutex.
+    class HuddleRoomEnricher
+      WORKERS = 4
+
+      def initialize(workspace:, client:, cache_store:, cache_mutex:, on_debug: nil)
+        @workspace = workspace
+        @client = client
+        @cache = cache_store
+        @cache_mutex = cache_mutex
+        @on_debug = on_debug
+      end
+
+      def call(huddles)
+        rooms = fan_out(huddles) { |huddle, client| room_for(huddle, client) }
+        names = guest_names(guest_ids(huddles, rooms))
+        HuddleScanner.sort(huddles.zip(rooms).map { |huddle, room| apply(huddle, room, names) })
+      end
+
+      private
+
+      def fan_out(items, &)
+        PooledFanout.call(items, workers: WORKERS, client: @client, &)
+      end
+
+      def room_for(huddle, client)
+        return nil if huddle.channel_id || huddle.call_id.nil?
+
+        HuddleRoom.new(api_client: client, workspace: @workspace, on_debug: @on_debug).lookup(huddle.call_id)
+      end
+
+      def guest_ids(huddles, rooms)
+        huddles.zip(rooms).flat_map do |huddle, room|
+          room ? room.participant_ids - huddle.participants.map(&:id) : []
+        end.uniq
+      end
+
+      def guest_names(ids)
+        cached = cached_names(ids)
+        missing = ids - cached.keys
+        fetched = missing.zip(fan_out(missing) { |id, client| fetch_name(id, client) }).to_h.compact
+        remember(fetched)
+        cached.merge(fetched)
+      end
+
+      def cached_names(ids)
+        @cache_mutex.synchronize { ids.to_h { |id| [id, @cache.get_user(@workspace.name, id)] }.compact }
+      end
+
+      def fetch_name(user_id, client)
+        user = Api::Users.new(client, @workspace, on_debug: @on_debug).info(user_id)['user']
+        user && Models::User.from_api(user).best_name
+      rescue ApiError => e
+        @on_debug&.call("User lookup failed for #{user_id}: #{e.message}")
+        nil
+      end
+
+      def remember(names)
+        return if names.empty?
+
+        @cache_mutex.synchronize do
+          names.each { |id, name| @cache.set_user(@workspace.name, id, name) }
+          @cache.save_user_cache(@workspace.name)
+        end
+      end
+
+      def apply(huddle, room, names)
+        return huddle unless room
+
+        known = huddle.participants.map(&:id)
+        added = (room.participant_ids - known).map do |id|
+          Models::HuddleParticipant.new(id: id, name: names[id] || id)
+        end
+        huddle.with(channel_id: room.channel_id,
+                    participants: HuddleScanner.sort_participants(huddle.participants + added))
+      end
+    end
+  end
+end

data/lib/slk/services/huddle_scanner.rb

@@ -26,12 +26,22 @@ module Slk
         member.dig('profile', 'huddle_state') == IN_HUDDLE
       end
 
+      def self.sort(huddles)
+        huddles.sort_by do |huddle|
+          [-huddle.participants.size, huddle.participants.first.name.downcase, huddle.call_id.to_s]
+        end
+      end
+
+      def self.sort_participants(people)
+        people.sort_by { |person| [person.name.downcase, person.id] }
+      end
+
       def initialize(members)
         @members = members
       end
 
       def group
-        huddles.sort_by { |huddle| sort_key(huddle) }
+        self.class.sort(huddles)
       end
 
       private
@@ -67,7 +77,7 @@ module Slk
       end
 
       def sorted_participants(people)
-        people.map { |member| participant(member) }.sort_by { |person| [person.name.downcase, person.id] }
+        self.class.sort_participants(people.map { |member| participant(member) })
       end
 
       def participant(member)
@@ -92,10 +102,6 @@ module Slk
         text = value.to_s
         text.empty? ? nil : text
       end
-
-      def sort_key(huddle)
-        [-huddle.participants.size, huddle.participants.first.name.downcase, huddle.call_id.to_s]
-      end
     end
   end
 end

data/lib/slk/services/pooled_fanout.rb

@@ -0,0 +1,59 @@
+# frozen_string_literal: true
+
+module Slk
+  module Services
+    # Runs a block per item on a few worker threads, each with its own
+    # connection, and returns the results in the original order.
+    #
+    # Net::HTTP is not safe to share across threads, so every worker gets an
+    # isolated client and closes it when the queue is empty. A client that
+    # cannot isolate (a test double) runs the items one at a time on itself.
+    # A failure waits for the other workers, then raises.
+    module PooledFanout
+      module_function
+
+      def call(items, workers:, client:, &block)
+        return items.map { |item| block.call(item, client) } unless pooled?(items, workers, client)
+
+        queue = Queue.new
+        items.each_with_index { |item, index| queue << [item, index] }
+        queue.close
+        results = Array.new(items.size)
+        threads = Array.new([workers, items.size].min) { start(queue, results, client, &block) }
+        wait_for_all(threads)
+        threads.each(&:value)
+        results
+      end
+
+      # Thread#join re-raises a worker's exception at once, which would
+      # return before the other workers close their connections.
+      def wait_for_all(threads)
+        threads.each do |thread|
+          thread.join
+        rescue StandardError
+          nil
+        end
+      end
+
+      def pooled?(items, workers, client)
+        workers > 1 && items.size > 1 && client.respond_to?(:isolated)
+      end
+
+      def start(queue, results, client, &block)
+        worker_client = client.isolated
+        Thread.new { drain(queue, results, worker_client, &block) }.tap do |thread|
+          thread.report_on_exception = false
+        end
+      end
+
+      def drain(queue, results, client, &block)
+        while (job = queue.pop)
+          item, index = job
+          results[index] = block.call(item, client)
+        end
+      ensure
+        client.close if client.respond_to?(:close)
+      end
+    end
+  end
+end

data/lib/slk/version.rb

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

data/lib/slk.rb

@@ -123,6 +123,9 @@ module Slk
     autoload :HuddleScanner, 'slk/services/huddle_scanner'
     autoload :HuddleFetch, 'slk/services/huddle_fetch'
     autoload :HuddleState, 'slk/services/huddle_state'
+    autoload :HuddleRoom, 'slk/services/huddle_room'
+    autoload :HuddleRoomEnricher, 'slk/services/huddle_room_enricher'
+    autoload :PooledFanout, 'slk/services/pooled_fanout'
     autoload :WorkspaceFanout, 'slk/services/workspace_fanout'
     autoload :HuddleChannelLabel, 'slk/services/huddle_channel_label'
     autoload :GroupDmLabel, 'slk/services/group_dm_label'
@@ -199,6 +202,7 @@ module Slk
     autoload :Saved, 'slk/api/saved'
     autoload :CustomStatus, 'slk/api/custom_status'
     autoload :Team, 'slk/api/team'
+    autoload :Huddles, 'slk/api/huddles'
   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.15.0
+  version: 0.16.0
 platform: ruby
 authors:
 - Eric Boehs
@@ -33,6 +33,7 @@ files:
 - lib/slk/api/custom_status.rb
 - lib/slk/api/dnd.rb
 - lib/slk/api/emoji.rb
+- lib/slk/api/huddles.rb
 - lib/slk/api/saved.rb
 - lib/slk/api/search.rb
 - lib/slk/api/team.rb
@@ -120,10 +121,13 @@ files:
 - lib/slk/services/group_dm_label.rb
 - lib/slk/services/huddle_channel_label.rb
 - lib/slk/services/huddle_fetch.rb
+- lib/slk/services/huddle_room.rb
+- lib/slk/services/huddle_room_enricher.rb
 - lib/slk/services/huddle_scanner.rb
 - lib/slk/services/huddle_state.rb
 - lib/slk/services/message_resolver.rb
 - lib/slk/services/meta_cache.rb
+- lib/slk/services/pooled_fanout.rb
 - lib/slk/services/preset_store.rb
 - lib/slk/services/profile_builder.rb
 - lib/slk/services/profile_resolver.rb