Add Slack DM recipient picker (user-message mount model)

src/main/__tests__/integration-event-bridge.test.ts

@@ -9,6 +9,7 @@ import {
   getIntegrationEventTelemetrySnapshot,
   IntegrationEventBridge,
   createWorkspaceScopedEventClient,
+  eventPathGlobsForIntegration,
   integrationSubscriptionSummaries,
   integrationRelayFileSyncOptions,
   localWatchEventPathsForFilename,
@@ -306,6 +307,29 @@ test('relayfile sdk path filters broaden partial-segment Slack DM globs', () =>
   ])
 })
 
+test('slack DM watch globs use the user-message model and drop vestigial /slack/dms', () => {
+  const slackDm = integration({
+    provider: 'slack',
+    integrationId: 'slack-1',
+    mountPaths: ['/slack/channels/C123ABC__proj-cloud'],
+    scope: { listenDms: true }
+  })
+  const globs = eventPathGlobsForIntegration(slackDm)
+  assert.ok(globs.includes('/slack/users/*/messages/**'), 'canonical user-message DM watch present')
+  assert.ok(globs.includes('/slack/channels/D*/**'), 'raw-D diagnostic alias retained')
+  assert.ok(!globs.includes('/slack/dms/*/**'), 'vestigial /slack/dms watch glob dropped')
+
+  const noDm = integration({
+    provider: 'slack',
+    integrationId: 'slack-2',
+    mountPaths: ['/slack/channels/C123ABC__proj-cloud'],
+    scope: { listenDms: false }
+  })
+  const noDmGlobs = eventPathGlobsForIntegration(noDm)
+  assert.ok(!noDmGlobs.includes('/slack/users/*/messages/**'), 'no DM watch when listenDms is off')
+  assert.ok(!noDmGlobs.includes('/slack/channels/D*/**'), 'no raw-D diagnostic watch when listenDms is off')
+})
+
 test('integration event remote stream keeps a refreshable relayfile token provider', () => {
   const tokenProvider = async () => 'workspace-token'
   const options = integrationRelayFileSyncOptions({

src/main/integration-event-bridge.ts

@@ -38,9 +38,15 @@ const INTEGRATION_EVENT_LOG_PATH = join(homedir(), '.agentworkforce', 'pear', 'i
 const AGGREGATED_WARNING_REPEAT_EVERY = 25
 const MAX_AGGREGATED_WARNING_KEYS = 256
 const SLACK_LIVE_EVENT_WINDOW_MS = 30 * 60 * 1_000
+// DM event watch globs. Canonical 1:1 DM surface is the user-recipient model
+// `/slack/users/<U>/messages` (where the adapter materializes message.im once
+// D→U mapping lands). `/slack/channels/D*` is retained only as a diagnostic
+// alias for raw Slack IM conversation ids the adapter still materializes
+// channel-style today. `/slack/dms/*` was vestigial residue — no adapter
+// resource or record ever materialized there — so it is intentionally dropped;
+// it must not imply mounted/readable DM content.
 const SLACK_DM_EVENT_GLOBS = [
   '/slack/channels/D*/**',
-  '/slack/dms/*/**',
   '/slack/users/*/messages/**'
 ]
 const MAX_EVENT_CONTEXT_PREVIEW_BYTES = 32 * 1024
@@ -480,7 +486,7 @@ function watchGlobForPath(path: string): string {
   return root.endsWith('/**') ? root : `${root || '/'}/**`
 }
 
-function eventPathGlobsForIntegration(integration: ConnectedIntegration): string[] {
+export function eventPathGlobsForIntegration(integration: ConnectedIntegration): string[] {
   return dedupeStrings([
     ...canonicalMountPaths(integration).map(watchGlobForPath),
     ...(slackListenDms(integration) ? SLACK_DM_EVENT_GLOBS : [])

src/renderer/src/components/settings/ProjectSettings.tsx

@@ -24,9 +24,15 @@ import { ProactiveAgentsSection } from '@/components/proactive/ProactiveAgentsSe
 import { pear, type ConnectedIntegration } from '@/lib/ipc'
 import {
   SlackChannelPicker,
+  SlackDmRecipientPicker,
   type IntegrationAccessibleResource,
   type ScopePickerValue
 } from '@/components/settings/scope-pickers'
+import {
+  isSlackUserMessagesMountPath,
+  mergeSlackScopeMountPaths,
+  slackUserResourceFromOption
+} from '@/components/settings/slack-scope'
 import { useAgentStore } from '@/stores/agent-store'
 import {
   normalizeChannelName,
@@ -385,6 +391,7 @@ function IntegrationVisibilitySection({
   const [error, setError] = useState<string | null>(null)
   const [scopeEditorIntegrationId, setScopeEditorIntegrationId] = useState<string | null>(null)
   const [pendingScopeValue, setPendingScopeValue] = useState<ScopePickerValue | null>(null)
+  const [pendingDmScopeValue, setPendingDmScopeValue] = useState<ScopePickerValue | null>(null)
   const [pendingSlackListenDms, setPendingSlackListenDms] = useState<boolean | null>(null)
   const resourceCacheRef = useRef(new Map<string, ResourceCacheEntry>())
 
@@ -634,6 +641,23 @@ function IntegrationVisibilitySection({
     })
   }, [cachedResources, projectId])
 
+  const listSlackDmRecipients = useCallback(async (integration: ConnectedIntegration): Promise<IntegrationAccessibleResource[]> => {
+    const cacheKey = `slack-users:${projectId}:${integration.integrationId}`
+    return cachedResources(cacheKey, async () => {
+      const listOptions = (pear.integrations as typeof pear.integrations & {
+        listOptions?: typeof pear.integrations.listOptions
+      }).listOptions
+      if (typeof listOptions !== 'function') {
+        throw new Error('Slack DM recipient options are not available yet.')
+      }
+      const options = await listOptions(projectId, integration.provider, 'users')
+      if (!Array.isArray(options)) {
+        throw new Error('Slack DM recipient options returned an unexpected response.')
+      }
+      return options.map(slackUserResourceFromOption)
+    })
+  }, [cachedResources, projectId])
+
   const saveSlackSourceChannels = useCallback(async (integration: ConnectedIntegration) => {
     const listenDms = pendingSlackListenDms ?? slackListenDmsFromScope(integration.scope)
     const nextScope = {
@@ -642,8 +666,18 @@ function IntegrationVisibilitySection({
       selection: pendingScopeValue?.scope.selection ?? integration.scope.selection ?? 'selected',
       channels: pendingScopeValue?.scope.channels ?? integration.scope.channels ?? [],
       resources: pendingScopeValue?.scope.resources ?? integration.scope.resources ?? [],
+      dmUsers: pendingDmScopeValue?.scope.dmUsers ?? integration.scope.dmUsers ?? [],
       listenDms
     }
+    const nextMountPaths = mergeSlackScopeMountPaths({
+      existing: integration.mountPaths ?? [],
+      channelPaths: pendingScopeValue?.mountPaths ?? null,
+      // Only mount concrete `/slack/users/<U>/messages` recipients — never a bare
+      // `/slack/users` root (emitted when no users are available to select).
+      dmPaths: pendingDmScopeValue
+        ? (pendingDmScopeValue.mountPaths ?? []).filter(isSlackUserMessagesMountPath)
+        : null
+    })
 
     setBusyIntegrationId(integration.integrationId)
     setError(null)
@@ -652,7 +686,7 @@ function IntegrationVisibilitySection({
         projectId,
         integration.integrationId,
         nextScope,
-        pendingScopeValue?.mountPaths ?? integration.mountPaths
+        nextMountPaths
       )
       setIntegrations((current) =>
         current.map((entry) =>
@@ -661,13 +695,14 @@ function IntegrationVisibilitySection({
       )
       setScopeEditorIntegrationId(null)
       setPendingScopeValue(null)
+      setPendingDmScopeValue(null)
       setPendingSlackListenDms(null)
     } catch (err) {
       setError(err instanceof Error ? err.message : String(err))
     } finally {
       setBusyIntegrationId(null)
     }
-  }, [pendingScopeValue, pendingSlackListenDms, projectId])
+  }, [pendingScopeValue, pendingDmScopeValue, pendingSlackListenDms, projectId])
 
   return (
     <Section
@@ -729,11 +764,19 @@ function IntegrationVisibilitySection({
             const scopeEditorOpen = scopeEditorIntegrationId === integration.integrationId
             const savedSlackListenDms = slackListenDmsFromScope(integration.scope)
             const slackListenDms = pendingSlackListenDms ?? savedSlackListenDms
+            const integrationMountPaths = integration.mountPaths ?? []
             const selectedSlackSourceIds = Array.from(new Set([
-              ...integration.mountPaths,
+              ...integrationMountPaths,
               ...scopeStringList(integration.scope, 'channels')
             ]))
-            const slackScopeDirty = !!pendingScopeValue || (
+            const selectedSlackDmRecipientIds = Array.from(new Set([
+              ...integrationMountPaths
+                .filter(isSlackUserMessagesMountPath)
+                .map((path) => path.split('/')[3])
+                .filter(Boolean),
+              ...scopeStringList(integration.scope, 'dmUsers')
+            ]))
+            const slackScopeDirty = !!pendingScopeValue || !!pendingDmScopeValue || (
               pendingSlackListenDms !== null && pendingSlackListenDms !== savedSlackListenDms
             )
             const knownTargetValues = new Set([
@@ -773,6 +816,7 @@ function IntegrationVisibilitySection({
                       disabled={busy}
                       onClick={() => {
                         setPendingScopeValue(null)
+                        setPendingDmScopeValue(null)
                         setPendingSlackListenDms(scopeEditorOpen ? null : savedSlackListenDms)
                         setScopeEditorIntegrationId(scopeEditorOpen ? null : integration.integrationId)
                       }}
@@ -879,16 +923,28 @@ function IntegrationVisibilitySection({
                       />
                       <span className="min-w-0">
                         <span className="block text-sm text-[var(--pear-text)]">Direct messages</span>
-                        <span className="block text-xs text-[var(--pear-text-faint)]">Listen for Slack DMs</span>
+                        <span className="block text-xs text-[var(--pear-text-faint)]">
+                          Observe DM events (watch-only). Choose recipients below to read &amp; send their DMs.
+                        </span>
                       </span>
                     </label>
+                    <div className="mt-3">
+                      <SlackDmRecipientPicker
+                        provider="slack"
+                        disabled={busy}
+                        initialSelectedIds={selectedSlackDmRecipientIds}
+                        listAccessibleResources={() => listSlackDmRecipients(integration)}
+                        onChange={setPendingDmScopeValue}
+                      />
+                    </div>
                     <div className="mt-3 flex justify-end gap-2">
                       <button
                         type="button"
                         disabled={busy}
                         onClick={() => {
                           setScopeEditorIntegrationId(null)
                           setPendingScopeValue(null)
+                          setPendingDmScopeValue(null)
                           setPendingSlackListenDms(null)
                         }}
                         className="h-8 rounded-md border border-[var(--pear-border)] px-3 text-xs text-[var(--pear-text-dim)] hover:text-[var(--pear-text)] disabled:opacity-40"

src/renderer/src/components/settings/scope-pickers/GenericScopePicker.tsx

@@ -32,6 +32,10 @@ type GenericScopePickerProps = ScopePickerProps & {
   resourceNoun?: string
   baseMountPath?: string
   scopeKey?: string
+  // When no prior selection exists, select every resource by default (true) or
+  // none (false). Bounded "watch everything" surfaces like channels default to
+  // true; DM recipients default to false so we never mount every user's DMs.
+  defaultSelectAll?: boolean
   getResourceLabel?: (resource: IntegrationAccessibleResource) => string
   getResourceDescription?: (resource: IntegrationAccessibleResource) => string
   getResourceMountSegment?: (resource: IntegrationAccessibleResource) => string
@@ -89,6 +93,7 @@ export function GenericScopePicker({
   resourceNoun = 'resources',
   baseMountPath = `/integrations/${provider}`,
   scopeKey = 'resources',
+  defaultSelectAll = true,
   getResourceLabel = (resource) => resourceText(resource, 'displayName', 'title', 'name', 'slug', 'key', 'path', 'id'),
   getResourceDescription = (resource) => resourceText(resource, 'path', 'type', 'kind'),
   getResourceMountSegment = (resource) => resourceText(resource, 'path', 'slug', 'key', 'name', 'id'),
@@ -103,13 +108,15 @@ export function GenericScopePicker({
   const getResourceScopeIdRef = useRef(getResourceScopeId)
   const listAccessibleResourcesRef = useRef(listAccessibleResources)
   const initialSelectedIdsRef = useRef(initialSelectedIds)
+  const defaultSelectAllRef = useRef(defaultSelectAll)
 
   useEffect(() => {
     onChangeRef.current = onChange
     getResourceMountSegmentRef.current = getResourceMountSegment
     getResourceScopeIdRef.current = getResourceScopeId
     listAccessibleResourcesRef.current = listAccessibleResources
     initialSelectedIdsRef.current = initialSelectedIds
+    defaultSelectAllRef.current = defaultSelectAll
   })
 
   useEffect(() => {
@@ -126,7 +133,9 @@ export function GenericScopePicker({
           new Set(
             seeds && seeds.length > 0
               ? seeds
-              : nextResources.map(resourceId)
+              : defaultSelectAllRef.current
+                ? nextResources.map(resourceId)
+                : []
           )
         )
       })
@@ -153,9 +162,10 @@ export function GenericScopePicker({
   )
 
   useEffect(() => {
-    if (loading) return
+    if (loading || error) return
 
     if (resources.length === 0) {
+      if (!defaultSelectAll) return
       onChangeRef.current({
         scope: { provider, selection: 'all', [scopeKey]: [] },
         mountPaths: [baseMountPath]
@@ -181,6 +191,8 @@ export function GenericScopePicker({
     })
   }, [
     baseMountPath,
+    defaultSelectAll,
+    error,
     loading,
     provider,
     resources.length,

src/renderer/src/components/settings/scope-pickers/SlackDmRecipientPicker.tsx

@@ -0,0 +1,26 @@
+import type React from 'react'
+import { GenericScopePicker, metadataText, resourceText, type ScopePickerProps } from './GenericScopePicker'
+import { slackDmMountSegment, slackDmUserId } from '../slack-scope'
+
+export function SlackDmRecipientPicker(props: ScopePickerProps): React.ReactNode {
+  return (
+    <GenericScopePicker
+      {...props}
+      title="Choose DM recipients"
+      resourceNoun="people"
+      baseMountPath="/slack/users"
+      scopeKey="dmUsers"
+      defaultSelectAll={false}
+      getResourceLabel={(resource) => {
+        const name = resourceText(resource, 'displayName', 'name', 'title')
+        if (!name) return slackDmUserId(resource)
+        return name.startsWith('@') ? name : `@${name}`
+      }}
+      getResourceDescription={(resource) =>
+        metadataText(resource, 'realName', 'email', 'workspace', 'team') || slackDmUserId(resource)
+      }
+      getResourceMountSegment={slackDmMountSegment}
+      getResourceScopeId={slackDmUserId}
+    />
+  )
+}

src/renderer/src/components/settings/scope-pickers/index.ts

@@ -11,3 +11,4 @@ export { GitHubRepoPicker } from './GitHubRepoPicker'
 export { LinearTeamPicker } from './LinearTeamPicker'
 export { NotionDatabasePicker } from './NotionDatabasePicker'
 export { SlackChannelPicker } from './SlackChannelPicker'
+export { SlackDmRecipientPicker } from './SlackDmRecipientPicker'