slk 0.11.1 → 0.11.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6377478c56d25efc2b234bcd4ab2118bbe394520ff4f48aed0da0db5bb6c2cea
-  data.tar.gz: 869096e0ca163dc27042e199e5b2f4f44c81cbdc176ad00ed8546b59cdac7553
+  metadata.gz: 663f35d4a747ac42d0fb9596caa7dd7b4809d7f3451b811b7fb7e8389c7a991c
+  data.tar.gz: 42e1ba0fda08b83c644b77212155ab2c68ac318d95f4966060624f5f0eb94827
 SHA512:
-  metadata.gz: c5ce6c57a9978ad2152a3267e9892274883a0980ee33f2648fe7ca14718f870ea3a0a7ecfa2420abffdea18b565c500bfda1524f2efc29bb73a35eaa9de56318
-  data.tar.gz: ffb2bd3791481c90223a9050760769868194e8044ffc0750704965180b5dfb750cdad1dd4a297f17e1688fc7e9e41c07a231f0b87d85e0af485a2c221e518f2b
+  metadata.gz: bd98ff12ddd5d0dfcf0ebc33e72852bfffed272c4136b74ed4b63b41ef38c0aab01b28826a02069738556781bec325a63b73eab66407f72c099de9186a6b56c2
+  data.tar.gz: 92a34fac64238598233edf4b8273d4597bb80deb07b316504649e21da575b4f56e75969a5178f2035c5fbaf5f0fa2ac70fe1eeb2e89d5baa3d6054285991a59a

data/CHANGELOG.md

@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.11.2] - 2026-09-24
+
+### Changed
+
+- `slk deactivations` now breaks the active-account total into full members, multi-channel guests, and single-channel guests, excluding bots and deactivated accounts. The summary labels the total as Slack accounts rather than company members, and `--json` adds the same breakdown while retaining `active_members`. An older roster cache is re-fetched so the new counts cannot appear as zeros.
+
 ## [0.11.1] - 2026-09-23
 
 ### Fixed

data/README.md

@@ -225,7 +225,8 @@ slk deactivations --json          # Machine-readable output
 ```
 
 ```
-acme: 16 deactivated since 30d (664 active members)
+acme: 16 deactivated since 30d (664 active accounts)
+  360 full members · 120 multi-channel guests · 184 single-channel guests
 
 2026-09-14  Dana Whitfield          Platform Support
 2026-09-11  Priya Raghunathan       UX Researcher
@@ -239,6 +240,12 @@ for that user. For a deactivated account that change is almost always the
 deactivation, but an admin editing a departed profile afterwards moves the date
 forward, so treat it as "last touched" rather than a payroll record.
 
+The active-account count excludes bots and deactivated accounts; full members and
+both types of Slack guests are shown separately. It is not an employee headcount.
+The same breakdown is available in `--json` as `active_full_members`,
+`active_multi_channel_guests`, and `active_single_channel_guests` (alongside the
+existing `active_members` total).
+
 The roster costs one API call per 1000 members, so the result is cached for six
 hours; `--refresh` re-fetches it.
 
@@ -248,7 +255,8 @@ hours; `--refresh` re-fetches it.
 "Start Date" profile field:
 
 ```
-acme: 3 deactivated since 30d (664 active members)
+acme: 3 deactivated since 30d (664 active accounts)
+  360 full members · 120 multi-channel guests · 184 single-channel guests
 
 2026-09-14  Dana Whitfield         1mo  Platform Support
 2026-09-11  Priya Raghunathan   2y 7mo  UX Researcher

data/lib/slk/commands/deactivations.rb

@@ -309,6 +309,7 @@ module Slk
       def render(workspace, report, records)
         formatter = Formatters::DeactivationFormatter.new(output: output, width: @options[:width])
         formatter.summary(summary_line(workspace, report, records))
+        render_account_breakdown(formatter, report)
         render_body(formatter, workspace, records)
         footer = footer(report, records)
         return if footer.empty?
@@ -340,7 +341,36 @@ module Slk
 
       def summary_line(workspace, report, records)
         "#{workspace.name}: #{records.size} #{scope_phrase} " \
-          "(#{report.active_count} active members)"
+          "(#{count_label(report.active_count, 'active account')})"
+      end
+
+      # Keep each guest type visible without overflowing a narrow terminal.
+      # rubocop:disable Metrics/MethodLength
+      def render_account_breakdown(formatter, report)
+        line = '  '
+        account_parts(report).each do |part|
+          combined = line == '  ' ? "#{line}#{part}" : "#{line} · #{part}"
+          if @options[:width] && combined.length > @options[:width] && line != '  '
+            formatter.note(line)
+            line = "  #{part}"
+          else
+            line = combined
+          end
+        end
+        formatter.note(line)
+      end
+      # rubocop:enable Metrics/MethodLength
+
+      def account_parts(report)
+        [
+          count_label(report.full_member_count, 'full member'),
+          count_label(report.multi_channel_guest_count, 'multi-channel guest'),
+          count_label(report.single_channel_guest_count, 'single-channel guest')
+        ]
+      end
+
+      def count_label(count, singular)
+        "#{count} #{singular}#{'s' unless count == 1}"
       end
 
       def scope_phrase
@@ -390,7 +420,7 @@ module Slk
         {
           workspace: workspace.name,
           fetched_at: report.fetched_at,
-          active_members: report.active_count,
+          **active_counts_json(report),
           accounts_ever: report.human_count,
           total_deactivated: total_deactivated(report),
           includes_bots: @options[:bots] ? true : false,
@@ -399,6 +429,15 @@ module Slk
         }
       end
 
+      def active_counts_json(report)
+        {
+          active_members: report.active_count,
+          active_full_members: report.full_member_count,
+          active_multi_channel_guests: report.multi_channel_guest_count,
+          active_single_channel_guests: report.single_channel_guest_count
+        }
+      end
+
       # started_on and tenure_months appear only when they were asked for:
       # a null that means "not looked up" is indistinguishable from one that
       # means "nobody filled it in".

data/lib/slk/services/deactivation_scanner.rb

@@ -11,11 +11,17 @@ module Slk
     # (deactivated members plus headcounts, not the whole roster) is cached in
     # the workspace meta cache with a TTL.
     class DeactivationScanner
-      CACHE_KEY = 'deactivations_v1'
+      CACHE_KEY = 'deactivations_v2'
       DEFAULT_TTL = 21_600 # 6 hours
-      REQUIRED_KEYS = %w[fetched_at member_count human_count active_count records].freeze
-
-      Report = Data.define(:records, :member_count, :human_count, :active_count, :fetched_at) do
+      REQUIRED_KEYS = %w[
+        fetched_at member_count human_count active_count full_member_count
+        multi_channel_guest_count single_channel_guest_count records
+      ].freeze
+
+      Report = Data.define(
+        :records, :member_count, :human_count, :active_count, :full_member_count,
+        :multi_channel_guest_count, :single_channel_guest_count, :fetched_at
+      ) do
         def deactivated_count = records.size
 
         def bots = records.count(&:bot)
@@ -70,30 +76,55 @@ module Slk
 
       def counts(members)
         humans = members.reject { |m| Models::Deactivation.bot?(m) }
+        active = humans.reject { |m| m['deleted'] }
 
         {
           'member_count' => members.size,
           'human_count' => humans.size,
-          'active_count' => humans.count { |m| !m['deleted'] }
+          'active_count' => active.size
+        }.merge(guest_counts(active))
+      end
+
+      def guest_counts(active)
+        groups = active.group_by { |member| guest_type(member) }
+        {
+          'full_member_count' => groups.fetch(:full, []).size,
+          'multi_channel_guest_count' => groups.fetch(:multi, []).size,
+          'single_channel_guest_count' => groups.fetch(:single, []).size
         }
       end
 
+      def guest_type(member)
+        return :single if member['is_ultra_restricted']
+        return :multi if member['is_restricted']
+
+        :full
+      end
+
       def fetch_members
         @users_api.list_all do |total|
           @on_debug&.call("users.list: #{total} members fetched")
         end
       end
 
+      # Keep the cache fields explicit: a missing headcount must not become a
+      # plausible-looking zero without usable? first checking the cache shape.
+      # rubocop:disable Metrics/AbcSize
       def build_report(data)
         Report.new(
           records: sorted_records(data['records'] || []),
           member_count: data['member_count'].to_i,
           human_count: data['human_count'].to_i,
           active_count: data['active_count'].to_i,
+          full_member_count: data['full_member_count'].to_i,
+          multi_channel_guest_count: data['multi_channel_guest_count'].to_i,
+          single_channel_guest_count: data['single_channel_guest_count'].to_i,
           fetched_at: data['fetched_at']&.to_i
         )
       end
 
+      # rubocop:enable Metrics/AbcSize
+
       # Newest first; accounts with no usable timestamp sort to the bottom
       # rather than pretending to be from 1970.
       def sorted_records(raw)

data/lib/slk/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: slk
 version: !ruby/object:Gem::Version
-  version: 0.11.1
+  version: 0.11.2
 platform: ruby
 authors:
 - Eric Boehs