From 6aa4391a49f597345694c3f5b1fba67c9018cd19 Mon Sep 17 00:00:00 2001
From: "thalamus-cortexos[bot]"
 <thalamus-cortexos[bot]@users.noreply.github.com>
Date: Sat, 22 Aug 2026 14:41:56 +0000
Subject: [PATCH] fix(desktop): show agent activity in DMs

Signed-off-by: thalamus-cortexos[bot] <thalamus-cortexos[bot]@users.noreply.github.com>
---
 .../ui/ChannelComposerActivityAccessory.tsx   |  6 +-
 .../ui/useChannelActivityTyping.test.mjs      | 63 +++++++++++++++++++
 .../channels/ui/useChannelAgentSessions.ts    | 15 +++++
 3 files changed, 81 insertions(+), 3 deletions(-)

diff --git a/desktop/src/features/channels/ui/ChannelComposerActivityAccessory.tsx b/desktop/src/features/channels/ui/ChannelComposerActivityAccessory.tsx
index f99888f0112..f1cdb49a881 100644
--- a/desktop/src/features/channels/ui/ChannelComposerActivityAccessory.tsx
+++ b/desktop/src/features/channels/ui/ChannelComposerActivityAccessory.tsx
@@ -40,10 +40,10 @@ export function ChannelComposerActivityAccessory({
       testId="channel-composer-activity-row"
       visible={visible}
     >
-      <div className="flex w-full items-center gap-2 overflow-visible pl-2">
+      <div className="flex w-full min-w-0 items-center justify-start gap-2 overflow-visible pl-2">
         {cardMintJobs.length > 0 ? <CardMintComposerChip /> : null}
         {workingBotPubkeys.length > 0 ? (
-          <div className="flex min-w-0 flex-1 overflow-visible">
+          <div className="flex min-w-0 shrink overflow-visible">
             <BotActivityComposerAction
               agents={agents}
               channelId={channel?.id ?? null}
@@ -58,7 +58,7 @@ export function ChannelComposerActivityAccessory({
         {typingPubkeys.length > 0 ? (
           <TypingIndicatorRow
             channel={channel}
-            className="min-w-0 flex-1 py-0 pl-[calc(0.75rem+1px)] pr-0 sm:pl-[calc(1rem+1px)]"
+            className="min-w-0 shrink py-0 px-0"
             currentPubkey={currentPubkey}
             profiles={profiles}
             typingPubkeys={typingPubkeys}
diff --git a/desktop/src/features/channels/ui/useChannelActivityTyping.test.mjs b/desktop/src/features/channels/ui/useChannelActivityTyping.test.mjs
index 3e3943f43e4..56455642c6c 100644
--- a/desktop/src/features/channels/ui/useChannelActivityTyping.test.mjs
+++ b/desktop/src/features/channels/ui/useChannelActivityTyping.test.mjs
@@ -12,6 +12,7 @@ import {
   channelScopedBotTypingPubkeyKey,
   mergeMemberAgentFlagsIntoProfiles,
 } from "./useChannelActivityTyping.ts";
+import { getChannelAgentSessionAgents } from "./useChannelAgentSessions.ts";
 
 const AGENT =
   "abcd1234abcd1234abcd1234abcd1234abcd1234abcd1234abcd1234abcd1234";
@@ -43,6 +44,68 @@ describe("channelScopedBotTypingPubkeyKey", () => {
   });
 });
 
+describe("DM agent typing classification", () => {
+  it("admits a known relay agent who participates in the active DM", () => {
+    const dm = {
+      id: "dm-1",
+      name: "Sigma DM",
+      channelType: "dm",
+      participantPubkeys: [AGENT, AGENT_2],
+    };
+    const agents = [
+      {
+        pubkey: AGENT,
+        name: "Sigma",
+        status: "deployed",
+        agentSource: "relay",
+        canInterruptTurn: false,
+        channelIds: [],
+        channels: [],
+      },
+    ];
+
+    assert.deepEqual(
+      getChannelAgentSessionAgents({
+        activeChannel: dm,
+        activeChannelId: dm.id,
+        agents,
+        channelMembers: [],
+      }),
+      agents,
+    );
+  });
+
+  it("does not admit a known agent who is not a DM participant", () => {
+    const dm = {
+      id: "dm-1",
+      name: "Sigma DM",
+      channelType: "dm",
+      participantPubkeys: [AGENT_2],
+    };
+    const agents = [
+      {
+        pubkey: AGENT,
+        name: "Sigma",
+        status: "deployed",
+        agentSource: "relay",
+        canInterruptTurn: false,
+        channelIds: [],
+        channels: [],
+      },
+    ];
+
+    assert.deepEqual(
+      getChannelAgentSessionAgents({
+        activeChannel: dm,
+        activeChannelId: dm.id,
+        agents,
+        channelMembers: [],
+      }),
+      [],
+    );
+  });
+});
+
 describe("thread-only bot typing regression", () => {
   beforeEach(() => {
     resetActiveAgentTurnsStore();
diff --git a/desktop/src/features/channels/ui/useChannelAgentSessions.ts b/desktop/src/features/channels/ui/useChannelAgentSessions.ts
index 8420c373279..7504b91142b 100644
--- a/desktop/src/features/channels/ui/useChannelAgentSessions.ts
+++ b/desktop/src/features/channels/ui/useChannelAgentSessions.ts
@@ -131,6 +131,14 @@ export function getChannelAgentSessionAgents({
           .map((member) => normalizePubkey(member.pubkey)),
       )
     : null;
+  const dmParticipantPubkeys =
+    activeChannel.channelType === "dm"
+      ? new Set(
+          activeChannel.participantPubkeys.map((pubkey) =>
+            normalizePubkey(pubkey),
+          ),
+        )
+      : null;
 
   return agents.filter((agent) => {
     const normalizedPubkey = normalizePubkey(agent.pubkey);
@@ -142,6 +150,13 @@ export function getChannelAgentSessionAgents({
       channelIds.includes(activeChannelId) ||
       channels.includes(activeChannel.name);
 
+    // DMs do not reliably expose channel membership or directory channel
+    // scope. A participant that is already a known managed/relay agent must
+    // still be classified as an agent so its typing feeds the working signal.
+    if (dmParticipantPubkeys?.has(normalizedPubkey)) {
+      return true;
+    }
+
     if (agent.agentSource === "member-bot") {
       return botMemberPubkeys?.has(normalizedPubkey) ?? matchesDeclaredChannel;
     }