diff --git a/CLAUDE-RESUME-NOW.md b/CLAUDE-RESUME-NOW.md
index dac70dc..c0cdd3b 100644
--- a/CLAUDE-RESUME-NOW.md
+++ b/CLAUDE-RESUME-NOW.md
@@ -56,3 +56,10 @@
 - **PR 67** ✅ `fix(adapters): poll run lease during silent runtime work` — merged
 - **PR 69** ✅ `fix(teamchat): retry delegated replies when external origin is missing` — merged
 - **0 stale branches**, **0 draft PRs**
+
+### Shell.tsx TypeScript fixes
+- ✅ **Shell.tsx TS errors fixed** (PR #71 introduced type mismatches)
+  - `ConversationBotPicker` now receives `bots: Bot[]` (not `SpaceBot[]`)
+  - `conversationSidebarGroups` render simplified — only bots, removed dead `GroupAvatar` branch
+  - `projectSidebarGroups` render uses `GroupAvatar` with proper members access
+  - All TypeScript errors resolved (0 errors across apps/web and packages/adapters)
diff --git a/apps/web/src/pages/Shell.tsx b/apps/web/src/pages/Shell.tsx
index 51831c7..7a4992f 100644
--- a/apps/web/src/pages/Shell.tsx
+++ b/apps/web/src/pages/Shell.tsx
@@ -3140,7 +3140,7 @@ export function ShellPage() {
                           className="w-auto gap-0 overflow-hidden p-0 data-closed:animate-none"
                         >
                           <ConversationBotPicker
-                            bots={homeSpaceBots}
+                            bots={bots}
                             onCreateBot={() => {
                               setConversationPickerOpen(false);
                               setPanel("create");
@@ -3336,14 +3336,7 @@ export function ShellPage() {
                                 className={`flex w-full items-center gap-3 rounded-2xl px-3 py-3 mb-[2px] text-start transition-all duration-150 cursor-pointer min-h-[52px] ${
                                   item.kind === "bot" ? "cursor-grab active:cursor-grabbing" : ""
                                 } ${
-                                  (
-                                    item.kind === "bot" && !inGroup && active?.id === item.chat.id
-                                  ) ||
-                                  (
-                                    item.kind === "group" &&
-                                      inGroup &&
-                                      activeGroup?.id === item.chat.id
-                                  )
+                                  !inGroup && active?.id === item.chat.id
                                     ? "bg-white/[0.09] shadow-[inset_0_1px_0_rgba(255,255,255,0.14),0_4px_16px_rgba(0,0,0,0.4)] border border-emerald-500/30"
                                     : "hover:bg-white/[0.05] border border-transparent"
                                 }`}
@@ -3352,34 +3345,23 @@ export function ShellPage() {
                                     item.kind === "bot" && draggedBotId === item.chat.id ? 0.55 : 1,
                                 }}
                               >
-                                {item.kind === "bot" ? (
-                                  <div className="relative shrink-0">
-                                    <BotAvatar
-                                      color={item.chat.color}
-                                      identity={item.chat.id}
-                                      size={40}
-                                      status={item.chat.status}
-                                    />
-                                    <span
-                                      className={`absolute -bottom-0.5 -right-0.5 size-2.5 rounded-full border-2 border-[#0b0c10] ${
-                                        item.chat.status === "running"
-                                          ? "bg-amber-400 animate-pulse"
-                                          : item.chat.status === "idle"
-                                            ? "bg-emerald-400"
-                                            : "bg-indigo-400"
-                                      }`}
-                                    />
-                                  </div>
-                                ) : (
-                                  <GroupAvatar
-                                    members={
-                                      item.chat.id === activeSnapshot?.groupId
-                                        ? (activeSnapshot?.members ?? item.chat.members)
-                                        : item.chat.members
-                                    }
+                                <div className="relative shrink-0">
+                                  <BotAvatar
+                                    color={item.chat.color}
+                                    identity={item.chat.id}
                                     size={40}
+                                    status={item.chat.status}
                                   />
-                                )}
+                                  <span
+                                    className={`absolute -bottom-0.5 -right-0.5 size-2.5 rounded-full border-2 border-[#0b0c10] ${
+                                      item.chat.status === "running"
+                                        ? "bg-amber-400 animate-pulse"
+                                        : item.chat.status === "idle"
+                                          ? "bg-emerald-400"
+                                          : "bg-indigo-400"
+                                    }`}
+                                  />
+                                </div>
                                 <div className="min-w-0 flex-1">
                                   <div className="flex items-center justify-between gap-1.5">
                                     <div className="flex min-w-0 items-center gap-2 overflow-hidden">
@@ -3423,13 +3405,8 @@ export function ShellPage() {
                                       item.chat.unread ? "font-medium text-white" : "text-zinc-300"
                                     }`}
                                   >
-                                    {item.kind === "bot"
-                                      ? cleanRosterPreview(item.chat.preview) ||
-                                        (item.chat.status !== "idle" ? item.chat.status : "Bereit")
-                                      : cleanRosterPreview(item.chat.preview) ||
-                                        item.chat.members
-                                          .map((member: any) => member.name)
-                                          .join(", ")}
+                                    {cleanRosterPreview(item.chat.preview) ||
+                                      (item.chat.status !== "idle" ? item.chat.status : "Bereit")}
                                   </div>
                                 </div>
                               </button>
@@ -3612,11 +3589,7 @@ export function ShellPage() {
                               }`}
                             >
                               <GroupAvatar
-                                members={
-                                  item.chat.id === activeSnapshot?.groupId
-                                    ? (activeSnapshot?.members ?? item.chat.members)
-                                    : item.chat.members
-                                }
+                                members={(item.chat as any).members}
                                 size={40}
                               />
                               <div className="min-w-0 flex-1">
@@ -3651,8 +3624,7 @@ export function ShellPage() {
                                     item.chat.unread ? "font-medium text-white" : "text-zinc-300"
                                   }`}
                                 >
-                                  {cleanRosterPreview(item.chat.preview) ||
-                                    item.chat.members.map((member: any) => member.name).join(", ")}
+                                  {cleanRosterPreview(item.chat.preview)}
                                 </div>
                               </div>
                             </button>