@@ -1,4 +1,5 @@
 import {
+  createForkSecretMappingContract,
   getForkMappingContract,
   updateForkMappingContract,
 } from '@/lib/api/contracts/workspace-fork'
@@ -8,6 +9,7 @@ import {
   internalSessionAuth,
 } from '@/lib/api/server/routes'
 import { internalForkErrorPolicy } from '@/ee/workspace-forking/api/route-policies'
+import { createWorkspaceForkSecretMapping } from '@/ee/workspace-forking/application/create-secret-mapping'
 import { getWorkspaceForkMappingDetails } from '@/ee/workspace-forking/application/mapping-details'
 import { forkOperations } from '@/ee/workspace-forking/application/operations'
 import { updateWorkspaceForkMappings } from '@/ee/workspace-forking/application/recovery-and-mappings'
@@ -38,3 +40,14 @@ export const PUT = defineInternalJsonRoute({
   useCase: updateWorkspaceForkMappings,
   present: (result) => ({ success: true as const, ...result }),
 })
+
+export const POST = defineInternalJsonRoute({
+  contract: createForkSecretMappingContract,
+  auth: internalSessionAuth,
+  operation: forkOperations.createSecretMapping,
+  rateLimit: internalRateLimits.none({ reason: 'Preserve existing internal fork request policy' }),
+  errorPolicy: internalForkErrorPolicy,
+  mapInput: ({ params, body }) => ({ workspaceId: params.id, ...body }),
+  useCase: createWorkspaceForkSecretMapping,
+  present: ({ name }) => ({ name }),
+})
@@ -0,0 +1,24 @@
+import { getWorkspaceSettingsNavigationContract } from '@/lib/api/contracts/workspace-settings'
+import {
+  defineInternalJsonRoute,
+  internalOrchestrationErrorPolicy,
+  internalRateLimits,
+  internalSessionAuth,
+} from '@/lib/api/server/routes'
+import {
+  readWorkspaceSettingsNavigation,
+  readWorkspaceSettingsNavigationOperation,
+} from '@/lib/settings/application/workspace-navigation'
+
+export const GET = defineInternalJsonRoute({
+  contract: getWorkspaceSettingsNavigationContract,
+  auth: internalSessionAuth,
+  operation: readWorkspaceSettingsNavigationOperation,
+  rateLimit: internalRateLimits.none({
+    reason: 'Read-only settings navigation, matching existing settings-page admission',
+  }),
+  errorPolicy: internalOrchestrationErrorPolicy,
+  mapInput: ({ params }) => ({ workspaceId: params.id }),
+  useCase: readWorkspaceSettingsNavigation,
+  staticResponseHeaders: { 'Cache-Control': 'private, no-store' },
+})
@@ -1,5 +1,6 @@
 'use client'
 
+import type { ReactNode } from 'react'
 import {
   chipVariants,
   cn,
@@ -28,6 +29,8 @@ import {
 
 interface ChatRowProps {
   chat: OrganizationChat
+  /** Shown before the title, such as the projects the chat worked in. */
+  leading?: ReactNode
   isCurrentRoute: boolean
   isSelected: boolean
   isMenuOpen: boolean
@@ -39,6 +42,7 @@ interface ChatRowProps {
 
 function ChatRow({
   chat,
+  leading,
   isCurrentRoute,
   isSelected,
   isMenuOpen,
@@ -66,6 +70,7 @@ function ChatRow({
       onContextMenu={(e) => onContextMenu(e, chat.id)}
       onSelectChat={onSelectChat}
     >
+      {leading}
       <OverflowText label={chat.name} className='flex-1 text-[var(--text-body)]' />
       <RowActions
         open={isMenuOpen}
@@ -103,6 +108,8 @@ interface ChatsSectionProps {
   isLoading: boolean
   isCollapsed: boolean
   pathname: string | null
+  /** Renders before each chat's title; the org project view shows the chat's projects. */
+  leadingFor?: (chat: OrganizationChat) => ReactNode
 }
 
 export function ChatsSection({
@@ -111,6 +118,7 @@ export function ChatsSection({
   isLoading,
   isCollapsed,
   pathname,
+  leadingFor,
 }: ChatsSectionProps) {
   const actions = useOrganizationChatActions({ organizationId, chats })
   const { menu, hover, rename, selectedChat, selectedChats, menuOpenChatId } = actions
@@ -140,7 +148,7 @@ export function ChatsSection({
                   <CollapsedChatFlyoutItem
                     key={chat.id}
                     chat={chat}
-                    isCurrentRoute={pathname === chat.href}
+                    isCurrentRoute={pathname === chat.href.split('?')[0]}
                     isSelected={selectedChats.size > 1 && selectedChats.has(chat.id)}
                     onSelectChat={actions.handleChatClick}
                     isMenuOpen={menuOpenChatId === chat.id}
@@ -184,7 +192,8 @@ export function ChatsSection({
                     <ChatRow
                       key={chat.id}
                       chat={chat}
-                      isCurrentRoute={pathname === chat.href}
+                      leading={leadingFor?.(chat)}
+                      isCurrentRoute={pathname === chat.href.split('?')[0]}
                       isSelected={selectedChats.size > 1 && selectedChats.has(chat.id)}
                       isMenuOpen={menuOpenChatId === chat.id}
                       onSelectChat={actions.handleChatClick}
 
@@ -23,8 +23,8 @@ import {
   SquareArrowUpRight,
   Trash,
 } from '@sim/emcn/icons'
-import Link from 'next/link'
 import { IdentityTile } from '@/components/identity-tile/identity-tile'
+import { SettingsGuardedLink as Link } from '@/components/settings/settings-guarded-link'
 import { useProjectActions } from '@/app/o/[organizationId]/components/organization-sidebar/components/projects-section/use-project-actions'
 import type { ProjectDragProps } from '@/app/o/[organizationId]/components/organization-sidebar/components/projects-section/use-project-order'
 import type { Project } from '@/app/o/[organizationId]/p/hooks/use-projects'
@@ -44,12 +44,9 @@ interface ProjectRowProps {
   href: string
   newChatHref: string
   active: boolean
-  /** Whether the chats under the row are shown; undefined when there are none to show. */
-  expanded?: boolean
   railCollapsed: boolean
   drag: ProjectDragProps
   isAnyDragActive: boolean
-  onToggleExpand: () => void
 }
 
 /**
@@ -62,11 +59,9 @@ export function ProjectRow({
   href,
   newChatHref,
   active,
-  expanded,
   railCollapsed,
   drag,
   isAnyDragActive,
-  onToggleExpand,
 }: ProjectRowProps) {
   const actions = useProjectActions()
   const pinned = actions.isPinned(project)
@@ -172,13 +167,11 @@ export function ProjectRow({
                   event.preventDefault()
                   return
                 }
-                onToggleExpand()
               }}
               onDoubleClick={(event) => {
                 event.preventDefault()
                 if (project.canAdminister) rename.handleStartEdit()
               }}
-              aria-expanded={expanded}
               className='flex min-w-0 flex-1 items-center gap-2'
             >
               <IdentityTile initial={project.name[0]} />
 
@@ -1,55 +1,38 @@
 'use client'
 
-import { useState } from 'react'
-import { chipVariants, cn, OverflowText } from '@sim/emcn'
-import { formatRelativeTime } from '@sim/utils/formatting'
-import Link from 'next/link'
+import { cn } from '@sim/emcn'
+import { useSearchParams } from 'next/navigation'
 import { useQueryStates } from 'nuqs'
 import { organizationRoutes } from '@/lib/navigation/paths'
 import { ProjectRow } from '@/app/o/[organizationId]/components/organization-sidebar/components/projects-section/project-row'
 import {
   type ProjectDragProps,
   useProjectOrder,
 } from '@/app/o/[organizationId]/components/organization-sidebar/components/projects-section/use-project-order'
-import {
-  defaultEnvironment,
-  type Project,
-  useProjects,
-} from '@/app/o/[organizationId]/p/hooks/use-projects'
-import { projectParsers } from '@/app/o/[organizationId]/p/search-params'
+import { projectPaneParsers } from '@/app/o/[organizationId]/home/components/project-pane/search-params'
+import { type Project, useProjects } from '@/app/o/[organizationId]/p/hooks/use-projects'
 import { SidebarSection } from '@/app/workspace/[workspaceId]/w/components/sidebar/components'
 import { SIDEBAR_ITEM_GAP_CLASS } from '@/app/workspace/[workspaceId]/w/components/sidebar/constants'
-import { useMothershipChats } from '@/hooks/queries/mothership-chats'
-
-/** Chats listed under an open project before "Show more". */
-const CHAT_PREVIEW = 3
 
 interface ProjectsSectionProps {
   organizationId: string
   isCollapsed: boolean
   pathname: string | null
 }
 
-/** The organization's projects, each with its chats underneath. */
+/** Projects select the pinned pane; chats remain independent organization conversations. */
 export function ProjectsSection({ organizationId, isCollapsed, pathname }: ProjectsSectionProps) {
-  const { projects: unordered, error } = useProjects(organizationId)
-  const { projects, dragProps, isAnyDragActive } = useProjectOrder(unordered)
-  const [{ chat: openChat }] = useQueryStates(projectParsers)
+  const { roots } = useProjects(organizationId)
+  const { projects, dragProps, isAnyDragActive } = useProjectOrder(roots)
   return (
     <SidebarSection title='Projects' railCollapsed={isCollapsed} className='shrink-0'>
       <div className={cn(SIDEBAR_ITEM_GAP_CLASS, 'flex flex-col px-2')}>
-        {error && !isCollapsed && (
-          <p role='alert' className='px-2 py-1 text-[var(--text-error)] text-caption'>
-            {error.message}
-          </p>
-        )}
         {projects.map((project) => (
           <ProjectTree
             key={project.id}
             organizationId={organizationId}
             project={project}
             pathname={pathname}
-            openChat={openChat}
             railCollapsed={isCollapsed}
             drag={dragProps(project)}
             isAnyDragActive={isAnyDragActive}
@@ -64,102 +47,41 @@ interface ProjectTreeProps {
   organizationId: string
   project: Project
   pathname: string | null
-  openChat: string
   railCollapsed: boolean
   drag: ProjectDragProps
   isAnyDragActive: boolean
 }
 
-/**
- * A project row with its chats listed underneath. The chats shown belong to the environment
- * you are in, else to the project's default environment.
- */
 function ProjectTree({
   organizationId,
   project,
   pathname,
-  openChat,
   railCollapsed,
   drag,
   isAnyDragActive,
 }: ProjectTreeProps) {
   const routes = organizationRoutes(organizationId)
-  const [showAll, setShowAll] = useState(false)
-  const activeId =
-    project.environments.find((environment) => {
-      const base = `${routes.root}/p/${environment.workspaceId}`
-      return pathname === base || pathname?.startsWith(`${base}/`)
-    })?.workspaceId ?? null
-  const inProject = activeId !== null
-  const homeWorkspaceId = defaultEnvironment(project).workspaceId
-  /** null follows navigation (open while you're in the project); a click pins it open or shut. */
-  const [override, setOverride] = useState<boolean | null>(null)
-  const expanded = override ?? inProject
-  const { data: chats = [] } = useMothershipChats(activeId ?? homeWorkspaceId)
-  const visible = showAll ? chats : chats.slice(0, CHAT_PREVIEW)
-  const panelHref = (chatId: string) =>
-    `${inProject && pathname ? pathname : routes.project(homeWorkspaceId)}?chat=${chatId}`
-
+  const searchParams = useSearchParams()
+  const [{ project: selectedWorkspace }] = useQueryStates(projectPaneParsers)
+  const inProject = project.environments.some(
+    (environment) => environment.workspaceId === selectedWorkspace
+  )
+  const query = new URLSearchParams(searchParams.toString())
+  if (inProject) query.delete('project')
+  else query.set('project', project.id)
+  query.delete('section')
+  query.set('pane', 'project')
+  const chatPath = pathname?.startsWith(`/o/${organizationId}/chat/`) ? pathname : routes.home
+  const href = `${chatPath}?${query}`
   return (
-    <div className='flex flex-col gap-[1px]'>
-      <ProjectRow
-        project={project}
-        href={routes.project(homeWorkspaceId)}
-        newChatHref={panelHref('new')}
-        active={inProject}
-        expanded={chats.length > 0 ? expanded : undefined}
-        railCollapsed={railCollapsed}
-        drag={drag}
-        isAnyDragActive={isAnyDragActive}
-        onToggleExpand={() => setOverride(inProject ? !expanded : true)}
-      />
-      {!railCollapsed && expanded && chats.length > 0 && (
-        <div className='flex flex-col gap-[1px] pl-[22px]'>
-          {visible.map((chat) => (
-            <Link
-              key={chat.id}
-              href={panelHref(chat.id)}
-              className={cn(
-                chipVariants({ active: openChat === chat.id && inProject, fullWidth: true }),
-                'h-[26px] gap-2'
-              )}
-            >
-              <OverflowText
-                label={chat.name}
-                className='sidebar-collapse-hide flex-1 text-[var(--text-body)] text-small'
-                focusTarget='nearest-interactive'
-              />
-              {chat.isActive ? (
-                <span
-                  role='img'
-                  aria-label='Running'
-                  className='inline-flex size-[14px] shrink-0 items-center justify-center'
-                >
-                  <span className='size-[7px] rounded-full bg-[var(--caution)]' />
-                </span>
-              ) : (
-                <span className='shrink-0 text-[var(--text-muted)] text-caption'>
-                  {formatRelativeTime(chat.updatedAt.toISOString())
-                    .replace(' ago', '')
-                    .replace('just now', 'now')}
-                </span>
-              )}
-            </Link>
-          ))}
-          {chats.length > CHAT_PREVIEW && (
-            <button
-              type='button'
-              onClick={() => setShowAll((prev) => !prev)}
-              className={cn(
-                chipVariants({ fullWidth: true }),
-                'h-[26px] text-[var(--text-muted)] text-small'
-              )}
-            >
-              {showAll ? 'Show less' : 'Show more'}
-            </button>
-          )}
-        </div>
-      )}
-    </div>
+    <ProjectRow
+      project={project}
+      href={href}
+      newChatHref={`${routes.home}?project=${encodeURIComponent(project.id)}&pane=project`}
+      active={inProject}
+      railCollapsed={railCollapsed}
+      drag={drag}
+      isAnyDragActive={isAnyDragActive}
+    />
   )
 }