feat: show active project in chat status

apps/desktop/src/app/session/hooks/use-message-stream/gateway-event.ts

@@ -32,6 +32,7 @@ import {
   setCurrentFastMode,
   setCurrentModel,
   setCurrentPersonality,
+  setCurrentProject,
   setCurrentProvider,
   setCurrentReasoningEffort,
   setCurrentServiceTier,
@@ -196,6 +197,10 @@ export function useGatewayEventHandler(deps: GatewayEventDeps) {
             setCurrentBranch(payload.branch)
           }
 
+          if ('project' in (payload ?? {})) {
+            setCurrentProject(payload?.project ?? null)
+          }
+
           if (typeof payload?.personality === 'string') {
             setCurrentPersonality(normalizePersonalityValue(payload.personality))
           }

apps/desktop/src/app/session/hooks/use-message-stream/utils.test.ts

@@ -33,8 +33,8 @@ describe('toTodoPayload', () => {
 
 describe('sessionInfoStatePatch / hasSessionInfoStatePatch', () => {
   it('extracts only present runtime fields', () => {
-    const patch = sessionInfoStatePatch(payload({ model: 'gpt', fast: true, branch: 'main' }))
-    expect(patch).toMatchObject({ model: 'gpt', fast: true, branch: 'main' })
+    const patch = sessionInfoStatePatch(payload({ model: 'gpt', fast: true, branch: 'main', project: null }))
+    expect(patch).toMatchObject({ model: 'gpt', fast: true, branch: 'main', project: null })
     expect(hasSessionInfoStatePatch(patch)).toBe(true)
     expect(hasSessionInfoStatePatch(sessionInfoStatePatch(payload({})))).toBe(false)
   })

apps/desktop/src/app/session/hooks/use-message-stream/utils.ts

@@ -6,7 +6,16 @@ import type { ClientSessionState } from '../../../types'
 type SessionRuntimeStatePatch = Partial<
   Pick<
     ClientSessionState,
-    'branch' | 'cwd' | 'fast' | 'model' | 'personality' | 'provider' | 'reasoningEffort' | 'serviceTier' | 'yolo'
+    | 'branch'
+    | 'cwd'
+    | 'fast'
+    | 'model'
+    | 'personality'
+    | 'project'
+    | 'provider'
+    | 'reasoningEffort'
+    | 'serviceTier'
+    | 'yolo'
   >
 >
 
@@ -29,6 +38,10 @@ export function sessionInfoStatePatch(payload: GatewayEventPayload | undefined):
     patch.branch = payload.branch
   }
 
+  if (payload && Object.hasOwn(payload, 'project')) {
+    patch.project = payload.project ?? null
+  }
+
   if (typeof payload?.personality === 'string') {
     patch.personality = normalizePersonalityValue(payload.personality)
   }

apps/desktop/src/app/session/hooks/use-session-actions.test.tsx

@@ -10,11 +10,13 @@ import { $projectScope, $projectTree, ALL_PROJECTS } from '@/store/projects'
 import {
   $activeSessionId,
   $currentCwd,
+  $currentProject,
   $messages,
   $newChatWorkspaceTarget,
   $resumeFailedSessionId,
   setActiveSessionId,
   setCurrentCwd,
+  setCurrentProject,
   setMessages,
   setNewChatWorkspaceTarget,
   setResumeFailedSessionId,
@@ -35,6 +37,7 @@ vi.mock('@/hermes', async importOriginal => ({
 }))
 
 const RUNTIME_SESSION_ID = 'rt-new-001'
+const PROJECT = { id: 'p_repo', name: 'Repo', primary_path: '/repo', slug: 'repo' }
 type HarnessHandle = Pick<
   ReturnType<typeof useSessionActions>,
   'createBackendSessionForSend' | 'startFreshSessionDraft'
@@ -256,6 +259,7 @@ describe('resumeSession failure recovery', () => {
     setResumeFailedSessionId(null)
     setMessages([])
     setSessions([])
+    setCurrentProject(null)
     vi.restoreAllMocks()
   })
 
@@ -381,6 +385,29 @@ describe('resumeSession failure recovery', () => {
     expect(resumeParams).toMatchObject({ source: 'desktop' })
   })
 
+  it('applies project metadata from synchronous resume info', async () => {
+    setCurrentProject({ id: 'p_old', name: 'Old', primary_path: '/old', slug: 'old' })
+
+    const requestGateway = vi.fn(async (method: string, params?: Record<string, unknown>) => {
+      if (method === 'session.resume') {
+        return {
+          session_id: 'runtime-1',
+          resumed: params?.session_id,
+          messages: [],
+          info: { branch: 'main', cwd: '/repo', project: PROJECT }
+        } as never
+      }
+
+      return {} as never
+    })
+
+    vi.mocked(getSessionMessages).mockResolvedValue({ messages: [] } as never)
+
+    await runResume(requestGateway)
+
+    expect($currentProject.get()).toEqual(PROJECT)
+  })
+
   it('arms the failure latch when resume succeeds with an empty transcript for a non-empty stored session', async () => {
     setSessions([storedSession({ message_count: 4 })])
 
@@ -423,6 +450,7 @@ describe('resumeSession failure recovery', () => {
             pendingBranchGroup: null,
             personality: '',
             provider: '',
+            project: null,
             reasoningEffort: '',
             sawAssistantPayload: false,
             serviceTier: '',
@@ -645,6 +673,7 @@ describe('createBackendSessionForSend workspace target', () => {
     $newChatProfile.set(null)
     $activeGatewayProfile.set('default')
     setCurrentCwd('')
+    setCurrentProject(null)
     setNewChatWorkspaceTarget(undefined)
     vi.restoreAllMocks()
   })
@@ -677,4 +706,19 @@ describe('createBackendSessionForSend workspace target', () => {
 
     expect(params).toMatchObject({ cwd: '/clicked-workspace' })
   })
+  it('clears the project label when starting a fresh draft', async () => {
+    const requestGateway = vi.fn(async () => ({}) as never)
+    let handle: HarnessHandle | null = null
+
+    render(<Harness onReady={h => (handle = h)} requestGateway={requestGateway} />)
+    await waitFor(() => expect(handle).not.toBeNull())
+
+    setCurrentProject(PROJECT)
+
+    await act(async () => {
+      handle!.startFreshSessionDraft()
+    })
+
+    expect($currentProject.get()).toBeNull()
+  })
 })

apps/desktop/src/app/session/hooks/use-session-actions/index.ts

@@ -30,6 +30,7 @@ import {
   setCurrentBranch,
   setCurrentCwd,
   setCurrentCwdTransient,
+  setCurrentProject,
   setCurrentServiceTier,
   setCurrentUsage,
   setFreshDraftReady,
@@ -228,6 +229,7 @@ export function useSessionActions({
       }
 
       setCurrentBranch('')
+      setCurrentProject(null)
       // Never clear the composer here — ChatBar's per-thread draft swap owns it.
       setFreshDraftReady(true)
     },
@@ -509,6 +511,7 @@ export function useSessionActions({
           syncSessionStateToView(cachedRuntimeId, cachedViewState)
           setCurrentCwd(cachedViewState.cwd)
           setCurrentBranch(cachedViewState.branch)
+          setCurrentProject(cachedViewState.project)
           setSessionStartedAt(Date.now())
 
           try {

apps/desktop/src/app/session/hooks/use-session-actions/utils.ts

@@ -14,6 +14,7 @@ import {
   setCurrentFastMode,
   setCurrentModel,
   setCurrentPersonality,
+  setCurrentProject,
   setCurrentProvider,
   setCurrentReasoningEffort,
   setCurrentServiceTier,
@@ -255,7 +256,16 @@ export async function resolveStoredSession(storedSessionId: string): Promise<Ses
 type SessionRuntimeStatePatch = Partial<
   Pick<
     ClientSessionState,
-    'branch' | 'cwd' | 'fast' | 'model' | 'personality' | 'provider' | 'reasoningEffort' | 'serviceTier' | 'yolo'
+    | 'branch'
+    | 'cwd'
+    | 'fast'
+    | 'model'
+    | 'personality'
+    | 'project'
+    | 'provider'
+    | 'reasoningEffort'
+    | 'serviceTier'
+    | 'yolo'
   >
 >
 
@@ -298,6 +308,11 @@ export function applyRuntimeInfo(info: SessionRuntimeInfo | undefined): SessionR
     sessionState.branch = info.branch || ''
   }
 
+  if (Object.hasOwn(info, 'project')) {
+    setCurrentProject(info.project ?? null)
+    sessionState.project = info.project ?? null
+  }
+
   if (typeof info.personality === 'string') {
     const personality = normalizePersonalityValue(info.personality)
     setCurrentPersonality(personality)
@@ -338,6 +353,7 @@ export function applyStoredSessionPreviewRuntimeInfo(stored: { model?: null | st
   setCurrentServiceTier('')
   setCurrentFastMode(false)
   setYoloActive(false)
+  setCurrentProject(null)
   setCurrentPersonality('')
 }
 

apps/desktop/src/app/session/hooks/use-session-state-cache.ts

@@ -13,6 +13,7 @@ import {
   setCurrentFastMode,
   setCurrentModel,
   setCurrentPersonality,
+  setCurrentProject,
   setCurrentProvider,
   setCurrentReasoningEffort,
   setCurrentServiceTier,
@@ -64,6 +65,7 @@ function syncRuntimeMetadataToView(state: ClientSessionState) {
   setCurrentFastMode(state.fast ?? false)
   setYoloActive(state.yolo ?? false)
   setCurrentPersonality(state.personality ?? '')
+  setCurrentProject(state.project ?? null)
 }
 
 export function useSessionStateCache({

apps/desktop/src/app/shell/hooks/use-statusbar-items.tsx

@@ -21,6 +21,7 @@ import {
   $busy,
   $connection,
   $currentCwd,
+  $currentProject,
   $currentUsage,
   $selectedStoredSessionId,
   $sessions,
@@ -91,6 +92,7 @@ export function useStatusbarItems({
   const terminalTakeover = useStore($terminalTakeover)
   const primaryBusy = useStore($busy)
   const currentCwd = useStore($currentCwd)
+  const currentProject = useStore($currentProject)
   const primaryUsage = useStore($currentUsage)
   const gatewayRestarting = useStore($gatewayRestarting)
   const primarySessionStartedAt = useStore($sessionStartedAt)
@@ -313,7 +315,7 @@ export function useStatusbarItems({
         hidden: !currentCwd,
         icon: <FolderOpen className="size-3" />,
         id: 'workspace-cwd',
-        label: currentCwd ? workspaceLabel(currentCwd) : undefined,
+        label: currentProject?.name || (currentCwd ? workspaceLabel(currentCwd) : undefined),
         menuItems: currentCwd
           ? [
               {
@@ -336,7 +338,7 @@ export function useStatusbarItems({
               }
             ]
           : undefined,
-        title: currentCwd || undefined,
+        title: currentProject?.primary_path || currentCwd || undefined,
         variant: 'menu'
       },
       {
@@ -378,6 +380,8 @@ export function useStatusbarItems({
       commandCenterOpen,
       copy,
       currentCwd,
+      currentProject?.name,
+      currentProject?.primary_path,
       fileMenu.copyPath,
       fileMenu.revealFileManager,
       fileMenu.revealInSidebar,

apps/desktop/src/app/types.ts

@@ -1,7 +1,7 @@
 import type * as React from 'react'
 
 import type { ChatMessage } from '@/lib/chat-messages'
-import type { UsageStats } from '@/types/hermes'
+import type { SessionRuntimeProjectInfo, UsageStats } from '@/types/hermes'
 
 export interface ContextSuggestion {
   text: string
@@ -139,6 +139,7 @@ export interface ClientSessionState {
   messages: ChatMessage[]
   branch: string
   cwd: string
+  project: SessionRuntimeProjectInfo | null
   model: string
   provider: string
   reasoningEffort: string

apps/desktop/src/lib/chat-messages.ts

@@ -4,7 +4,7 @@ import { dedupeGeneratedImageEchoesInParts } from '@/lib/generated-images'
 import { mediaDisplayLabel, mediaMarkdownHref } from '@/lib/media'
 import { normalize } from '@/lib/text'
 import { parseTodos } from '@/lib/todos'
-import type { SessionMessage, UsageStats } from '@/types/hermes'
+import type { SessionMessage, SessionRuntimeProjectInfo, UsageStats } from '@/types/hermes'
 
 export type ChatMessagePart = Exclude<ThreadMessageLike['content'], string>[number]
 
@@ -51,6 +51,7 @@ export type GatewayEventPayload = {
   running?: boolean
   cwd?: string
   branch?: string
+  project?: null | SessionRuntimeProjectInfo
   credential_warning?: string
   install_warning?: string
   personality?: string

apps/desktop/src/lib/chat-runtime.ts

@@ -41,6 +41,7 @@ export function createClientSessionState(
     messages,
     branch: '',
     cwd: '',
+    project: null,
     model: '',
     provider: '',
     reasoningEffort: '',

apps/desktop/src/lib/markdown-code.test.ts

@@ -20,4 +20,34 @@ describe('isLikelyProseCodeBlock', () => {
   it('keeps real code blocks', () => {
     expect(isLikelyProseCodeBlock('ts', 'const value = { bunny: true };\nreturn value')).toBe(false)
   })
+
+  it('keeps zsh command blocks as code even when they look like prose lines', () => {
+    expect(
+      isLikelyProseCodeBlock(
+        'zsh',
+        [
+          'cd ~/Documents/dan-personal',
+          'bash -n install.sh',
+          'brew bundle check --file=packages/Brewfile',
+          'env -i HOME="$HOME" USER="$USER" LOGNAME="$LOGNAME" SHELL=/bin/zsh TERM=xterm-256color \\',
+          "  /bin/zsh -lic 'command -v brew && command -v starship && command -v gh && command -v stow'"
+        ].join('\n')
+      )
+    ).toBe(false)
+  })
+
+  it('keeps text-labeled shell command blocks as code', () => {
+    expect(
+      isLikelyProseCodeBlock(
+        'text',
+        [
+          'cd ~/Documents/',
+          'bash -n install.sh',
+          'brew bundle check --file=packages/Brewfile',
+          'env -i HOME="$HOME" USER="$USER" LOGNAME="$LOGNAME" SHELL=/bin/zsh TERM=xterm-256color \\',
+          "/bin/zsh -lic 'command -v brew && command -v starship && command -v gh && command -v stow'"
+        ].join('\n')
+      )
+    ).toBe(false)
+  })
 })