From 1fbab15ce288cd0e7487eb34cdbae5e7c75d2373 Mon Sep 17 00:00:00 2001
From: Sam <sameer+bot@dembrane.com>
Date: Tue, 23 Jun 2026 13:24:11 +0200
Subject: [PATCH 1/2] fix(sidebar): highlight conversations tab on nested
 conversation/transcript pages

---
 .../features/sidebar/views/project/ProjectHomeView.tsx    | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/echo/frontend/src/features/sidebar/views/project/ProjectHomeView.tsx b/echo/frontend/src/features/sidebar/views/project/ProjectHomeView.tsx
index e66af76c..2c258cb1 100644
--- a/echo/frontend/src/features/sidebar/views/project/ProjectHomeView.tsx
+++ b/echo/frontend/src/features/sidebar/views/project/ProjectHomeView.tsx
@@ -12,7 +12,7 @@ import {
 	PaintBrushIcon,
 	UsersThreeIcon,
 } from "@phosphor-icons/react";
-import { useParams } from "react-router";
+import { useLocation, useParams } from "react-router";
 import { useProjectChatsCountQuery } from "@/components/chat/hooks";
 import { useConversationsCountByProjectId } from "@/components/conversation/hooks";
 import { useProjectById } from "@/components/project/hooks";
@@ -38,10 +38,15 @@ export const ProjectHomeView = () => {
 		hasMessages: true,
 	});
 	const project = projectQuery.data;
+	const { pathname } = useLocation();
 
 	if (!workspaceId || !projectId) return null;
 	const base = `/w/${workspaceId}/projects/${projectId}`;
 
+	const isConversationsActive =
+		pathname.includes(`/projects/${projectId}/conversations`) ||
+		pathname.includes(`/projects/${projectId}/conversation`);
+
 	return (
 		<nav className="flex h-full flex-col gap-0.5 p-1.5">
 			{/* Back button doubles as the section title: centered label is the
@@ -97,6 +102,7 @@ export const ProjectHomeView = () => {
 				label={<Trans>Conversations</Trans>}
 				icon={ChatCircleTextIcon}
 				badge={conversationsCountQuery.data || undefined}
+				active={isConversationsActive}
 			/>
 			<NavItem
 				to={`${base}/access`}

From d03bbfbc7fcb8734b29afa077eb70425e6ad1627 Mon Sep 17 00:00:00 2001
From: Sam <sameer+bot@dembrane.com>
Date: Tue, 23 Jun 2026 14:42:59 +0200
Subject: [PATCH 2/2] fix(router): align nested conversation detail URL prefix
 under conversations

---
 echo/frontend/src/Router.tsx                           |  2 +-
 .../src/components/aspect/hooks/useCopyAspect.tsx      |  6 +++---
 .../src/components/aspect/hooks/useCopyQuote.ts        |  8 ++++----
 echo/frontend/src/components/chat/References.tsx       |  6 +++---
 echo/frontend/src/components/chat/Sources.tsx          | 10 +++++-----
 .../components/conversation/ConversationAccordion.tsx  |  6 +++---
 .../src/components/conversation/ConversationLink.tsx   | 10 +++++-----
 .../src/components/conversation/ConversationLinks.tsx  |  4 ++--
 .../components/conversation/MoveConversationButton.tsx |  2 +-
 .../conversation/ProjectConversationsPanel.tsx         |  4 ++--
 .../conversation/RetranscribeConversation.tsx          |  2 +-
 .../project/webhooks/WebhookSettingsCard.tsx           |  2 +-
 echo/frontend/src/components/quote/Quote.tsx           |  2 +-
 .../src/components/report/ConversationStatusTable.tsx  |  2 +-
 .../features/sidebar/breadcrumbs/AppBreadcrumbs.tsx    |  2 +-
 .../src/features/sidebar/hooks/useSearchHits.ts        |  4 ++--
 .../src/features/sidebar/hooks/useSidebarView.ts       |  2 +-
 .../features/sidebar/views/project/ProjectHomeView.tsx |  8 +-------
 18 files changed, 38 insertions(+), 44 deletions(-)

diff --git a/echo/frontend/src/Router.tsx b/echo/frontend/src/Router.tsx
index 4ab54322..da30e283 100644
--- a/echo/frontend/src/Router.tsx
+++ b/echo/frontend/src/Router.tsx
@@ -239,7 +239,7 @@ const projectRouteChildren = [
 								path: "debug",
 							},
 						],
-						path: "conversation/:conversationId",
+						path: "conversations/:conversationId",
 					},
 					{
 						children: [
diff --git a/echo/frontend/src/components/aspect/hooks/useCopyAspect.tsx b/echo/frontend/src/components/aspect/hooks/useCopyAspect.tsx
index a4e95bae..a4fa8202 100644
--- a/echo/frontend/src/components/aspect/hooks/useCopyAspect.tsx
+++ b/echo/frontend/src/components/aspect/hooks/useCopyAspect.tsx
@@ -71,9 +71,9 @@ export const useCopyAspect = () => {
 						?.conversation_id as Conversation;
 					const participantName = conversation?.participant_name ?? "Unknown";
 
-					const conversationUrl =
-						window.location.origin +
-						`/${language}/projects/${projectId}/conversation/${conversationId}`;
+						const conversationUrl =
+							window.location.origin +
+							`/${language}/projects/${projectId}/conversations/${conversationId}`;
 
 					stringBuilder.push(`"${description}"\n`);
 					stringBuilder.push(`from [${participantName}](${conversationUrl})\n\n`);
diff --git a/echo/frontend/src/components/aspect/hooks/useCopyQuote.ts b/echo/frontend/src/components/aspect/hooks/useCopyQuote.ts
index dbdbd144..f174b096 100644
--- a/echo/frontend/src/components/aspect/hooks/useCopyQuote.ts
+++ b/echo/frontend/src/components/aspect/hooks/useCopyQuote.ts
@@ -40,10 +40,10 @@ export const useCopyQuote = () => {
 			// Format timestamp if available
 			const timestamp = conversation?.created_at ?? "";
 
-			// Build the formatted quote with context
-			stringBuilder.push(
-				`# Quote from [${conversation?.participant_name}](${window.location.origin}/${language}/projects/${projectId}/conversation/${conversation?.id})`,
-			);
+				// Build the formatted quote with context
+				stringBuilder.push(
+					`# Quote from [${conversation?.participant_name}](${window.location.origin}/${language}/projects/${projectId}/conversations/${conversation?.id})`,
+				);
 			stringBuilder.push(`"${quote.description}"`);
 			stringBuilder.push(`${quote.verbatim_transcript}`);
 
diff --git a/echo/frontend/src/components/chat/References.tsx b/echo/frontend/src/components/chat/References.tsx
index f9cec4c4..18d67f66 100644
--- a/echo/frontend/src/components/chat/References.tsx
+++ b/echo/frontend/src/components/chat/References.tsx
@@ -30,9 +30,9 @@ export const References = ({
 							<span className="mr-2">
 								<Trans>{citation.reference_text}</Trans>
 							</span>
-							<I18nLink
-								to={`/w/${workspaceId}/projects/${projectId}/conversation/${citation?.conversation?.id || citation?.conversation}`}
-							>
+								<I18nLink
+									to={`/w/${workspaceId}/projects/${projectId}/conversations/${citation?.conversation?.id || citation?.conversation}`}
+								>
 								<Badge
 									size="sm"
 									variant="light"
diff --git a/echo/frontend/src/components/chat/Sources.tsx b/echo/frontend/src/components/chat/Sources.tsx
index de545e10..ae697628 100644
--- a/echo/frontend/src/components/chat/Sources.tsx
+++ b/echo/frontend/src/components/chat/Sources.tsx
@@ -28,11 +28,11 @@ export const Sources = ({
 			</Group>
 			<Group gap="xs" mt={10}>
 				{references.map((ref, index) => (
-					<I18nLink
-						// biome-ignore lint/suspicious/noArrayIndexKey: needs to be fixed
-						key={index}
-						to={`/w/${workspaceId}/projects/${projectId}/conversation/${ref?.conversation?.id || ref?.conversation}`}
-					>
+						<I18nLink
+							// biome-ignore lint/suspicious/noArrayIndexKey: needs to be fixed
+							key={index}
+							to={`/w/${workspaceId}/projects/${projectId}/conversations/${ref?.conversation?.id || ref?.conversation}`}
+						>
 						<Badge className="cursor-pointer normal-case" variant="default">
 							{ref?.conversation_title ||
 								ref?.conversation?.participant_name || (
diff --git a/echo/frontend/src/components/conversation/ConversationAccordion.tsx b/echo/frontend/src/components/conversation/ConversationAccordion.tsx
index 60e61497..638598df 100644
--- a/echo/frontend/src/components/conversation/ConversationAccordion.tsx
+++ b/echo/frontend/src/components/conversation/ConversationAccordion.tsx
@@ -534,9 +534,9 @@ const ConversationAccordionItem = ({
 		);
 
 	return (
-		<NavigationButton
-			to={`/w/${workspaceId}/projects/${conversation.project_id}/conversation/${conversation.id}`}
-			active={highlight}
+			<NavigationButton
+				to={`/w/${workspaceId}/projects/${conversation.project_id}/conversations/${conversation.id}`}
+				active={highlight}
 			className="w-full"
 			rightSection={
 				shouldShowCheckboxes ? (
diff --git a/echo/frontend/src/components/conversation/ConversationLink.tsx b/echo/frontend/src/components/conversation/ConversationLink.tsx
index f0f17150..63526ef5 100644
--- a/echo/frontend/src/components/conversation/ConversationLink.tsx
+++ b/echo/frontend/src/components/conversation/ConversationLink.tsx
@@ -39,9 +39,9 @@ export const ConversationLink = ({
 							This conversation is a copy of
 						</Trans>
 
-						<ConversationAnchor
-							key={linkingConversation?.id}
-							to={`/w/${workspaceId}/projects/${projectId}/conversation/${(linkingConversation?.source_conversation_id as Conversation)?.id}`}
+							<ConversationAnchor
+								key={linkingConversation?.id}
+								to={`/w/${workspaceId}/projects/${projectId}/conversations/${(linkingConversation?.source_conversation_id as Conversation)?.id}`}
 							name={
 								(linkingConversation?.source_conversation_id as Conversation)
 									?.participant_name ?? ""
@@ -62,8 +62,8 @@ export const ConversationLink = ({
 								(conversationLink?.target_conversation_id as Conversation)
 									?.id && (
 									<List.Item key={conversationLink?.id}>
-										<ConversationAnchor
-											to={`/w/${workspaceId}/projects/${projectId}/conversation/${(conversationLink?.target_conversation_id as Conversation)?.id}`}
+											<ConversationAnchor
+												to={`/w/${workspaceId}/projects/${projectId}/conversations/${(conversationLink?.target_conversation_id as Conversation)?.id}`}
 											name={
 												(
 													conversationLink?.target_conversation_id as Conversation
diff --git a/echo/frontend/src/components/conversation/ConversationLinks.tsx b/echo/frontend/src/components/conversation/ConversationLinks.tsx
index 18262092..5219deb6 100644
--- a/echo/frontend/src/components/conversation/ConversationLinks.tsx
+++ b/echo/frontend/src/components/conversation/ConversationLinks.tsx
@@ -36,7 +36,7 @@ const ConversationList = ({
 		{conversations.map((conversation, index) => (
 			<I18nLink
 				key={conversation.id}
-				to={`/w/${workspaceId}/projects/${projectId}/conversation/${conversation.id}`}
+				to={`/w/${workspaceId}/projects/${projectId}/conversations/${conversation.id}`}
 				onClick={onItemClick}
 			>
 				<Box className="cursor-pointer rounded-lg px-3.5 py-2.5 hover:bg-primary-100">
@@ -143,7 +143,7 @@ export const ConversationLinks = ({
 				{visibleConversations.map((conversation) => (
 					<I18nLink
 						key={conversation.id}
-						to={`/w/${workspaceId}/projects/${projectId}/conversation/${conversation.id}`}
+						to={`/w/${workspaceId}/projects/${projectId}/conversations/${conversation.id}`}
 					>
 						<Box maw={300} className="cursor-pointer hover:underline">
 							<Text size="xs" truncate="end" c="gray.7" pr={3}>
diff --git a/echo/frontend/src/components/conversation/MoveConversationButton.tsx b/echo/frontend/src/components/conversation/MoveConversationButton.tsx
index 0d65c63e..ec1b51c4 100644
--- a/echo/frontend/src/components/conversation/MoveConversationButton.tsx
+++ b/echo/frontend/src/components/conversation/MoveConversationButton.tsx
@@ -97,7 +97,7 @@ export const MoveConversationButton = ({
 				onSuccess: () => {
 					close();
 					navigate(
-						`/w/${workspaceId}/projects/${data.targetProjectId}/conversation/${conversation.id}`,
+						`/w/${workspaceId}/projects/${data.targetProjectId}/conversations/${conversation.id}`,
 					);
 				},
 			},
diff --git a/echo/frontend/src/components/conversation/ProjectConversationsPanel.tsx b/echo/frontend/src/components/conversation/ProjectConversationsPanel.tsx
index e12526ca..cb780210 100644
--- a/echo/frontend/src/components/conversation/ProjectConversationsPanel.tsx
+++ b/echo/frontend/src/components/conversation/ProjectConversationsPanel.tsx
@@ -635,7 +635,7 @@ export const ProjectConversationsPanel = ({
 	const openConversation = (conversation: Conversation) => {
 		if (!resolvedWorkspaceId) return;
 		navigate(
-			`/w/${resolvedWorkspaceId}/projects/${projectId}/conversation/${conversation.id}`,
+			`/w/${resolvedWorkspaceId}/projects/${projectId}/conversations/${conversation.id}`,
 		);
 	};
 
@@ -872,7 +872,7 @@ export const ProjectConversationsPanel = ({
 							href={
 								selectionMode || !resolvedWorkspaceId
 									? undefined
-									: `/w/${resolvedWorkspaceId}/projects/${projectId}/conversation/${conversation.id}`
+									: `/w/${resolvedWorkspaceId}/projects/${projectId}/conversations/${conversation.id}`
 							}
 							isSelected={selectedConversationIds.has(conversation.id)}
 							onEdit={openEdit}
diff --git a/echo/frontend/src/components/conversation/RetranscribeConversation.tsx b/echo/frontend/src/components/conversation/RetranscribeConversation.tsx
index aa352274..f4bc75a6 100644
--- a/echo/frontend/src/components/conversation/RetranscribeConversation.tsx
+++ b/echo/frontend/src/components/conversation/RetranscribeConversation.tsx
@@ -131,7 +131,7 @@ export const RetranscribeConversationModal = ({
 						label: t`Go to new conversation`,
 						onClick: () => {
 							navigate(
-								`/w/${workspaceId}/projects/${projectId}/conversation/${new_conversation_id}`,
+								`/w/${workspaceId}/projects/${projectId}/conversations/${new_conversation_id}`,
 							);
 						},
 					},
diff --git a/echo/frontend/src/components/project/webhooks/WebhookSettingsCard.tsx b/echo/frontend/src/components/project/webhooks/WebhookSettingsCard.tsx
index 7e91f43f..b0fadd69 100644
--- a/echo/frontend/src/components/project/webhooks/WebhookSettingsCard.tsx
+++ b/echo/frontend/src/components/project/webhooks/WebhookSettingsCard.tsx
@@ -723,7 +723,7 @@ const EXAMPLE_WEBHOOK_PAYLOAD = `{
     "name": "Customer Interviews",
     "language": "en"
   },
-  "dashboardUrl": "https://app.example.com/en-US/projects/proj-789/conversation/abc123-def456/overview"
+  "dashboardUrl": "https://app.example.com/en-US/projects/proj-789/conversations/abc123-def456/overview"
 }`;
 
 interface WebhookHelpAccordionProps {
diff --git a/echo/frontend/src/components/quote/Quote.tsx b/echo/frontend/src/components/quote/Quote.tsx
index a628d0c0..0464086e 100644
--- a/echo/frontend/src/components/quote/Quote.tsx
+++ b/echo/frontend/src/components/quote/Quote.tsx
@@ -172,7 +172,7 @@ export const Quote = ({
 					className="border-t border-gray-200 dark:border-gray-700"
 				>
 					<I18nLink
-						to={`/w/${workspaceId}/projects/${projectId}/conversation/${conversationId}`}
+						to={`/w/${workspaceId}/projects/${projectId}/conversations/${conversationId}`}
 					>
 						<Pill
 							size="sm"
diff --git a/echo/frontend/src/components/report/ConversationStatusTable.tsx b/echo/frontend/src/components/report/ConversationStatusTable.tsx
index af783d23..4c5dd365 100644
--- a/echo/frontend/src/components/report/ConversationStatusTable.tsx
+++ b/echo/frontend/src/components/report/ConversationStatusTable.tsx
@@ -90,7 +90,7 @@ export const ConversationStatusTable = ({
 						<Table.Td>
 							<Anchor
 								component={Link}
-								to={`/w/${workspaceId}/projects/${projectId}/conversation/${conv.id}`}
+								to={`/w/${workspaceId}/projects/${projectId}/conversations/${conv.id}`}
 							>
 								<Trans>View</Trans>
 							</Anchor>
diff --git a/echo/frontend/src/features/sidebar/breadcrumbs/AppBreadcrumbs.tsx b/echo/frontend/src/features/sidebar/breadcrumbs/AppBreadcrumbs.tsx
index 72b1b795..c694f4b2 100644
--- a/echo/frontend/src/features/sidebar/breadcrumbs/AppBreadcrumbs.tsx
+++ b/echo/frontend/src/features/sidebar/breadcrumbs/AppBreadcrumbs.tsx
@@ -199,7 +199,7 @@ export const AppBreadcrumbs = () => {
 					});
 				}
 				const section = params.section;
-				if (section === "conversation") {
+				if (section === "conversations" && params.conversationId) {
 					// Detail page: link back to the conversations list first.
 					out.push({
 						href: `/w/${params.workspaceId}/projects/${params.projectId}/conversations`,
diff --git a/echo/frontend/src/features/sidebar/hooks/useSearchHits.ts b/echo/frontend/src/features/sidebar/hooks/useSearchHits.ts
index df52d6a6..dffdfa4f 100644
--- a/echo/frontend/src/features/sidebar/hooks/useSearchHits.ts
+++ b/echo/frontend/src/features/sidebar/hooks/useSearchHits.ts
@@ -223,7 +223,7 @@ export function useSearchHits(
 					? `${c.projectName} / ${c.displayLabel}`
 					: t`Conversation`;
 			push({
-				href: `/w/${c.workspaceId}/projects/${c.projectId}/conversation/${c.id}`,
+				href: `/w/${c.workspaceId}/projects/${c.projectId}/conversations/${c.id}`,
 				icon: ChatCircleIcon,
 				id: `conv-${c.id}`,
 				label: c.displayLabel,
@@ -240,7 +240,7 @@ export function useSearchHits(
 				? `${path}: "${tr.excerpt.slice(0, EXCERPT_LENGTH)}..."`
 				: path;
 			push({
-				href: `/w/${tr.workspaceId}/projects/${tr.projectId}/conversation/${tr.conversationId}`,
+				href: `/w/${tr.workspaceId}/projects/${tr.projectId}/conversations/${tr.conversationId}`,
 				icon: FileTextIcon,
 				id: `chunk-${tr.id}`,
 				label: tr.conversationLabel ?? t`Transcript`,
diff --git a/echo/frontend/src/features/sidebar/hooks/useSidebarView.ts b/echo/frontend/src/features/sidebar/hooks/useSidebarView.ts
index 1608f812..36ecf27e 100644
--- a/echo/frontend/src/features/sidebar/hooks/useSidebarView.ts
+++ b/echo/frontend/src/features/sidebar/hooks/useSidebarView.ts
@@ -140,7 +140,7 @@ export function resolveSidebarView(
 					projectId,
 					section: segs[4],
 					workspaceId,
-					...(segs[4] === "conversation" && segs[5]
+					...(segs[4] === "conversations" && segs[5]
 						? { conversationId: segs[5] }
 						: {}),
 				},
diff --git a/echo/frontend/src/features/sidebar/views/project/ProjectHomeView.tsx b/echo/frontend/src/features/sidebar/views/project/ProjectHomeView.tsx
index 2c258cb1..e66af76c 100644
--- a/echo/frontend/src/features/sidebar/views/project/ProjectHomeView.tsx
+++ b/echo/frontend/src/features/sidebar/views/project/ProjectHomeView.tsx
@@ -12,7 +12,7 @@ import {
 	PaintBrushIcon,
 	UsersThreeIcon,
 } from "@phosphor-icons/react";
-import { useLocation, useParams } from "react-router";
+import { useParams } from "react-router";
 import { useProjectChatsCountQuery } from "@/components/chat/hooks";
 import { useConversationsCountByProjectId } from "@/components/conversation/hooks";
 import { useProjectById } from "@/components/project/hooks";
@@ -38,15 +38,10 @@ export const ProjectHomeView = () => {
 		hasMessages: true,
 	});
 	const project = projectQuery.data;
-	const { pathname } = useLocation();
 
 	if (!workspaceId || !projectId) return null;
 	const base = `/w/${workspaceId}/projects/${projectId}`;
 
-	const isConversationsActive =
-		pathname.includes(`/projects/${projectId}/conversations`) ||
-		pathname.includes(`/projects/${projectId}/conversation`);
-
 	return (
 		<nav className="flex h-full flex-col gap-0.5 p-1.5">
 			{/* Back button doubles as the section title: centered label is the
@@ -102,7 +97,6 @@ export const ProjectHomeView = () => {
 				label={<Trans>Conversations</Trans>}
 				icon={ChatCircleTextIcon}
 				badge={conversationsCountQuery.data || undefined}
-				active={isConversationsActive}
 			/>
 			<NavItem
 				to={`${base}/access`}