slk 0.11.0 → 0.11.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c7db83e915de4b86bafd0cc62e8a67fdaee0dcd9209cb94a1f8fd6a5a2704c46
-  data.tar.gz: eb25d2aafaa23a51016e64c2f5eb40c0117aeacb829d784caff9a50078946992
+  metadata.gz: 663f35d4a747ac42d0fb9596caa7dd7b4809d7f3451b811b7fb7e8389c7a991c
+  data.tar.gz: 42e1ba0fda08b83c644b77212155ab2c68ac318d95f4966060624f5f0eb94827
 SHA512:
-  metadata.gz: 2d928dbf2906c22dc3ad108503c6ef4bfaeb68c29c0ed562dcd27e3515cf1468df426801dc6f7e73a3c2f9bb47d79fd7bf90054b3a9fc424453a35e8f60fd75d
-  data.tar.gz: 93850e6e114cd1634ce2546631b1c370eb94731ff284eb29c05c458a533f16fb1229afde2ca27f60e6ea2e00d12828d6db17342f1d336350cc59d5ae788cc1bb
+  metadata.gz: bd98ff12ddd5d0dfcf0ebc33e72852bfffed272c4136b74ed4b63b41ef38c0aab01b28826a02069738556781bec325a63b73eab66407f72c099de9186a6b56c2
+  data.tar.gz: 92a34fac64238598233edf4b8273d4597bb80deb07b316504649e21da575b4f56e75969a5178f2035c5fbaf5f0fa2ac70fe1eeb2e89d5baa3d6054285991a59a

data/CHANGELOG.md

@@ -7,6 +7,18 @@ 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
+
+- `slk sent` and URL-based message history now use built-in rational arithmetic for exact Slack timestamps instead of requiring the optional `bigdecimal` gem. A standalone install on Ruby 3.4+ works without development dependencies; CI checks the packaged gem in an isolated gem home.
+
 ## [0.11.0] - 2026-09-23
 
 ### Changed

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/commands/messages.rb

@@ -228,8 +228,7 @@ module Slk
 
       # Adjust a Slack timestamp by a small amount while preserving precision
       def adjust_timestamp(timestamp, delta)
-        require 'bigdecimal'
-        (BigDecimal(timestamp) + BigDecimal(delta.to_s)).to_s('F')
+        Support::DecimalTimestamp.add(timestamp, delta)
       end
 
       def fetch_all_thread_replies(api, channel_id, thread_ts)

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/services/sent_changes.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'bigdecimal'
-
 module Slk
   module Services
     # Stateless diff of watched sent conversations. Search discovers what to
@@ -32,7 +30,7 @@ module Slk
           conversation = change.conversation
           # Put the most recently active conversation last. Trailing identity
           # keys make ties deterministic across platforms (including Windows).
-          [BigDecimal(conversation.messages.last.ts), conversation.workspace.name.to_s,
+          [Support::DecimalTimestamp.parse(conversation.messages.last.ts), conversation.workspace.name.to_s,
            conversation.channel_id.to_s, conversation.thread_ts.to_s]
         end
       end
@@ -90,8 +88,8 @@ module Slk
         cursor = nil
         loop do
           response = @api.history(channel: hits.first.channel_id,
-                                  oldest: roots.min_by { |root| BigDecimal(root) }, inclusive: true,
-                                  limit: 200, cursor: cursor)
+                                  oldest: roots.min_by { |root| Support::DecimalTimestamp.parse(root) },
+                                  inclusive: true, limit: 200, cursor: cursor)
           response.fetch('messages', []).each do |message|
             found[message['ts']] = message if wanted[message['ts']]
           end
@@ -253,7 +251,7 @@ module Slk
 
       def normalize(raw, channel_id)
         raw.map { |row| row.is_a?(Models::Message) ? row : Models::Message.from_api(row, channel_id: channel_id) }
-           .uniq(&:ts).sort_by { |message| BigDecimal(message.ts) }
+           .uniq(&:ts).sort_by { |message| Support::DecimalTimestamp.parse(message.ts) }
       end
 
       def after_cutoff(raw)
@@ -265,7 +263,7 @@ module Slk
       end
 
       def newer?(timestamp)
-        BigDecimal(timestamp) > BigDecimal(@since_ts)
+        Support::DecimalTimestamp.parse(timestamp) > Support::DecimalTimestamp.parse(@since_ts)
       end
 
       def page_through(endpoint, **params)

data/lib/slk/services/sent_conversations.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'bigdecimal'
-
 module Slk
   module Services
     # Expands indexed from:me hits into bounded channel windows, full DM
@@ -42,7 +40,7 @@ module Slk
       def ordered_conversations(conversations)
         conversations.sort_by do |conversation|
           # Keep Slack's fractional timestamp precise; identity breaks ties regardless of input order or platform.
-          [BigDecimal(conversation.first_sent_ts), conversation.workspace.name.to_s,
+          [Support::DecimalTimestamp.parse(conversation.first_sent_ts), conversation.workspace.name.to_s,
            conversation.channel_id.to_s, conversation.thread_ts.to_s]
         end
       end
@@ -115,7 +113,7 @@ module Slk
       def following_messages(channel_id, window)
         return [] if @after_seconds.zero?
 
-        end_at = (BigDecimal(window.last.ts) + @after_seconds).to_s('F')
+        end_at = Support::DecimalTimestamp.add(window.last.ts, @after_seconds)
         page_through(:history, channel: channel_id, oldest: window.first.ts, latest: end_at, inclusive: true)
       end
 

data/lib/slk/support/check_in_time.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require 'bigdecimal'
 require 'date'
 require 'time'
 
@@ -31,7 +30,7 @@ module Slk
       end
 
       def self.epoch_time(value)
-        Time.at(BigDecimal(value).to_r)
+        Time.at(DecimalTimestamp.parse(value))
       rescue ArgumentError
         raise UsageError, "Invalid --changed-since time: #{value.inspect}."
       end

data/lib/slk/support/decimal_timestamp.rb

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+module Slk
+  module Support
+    # Exact decimal arithmetic for Slack timestamps without an optional gem.
+    module DecimalTimestamp
+      def self.parse(value)
+        Rational(value.to_s)
+      end
+
+      def self.add(timestamp, offset)
+        decimal(parse(timestamp) + parse(offset))
+      end
+
+      def self.decimal(value)
+        twos, remaining = factor(value.denominator, 2)
+        fives, remaining = factor(remaining, 5)
+        raise ArgumentError, 'Timestamp must have a finite decimal representation' unless remaining == 1
+
+        places = [twos, fives].max
+        scaled = value.numerator * ((10**places) / value.denominator)
+        format_digits(scaled, places)
+      end
+
+      def self.format_digits(scaled, places)
+        digits = scaled.abs.to_s.rjust(places + 1, '0')
+        sign = scaled.negative? ? '-' : ''
+        return "#{sign}#{digits}.0" if places.zero?
+
+        "#{sign}#{digits[0...-places]}.#{digits[-places..]}"
+      end
+      private_class_method :format_digits
+
+      def self.factor(number, divisor)
+        count = 0
+        while (number % divisor).zero?
+          number /= divisor
+          count += 1
+        end
+        [count, number]
+      end
+      private_class_method :factor
+    end
+  end
+end

data/lib/slk/version.rb

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

data/lib/slk.rb

@@ -200,6 +200,7 @@ module Slk
     autoload :InteractivePrompt, 'slk/support/interactive_prompt'
     autoload :DateParser, 'slk/support/date_parser'
     autoload :CheckInTime, 'slk/support/check_in_time'
+    autoload :DecimalTimestamp, 'slk/support/decimal_timestamp'
     autoload :TimeParser, 'slk/support/time_parser'
     autoload :TimeRangeParser, 'slk/support/time_range_parser'
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: slk
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.11.2
 platform: ruby
 authors:
 - Eric Boehs
@@ -137,6 +137,7 @@ files:
 - lib/slk/services/who_target_resolver.rb
 - lib/slk/support/check_in_time.rb
 - lib/slk/support/date_parser.rb
+- lib/slk/support/decimal_timestamp.rb
 - lib/slk/support/error_logger.rb
 - lib/slk/support/help_formatter.rb
 - lib/slk/support/inline_images.rb