-
-
+ {(hasMessages || phase !== "idle") && (
+
-
+
+ )}
+ {!hasMessages ? (
+
+
{botName}
-
- {t`1:1 conversation`}
- {persona.roleLine ? ` · ${persona.roleLine}` : ""}
-
+ {persona.roleLine ? (
+
+ {persona.roleLine}
+
+ ) : null}
-
+ ) : null}
{awarenessLabel && awarenessEvent ? (
diff --git a/apps/web/src/pages/Shell.tsx b/apps/web/src/pages/Shell.tsx
index 3703d92..299462a 100644
--- a/apps/web/src/pages/Shell.tsx
+++ b/apps/web/src/pages/Shell.tsx
@@ -232,7 +232,7 @@ import {
import type { SettingsSection } from "./SettingsOverlay";
import { SpaceSearchResults } from "./SpaceSearch";
import { BotSettings, CreateBotForm } from "./shell/bot-panel";
-import { BotCreatePicker } from "./shell/bot-picker";
+import { BotCreatePicker, ConversationBotPicker } from "./shell/bot-picker";
import { CommandPalette, isCommandPaletteHotkey } from "./shell/command-palette";
import {
ClearConversationDialog,
@@ -339,6 +339,14 @@ function readCollapsedSidebarSections(userId: string | null | undefined): Set
(null);
const [draggedBotId, setDraggedBotId] = useState(null);
const [createMenuOpen, setCreateMenuOpen] = useState(false);
+ const [conversationPickerOpen, setConversationPickerOpen] = useState(false);
const [botsSidebarCollapsed, setBotsSidebarCollapsed] = useState(false);
const focusPromptAbortRef = useRef(null);
const focusPromptBotIdRef = useRef(null);
@@ -1555,6 +1564,71 @@ export function ShellPage() {
[groups],
);
+ const homeSpaceId = bootstrapMe?.spaceId;
+
+ const homeSpaceBots = useMemo(() => {
+ if (!homeSpaceId) return bots;
+ const home = spaces.find((space) => space.id === homeSpaceId);
+ return home?.bots ?? bots;
+ }, [bots, homeSpaceId, spaces]);
+
+ const conversationSidebarGroups = useMemo(() => {
+ if (!homeSpaceId) return [];
+ return sidebarGroups
+ .filter((group) => group.spaceId === homeSpaceId)
+ .map((group) => ({
+ ...group,
+ title: stripSpaceTitlePrefix(group.title, group.spaceName),
+ showLock: false,
+ bots: group.bots.filter((item) => item.kind === "bot"),
+ }))
+ .filter((group) => group.bots.length > 0);
+ }, [homeSpaceId, sidebarGroups]);
+
+ const projectSidebarGroups = useMemo(() => {
+ if (!homeSpaceId) return [];
+ const entries: typeof sidebarGroups = [];
+
+ for (const space of spaces) {
+ if (space.id === homeSpaceId) continue;
+ const groupsInSpace = sidebarGroups.flatMap((group) =>
+ group.spaceId === space.id
+ ? group.bots.filter(
+ (item) => item.kind === "group" && item.chat.id !== hauptthreadGroup?.id,
+ )
+ : [],
+ );
+ entries.push({
+ key: groupsInSpace.length > 0 ? `project-space:${space.id}` : `project-space:${space.id}:empty`,
+ title: space.name,
+ bots: groupsInSpace,
+ sectionId: null,
+ showLock: true,
+ emptySpaceId: groupsInSpace.length > 0 ? undefined : space.id,
+ spaceId: space.id,
+ spaceName: space.name,
+ canDeleteSpace: space.canDelete === true,
+ });
+ }
+
+ for (const group of sidebarGroups) {
+ if (group.spaceId !== homeSpaceId) continue;
+ const groupChats = group.bots.filter(
+ (item) => item.kind === "group" && item.chat.id !== hauptthreadGroup?.id,
+ );
+ if (groupChats.length === 0) continue;
+ entries.push({
+ ...group,
+ title: stripSpaceTitlePrefix(group.title, group.spaceName),
+ showLock: false,
+ emptySpaceId: undefined,
+ bots: groupChats,
+ });
+ }
+
+ return entries;
+ }, [hauptthreadGroup?.id, homeSpaceId, sidebarGroups, spaces]);
+
const openSpaceChat = useCallback(
(spaceId: string, path: string) => {
setMobileSidebarOpen(false);
@@ -1574,6 +1648,23 @@ export function ShellPage() {
},
[bootstrapMe?.spaceId, navigate],
);
+
+ const openConversationBot = useCallback(
+ (botId: string) => {
+ setConversationPickerOpen(false);
+ setMobileSidebarOpen(false);
+ setActiveNavPillar("team");
+ const bot =
+ homeSpaceBots.find((item) => item.id === botId) ?? bots.find((item) => item.id === botId);
+ if (bot) {
+ openSpaceChat(bot.spaceId, `/app/${botId}`);
+ return;
+ }
+ navigate(`/app/${botId}`);
+ },
+ [bots, homeSpaceBots, navigate, openSpaceChat],
+ );
+
const flushBotOrder = useCallback(async () => {
if (savingBotOrderRef.current) return;
savingBotOrderRef.current = true;
@@ -3059,237 +3150,57 @@ export function ShellPage() {
- {/* PROJEKTE SECTION */}
-
-
-
{t`Projekte`}
-
- {t`Threads by topic · folders`}
-
-
-
-
-
-
- {sidebarGroups
- .map((group) => ({
- ...group,
- bots: group.bots.filter(
- (b) => b.kind === "group" && b.chat.id !== hauptthreadGroup?.id,
- ) as any[],
- }))
- .filter((group) => group.bots.length > 0 || group.emptySpaceId).length === 0 ? (
-
-
{t`No projects yet.`}
-
-
- ) : null}
- {sidebarGroups
- .map((group) => ({
- ...group,
- bots: group.bots.filter(
- (b) => b.kind === "group" && b.chat.id !== hauptthreadGroup?.id,
- ) as any[],
- }))
- .filter((group) => group.bots.length > 0 || group.emptySpaceId)
- .map((group) => {
- const collapsed =
- Boolean(group.title) && collapsedSidebarSections.has(group.key);
- return (
-
- {group.title ? (
-
-
-
- ) : null}
- {!collapsed &&
- group.bots.map((item) => (
-
- ))}
-
- );
- })}
-
- {/* TEAM SECTION */}
+
-
{t`Team`}
+
{t`Unterhaltungen`}
- {t`Your Oos — open a 1:1 conversation`}
+ {t`1:1 mit deinen Oos`}
-
+
+
+
+
+ {conversationPickerOpen ? (
+
+ {
+ setConversationPickerOpen(false);
+ setPanel("create");
+ }}
+ onOpenBot={openConversationBot}
+ />
+
+ ) : null}
+
- {sidebarGroups
- .map((group) => ({
- ...group,
- bots: group.bots.filter((b) => b.kind === "bot") as any[],
- }))
- .filter((group) => group.bots.length > 0 || group.emptySpaceId).length === 0 ? (
+ {conversationSidebarGroups.length === 0 ? (
-
{t`No Oos in your team yet.`}
+
{t`Noch keine Unterhaltung.`}
) : null}
- {sidebarGroups
- .map((group) => ({
- ...group,
- bots: group.bots.filter((b) => b.kind === "bot") as any[],
- }))
- .filter((group) => group.bots.length > 0 || group.emptySpaceId)
- .map((group) => {
+ {conversationSidebarGroups.map((group) => {
const collapsed =
Boolean(group.title) && collapsedSidebarSections.has(group.key);
const groupBotIds = group.bots.flatMap((item) =>
@@ -3443,17 +3354,8 @@ export function ShellPage() {
: t`Group conversation ${item.chat.name}`
}
onClick={() => {
- if (item.kind === "bot") {
- setActiveNavPillar("team");
- } else {
- setActiveNavPillar("projekte");
- }
- openSpaceChat(
- item.chat.spaceId,
- item.kind === "bot"
- ? `/app/${item.chat.id}`
- : `/app/g/${item.chat.id}`,
- );
+ setActiveNavPillar("team");
+ openSpaceChat(item.chat.spaceId, `/app/${item.chat.id}`);
}}
onContextMenu={(event) => {
if (item.chat.spaceId !== bootstrapMe?.spaceId) return;
@@ -3585,6 +3487,214 @@ export function ShellPage() {
);
})}
+
+ {/* PROJEKTE SECTION */}
+
+
+
{t`Projekte`}
+
+ {t`Threads by topic · folders`}
+
+
+
+
+
+
+ {projectSidebarGroups.length === 0 ? (
+
+
{t`No projects yet.`}
+
+
+ ) : null}
+ {projectSidebarGroups.map((group) => {
+ const collapsed =
+ Boolean(group.title) && collapsedSidebarSections.has(group.key);
+ return (
+
+ {group.title ? (
+
+
+ {group.canDeleteSpace ? (
+
+ ) : null}
+
+ ) : null}
+ {!collapsed &&
+ group.bots.map((item) => (
+
+ ))}
+
+ );
+ })}
+