diff --git a/components/ambient-ui/src/adapters/__tests__/mappers.test.ts b/components/ambient-ui/src/adapters/__tests__/mappers.test.ts
index 718184838..156b4fdf1 100644
--- a/components/ambient-ui/src/adapters/__tests__/mappers.test.ts
+++ b/components/ambient-ui/src/adapters/__tests__/mappers.test.ts
@@ -170,6 +170,214 @@ describe('mapSdkSessionToDomain', () => {
     expect(domain.createdAt).toBe('')
     expect(domain.updatedAt).toBe('')
   })
+
+  describe('new session fields', () => {
+    it('parses repos from valid JSON string', () => {
+      const repos = JSON.stringify([
+        { url: 'https://github.com/org/repo1', branch: 'main', name: 'repo1', autoPush: true },
+        { url: 'https://github.com/org/repo2', branch: null, name: null, autoPush: false },
+      ])
+      const sdk = makeSdkSession({ repos })
+      const domain = mapSdkSessionToDomain(sdk)
+
+      expect(domain.repos).toHaveLength(2)
+      expect(domain.repos[0]).toEqual({
+        url: 'https://github.com/org/repo1',
+        branch: 'main',
+        name: 'repo1',
+        autoPush: true,
+      })
+      expect(domain.repos[1]).toEqual({
+        url: 'https://github.com/org/repo2',
+        branch: null,
+        name: null,
+        autoPush: false,
+      })
+    })
+
+    it('returns empty repos for empty string', () => {
+      const sdk = makeSdkSession({ repos: '' })
+      const domain = mapSdkSessionToDomain(sdk)
+      expect(domain.repos).toEqual([])
+    })
+
+    it('returns empty repos for invalid JSON', () => {
+      const sdk = makeSdkSession({ repos: 'not valid json' })
+      const domain = mapSdkSessionToDomain(sdk)
+      expect(domain.repos).toEqual([])
+    })
+
+    it('parses reconciled repos with all status variants', () => {
+      const reconciledRepos = JSON.stringify([
+        { url: 'https://github.com/org/repo1', name: 'repo1', status: 'Cloning', currentActiveBranch: 'feat-1', defaultBranch: 'main', clonedAt: '2026-01-15T10:00:00Z' },
+        { url: 'https://github.com/org/repo2', name: 'repo2', status: 'Ready', currentActiveBranch: 'main', defaultBranch: 'main', clonedAt: '2026-01-15T10:01:00Z' },
+        { url: 'https://github.com/org/repo3', name: 'repo3', status: 'Failed', currentActiveBranch: null, defaultBranch: null, clonedAt: null },
+      ])
+      const sdk = makeSdkSession({ reconciled_repos: reconciledRepos })
+      const domain = mapSdkSessionToDomain(sdk)
+
+      expect(domain.reconciledRepos).toHaveLength(3)
+      expect(domain.reconciledRepos[0]).toEqual({
+        url: 'https://github.com/org/repo1',
+        name: 'repo1',
+        status: 'Cloning',
+        currentActiveBranch: 'feat-1',
+        defaultBranch: 'main',
+        clonedAt: '2026-01-15T10:00:00Z',
+      })
+      expect(domain.reconciledRepos[1]!.status).toBe('Ready')
+      expect(domain.reconciledRepos[2]!.status).toBe('Failed')
+      expect(domain.reconciledRepos[2]!.currentActiveBranch).toBeNull()
+      expect(domain.reconciledRepos[2]!.clonedAt).toBeNull()
+    })
+
+    it('returns null status for invalid reconciled repo status', () => {
+      const reconciledRepos = JSON.stringify([
+        { url: 'https://github.com/org/repo1', name: 'repo1', status: 'SomeBogusStatus' },
+      ])
+      const sdk = makeSdkSession({ reconciled_repos: reconciledRepos })
+      const domain = mapSdkSessionToDomain(sdk)
+
+      expect(domain.reconciledRepos).toHaveLength(1)
+      expect(domain.reconciledRepos[0]!.status).toBeNull()
+    })
+
+    it('parses conditions array', () => {
+      const conditions = JSON.stringify([
+        { type: 'Ready', status: 'True', reason: 'AllGood', message: 'Session is ready', lastTransitionTime: '2026-01-15T10:05:00Z' },
+        { type: 'Progressing', status: 'False', reason: null, message: null, lastTransitionTime: null },
+      ])
+      const sdk = makeSdkSession({ conditions })
+      const domain = mapSdkSessionToDomain(sdk)
+
+      expect(domain.conditions).toHaveLength(2)
+      expect(domain.conditions[0]).toEqual({
+        type: 'Ready',
+        status: 'True',
+        reason: 'AllGood',
+        message: 'Session is ready',
+        lastTransitionTime: '2026-01-15T10:05:00Z',
+      })
+      expect(domain.conditions[1]).toEqual({
+        type: 'Progressing',
+        status: 'False',
+        reason: null,
+        message: null,
+        lastTransitionTime: null,
+      })
+    })
+
+    it('returns Unknown for invalid condition status', () => {
+      const conditions = JSON.stringify([
+        { type: 'Ready', status: 'Maybe' },
+      ])
+      const sdk = makeSdkSession({ conditions })
+      const domain = mapSdkSessionToDomain(sdk)
+
+      expect(domain.conditions).toHaveLength(1)
+      expect(domain.conditions[0]!.status).toBe('Unknown')
+    })
+
+    it('parses environment variables from JSON string', () => {
+      const envVars = JSON.stringify({ NODE_ENV: 'production', API_URL: 'https://api.example.com' })
+      const sdk = makeSdkSession({ environment_variables: envVars })
+      const domain = mapSdkSessionToDomain(sdk)
+
+      expect(domain.environmentVariables).toEqual({
+        NODE_ENV: 'production',
+        API_URL: 'https://api.example.com',
+      })
+    })
+
+    it('parses labels from JSON string', () => {
+      const labels = JSON.stringify({ team: 'platform', tier: 'production' })
+      const sdk = makeSdkSession({ labels })
+      const domain = mapSdkSessionToDomain(sdk)
+
+      expect(domain.labels).toEqual({
+        team: 'platform',
+        tier: 'production',
+      })
+    })
+
+    it('returns empty object for invalid env vars JSON', () => {
+      const sdk = makeSdkSession({ environment_variables: '{broken' })
+      const domain = mapSdkSessionToDomain(sdk)
+      expect(domain.environmentVariables).toEqual({})
+    })
+
+    it('returns empty object for invalid labels JSON', () => {
+      const sdk = makeSdkSession({ labels: 'not-json' })
+      const domain = mapSdkSessionToDomain(sdk)
+      expect(domain.labels).toEqual({})
+    })
+
+    it('returns empty object for array-shaped env vars', () => {
+      const sdk = makeSdkSession({ environment_variables: '["a","b"]' })
+      const domain = mapSdkSessionToDomain(sdk)
+      expect(domain.environmentVariables).toEqual({})
+    })
+
+    it('returns empty object for array-shaped labels', () => {
+      const sdk = makeSdkSession({ labels: '["x"]' })
+      const domain = mapSdkSessionToDomain(sdk)
+      expect(domain.labels).toEqual({})
+    })
+
+    it('maps temperature, maxTokens, timeout from SDK numbers', () => {
+      const sdk = makeSdkSession({ llm_temperature: 0.5, llm_max_tokens: 8192, timeout: 7200 })
+      const domain = mapSdkSessionToDomain(sdk)
+
+      expect(domain.temperature).toBe(0.5)
+      expect(domain.maxTokens).toBe(8192)
+      expect(domain.timeout).toBe(7200)
+    })
+
+    it('returns null for zero temperature, maxTokens, timeout', () => {
+      const sdk = makeSdkSession({ llm_temperature: 0, llm_max_tokens: 0, timeout: 0 })
+      const domain = mapSdkSessionToDomain(sdk)
+
+      expect(domain.temperature).toBeNull()
+      expect(domain.maxTokens).toBeNull()
+      expect(domain.timeout).toBeNull()
+    })
+
+    it('maps workflowId from workflow_id', () => {
+      const sdk = makeSdkSession({ workflow_id: 'wf-42' })
+      const domain = mapSdkSessionToDomain(sdk)
+      expect(domain.workflowId).toBe('wf-42')
+    })
+
+    it('maps workflowId to null for empty string', () => {
+      const sdk = makeSdkSession({ workflow_id: '' })
+      const domain = mapSdkSessionToDomain(sdk)
+      expect(domain.workflowId).toBeNull()
+    })
+
+    it('maps prompt from SDK', () => {
+      const sdk = makeSdkSession({ prompt: 'Fix the bug in auth.ts' })
+      const domain = mapSdkSessionToDomain(sdk)
+      expect(domain.prompt).toBe('Fix the bug in auth.ts')
+    })
+
+    it('maps prompt to null for empty string', () => {
+      const sdk = makeSdkSession({ prompt: '' })
+      const domain = mapSdkSessionToDomain(sdk)
+      expect(domain.prompt).toBeNull()
+    })
+
+    it('maps sdkRestartCount from sdk_restart_count', () => {
+      const sdk = makeSdkSession({ sdk_restart_count: 3 })
+      const domain = mapSdkSessionToDomain(sdk)
+      expect(domain.sdkRestartCount).toBe(3)
+    })
+
+    it('defaults sdkRestartCount to 0 when sdk_restart_count is 0', () => {
+      const sdk = makeSdkSession({ sdk_restart_count: 0 })
+      const domain = mapSdkSessionToDomain(sdk)
+      expect(domain.sdkRestartCount).toBe(0)
+    })
+  })
 })
 
 describe('mapSdkProjectToDomain', () => {
diff --git a/components/ambient-ui/src/adapters/mappers.ts b/components/ambient-ui/src/adapters/mappers.ts
index fd783b10f..a648c67ef 100644
--- a/components/ambient-ui/src/adapters/mappers.ts
+++ b/components/ambient-ui/src/adapters/mappers.ts
@@ -1,5 +1,8 @@
 import type { Session, Project } from 'ambient-sdk'
-import type { DomainSession, DomainProject, DomainSessionMessage, SessionPhase, SessionEventType } from '@/domain/types'
+import type {
+  DomainSession, DomainProject, DomainSessionMessage, SessionPhase, SessionEventType,
+  DomainRepo, DomainReconciledRepo, DomainCondition, ReconciledRepoStatus, ConditionStatus,
+} from '@/domain/types'
 
 const VALID_PHASES: ReadonlySet<string> = new Set<string>([
   'Pending',
@@ -37,10 +40,85 @@ function parseAnnotations(raw: string): Record<string, string> {
   }
 }
 
+function parseJsonArray(raw: string): unknown[] {
+  if (!raw) return []
+  try {
+    const parsed: unknown = JSON.parse(raw)
+    return Array.isArray(parsed) ? parsed : []
+  } catch {
+    return []
+  }
+}
+
+function parseJsonObject(raw: string): Record<string, string> {
+  if (!raw) return {}
+  try {
+    const parsed: unknown = JSON.parse(raw)
+    if (typeof parsed === 'object' && parsed !== null && !Array.isArray(parsed)) {
+      const result: Record<string, string> = {}
+      for (const [key, value] of Object.entries(parsed as Record<string, unknown>)) {
+        result[key] = String(value)
+      }
+      return result
+    }
+    return {}
+  } catch {
+    return {}
+  }
+}
+
+const VALID_REPO_STATUSES: ReadonlySet<string> = new Set(['Cloning', 'Ready', 'Failed'])
+const VALID_CONDITION_STATUSES: ReadonlySet<string> = new Set(['True', 'False', 'Unknown'])
+
+function parseRepos(raw: string): DomainRepo[] {
+  return parseJsonArray(raw).map((item) => {
+    const r = item as Record<string, unknown>
+    return {
+      url: String(r.url ?? ''),
+      branch: r.branch ? String(r.branch) : null,
+      name: r.name ? String(r.name) : null,
+      autoPush: Boolean(r.autoPush),
+    }
+  })
+}
+
+function parseReconciledRepos(raw: string): DomainReconciledRepo[] {
+  return parseJsonArray(raw).map((item) => {
+    const r = item as Record<string, unknown>
+    const status = String(r.status ?? '')
+    return {
+      url: String(r.url ?? ''),
+      name: r.name ? String(r.name) : null,
+      status: VALID_REPO_STATUSES.has(status) ? (status as ReconciledRepoStatus) : null,
+      currentActiveBranch: r.currentActiveBranch ? String(r.currentActiveBranch) : null,
+      defaultBranch: r.defaultBranch ? String(r.defaultBranch) : null,
+      clonedAt: r.clonedAt ? String(r.clonedAt) : null,
+    }
+  })
+}
+
+function parseConditions(raw: string): DomainCondition[] {
+  return parseJsonArray(raw).map((item) => {
+    const c = item as Record<string, unknown>
+    const status = String(c.status ?? 'Unknown')
+    return {
+      type: String(c.type ?? ''),
+      status: VALID_CONDITION_STATUSES.has(status) ? (status as ConditionStatus) : 'Unknown',
+      reason: c.reason ? String(c.reason) : null,
+      message: c.message ? String(c.message) : null,
+      lastTransitionTime: c.lastTransitionTime ? String(c.lastTransitionTime) : null,
+    }
+  })
+}
+
 function emptyToNull(value: string): string | null {
   return value || null
 }
 
+function numberOrNull(value: number): number | null {
+  return value === 0 || value === undefined || value === null ? null : value
+}
+
 export function mapSdkSessionToDomain(sdk: Session): DomainSession {
   const annotations = parseAnnotations(sdk.annotations)
   return {
@@ -51,11 +129,22 @@ export function mapSdkSessionToDomain(sdk: Session): DomainSession {
     agentName: annotations['agent_name'] ?? null,
     projectId: emptyToNull(sdk.project_id),
     model: emptyToNull(sdk.llm_model),
+    temperature: numberOrNull(sdk.llm_temperature),
+    maxTokens: numberOrNull(sdk.llm_max_tokens),
+    timeout: numberOrNull(sdk.timeout),
+    workflowId: emptyToNull(sdk.workflow_id),
+    prompt: emptyToNull(sdk.prompt),
+    sdkRestartCount: sdk.sdk_restart_count ?? 0,
     startTime: emptyToNull(sdk.start_time),
     completionTime: emptyToNull(sdk.completion_time),
     createdAt: sdk.created_at ?? '',
     updatedAt: sdk.updated_at ?? '',
     annotations,
+    labels: parseJsonObject(sdk.labels),
+    environmentVariables: parseJsonObject(sdk.environment_variables),
+    repos: parseRepos(sdk.repos),
+    reconciledRepos: parseReconciledRepos(sdk.reconciled_repos),
+    conditions: parseConditions(sdk.conditions),
   }
 }
 
diff --git a/components/ambient-ui/src/app/(dashboard)/[projectId]/fleet/[sessionId]/_components/phase-tab.tsx b/components/ambient-ui/src/app/(dashboard)/[projectId]/fleet/[sessionId]/_components/phase-tab.tsx
deleted file mode 100644
index 041797ff6..000000000
--- a/components/ambient-ui/src/app/(dashboard)/[projectId]/fleet/[sessionId]/_components/phase-tab.tsx
+++ /dev/null
@@ -1,132 +0,0 @@
-import { Card, CardContent, CardHeader, CardTitle } from '@/components/ui/card'
-import {
-  Table,
-  TableBody,
-  TableCell,
-  TableHead,
-  TableHeader,
-  TableRow,
-} from '@/components/ui/table'
-import type { DomainSession, SessionPhase } from '@/domain/types'
-import { cn } from '@/lib/utils'
-import { formatAbsoluteTime } from '@/lib/format-timestamp'
-
-const LIFECYCLE: SessionPhase[] = ['Pending', 'Creating', 'Running']
-
-const TERMINAL_ORDER = 4
-
-const PHASE_ORDER: Record<SessionPhase, number> = {
-  Pending: 0, Creating: 1, Running: 2, Stopping: 3,
-  Completed: TERMINAL_ORDER, Failed: TERMINAL_ORDER, Stopped: TERMINAL_ORDER,
-}
-
-export function PhaseTab({ session }: { session: DomainSession }) {
-  const currentOrder = PHASE_ORDER[session.phase]
-
-  return (
-    <div className="space-y-6 pt-4">
-      <Card>
-        <CardHeader>
-          <CardTitle className="text-base">Phase Timeline</CardTitle>
-        </CardHeader>
-        <CardContent>
-          <div className="flex items-center gap-2">
-            {LIFECYCLE.map((phase, i) => {
-              const order = PHASE_ORDER[phase]
-              const isCurrent = phase === session.phase
-              const isPast = order < currentOrder
-              return (
-                <div key={phase} className="flex items-center gap-2">
-                  {i > 0 && (
-                    <div className={cn(
-                      'h-0.5 w-8',
-                      isPast || isCurrent ? 'bg-foreground' : 'bg-border',
-                    )} />
-                  )}
-                  <div className="flex flex-col items-center gap-1">
-                    <div className={cn(
-                      'h-3 w-3 rounded-full border-2',
-                      isCurrent && 'bg-foreground border-foreground',
-                      isPast && 'bg-foreground border-foreground',
-                      !isCurrent && !isPast && 'bg-background border-muted-foreground/40',
-                    )} />
-                    <span className={cn(
-                      'text-xs',
-                      isCurrent ? 'font-medium' : 'text-muted-foreground',
-                    )}>
-                      {phase}
-                    </span>
-                  </div>
-                </div>
-              )
-            })}
-            <div className="h-0.5 w-8 bg-border" />
-            <div className="flex flex-col items-center gap-1">
-              <div className={cn(
-                'h-3 w-3 rounded-full border-2',
-                currentOrder >= TERMINAL_ORDER ? 'bg-foreground border-foreground' : 'bg-background border-muted-foreground/40',
-              )} />
-              <span className={cn(
-                'text-xs',
-                currentOrder >= TERMINAL_ORDER ? 'font-medium' : 'text-muted-foreground',
-              )}>
-                {currentOrder >= TERMINAL_ORDER ? session.phase : 'Terminal'}
-              </span>
-            </div>
-          </div>
-        </CardContent>
-      </Card>
-
-      <Card>
-        <CardHeader>
-          <CardTitle className="text-base">Metadata</CardTitle>
-        </CardHeader>
-        <CardContent>
-          <dl className="grid grid-cols-2 gap-x-8 gap-y-3 text-sm">
-            <MetaRow label="Session ID" value={session.id} mono />
-            <MetaRow label="Project" value={session.projectId ?? '—'} />
-            <MetaRow label="Agent" value={session.agentName ?? session.agentId ?? '—'} />
-            <MetaRow label="Model" value={session.model ?? '—'} />
-            <MetaRow label="Started" value={session.startTime ? formatAbsoluteTime(session.startTime) : '—'} />
-            <MetaRow label="Completed" value={session.completionTime ? formatAbsoluteTime(session.completionTime) : '—'} />
-          </dl>
-        </CardContent>
-      </Card>
-
-      {Object.keys(session.annotations).length > 0 && (
-        <Card>
-          <CardHeader>
-            <CardTitle className="text-base">Annotations</CardTitle>
-          </CardHeader>
-          <CardContent>
-            <Table>
-              <TableHeader>
-                <TableRow>
-                  <TableHead>Key</TableHead>
-                  <TableHead>Value</TableHead>
-                </TableRow>
-              </TableHeader>
-              <TableBody>
-                {Object.entries(session.annotations).map(([key, value]) => (
-                  <TableRow key={key}>
-                    <TableCell className="font-mono text-xs">{key}</TableCell>
-                    <TableCell className="text-sm">{value}</TableCell>
-                  </TableRow>
-                ))}
-              </TableBody>
-            </Table>
-          </CardContent>
-        </Card>
-      )}
-    </div>
-  )
-}
-
-function MetaRow({ label, value, mono }: { label: string; value: string; mono?: boolean }) {
-  return (
-    <div>
-      <dt className="text-muted-foreground">{label}</dt>
-      <dd className={cn('mt-0.5', mono && 'font-mono text-xs')}>{value}</dd>
-    </div>
-  )
-}
diff --git a/components/ambient-ui/src/app/(dashboard)/[projectId]/fleet/_components/__tests__/fleet-summary.test.tsx b/components/ambient-ui/src/app/(dashboard)/[projectId]/fleet/_components/__tests__/fleet-summary.test.tsx
deleted file mode 100644
index 9eb47026e..000000000
--- a/components/ambient-ui/src/app/(dashboard)/[projectId]/fleet/_components/__tests__/fleet-summary.test.tsx
+++ /dev/null
@@ -1,66 +0,0 @@
-import { describe, it, expect } from 'vitest'
-import { render, screen } from '@testing-library/react'
-import { FleetSummary } from '../fleet-summary'
-import type { DomainSession, SessionPhase } from '@/domain/types'
-
-function makeSession(overrides: Partial<DomainSession> = {}): DomainSession {
-  return {
-    id: 'sess-001',
-    name: 'test-session',
-    phase: 'Running',
-    agentId: null,
-    agentName: null,
-    projectId: 'proj-001',
-    model: null,
-    startTime: null,
-    completionTime: null,
-    createdAt: '2026-01-15T10:00:00Z',
-    updatedAt: '2026-01-15T10:00:00Z',
-    annotations: {},
-    ...overrides,
-  }
-}
-
-describe('FleetSummary', () => {
-  it('shows total session count', () => {
-    const sessions = [
-      makeSession({ id: 'sess-1' }),
-      makeSession({ id: 'sess-2' }),
-      makeSession({ id: 'sess-3' }),
-    ]
-
-    render(<FleetSummary sessions={sessions} />)
-    expect(screen.getByText('3 sessions')).toBeInTheDocument()
-  })
-
-  it('shows phase counts grouped by phase', () => {
-    const sessions = [
-      makeSession({ id: 'sess-1', phase: 'Running' }),
-      makeSession({ id: 'sess-2', phase: 'Running' }),
-      makeSession({ id: 'sess-3', phase: 'Failed' }),
-      makeSession({ id: 'sess-4', phase: 'Completed' }),
-    ]
-
-    render(<FleetSummary sessions={sessions} />)
-    expect(screen.getByText('4 sessions')).toBeInTheDocument()
-    expect(screen.getByText('Running')).toBeInTheDocument()
-    expect(screen.getByText('Failed')).toBeInTheDocument()
-    expect(screen.getByText('Completed')).toBeInTheDocument()
-    expect(screen.getByText('2')).toBeInTheDocument()
-    expect(screen.getAllByText('1')).toHaveLength(2)
-  })
-
-  it('does not render phases with zero count', () => {
-    const sessions = [makeSession({ id: 'sess-1', phase: 'Running' })]
-
-    render(<FleetSummary sessions={sessions} />)
-    expect(screen.queryByText('Pending')).not.toBeInTheDocument()
-    expect(screen.queryByText('Failed')).not.toBeInTheDocument()
-    expect(screen.queryByText('Stopped')).not.toBeInTheDocument()
-  })
-
-  it('handles empty sessions array', () => {
-    render(<FleetSummary sessions={[]} />)
-    expect(screen.getByText('0 sessions')).toBeInTheDocument()
-  })
-})
diff --git a/components/ambient-ui/src/app/(dashboard)/[projectId]/fleet/_components/fleet-columns.tsx b/components/ambient-ui/src/app/(dashboard)/[projectId]/fleet/_components/fleet-columns.tsx
deleted file mode 100644
index 1107be31f..000000000
--- a/components/ambient-ui/src/app/(dashboard)/[projectId]/fleet/_components/fleet-columns.tsx
+++ /dev/null
@@ -1,118 +0,0 @@
-import { createColumnHelper } from '@tanstack/react-table'
-import { MessageSquare } from 'lucide-react'
-import { Button } from '@/components/ui/button'
-import {
-  Tooltip,
-  TooltipContent,
-  TooltipTrigger,
-} from '@/components/ui/tooltip'
-import type { DomainSession } from '@/domain/types'
-import { formatRelativeTime, formatDuration } from '@/lib/format-timestamp'
-import { useChatSidebar } from '@/components/chat-sidebar-context'
-import { PhaseBadge } from './phase-badge'
-
-const COST_ANNOTATION = 'ambient-code.io/cost/estimate'
-const col = createColumnHelper<DomainSession>()
-
-function ChatColumnButton({ sessionId }: { sessionId: string }) {
-  const { openSidebar, openSessionId } = useChatSidebar()
-  const isActive = openSessionId === sessionId
-
-  return (
-    <Tooltip>
-      <TooltipTrigger asChild>
-        <Button
-          variant="ghost"
-          size="icon"
-          className="h-7 w-7"
-          onClick={(e) => {
-            e.stopPropagation()
-            openSidebar(sessionId)
-          }}
-          aria-label="Open chat sidebar"
-        >
-          <MessageSquare
-            className={`h-4 w-4 ${isActive ? 'text-primary' : 'text-muted-foreground'}`}
-          />
-        </Button>
-      </TooltipTrigger>
-      <TooltipContent>
-        {isActive ? 'Chat sidebar is open' : 'Open chat in sidebar'}
-      </TooltipContent>
-    </Tooltip>
-  )
-}
-
-export const fleetColumns = [
-  col.accessor('phase', {
-    header: 'Phase',
-    cell: info => <PhaseBadge phase={info.getValue()} />,
-    size: 130,
-  }),
-  col.accessor('name', {
-    header: 'Name',
-    cell: info => (
-      <span className="font-medium">{info.getValue()}</span>
-    ),
-  }),
-  col.accessor('agentName', {
-    header: 'Agent',
-    cell: info => {
-      const name = info.getValue()
-      const agentId = info.row.original.agentId
-      return (
-        <span className="text-muted-foreground">
-          {name ?? agentId ?? '—'}
-        </span>
-      )
-    },
-  }),
-  col.display({
-    id: 'duration',
-    header: 'Duration',
-    cell: ({ row }) => {
-      const { startTime, completionTime } = row.original
-      if (!startTime) return <span className="text-muted-foreground">—</span>
-      return (
-        <span className="text-muted-foreground font-mono text-xs">
-          {formatDuration(startTime, completionTime)}
-        </span>
-      )
-    },
-  }),
-  col.accessor('model', {
-    header: 'Model',
-    cell: info => (
-      <span className="text-muted-foreground text-xs">
-        {info.getValue() ?? '—'}
-      </span>
-    ),
-  }),
-  col.accessor('updatedAt', {
-    header: 'Last Activity',
-    cell: info => (
-      <span className="text-muted-foreground text-xs">
-        {formatRelativeTime(info.getValue())}
-      </span>
-    ),
-  }),
-  col.display({
-    id: 'cost',
-    header: 'Cost',
-    cell: ({ row }) => {
-      const cost = row.original.annotations[COST_ANNOTATION]
-      return (
-        <span className="text-muted-foreground text-xs font-mono">
-          {cost ?? '—'}
-        </span>
-      )
-    },
-    size: 80,
-  }),
-  col.display({
-    id: 'chat',
-    header: '',
-    cell: ({ row }) => <ChatColumnButton sessionId={row.original.id} />,
-    size: 48,
-  }),
-]
diff --git a/components/ambient-ui/src/app/(dashboard)/[projectId]/fleet/_components/fleet-summary.tsx b/components/ambient-ui/src/app/(dashboard)/[projectId]/fleet/_components/fleet-summary.tsx
deleted file mode 100644
index 431ae8bf2..000000000
--- a/components/ambient-ui/src/app/(dashboard)/[projectId]/fleet/_components/fleet-summary.tsx
+++ /dev/null
@@ -1,28 +0,0 @@
-import type { DomainSession, SessionPhase } from '@/domain/types'
-import { PhaseBadge } from './phase-badge'
-
-export function FleetSummary({ sessions }: { sessions: DomainSession[] }) {
-  const counts = sessions.reduce<Partial<Record<SessionPhase, number>>>((acc, s) => {
-    acc[s.phase] = (acc[s.phase] ?? 0) + 1
-    return acc
-  }, {})
-
-  const phases: SessionPhase[] = ['Running', 'Pending', 'Creating', 'Stopping', 'Failed', 'Completed', 'Stopped']
-
-  return (
-    <div className="flex items-center gap-4 text-sm">
-      <span className="font-medium">{sessions.length} sessions</span>
-      <span className="text-muted-foreground">—</span>
-      {phases.map(phase => {
-        const count = counts[phase]
-        if (!count) return null
-        return (
-          <div key={phase} className="flex items-center gap-1.5">
-            <PhaseBadge phase={phase} />
-            <span className="text-muted-foreground">{count}</span>
-          </div>
-        )
-      })}
-    </div>
-  )
-}
diff --git a/components/ambient-ui/src/app/(dashboard)/[projectId]/fleet/_components/fleet-table.tsx b/components/ambient-ui/src/app/(dashboard)/[projectId]/fleet/_components/fleet-table.tsx
deleted file mode 100644
index c54843d2b..000000000
--- a/components/ambient-ui/src/app/(dashboard)/[projectId]/fleet/_components/fleet-table.tsx
+++ /dev/null
@@ -1,85 +0,0 @@
-'use client'
-
-import { useRouter, useParams } from 'next/navigation'
-import {
-  useReactTable,
-  getCoreRowModel,
-  getFilteredRowModel,
-  flexRender,
-} from '@tanstack/react-table'
-import {
-  Table,
-  TableBody,
-  TableCell,
-  TableHead,
-  TableHeader,
-  TableRow,
-} from '@/components/ui/table'
-import { TooltipProvider } from '@/components/ui/tooltip'
-import type { DomainSession } from '@/domain/types'
-import { fleetColumns } from './fleet-columns'
-
-export function FleetTable({
-  sessions,
-  searchFilter,
-}: {
-  sessions: DomainSession[]
-  searchFilter: string
-}) {
-  const router = useRouter()
-  const { projectId } = useParams<{ projectId: string }>()
-
-  const table = useReactTable({
-    data: sessions,
-    columns: fleetColumns,
-    getCoreRowModel: getCoreRowModel(),
-    getFilteredRowModel: getFilteredRowModel(),
-    globalFilterFn: 'includesString',
-    state: { globalFilter: searchFilter },
-  })
-
-  return (
-    <TooltipProvider>
-    <div className="rounded-md border">
-      <Table>
-        <TableHeader>
-          {table.getHeaderGroups().map(headerGroup => (
-            <TableRow key={headerGroup.id}>
-              {headerGroup.headers.map(header => (
-                <TableHead key={header.id}>
-                  {header.isPlaceholder
-                    ? null
-                    : flexRender(header.column.columnDef.header, header.getContext())}
-                </TableHead>
-              ))}
-            </TableRow>
-          ))}
-        </TableHeader>
-        <TableBody>
-          {table.getRowModel().rows.length ? (
-            table.getRowModel().rows.map(row => (
-              <TableRow
-                key={row.id}
-                className="cursor-pointer"
-                onClick={() => router.push(`/${projectId}/fleet/${row.original.id}`)}
-              >
-                {row.getVisibleCells().map(cell => (
-                  <TableCell key={cell.id}>
-                    {flexRender(cell.column.columnDef.cell, cell.getContext())}
-                  </TableCell>
-                ))}
-              </TableRow>
-            ))
-          ) : (
-            <TableRow>
-              <TableCell colSpan={fleetColumns.length} className="h-24 text-center text-muted-foreground">
-                No sessions match your filter.
-              </TableCell>
-            </TableRow>
-          )}
-        </TableBody>
-      </Table>
-    </div>
-    </TooltipProvider>
-  )
-}
diff --git a/components/ambient-ui/src/app/(dashboard)/[projectId]/sessions/[sessionId]/_components/__tests__/config-tab.test.tsx b/components/ambient-ui/src/app/(dashboard)/[projectId]/sessions/[sessionId]/_components/__tests__/config-tab.test.tsx
new file mode 100644
index 000000000..f8d959e6b
--- /dev/null
+++ b/components/ambient-ui/src/app/(dashboard)/[projectId]/sessions/[sessionId]/_components/__tests__/config-tab.test.tsx
@@ -0,0 +1,208 @@
+import { describe, it, expect } from 'vitest'
+import { render, screen, fireEvent } from '@testing-library/react'
+import { ConfigTab } from '../config-tab'
+import type { DomainSession } from '@/domain/types'
+
+function makeSession(overrides: Partial<DomainSession> = {}): DomainSession {
+  return {
+    id: 'sess-001',
+    name: 'test-session',
+    phase: 'Running',
+    agentId: null,
+    agentName: null,
+    projectId: 'proj-001',
+    model: 'claude-sonnet-4-20250514',
+    temperature: 0.7,
+    maxTokens: 4096,
+    timeout: 3600,
+    workflowId: null,
+    prompt: null,
+    sdkRestartCount: 0,
+    startTime: null,
+    completionTime: null,
+    createdAt: '2026-01-15T10:00:00Z',
+    updatedAt: '2026-01-15T10:00:00Z',
+    annotations: {},
+    labels: {},
+    environmentVariables: {},
+    repos: [],
+    reconciledRepos: [],
+    conditions: [],
+    ...overrides,
+  }
+}
+
+describe('ConfigTab', () => {
+  it('renders configuration metadata', () => {
+    render(<ConfigTab session={makeSession()} />)
+    expect(screen.getByText('Configuration')).toBeTruthy()
+    expect(screen.getByText('claude-sonnet-4-20250514')).toBeTruthy()
+    expect(screen.getByText('0.7')).toBeTruthy()
+    expect(screen.getByText('4096')).toBeTruthy()
+    expect(screen.getByText('3600s')).toBeTruthy()
+  })
+
+  it('shows dashes for null config values', () => {
+    render(
+      <ConfigTab
+        session={makeSession({ model: null, temperature: null, maxTokens: null, timeout: null })}
+      />,
+    )
+    const dashes = screen.getAllByText('—')
+    expect(dashes.length).toBeGreaterThanOrEqual(4)
+  })
+
+  it('renders environment variables table with count', () => {
+    render(
+      <ConfigTab
+        session={makeSession({ environmentVariables: { NODE_ENV: 'production', DEBUG: 'true' } })}
+      />,
+    )
+    expect(screen.getByText('Environment Variables (2)')).toBeTruthy()
+    expect(screen.getByText('NODE_ENV')).toBeTruthy()
+    expect(screen.getByText('production')).toBeTruthy()
+    expect(screen.getByText('DEBUG')).toBeTruthy()
+  })
+
+  it('hides environment variables section when empty', () => {
+    render(<ConfigTab session={makeSession()} />)
+    expect(screen.queryByText(/Environment Variables/)).toBeNull()
+  })
+
+  it('renders annotations with friendly labels for registered keys', () => {
+    render(
+      <ConfigTab
+        session={makeSession({
+          annotations: {
+            'ambient-code.io/jira/issue': 'HYPERFLEET-234',
+            'ambient-code.io/github/pr': 'org/repo#42',
+          },
+        })}
+      />,
+    )
+    expect(screen.getByText('Annotations (2)')).toBeTruthy()
+    expect(screen.getByText('Jira Issue')).toBeTruthy()
+    expect(screen.getByText('GitHub PR')).toBeTruthy()
+    const hyperfleetMatches = screen.getAllByText('HYPERFLEET-234')
+    expect(hyperfleetMatches.length).toBeGreaterThanOrEqual(1)
+    const prMatches = screen.getAllByText('org/repo#42')
+    expect(prMatches.length).toBeGreaterThanOrEqual(1)
+  })
+
+  it('renders raw annotation keys when not registered', () => {
+    render(
+      <ConfigTab
+        session={makeSession({
+          annotations: { 'custom-key': 'custom-val' },
+        })}
+      />,
+    )
+    expect(screen.getByText('Annotations (1)')).toBeTruthy()
+    expect(screen.getByText('custom-key')).toBeTruthy()
+    expect(screen.getByText('custom-val')).toBeTruthy()
+  })
+
+  it('hides annotations section when no annotations exist', () => {
+    render(<ConfigTab session={makeSession()} />)
+    expect(screen.queryByText(/Annotations/)).toBeNull()
+  })
+
+  it('renders labels table with count', () => {
+    render(
+      <ConfigTab
+        session={makeSession({ labels: { team: 'platform', tier: 'production' } })}
+      />,
+    )
+    expect(screen.getByText('Labels (2)')).toBeTruthy()
+    expect(screen.getByText('team')).toBeTruthy()
+    expect(screen.getByText('platform')).toBeTruthy()
+  })
+
+  it('hides labels section when empty', () => {
+    render(<ConfigTab session={makeSession()} />)
+    expect(screen.queryByText(/Labels/)).toBeNull()
+  })
+
+  it('renders prompt with truncation and char count', () => {
+    const longPrompt = 'x'.repeat(300)
+    render(<ConfigTab session={makeSession({ prompt: longPrompt })} />)
+    expect(screen.getByText('Prompt')).toBeTruthy()
+    expect(screen.getByText('Show more (300 chars)')).toBeTruthy()
+  })
+
+  it('expands truncated prompt on click', () => {
+    const longPrompt = 'A'.repeat(100) + 'B'.repeat(200)
+    render(<ConfigTab session={makeSession({ prompt: longPrompt })} />)
+    fireEvent.click(screen.getByText('Show more (300 chars)'))
+    expect(screen.getByText('Show less')).toBeTruthy()
+    expect(screen.getByText(longPrompt)).toBeTruthy()
+  })
+
+  it('renders short prompt without truncation', () => {
+    render(<ConfigTab session={makeSession({ prompt: 'Fix the auth bug' })} />)
+    expect(screen.getByText('Fix the auth bug')).toBeTruthy()
+    expect(screen.queryByText(/Show more/)).toBeNull()
+  })
+
+  it('renders clickable URL annotation values as links', () => {
+    render(
+      <ConfigTab
+        session={makeSession({
+          annotations: { 'ambient-code.io/ui/preview-url': 'https://app.example.com' },
+        })}
+      />,
+    )
+    const link = screen.getByRole('link', { name: 'https://app.example.com' })
+    expect(link).toBeTruthy()
+    expect(link.getAttribute('href')).toBe('https://app.example.com')
+    expect(link.getAttribute('target')).toBe('_blank')
+  })
+
+  it('masks secret-looking env var values', () => {
+    render(
+      <ConfigTab
+        session={makeSession({
+          environmentVariables: { CREDENTIAL_ID: 'masked-val', NODE_ENV: 'production' },
+        })}
+      />,
+    )
+    expect(screen.getByText('NODE_ENV')).toBeTruthy()
+    expect(screen.getByText('production')).toBeTruthy()
+    expect(screen.getByText('CREDENTIAL_ID')).toBeTruthy()
+    expect(screen.getByText('••••••••')).toBeTruthy()
+    expect(screen.queryByText('masked-val')).toBeNull()
+  })
+
+  it('reveals secret value on toggle click', () => {
+    render(
+      <ConfigTab
+        session={makeSession({
+          environmentVariables: { SENSITIVE_CREDENTIAL: 'revealed-val' },
+        })}
+      />,
+    )
+    expect(screen.getByText('••••••••')).toBeTruthy()
+    fireEvent.click(screen.getByLabelText('Reveal secret value'))
+    expect(screen.getByText('revealed-val')).toBeTruthy()
+    expect(screen.queryByText('••••••••')).toBeNull()
+  })
+
+  it('hides Agent Restarts when sdkRestartCount is 0', () => {
+    render(<ConfigTab session={makeSession({ sdkRestartCount: 0 })} />)
+    expect(screen.queryByText('Agent Restarts')).toBeNull()
+  })
+
+  it('shows Agent Restarts when sdkRestartCount > 0', () => {
+    render(<ConfigTab session={makeSession({ sdkRestartCount: 3 })} />)
+    expect(screen.getByText('Agent Restarts')).toBeTruthy()
+    expect(screen.getByText('3')).toBeTruthy()
+  })
+
+  it('renders Workflow ID with mono styling and tooltip', () => {
+    render(<ConfigTab session={makeSession({ workflowId: 'wf-abc-123' })} />)
+    const wfElement = screen.getByText('wf-abc-123')
+    expect(wfElement).toBeTruthy()
+    expect(wfElement.getAttribute('title')).toBe('Workflow ID')
+    expect(wfElement.className).toContain('font-mono')
+  })
+})
diff --git a/components/ambient-ui/src/app/(dashboard)/[projectId]/fleet/[sessionId]/_components/__tests__/event-type-badge.test.tsx b/components/ambient-ui/src/app/(dashboard)/[projectId]/sessions/[sessionId]/_components/__tests__/event-type-badge.test.tsx
similarity index 100%
rename from components/ambient-ui/src/app/(dashboard)/[projectId]/fleet/[sessionId]/_components/__tests__/event-type-badge.test.tsx
rename to components/ambient-ui/src/app/(dashboard)/[projectId]/sessions/[sessionId]/_components/__tests__/event-type-badge.test.tsx
diff --git a/components/ambient-ui/src/app/(dashboard)/[projectId]/fleet/[sessionId]/_components/__tests__/logs-tab.test.tsx b/components/ambient-ui/src/app/(dashboard)/[projectId]/sessions/[sessionId]/_components/__tests__/logs-tab.test.tsx
similarity index 96%
rename from components/ambient-ui/src/app/(dashboard)/[projectId]/fleet/[sessionId]/_components/__tests__/logs-tab.test.tsx
rename to components/ambient-ui/src/app/(dashboard)/[projectId]/sessions/[sessionId]/_components/__tests__/logs-tab.test.tsx
index e067bd256..f9409ad5d 100644
--- a/components/ambient-ui/src/app/(dashboard)/[projectId]/fleet/[sessionId]/_components/__tests__/logs-tab.test.tsx
+++ b/components/ambient-ui/src/app/(dashboard)/[projectId]/sessions/[sessionId]/_components/__tests__/logs-tab.test.tsx
@@ -13,11 +13,22 @@ function makeSession(overrides: Partial<DomainSession> = {}): DomainSession {
     agentName: null,
     projectId: 'proj-001',
     model: null,
+    temperature: null,
+    maxTokens: null,
+    timeout: null,
+    workflowId: null,
+    prompt: null,
+    sdkRestartCount: 0,
     startTime: null,
     completionTime: null,
     createdAt: '2026-01-15T10:00:00Z',
     updatedAt: '2026-01-15T10:00:00Z',
     annotations: {},
+    labels: {},
+    environmentVariables: {},
+    repos: [],
+    reconciledRepos: [],
+    conditions: [],
     ...overrides,
   }
 }
diff --git a/components/ambient-ui/src/app/(dashboard)/[projectId]/sessions/[sessionId]/_components/__tests__/resources-tab.test.tsx b/components/ambient-ui/src/app/(dashboard)/[projectId]/sessions/[sessionId]/_components/__tests__/resources-tab.test.tsx
new file mode 100644
index 000000000..625e49b5b
--- /dev/null
+++ b/components/ambient-ui/src/app/(dashboard)/[projectId]/sessions/[sessionId]/_components/__tests__/resources-tab.test.tsx
@@ -0,0 +1,130 @@
+import { describe, it, expect } from 'vitest'
+import { render, screen } from '@testing-library/react'
+import { ResourcesTab } from '../resources-tab'
+import type { DomainSession, DomainRepo, DomainReconciledRepo } from '@/domain/types'
+
+function makeSession(overrides: Partial<DomainSession> = {}): DomainSession {
+  return {
+    id: 'sess-001',
+    name: 'test-session',
+    phase: 'Running',
+    agentId: null,
+    agentName: null,
+    projectId: 'proj-001',
+    model: null,
+    temperature: null,
+    maxTokens: null,
+    timeout: null,
+    workflowId: null,
+    prompt: null,
+    sdkRestartCount: 0,
+    startTime: null,
+    completionTime: null,
+    createdAt: '2026-01-15T10:00:00Z',
+    updatedAt: '2026-01-15T10:00:00Z',
+    annotations: {},
+    labels: {},
+    environmentVariables: {},
+    repos: [],
+    reconciledRepos: [],
+    conditions: [],
+    ...overrides,
+  }
+}
+
+const REPO: DomainRepo = {
+  url: 'https://github.com/org/platform.git',
+  branch: 'main',
+  name: 'platform',
+  autoPush: false,
+}
+
+const RECONCILED: DomainReconciledRepo = {
+  url: 'https://github.com/org/platform.git',
+  name: 'platform',
+  status: 'Ready',
+  currentActiveBranch: 'feat/new-feature',
+  defaultBranch: 'main',
+  clonedAt: '2026-01-15T10:02:00Z',
+}
+
+describe('ResourcesTab', () => {
+  it('shows empty state when no repos', () => {
+    render(<ResourcesTab session={makeSession()} />)
+    expect(screen.getByText('No resources attached')).toBeTruthy()
+    expect(screen.getByText('This session has no repositories configured.')).toBeTruthy()
+  })
+
+  it('renders repo table with merged data', () => {
+    render(
+      <ResourcesTab
+        session={makeSession({ repos: [REPO], reconciledRepos: [RECONCILED] })}
+      />,
+    )
+    expect(screen.getByText('platform')).toBeTruthy()
+    const link = screen.getByRole('link', { name: 'https://github.com/org/platform.git' })
+    expect(link).toBeTruthy()
+    expect(link.getAttribute('href')).toBe('https://github.com/org/platform.git')
+    expect(link.getAttribute('target')).toBe('_blank')
+    expect(screen.getByText('feat/new-feature')).toBeTruthy()
+    expect(screen.getByText('Ready')).toBeTruthy()
+  })
+
+  it('shows config branch when no reconciled data', () => {
+    render(<ResourcesTab session={makeSession({ repos: [REPO] })} />)
+    expect(screen.getByText('main')).toBeTruthy()
+  })
+
+  it('renders clone status badges with correct text', () => {
+    const cloningRepo: DomainReconciledRepo = { ...RECONCILED, status: 'Cloning', clonedAt: null }
+    render(
+      <ResourcesTab
+        session={makeSession({ repos: [REPO], reconciledRepos: [cloningRepo] })}
+      />,
+    )
+    expect(screen.getByText('Cloning')).toBeTruthy()
+  })
+
+  it('renders failed clone status', () => {
+    const failedRepo: DomainReconciledRepo = { ...RECONCILED, status: 'Failed', clonedAt: null }
+    render(
+      <ResourcesTab
+        session={makeSession({ repos: [REPO], reconciledRepos: [failedRepo] })}
+      />,
+    )
+    expect(screen.getByText('Failed')).toBeTruthy()
+  })
+
+  it('shows dash for missing clone status', () => {
+    const noStatusRepo: DomainReconciledRepo = { ...RECONCILED, status: null, clonedAt: null }
+    render(
+      <ResourcesTab
+        session={makeSession({ repos: [REPO], reconciledRepos: [noStatusRepo] })}
+      />,
+    )
+    const cells = screen.getAllByRole('cell')
+    const statusCell = cells[3]
+    expect(statusCell.textContent).toBe('—')
+  })
+
+  it('shows repository count in card title', () => {
+    render(
+      <ResourcesTab session={makeSession({ repos: [REPO] })} />,
+    )
+    expect(screen.getByText(/Repositories \(1\)/)).toBeTruthy()
+  })
+
+  it('renders repo URLs as clickable links with title tooltips', () => {
+    render(
+      <ResourcesTab session={makeSession({ repos: [REPO] })} />,
+    )
+    const link = screen.getByRole('link', { name: 'https://github.com/org/platform.git' })
+    expect(link.getAttribute('title')).toBe('https://github.com/org/platform.git')
+  })
+
+  it('derives name from URL basename when no name provided', () => {
+    const unnamedRepo: DomainRepo = { url: 'https://github.com/org/myrepo.git', branch: null, name: null, autoPush: false }
+    render(<ResourcesTab session={makeSession({ repos: [unnamedRepo] })} />)
+    expect(screen.getByText('myrepo')).toBeTruthy()
+  })
+})
diff --git a/components/ambient-ui/src/app/(dashboard)/[projectId]/fleet/[sessionId]/_components/chat-tab.tsx b/components/ambient-ui/src/app/(dashboard)/[projectId]/sessions/[sessionId]/_components/chat-tab.tsx
similarity index 100%
rename from components/ambient-ui/src/app/(dashboard)/[projectId]/fleet/[sessionId]/_components/chat-tab.tsx
rename to components/ambient-ui/src/app/(dashboard)/[projectId]/sessions/[sessionId]/_components/chat-tab.tsx
diff --git a/components/ambient-ui/src/app/(dashboard)/[projectId]/sessions/[sessionId]/_components/config-tab.tsx b/components/ambient-ui/src/app/(dashboard)/[projectId]/sessions/[sessionId]/_components/config-tab.tsx
new file mode 100644
index 000000000..19b65bc9d
--- /dev/null
+++ b/components/ambient-ui/src/app/(dashboard)/[projectId]/sessions/[sessionId]/_components/config-tab.tsx
@@ -0,0 +1,252 @@
+'use client'
+
+import { useState } from 'react'
+import { Card, CardContent, CardHeader, CardTitle } from '@/components/ui/card'
+import {
+  Table,
+  TableBody,
+  TableCell,
+  TableHead,
+  TableHeader,
+  TableRow,
+} from '@/components/ui/table'
+import type { DomainSession } from '@/domain/types'
+import { getRegisteredAnnotation } from '@/domain/annotations'
+import type { LucideIcon } from 'lucide-react'
+import {
+  Pin,
+  Tag,
+  Ticket,
+  GitPullRequest,
+  GitBranch,
+  FolderGit2,
+  Layers,
+  ExternalLink,
+  MessageCircle,
+  User,
+  Play,
+  DollarSign,
+  Siren,
+  Bot,
+  AlertTriangle,
+  Eye,
+  EyeOff,
+} from 'lucide-react'
+import { MetaRow, NoValue } from './meta-row'
+
+const ICON_MAP: Record<string, LucideIcon> = {
+  pin: Pin, tag: Tag, ticket: Ticket, layers: Layers, play: Play, bot: Bot,
+  siren: Siren, user: User, 'dollar-sign': DollarSign,
+  'git-pull-request': GitPullRequest, 'git-branch': GitBranch,
+  'folder-git-2': FolderGit2, 'external-link': ExternalLink,
+  'message-circle': MessageCircle, 'alert-triangle': AlertTriangle,
+}
+
+const PROMPT_TRUNCATE_LENGTH = 200
+
+const SECRET_PATTERNS = /SECRET|TOKEN|PASSWORD|KEY|API|CREDENTIAL/i
+
+function isSecretKey(key: string): boolean {
+  return SECRET_PATTERNS.test(key)
+}
+
+function isClickableValue(value: string): boolean {
+  return /^https?:\/\//.test(value)
+}
+
+function SecretValue({ value }: { value: string }) {
+  const [revealed, setRevealed] = useState(false)
+
+  return (
+    <span className="inline-flex items-center gap-1.5">
+      <span className="font-mono text-xs">
+        {revealed ? value : '••••••••'}
+      </span>
+      <button
+        type="button"
+        className="inline-flex items-center text-muted-foreground hover:text-foreground"
+        onClick={() => setRevealed((prev) => !prev)}
+        aria-label={revealed ? 'Hide secret value' : 'Reveal secret value'}
+      >
+        {revealed ? <EyeOff className="size-3.5" /> : <Eye className="size-3.5" />}
+      </button>
+    </span>
+  )
+}
+
+export function ConfigTab({ session }: { session: DomainSession }) {
+  const [promptExpanded, setPromptExpanded] = useState(false)
+
+  const envEntries = Object.entries(session.environmentVariables)
+  const annotationEntries = Object.entries(session.annotations)
+  const labelEntries = Object.entries(session.labels)
+
+  const promptNeedsTruncation =
+    session.prompt != null && session.prompt.length > PROMPT_TRUNCATE_LENGTH
+  const displayPrompt =
+    session.prompt != null
+      ? promptNeedsTruncation && !promptExpanded
+        ? session.prompt.slice(0, PROMPT_TRUNCATE_LENGTH) + '…'
+        : session.prompt
+      : null
+
+  return (
+    <div className="space-y-6 pt-4">
+      <Card>
+        <CardHeader>
+          <CardTitle className="text-base">Configuration</CardTitle>
+        </CardHeader>
+        <CardContent>
+          <dl className="grid grid-cols-1 sm:grid-cols-2 gap-x-8 gap-y-3 text-sm">
+            <MetaRow label="Model" value={session.model ?? <NoValue />} />
+            <MetaRow label="Temperature" value={session.temperature != null ? String(session.temperature) : <NoValue />} />
+            <MetaRow label="Max Tokens" value={session.maxTokens != null ? String(session.maxTokens) : <NoValue />} />
+            <MetaRow label="Timeout" value={session.timeout != null ? `${session.timeout}s` : <NoValue />} />
+            <MetaRow
+              label="Workflow ID"
+              value={
+                session.workflowId
+                  ? <span title="Workflow ID" className="font-mono text-xs">{session.workflowId}</span>
+                  : <NoValue />
+              }
+            />
+            {session.sdkRestartCount > 0 && (
+              <MetaRow label="Agent Restarts" value={String(session.sdkRestartCount)} />
+            )}
+          </dl>
+        </CardContent>
+      </Card>
+
+      {displayPrompt != null && (
+        <Card>
+          <CardHeader>
+            <CardTitle className="text-base">Prompt</CardTitle>
+          </CardHeader>
+          <CardContent>
+            <pre className="whitespace-pre-wrap text-sm font-mono">{displayPrompt}</pre>
+            {promptNeedsTruncation && (
+              <button
+                type="button"
+                className="mt-2 py-1 text-sm text-muted-foreground underline hover:text-foreground"
+                onClick={() => setPromptExpanded((prev) => !prev)}
+              >
+                {promptExpanded
+                  ? 'Show less'
+                  : `Show more (${session.prompt!.length.toLocaleString()} chars)`}
+              </button>
+            )}
+          </CardContent>
+        </Card>
+      )}
+
+      {envEntries.length > 0 && (
+        <Card>
+          <CardHeader>
+            <CardTitle className="text-base">
+              Environment Variables ({envEntries.length})
+            </CardTitle>
+          </CardHeader>
+          <CardContent>
+            <Table>
+              <TableHeader>
+                <TableRow>
+                  <TableHead>Key</TableHead>
+                  <TableHead>Value</TableHead>
+                </TableRow>
+              </TableHeader>
+              <TableBody>
+                {envEntries.map(([key, value]) => (
+                  <TableRow key={key}>
+                    <TableCell className="font-mono text-xs">{key}</TableCell>
+                    <TableCell className="text-sm">
+                      {isSecretKey(key) ? <SecretValue value={value} /> : value}
+                    </TableCell>
+                  </TableRow>
+                ))}
+              </TableBody>
+            </Table>
+          </CardContent>
+        </Card>
+      )}
+
+      {annotationEntries.length > 0 && (
+        <Card>
+          <CardHeader>
+            <CardTitle className="text-base">
+              Annotations ({annotationEntries.length})
+            </CardTitle>
+          </CardHeader>
+          <CardContent>
+            <Table>
+              <TableHeader>
+                <TableRow>
+                  <TableHead>Key</TableHead>
+                  <TableHead>Value</TableHead>
+                </TableRow>
+              </TableHeader>
+              <TableBody>
+                {annotationEntries.map(([key, value]) => {
+                  const registered = getRegisteredAnnotation(key)
+                  const Icon = registered?.icon ? ICON_MAP[registered.icon] : null
+                  const clickable = isClickableValue(value)
+                  return (
+                    <TableRow key={key}>
+                      <TableCell className="font-mono text-xs">
+                        <span className="inline-flex items-center gap-1.5">
+                          {Icon && <Icon className="size-3.5 shrink-0 text-muted-foreground" />}
+                          {registered ? registered.label : key}
+                        </span>
+                      </TableCell>
+                      <TableCell className="text-sm">
+                        {clickable ? (
+                          <a
+                            href={value}
+                            target="_blank"
+                            rel="noopener noreferrer"
+                            className="truncate text-link underline hover:text-link-hover"
+                          >
+                            {value}
+                          </a>
+                        ) : (
+                          value
+                        )}
+                      </TableCell>
+                    </TableRow>
+                  )
+                })}
+              </TableBody>
+            </Table>
+          </CardContent>
+        </Card>
+      )}
+
+      {labelEntries.length > 0 && (
+        <Card>
+          <CardHeader>
+            <CardTitle className="text-base">
+              Labels ({labelEntries.length})
+            </CardTitle>
+          </CardHeader>
+          <CardContent>
+            <Table>
+              <TableHeader>
+                <TableRow>
+                  <TableHead>Key</TableHead>
+                  <TableHead>Value</TableHead>
+                </TableRow>
+              </TableHeader>
+              <TableBody>
+                {labelEntries.map(([key, value]) => (
+                  <TableRow key={key}>
+                    <TableCell className="font-mono text-xs">{key}</TableCell>
+                    <TableCell className="text-sm">{value}</TableCell>
+                  </TableRow>
+                ))}
+              </TableBody>
+            </Table>
+          </CardContent>
+        </Card>
+      )}
+    </div>
+  )
+}
diff --git a/components/ambient-ui/src/app/(dashboard)/[projectId]/fleet/[sessionId]/_components/event-announcer.tsx b/components/ambient-ui/src/app/(dashboard)/[projectId]/sessions/[sessionId]/_components/event-announcer.tsx
similarity index 100%
rename from components/ambient-ui/src/app/(dashboard)/[projectId]/fleet/[sessionId]/_components/event-announcer.tsx
rename to components/ambient-ui/src/app/(dashboard)/[projectId]/sessions/[sessionId]/_components/event-announcer.tsx
diff --git a/components/ambient-ui/src/app/(dashboard)/[projectId]/fleet/[sessionId]/_components/event-row.tsx b/components/ambient-ui/src/app/(dashboard)/[projectId]/sessions/[sessionId]/_components/event-row.tsx
similarity index 100%
rename from components/ambient-ui/src/app/(dashboard)/[projectId]/fleet/[sessionId]/_components/event-row.tsx
rename to components/ambient-ui/src/app/(dashboard)/[projectId]/sessions/[sessionId]/_components/event-row.tsx
diff --git a/components/ambient-ui/src/app/(dashboard)/[projectId]/fleet/[sessionId]/_components/event-summary-banner.tsx b/components/ambient-ui/src/app/(dashboard)/[projectId]/sessions/[sessionId]/_components/event-summary-banner.tsx
similarity index 100%
rename from components/ambient-ui/src/app/(dashboard)/[projectId]/fleet/[sessionId]/_components/event-summary-banner.tsx
rename to components/ambient-ui/src/app/(dashboard)/[projectId]/sessions/[sessionId]/_components/event-summary-banner.tsx
diff --git a/components/ambient-ui/src/app/(dashboard)/[projectId]/fleet/[sessionId]/_components/event-type-badge.tsx b/components/ambient-ui/src/app/(dashboard)/[projectId]/sessions/[sessionId]/_components/event-type-badge.tsx
similarity index 100%
rename from components/ambient-ui/src/app/(dashboard)/[projectId]/fleet/[sessionId]/_components/event-type-badge.tsx
rename to components/ambient-ui/src/app/(dashboard)/[projectId]/sessions/[sessionId]/_components/event-type-badge.tsx
diff --git a/components/ambient-ui/src/app/(dashboard)/[projectId]/fleet/[sessionId]/_components/live-tail-indicator.tsx b/components/ambient-ui/src/app/(dashboard)/[projectId]/sessions/[sessionId]/_components/live-tail-indicator.tsx
similarity index 100%
rename from components/ambient-ui/src/app/(dashboard)/[projectId]/fleet/[sessionId]/_components/live-tail-indicator.tsx
rename to components/ambient-ui/src/app/(dashboard)/[projectId]/sessions/[sessionId]/_components/live-tail-indicator.tsx
diff --git a/components/ambient-ui/src/app/(dashboard)/[projectId]/fleet/[sessionId]/_components/logs-tab.tsx b/components/ambient-ui/src/app/(dashboard)/[projectId]/sessions/[sessionId]/_components/logs-tab.tsx
similarity index 100%
rename from components/ambient-ui/src/app/(dashboard)/[projectId]/fleet/[sessionId]/_components/logs-tab.tsx
rename to components/ambient-ui/src/app/(dashboard)/[projectId]/sessions/[sessionId]/_components/logs-tab.tsx
diff --git a/components/ambient-ui/src/app/(dashboard)/[projectId]/sessions/[sessionId]/_components/meta-row.tsx b/components/ambient-ui/src/app/(dashboard)/[projectId]/sessions/[sessionId]/_components/meta-row.tsx
new file mode 100644
index 000000000..e45a22efa
--- /dev/null
+++ b/components/ambient-ui/src/app/(dashboard)/[projectId]/sessions/[sessionId]/_components/meta-row.tsx
@@ -0,0 +1,16 @@
+import { cn } from '@/lib/utils'
+
+export function MetaRow({ label, value, mono }: { label: string; value: React.ReactNode; mono?: boolean }) {
+  return (
+    <div>
+      <dt className="text-muted-foreground">{label}</dt>
+      <dd className={cn('mt-0.5', mono && 'font-mono text-xs')}>
+        {value ?? <NoValue />}
+      </dd>
+    </div>
+  )
+}
+
+export function NoValue() {
+  return <span className="text-muted-foreground">&mdash;</span>
+}
diff --git a/components/ambient-ui/src/app/(dashboard)/[projectId]/sessions/[sessionId]/_components/overview-tab.tsx b/components/ambient-ui/src/app/(dashboard)/[projectId]/sessions/[sessionId]/_components/overview-tab.tsx
new file mode 100644
index 000000000..1aed9ea28
--- /dev/null
+++ b/components/ambient-ui/src/app/(dashboard)/[projectId]/sessions/[sessionId]/_components/overview-tab.tsx
@@ -0,0 +1,103 @@
+import { Card, CardContent, CardHeader, CardTitle } from '@/components/ui/card'
+import type { DomainSession, SessionPhase } from '@/domain/types'
+import { cn } from '@/lib/utils'
+import { formatAbsoluteTime } from '@/lib/format-timestamp'
+import { MetaRow, NoValue } from './meta-row'
+
+const LIFECYCLE: SessionPhase[] = ['Pending', 'Creating', 'Running']
+
+const TERMINAL_ORDER = 4
+
+const PHASE_ORDER: Record<SessionPhase, number> = {
+  Pending: 0, Creating: 1, Running: 2, Stopping: 3,
+  Completed: TERMINAL_ORDER, Failed: TERMINAL_ORDER, Stopped: TERMINAL_ORDER,
+}
+
+function phaseColor(phase: SessionPhase): string {
+  switch (phase) {
+    case 'Running':
+      return 'bg-green-500 border-green-500'
+    case 'Failed':
+      return 'bg-red-500 border-red-500'
+    case 'Completed':
+      return 'bg-blue-500 border-blue-500'
+    case 'Stopped':
+      return 'bg-muted-foreground border-muted-foreground'
+    default:
+      return 'bg-foreground border-foreground'
+  }
+}
+
+function TimelineSteps({ session, currentOrder }: { session: DomainSession; currentOrder: number }) {
+  const terminalLabel = currentOrder >= TERMINAL_ORDER ? session.phase : 'Terminal'
+  const terminalActive = currentOrder >= TERMINAL_ORDER
+  const steps = [
+    ...LIFECYCLE.map((phase) => ({
+      label: phase,
+      isCurrent: phase === session.phase,
+      isPast: PHASE_ORDER[phase] < currentOrder,
+    })),
+    { label: terminalLabel, isCurrent: terminalActive, isPast: false },
+  ]
+
+  return (
+    <div className="flex items-start">
+      {steps.map((step, i) => (
+        <div key={step.label} className="flex items-start">
+          {i > 0 && (
+            <div className={cn(
+              'mt-[5px] h-0.5 w-8',
+              (step.isPast || step.isCurrent) ? 'bg-foreground' : 'bg-border',
+            )} />
+          )}
+          <div className="flex flex-col items-center gap-1">
+            <div className={cn(
+              'size-3 shrink-0 rounded-full border-2',
+              step.isCurrent && phaseColor(session.phase),
+              step.isPast && 'bg-foreground border-foreground',
+              !step.isCurrent && !step.isPast && 'bg-background border-muted-foreground/40',
+            )} />
+            <span className={cn(
+              'text-xs',
+              step.isCurrent ? 'font-medium' : 'text-muted-foreground',
+            )}>
+              {step.label}
+            </span>
+          </div>
+        </div>
+      ))}
+    </div>
+  )
+}
+
+export function OverviewTab({ session }: { session: DomainSession }) {
+  const currentOrder = PHASE_ORDER[session.phase]
+
+  return (
+    <div className="space-y-6 pt-4">
+      <Card>
+        <CardHeader>
+          <CardTitle className="text-base">Phase Timeline</CardTitle>
+        </CardHeader>
+        <CardContent>
+          <TimelineSteps session={session} currentOrder={currentOrder} />
+        </CardContent>
+      </Card>
+
+      <Card>
+        <CardHeader>
+          <CardTitle className="text-base">Timing</CardTitle>
+        </CardHeader>
+        <CardContent>
+          <dl className="grid grid-cols-1 sm:grid-cols-2 gap-x-8 gap-y-3 text-sm">
+            <MetaRow label="Session ID" value={session.id} mono />
+            <MetaRow label="Project" value={session.projectId ?? <NoValue />} />
+            <MetaRow label="Agent" value={session.agentName ?? session.agentId ?? <NoValue />} />
+            <MetaRow label="Started" value={session.startTime ? formatAbsoluteTime(session.startTime) : <NoValue />} />
+            <MetaRow label="Completed" value={session.completionTime ? formatAbsoluteTime(session.completionTime) : <NoValue />} />
+          </dl>
+        </CardContent>
+      </Card>
+    </div>
+  )
+}
diff --git a/components/ambient-ui/src/app/(dashboard)/[projectId]/sessions/[sessionId]/_components/resources-tab.tsx b/components/ambient-ui/src/app/(dashboard)/[projectId]/sessions/[sessionId]/_components/resources-tab.tsx
new file mode 100644
index 000000000..30cb4db5a
--- /dev/null
+++ b/components/ambient-ui/src/app/(dashboard)/[projectId]/sessions/[sessionId]/_components/resources-tab.tsx
@@ -0,0 +1,152 @@
+import { Badge } from '@/components/ui/badge'
+import { Card, CardContent, CardHeader, CardTitle } from '@/components/ui/card'
+import {
+  Table,
+  TableBody,
+  TableCell,
+  TableHead,
+  TableHeader,
+  TableRow,
+} from '@/components/ui/table'
+import { EmptyState } from '@/components/empty-state'
+import type { DomainSession, DomainRepo, DomainReconciledRepo, ReconciledRepoStatus } from '@/domain/types'
+import { formatAbsoluteTime } from '@/lib/format-timestamp'
+import { cn } from '@/lib/utils'
+import { FolderGit2 } from 'lucide-react'
+import { NoValue } from './meta-row'
+
+const STATUS_CLASSES: Record<ReconciledRepoStatus, string> = {
+  Ready: 'bg-status-success text-status-success-foreground border-status-success-border',
+  Cloning: 'bg-status-warning text-status-warning-foreground border-status-warning-border',
+  Failed: 'bg-status-error text-status-error-foreground border-status-error-border',
+}
+
+type MergedRepo = {
+  url: string
+  name: string
+  branch: string | null
+  status: ReconciledRepoStatus | null
+  clonedAt: string | null
+}
+
+function mergeRepos(
+  repos: DomainRepo[],
+  reconciledRepos: DomainReconciledRepo[],
+): MergedRepo[] {
+  const reconciledByUrl = new Map(
+    reconciledRepos.map(r => [r.url, r]),
+  )
+
+  const seen = new Set<string>()
+  const result: MergedRepo[] = []
+
+  for (const repo of repos) {
+    seen.add(repo.url)
+    const reconciled = reconciledByUrl.get(repo.url)
+    result.push({
+      url: repo.url,
+      name: reconciled?.name ?? repo.name ?? baseNameFromUrl(repo.url),
+      branch: reconciled?.currentActiveBranch ?? repo.branch ?? null,
+      status: reconciled?.status ?? null,
+      clonedAt: reconciled?.clonedAt ?? null,
+    })
+  }
+
+  for (const reconciled of reconciledRepos) {
+    if (!seen.has(reconciled.url)) {
+      result.push({
+        url: reconciled.url,
+        name: reconciled.name ?? baseNameFromUrl(reconciled.url),
+        branch: reconciled.currentActiveBranch ?? null,
+        status: reconciled.status,
+        clonedAt: reconciled.clonedAt,
+      })
+    }
+  }
+
+  return result
+}
+
+function baseNameFromUrl(url: string): string {
+  const segments = url.replace(/\.git$/, '').split('/')
+  return segments[segments.length - 1] || url
+}
+
+export function ResourcesTab({ session }: { session: DomainSession }) {
+  const merged = mergeRepos(session.repos, session.reconciledRepos)
+  const hasRepos = merged.length > 0
+
+  if (!hasRepos) {
+    return (
+      <div className="pt-4">
+        <EmptyState
+          icon={FolderGit2}
+          title="No resources attached"
+          description="This session has no repositories configured."
+        />
+      </div>
+    )
+  }
+
+  return (
+    <div className="space-y-6 pt-4">
+      <Card>
+        <CardHeader>
+          <CardTitle className="text-base">
+            <FolderGit2 className="mr-2 inline-block size-4" />
+            Repositories ({merged.length})
+          </CardTitle>
+        </CardHeader>
+        <CardContent>
+          <Table>
+            <TableHeader>
+              <TableRow>
+                <TableHead>Name</TableHead>
+                <TableHead>URL</TableHead>
+                <TableHead>Branch</TableHead>
+                <TableHead>Clone Status</TableHead>
+                <TableHead>Cloned At</TableHead>
+              </TableRow>
+            </TableHeader>
+            <TableBody>
+              {merged.map(repo => (
+                <TableRow key={repo.url}>
+                  <TableCell className="font-medium">{repo.name}</TableCell>
+                  <TableCell className="max-w-[300px] truncate font-mono text-xs">
+                    <a
+                      href={repo.url}
+                      target="_blank"
+                      rel="noopener noreferrer"
+                      title={repo.url}
+                      className="text-link hover:text-link-hover"
+                    >
+                      {repo.url}
+                    </a>
+                  </TableCell>
+                  <TableCell className="text-sm">
+                    {repo.branch ?? <NoValue />}
+                  </TableCell>
+                  <TableCell>
+                    {repo.status ? (
+                      <Badge
+                        variant="outline"
+                        className={cn('font-medium', STATUS_CLASSES[repo.status])}
+                      >
+                        {repo.status}
+                      </Badge>
+                    ) : (
+                      <NoValue />
+                    )}
+                  </TableCell>
+                  <TableCell className="text-sm">
+                    {repo.clonedAt ? formatAbsoluteTime(repo.clonedAt) : <NoValue />}
+                  </TableCell>
+                </TableRow>
+              ))}
+            </TableBody>
+          </Table>
+        </CardContent>
+      </Card>
+    </div>
+  )
+}
diff --git a/components/ambient-ui/src/app/(dashboard)/[projectId]/fleet/[sessionId]/_components/session-header.tsx b/components/ambient-ui/src/app/(dashboard)/[projectId]/sessions/[sessionId]/_components/session-header.tsx
similarity index 93%
rename from components/ambient-ui/src/app/(dashboard)/[projectId]/fleet/[sessionId]/_components/session-header.tsx
rename to components/ambient-ui/src/app/(dashboard)/[projectId]/sessions/[sessionId]/_components/session-header.tsx
index 86f8d2e1e..ff18227de 100644
--- a/components/ambient-ui/src/app/(dashboard)/[projectId]/fleet/[sessionId]/_components/session-header.tsx
+++ b/components/ambient-ui/src/app/(dashboard)/[projectId]/sessions/[sessionId]/_components/session-header.tsx
@@ -59,7 +59,7 @@ export function SessionHeader({ session }: { session: DomainSession }) {
     deleteSession.mutate(session.id, {
       onSuccess: () => {
         setDeleteDialogOpen(false)
-        router.push(`/${projectId}/fleet`)
+        router.push(`/${projectId}/sessions`)
       },
       onError: () => setDeleteDialogOpen(false),
     })
@@ -100,11 +100,11 @@ export function SessionHeader({ session }: { session: DomainSession }) {
 
   return (
     <>
-      <div className="sticky top-0 z-[5] bg-background/95 backdrop-blur supports-[backdrop-filter]:bg-background/60 pb-4 -mx-1 px-1">
+      <div className="sticky top-14 z-[5] bg-background/95 backdrop-blur supports-[backdrop-filter]:bg-background/60 pb-4 -mx-1 px-1">
         <div className="space-y-3">
           <div className="flex items-center justify-between">
             <div className="flex items-center gap-3">
-              <h1 className="text-2xl font-semibold">{session.name}</h1>
+              <h1 className="text-lg font-semibold">{session.name}</h1>
               <PhaseBadge phase={session.phase} />
             </div>
 
@@ -116,7 +116,7 @@ export function SessionHeader({ session }: { session: DomainSession }) {
                   onClick={() => setPreviewOpen(true)}
                   aria-label="Open preview"
                 >
-                  <ExternalLink className="h-4 w-4" />
+                  <ExternalLink className="size-4" />
                   Preview
                 </Button>
               )}
@@ -129,7 +129,7 @@ export function SessionHeader({ session }: { session: DomainSession }) {
                   disabled={stopSession.isPending}
                   aria-label="Stop session"
                 >
-                  <Square className="h-4 w-4" />
+                  <Square className="size-4" />
                   Stop
                 </Button>
               )}
@@ -142,20 +142,20 @@ export function SessionHeader({ session }: { session: DomainSession }) {
                   disabled={startSession.isPending}
                   aria-label="Restart session"
                 >
-                  <RotateCcw className="h-4 w-4" />
+                  <RotateCcw className="size-4" />
                   Restart
                 </Button>
               )}
 
               <DropdownMenu>
                 <DropdownMenuTrigger asChild>
-                  <Button variant="ghost" size="icon" className="h-8 w-8" aria-label="More actions">
-                    <MoreVertical className="h-4 w-4" />
+                  <Button variant="ghost" size="icon" className="size-8" aria-label="More actions">
+                    <MoreVertical className="size-4" />
                   </Button>
                 </DropdownMenuTrigger>
                 <DropdownMenuContent align="end">
                   <DropdownMenuItem onClick={handleExport}>
-                    <Download className="h-4 w-4 mr-2" />
+                    <Download className="size-4 mr-2" />
                     Export
                   </DropdownMenuItem>
                   <DropdownMenuSeparator />
@@ -164,7 +164,7 @@ export function SessionHeader({ session }: { session: DomainSession }) {
                     disabled={deleteSession.isPending}
                     className="text-destructive focus:text-destructive"
                   >
-                    <Trash2 className="h-4 w-4 mr-2" />
+                    <Trash2 className="size-4 mr-2" />
                     Delete
                   </DropdownMenuItem>
                 </DropdownMenuContent>
diff --git a/components/ambient-ui/src/app/(dashboard)/[projectId]/fleet/[sessionId]/page.tsx b/components/ambient-ui/src/app/(dashboard)/[projectId]/sessions/[sessionId]/page.tsx
similarity index 58%
rename from components/ambient-ui/src/app/(dashboard)/[projectId]/fleet/[sessionId]/page.tsx
rename to components/ambient-ui/src/app/(dashboard)/[projectId]/sessions/[sessionId]/page.tsx
index 1d85f3ee9..251d3c73a 100644
--- a/components/ambient-ui/src/app/(dashboard)/[projectId]/fleet/[sessionId]/page.tsx
+++ b/components/ambient-ui/src/app/(dashboard)/[projectId]/sessions/[sessionId]/page.tsx
@@ -5,16 +5,25 @@ import { useParams } from 'next/navigation'
 import { Skeleton } from '@/components/ui/skeleton'
 import { Tabs, TabsContent, TabsList, TabsTrigger } from '@/components/ui/tabs'
 import { useSession } from '@/queries/use-sessions'
+import {
+  LayoutDashboard,
+  ScrollText,
+  FolderGit2,
+  Settings,
+  MessageSquare,
+} from 'lucide-react'
 import { SessionHeader } from './_components/session-header'
-import { PhaseTab } from './_components/phase-tab'
+import { OverviewTab } from './_components/overview-tab'
 import { LogsTab } from './_components/logs-tab'
 import { ChatTab } from './_components/chat-tab'
+import { ResourcesTab } from './_components/resources-tab'
+import { ConfigTab } from './_components/config-tab'
 
 export default function SessionDetailPage() {
   const { sessionId } = useParams<{ projectId: string; sessionId: string }>()
   const [activeTab, setActiveTab] = useState(() => {
-    if (typeof window === 'undefined') return 'phase'
-    return new URL(window.location.href).searchParams.get('tab') ?? 'phase'
+    if (typeof window === 'undefined') return 'overview'
+    return new URL(window.location.href).searchParams.get('tab') ?? 'overview'
   })
   const { data: session, isLoading, error } = useSession(sessionId)
 
@@ -47,18 +56,34 @@ export default function SessionDetailPage() {
       <SessionHeader session={session} />
       <Tabs value={activeTab} onValueChange={handleTabChange}>
         <TabsList className="w-full *:flex-1">
-          <TabsTrigger value="phase">Phase</TabsTrigger>
-          <TabsTrigger value="logs">Logs</TabsTrigger>
-          <TabsTrigger value="resources" disabled>Resources</TabsTrigger>
-          <TabsTrigger value="details" disabled>Details</TabsTrigger>
-          <TabsTrigger value="chat">Chat</TabsTrigger>
+          <TabsTrigger value="overview">
+            <LayoutDashboard className="size-4 mr-1.5" /> Overview
+          </TabsTrigger>
+          <TabsTrigger value="logs">
+            <ScrollText className="size-4 mr-1.5" /> Logs
+          </TabsTrigger>
+          <TabsTrigger value="resources">
+            <FolderGit2 className="size-4 mr-1.5" /> Resources
+          </TabsTrigger>
+          <TabsTrigger value="config">
+            <Settings className="size-4 mr-1.5" /> Config
+          </TabsTrigger>
+          <TabsTrigger value="chat">
+            <MessageSquare className="size-4 mr-1.5" /> Chat
+          </TabsTrigger>
         </TabsList>
-        <TabsContent value="phase">
-          <PhaseTab session={session} />
+        <TabsContent value="overview">
+          <OverviewTab session={session} />
         </TabsContent>
         <TabsContent value="logs">
           <LogsTab session={session} />
         </TabsContent>
+        <TabsContent value="resources">
+          <ResourcesTab session={session} />
+        </TabsContent>
+        <TabsContent value="config">
+          <ConfigTab session={session} />
+        </TabsContent>
         <TabsContent value="chat">
           <ChatTab session={session} />
         </TabsContent>
diff --git a/components/ambient-ui/src/app/(dashboard)/[projectId]/sessions/_components/__tests__/fleet-summary.test.tsx b/components/ambient-ui/src/app/(dashboard)/[projectId]/sessions/_components/__tests__/fleet-summary.test.tsx
new file mode 100644
index 000000000..bdddba212
--- /dev/null
+++ b/components/ambient-ui/src/app/(dashboard)/[projectId]/sessions/_components/__tests__/fleet-summary.test.tsx
@@ -0,0 +1,160 @@
+import { describe, it, expect, vi } from 'vitest'
+import { render, screen, fireEvent } from '@testing-library/react'
+import { FleetSummary } from '../fleet-summary'
+import type { DomainSession, SessionPhase } from '@/domain/types'
+
+function makeSession(overrides: Partial<DomainSession> = {}): DomainSession {
+  return {
+    id: 'sess-001',
+    name: 'test-session',
+    phase: 'Running',
+    agentId: null,
+    agentName: null,
+    projectId: 'proj-001',
+    model: null,
+    temperature: null,
+    maxTokens: null,
+    timeout: null,
+    workflowId: null,
+    prompt: null,
+    sdkRestartCount: 0,
+    startTime: null,
+    completionTime: null,
+    createdAt: '2026-01-15T10:00:00Z',
+    updatedAt: '2026-01-15T10:00:00Z',
+    annotations: {},
+    labels: {},
+    environmentVariables: {},
+    repos: [],
+    reconciledRepos: [],
+    conditions: [],
+    ...overrides,
+  }
+}
+
+describe('FleetSummary', () => {
+  it('shows total session count', () => {
+    const sessions = [
+      makeSession({ id: 'sess-1' }),
+      makeSession({ id: 'sess-2' }),
+      makeSession({ id: 'sess-3' }),
+    ]
+
+    render(<FleetSummary sessions={sessions} />)
+    expect(screen.getByText('3 sessions')).toBeInTheDocument()
+  })
+
+  it('shows phase counts grouped by phase', () => {
+    const sessions = [
+      makeSession({ id: 'sess-1', phase: 'Running' }),
+      makeSession({ id: 'sess-2', phase: 'Running' }),
+      makeSession({ id: 'sess-3', phase: 'Failed' }),
+      makeSession({ id: 'sess-4', phase: 'Completed' }),
+    ]
+
+    render(<FleetSummary sessions={sessions} />)
+    expect(screen.getByText('4 sessions')).toBeInTheDocument()
+    expect(screen.getByText('Running')).toBeInTheDocument()
+    expect(screen.getByText('Failed')).toBeInTheDocument()
+    expect(screen.getByText('Completed')).toBeInTheDocument()
+    expect(screen.getByText('2')).toBeInTheDocument()
+    expect(screen.getAllByText('1')).toHaveLength(2)
+  })
+
+  it('does not render phases with zero count', () => {
+    const sessions = [makeSession({ id: 'sess-1', phase: 'Running' })]
+
+    render(<FleetSummary sessions={sessions} />)
+    expect(screen.queryByText('Pending')).not.toBeInTheDocument()
+    expect(screen.queryByText('Failed')).not.toBeInTheDocument()
+    expect(screen.queryByText('Stopped')).not.toBeInTheDocument()
+  })
+
+  it('handles empty sessions array', () => {
+    render(<FleetSummary sessions={[]} />)
+    expect(screen.getByText('0 sessions')).toBeInTheDocument()
+  })
+
+  it('shows filtered count when filteredCount differs from total', () => {
+    const sessions = [
+      makeSession({ id: 'sess-1' }),
+      makeSession({ id: 'sess-2' }),
+      makeSession({ id: 'sess-3' }),
+    ]
+
+    render(<FleetSummary sessions={sessions} filteredCount={2} />)
+    expect(screen.getByText('Showing 2 of 3 sessions')).toBeInTheDocument()
+  })
+
+  it('shows normal count when filteredCount equals total', () => {
+    const sessions = [
+      makeSession({ id: 'sess-1' }),
+      makeSession({ id: 'sess-2' }),
+    ]
+
+    render(<FleetSummary sessions={sessions} filteredCount={2} />)
+    expect(screen.getByText('2 sessions')).toBeInTheDocument()
+  })
+
+  it('calls onPhaseFilter when a phase chip is clicked', () => {
+    const onPhaseFilter = vi.fn()
+    const sessions = [
+      makeSession({ id: 'sess-1', phase: 'Running' }),
+      makeSession({ id: 'sess-2', phase: 'Failed' }),
+    ]
+
+    render(
+      <FleetSummary
+        sessions={sessions}
+        onPhaseFilter={onPhaseFilter}
+      />
+    )
+
+    const runningButton = screen.getByRole('button', { name: 'Filter by Running' })
+    fireEvent.click(runningButton)
+    expect(onPhaseFilter).toHaveBeenCalledWith('Running')
+  })
+
+  it('clears phase filter when active phase chip is clicked', () => {
+    const onPhaseFilter = vi.fn()
+    const sessions = [
+      makeSession({ id: 'sess-1', phase: 'Running' }),
+    ]
+
+    render(
+      <FleetSummary
+        sessions={sessions}
+        activePhase={'Running' as SessionPhase}
+        onPhaseFilter={onPhaseFilter}
+      />
+    )
+
+    const runningButton = screen.getByRole('button', { name: 'Filter by Running' })
+    fireEvent.click(runningButton)
+    expect(onPhaseFilter).toHaveBeenCalledWith(null)
+  })
+
+  it('renders phase chips as buttons when onPhaseFilter is provided', () => {
+    const sessions = [
+      makeSession({ id: 'sess-1', phase: 'Running' }),
+    ]
+
+    render(
+      <FleetSummary
+        sessions={sessions}
+        onPhaseFilter={() => {}}
+      />
+    )
+
+    expect(screen.getByRole('button', { name: 'Filter by Running' })).toBeInTheDocument()
+  })
+
+  it('renders phase chips as non-interactive when onPhaseFilter is not provided', () => {
+    const sessions = [
+      makeSession({ id: 'sess-1', phase: 'Running' }),
+    ]
+
+    render(<FleetSummary sessions={sessions} />)
+    expect(screen.queryByRole('button', { name: 'Filter by Running' })).not.toBeInTheDocument()
+  })
+})
diff --git a/components/ambient-ui/src/app/(dashboard)/[projectId]/fleet/_components/__tests__/phase-badge.test.tsx b/components/ambient-ui/src/app/(dashboard)/[projectId]/sessions/_components/__tests__/phase-badge.test.tsx
similarity index 100%
rename from components/ambient-ui/src/app/(dashboard)/[projectId]/fleet/_components/__tests__/phase-badge.test.tsx
rename to components/ambient-ui/src/app/(dashboard)/[projectId]/sessions/_components/__tests__/phase-badge.test.tsx
diff --git a/components/ambient-ui/src/app/(dashboard)/[projectId]/sessions/_components/fleet-columns.tsx b/components/ambient-ui/src/app/(dashboard)/[projectId]/sessions/_components/fleet-columns.tsx
new file mode 100644
index 000000000..8abb553b5
--- /dev/null
+++ b/components/ambient-ui/src/app/(dashboard)/[projectId]/sessions/_components/fleet-columns.tsx
@@ -0,0 +1,215 @@
+import { createColumnHelper } from '@tanstack/react-table'
+import type { SortingFn } from '@tanstack/react-table'
+import { MessageSquare } from 'lucide-react'
+import { Button } from '@/components/ui/button'
+import {
+  Tooltip,
+  TooltipContent,
+  TooltipTrigger,
+} from '@/components/ui/tooltip'
+import type { DomainSession, SessionPhase } from '@/domain/types'
+import { formatRelativeTime, formatPreciseDuration } from '@/lib/format-timestamp'
+import { useChatSidebar } from '@/components/chat-sidebar-context'
+import { PhaseBadge } from './phase-badge'
+
+const COST_ANNOTATION = 'ambient-code.io/cost/estimate'
+const col = createColumnHelper<DomainSession>()
+
+const RUNNING_PHASES: ReadonlySet<SessionPhase> = new Set(['Running', 'Creating', 'Pending', 'Stopping'])
+const TERMINAL_PHASES: ReadonlySet<SessionPhase> = new Set(['Completed', 'Failed', 'Stopped'])
+
+/** Priority order for phase sorting: Failed first (0), terminal last */
+const PHASE_SORT_PRIORITY: Record<SessionPhase, number> = {
+  Failed: 0,
+  Running: 1,
+  Stopping: 2,
+  Creating: 3,
+  Pending: 4,
+  Completed: 5,
+  Stopped: 6,
+}
+
+const phaseSortingFn: SortingFn<DomainSession> = (rowA, rowB) => {
+  const a = PHASE_SORT_PRIORITY[rowA.original.phase] ?? 99
+  const b = PHASE_SORT_PRIORITY[rowB.original.phase] ?? 99
+  return a - b
+}
+
+function ChatColumnButton({ sessionId, phase }: { sessionId: string; phase: SessionPhase }) {
+  const { openSidebar, openSessionId } = useChatSidebar()
+  const isActive = openSessionId === sessionId
+  const isTerminal = TERMINAL_PHASES.has(phase)
+
+  return (
+    <Tooltip>
+      <TooltipTrigger asChild>
+        <Button
+          variant="ghost"
+          size="icon"
+          className="h-7 w-7"
+          onClick={(e) => {
+            e.stopPropagation()
+            openSidebar(sessionId)
+          }}
+          aria-label={isTerminal ? 'View chat history' : 'Open chat sidebar'}
+        >
+          <MessageSquare
+            className={`h-4 w-4 ${isActive ? 'text-primary' : 'text-muted-foreground'}`}
+          />
+        </Button>
+      </TooltipTrigger>
+      <TooltipContent>
+        {isActive
+          ? 'Chat sidebar is open'
+          : isTerminal
+            ? 'View chat history'
+            : 'Open chat in sidebar'}
+      </TooltipContent>
+    </Tooltip>
+  )
+}
+
+export const fleetColumns = [
+  col.accessor('phase', {
+    header: 'Phase',
+    cell: info => <PhaseBadge phase={info.getValue()} />,
+    size: 130,
+    enableSorting: true,
+    sortingFn: phaseSortingFn,
+  }),
+  col.accessor('name', {
+    header: 'Name',
+    cell: info => (
+      <span className="font-medium">{info.getValue()}</span>
+    ),
+  }),
+  col.accessor('agentId', {
+    header: 'Agent',
+    cell: info => {
+      const agentId = info.getValue()
+      const annotationName = info.row.original.agentName
+      const agentNames = (info.table.options.meta as { agentNames?: Map<string, string> } | undefined)?.agentNames
+      const resolvedName = annotationName ?? (agentId ? agentNames?.get(agentId) : null) ?? null
+      if (!resolvedName) return <span className="text-muted-foreground">—</span>
+      return (
+        <span className="text-sm text-foreground">
+          {resolvedName}
+        </span>
+      )
+    },
+  }),
+  col.display({
+    id: 'duration',
+    header: 'Duration',
+    enableSorting: true,
+    sortingFn: (rowA, rowB) => {
+      const getMs = (row: typeof rowA) => {
+        const { startTime, completionTime, phase } = row.original
+        if (!startTime) return 0
+        const isActive = RUNNING_PHASES.has(phase)
+        const end = isActive ? new Date() : (completionTime ? new Date(completionTime) : new Date())
+        return Math.max(0, end.getTime() - new Date(startTime).getTime())
+      }
+      return getMs(rowA) - getMs(rowB)
+    },
+    cell: ({ row }) => {
+      const { startTime, completionTime, phase } = row.original
+      if (!startTime) return <span className="text-muted-foreground">—</span>
+      const isActive = RUNNING_PHASES.has(phase)
+      const endTime = isActive ? null
+        : (completionTime && new Date(completionTime) > new Date(startTime)) ? completionTime
+        : null
+      return (
+        <span className="text-muted-foreground font-mono text-xs">
+          {formatPreciseDuration(startTime, endTime)}
+        </span>
+      )
+    },
+  }),
+  col.accessor('model', {
+    header: 'Model',
+    cell: info => (
+      <span className="text-muted-foreground text-xs">
+        {info.getValue() ?? '—'}
+      </span>
+    ),
+  }),
+  col.display({
+    id: 'lastActivity',
+    header: 'Last Activity',
+    enableSorting: true,
+    sortingFn: (rowA, rowB) => {
+      const getTime = (row: typeof rowA) => {
+        const { phase, completionTime, updatedAt } = row.original
+        if (RUNNING_PHASES.has(phase)) return Date.now()
+        return new Date(completionTime ?? updatedAt).getTime()
+      }
+      return getTime(rowA) - getTime(rowB)
+    },
+    cell: ({ row }) => {
+      const { phase, completionTime, updatedAt } = row.original
+
+      if (phase === 'Running') {
+        return (
+          <span className="text-xs font-medium text-status-success-foreground">
+            Active now
+          </span>
+        )
+      }
+
+      if (phase === 'Creating' || phase === 'Pending') {
+        return (
+          <span className="text-xs font-medium text-status-warning-foreground">
+            Starting...
+          </span>
+        )
+      }
+
+      if (phase === 'Stopping') {
+        return (
+          <span className="text-xs font-medium text-muted-foreground">
+            Stopping...
+          </span>
+        )
+      }
+
+      const activityTime = completionTime ?? updatedAt
+      return (
+        <span className="text-muted-foreground text-xs">
+          {formatRelativeTime(activityTime)}
+        </span>
+      )
+    },
+  }),
+  col.display({
+    id: 'cost',
+    header: 'Cost',
+    enableSorting: true,
+    sortingFn: (rowA, rowB) => {
+      const getCost = (row: typeof rowA) => {
+        const raw = row.original.annotations[COST_ANNOTATION]
+        if (!raw) return 0
+        return parseFloat(raw.replace(/[^0-9.]/g, '')) || 0
+      }
+      return getCost(rowA) - getCost(rowB)
+    },
+    cell: ({ row }) => {
+      const cost = row.original.annotations[COST_ANNOTATION]
+      return (
+        <span className="text-muted-foreground text-xs font-mono">
+          {cost ?? '—'}
+        </span>
+      )
+    },
+    size: 80,
+  }),
+  col.display({
+    id: 'chat',
+    header: () => (
+      <MessageSquare className="size-3.5 text-muted-foreground" aria-label="Chat" />
+    ),
+    cell: ({ row }) => <ChatColumnButton sessionId={row.original.id} phase={row.original.phase} />,
+    size: 48,
+    enableSorting: false,
+  }),
+]
diff --git a/components/ambient-ui/src/app/(dashboard)/[projectId]/sessions/_components/fleet-summary.tsx b/components/ambient-ui/src/app/(dashboard)/[projectId]/sessions/_components/fleet-summary.tsx
new file mode 100644
index 000000000..87752b5f9
--- /dev/null
+++ b/components/ambient-ui/src/app/(dashboard)/[projectId]/sessions/_components/fleet-summary.tsx
@@ -0,0 +1,69 @@
+import { cn } from '@/lib/utils'
+import type { DomainSession, SessionPhase } from '@/domain/types'
+import { PhaseBadge } from './phase-badge'
+
+export function FleetSummary({
+  sessions,
+  filteredCount,
+  activePhase,
+  onPhaseFilter,
+}: {
+  sessions: DomainSession[]
+  filteredCount?: number
+  activePhase?: SessionPhase | null
+  onPhaseFilter?: (phase: SessionPhase | null) => void
+}) {
+  const counts = sessions.reduce<Partial<Record<SessionPhase, number>>>((acc, s) => {
+    acc[s.phase] = (acc[s.phase] ?? 0) + 1
+    return acc
+  }, {})
+
+  const total = sessions.length
+  const showFiltered = filteredCount !== undefined && filteredCount !== total
+
+  const phases: SessionPhase[] = ['Running', 'Pending', 'Creating', 'Stopping', 'Failed', 'Completed', 'Stopped']
+
+  return (
+    <div className="flex items-center gap-4 text-sm rounded-lg border bg-muted/30 px-4 py-2.5">
+      <span className="font-medium">
+        {showFiltered
+          ? `Showing ${filteredCount} of ${total} sessions`
+          : `${total} sessions`}
+      </span>
+      <span className="text-muted-foreground">—</span>
+      {phases.map(phase => {
+        const count = counts[phase]
+        if (!count) return null
+        const isActive = activePhase === phase
+
+        if (onPhaseFilter) {
+          return (
+            <button
+              key={phase}
+              type="button"
+              className={cn(
+                'flex items-center gap-1.5 rounded-md px-1.5 py-0.5 transition-colors',
+                isActive
+                  ? 'bg-accent ring-1 ring-ring'
+                  : 'hover:bg-accent/50'
+              )}
+              onClick={() => onPhaseFilter(isActive ? null : phase)}
+              aria-pressed={isActive}
+              aria-label={`Filter by ${phase}`}
+            >
+              <PhaseBadge phase={phase} />
+              <span className="text-muted-foreground">{count}</span>
+            </button>
+          )
+        }
+
+        return (
+          <div key={phase} className="flex items-center gap-1.5">
+            <PhaseBadge phase={phase} />
+            <span className="text-muted-foreground">{count}</span>
+          </div>
+        )
+      })}
+    </div>
+  )
+}
diff --git a/components/ambient-ui/src/app/(dashboard)/[projectId]/sessions/_components/fleet-table.tsx b/components/ambient-ui/src/app/(dashboard)/[projectId]/sessions/_components/fleet-table.tsx
new file mode 100644
index 000000000..0fa6eddfa
--- /dev/null
+++ b/components/ambient-ui/src/app/(dashboard)/[projectId]/sessions/_components/fleet-table.tsx
@@ -0,0 +1,166 @@
+'use client'
+
+import { useState, useEffect } from 'react'
+import { useRouter, useParams } from 'next/navigation'
+import {
+  useReactTable,
+  getCoreRowModel,
+  getFilteredRowModel,
+  getSortedRowModel,
+  flexRender,
+} from '@tanstack/react-table'
+import type { SortingState, ColumnFiltersState } from '@tanstack/react-table'
+import { ChevronUp, ChevronDown } from 'lucide-react'
+import {
+  Table,
+  TableBody,
+  TableCell,
+  TableHead,
+  TableHeader,
+  TableRow,
+} from '@/components/ui/table'
+import { TooltipProvider } from '@/components/ui/tooltip'
+import type { DomainSession, SessionPhase } from '@/domain/types'
+import { fleetColumns } from './fleet-columns'
+
+export function FleetTable({
+  sessions,
+  searchFilter,
+  agentNames,
+  phaseFilter,
+  onFilteredCountChange,
+}: {
+  sessions: DomainSession[]
+  searchFilter: string
+  agentNames?: Map<string, string>
+  phaseFilter?: SessionPhase | null
+  onFilteredCountChange?: (count: number) => void
+}) {
+  const router = useRouter()
+  const { projectId } = useParams<{ projectId: string }>()
+
+  const [sorting, setSorting] = useState<SortingState>([
+    { id: 'phase', desc: false },
+    { id: 'lastActivity', desc: true },
+  ])
+
+  const [columnFilters, setColumnFilters] = useState<ColumnFiltersState>([])
+
+  // Sync phaseFilter prop to column filters
+  useEffect(() => {
+    setColumnFilters(prev => {
+      const without = prev.filter(f => f.id !== 'phase')
+      if (phaseFilter) {
+        return [...without, { id: 'phase', value: phaseFilter }]
+      }
+      return without
+    })
+  }, [phaseFilter])
+
+  const table = useReactTable({
+    data: sessions,
+    columns: fleetColumns,
+    getCoreRowModel: getCoreRowModel(),
+    getFilteredRowModel: getFilteredRowModel(),
+    getSortedRowModel: getSortedRowModel(),
+    globalFilterFn: 'includesString',
+    state: {
+      globalFilter: searchFilter,
+      sorting,
+      columnFilters,
+    },
+    onSortingChange: setSorting,
+    onColumnFiltersChange: setColumnFilters,
+    meta: { agentNames },
+    filterFns: {
+      phaseEquals: (row, columnId, filterValue) => {
+        return row.getValue(columnId) === filterValue
+      },
+    },
+  })
+
+  // Report filtered count back to parent
+  const filteredRowCount = table.getFilteredRowModel().rows.length
+  useEffect(() => {
+    onFilteredCountChange?.(filteredRowCount)
+  }, [filteredRowCount, onFilteredCountChange])
+
+  return (
+    <TooltipProvider delayDuration={300}>
+    <div className="rounded-md border">
+      <Table>
+        <TableHeader>
+          {table.getHeaderGroups().map(headerGroup => (
+            <TableRow key={headerGroup.id}>
+              {headerGroup.headers.map(header => {
+                const canSort = header.column.getCanSort()
+                const sorted = header.column.getIsSorted()
+                const isChat = header.column.id === 'chat'
+
+                return (
+                  <TableHead
+                    key={header.id}
+                    {...(isChat ? { 'data-sticky': 'right' } : {})}
+                    className={canSort ? 'cursor-pointer select-none' : undefined}
+                    onClick={canSort ? header.column.getToggleSortingHandler() : undefined}
+                  >
+                    <div className="flex items-center gap-1">
+                      {header.isPlaceholder
+                        ? null
+                        : flexRender(header.column.columnDef.header, header.getContext())}
+                      {canSort && sorted === 'asc' && (
+                        <ChevronUp className="size-3.5 text-foreground" />
+                      )}
+                      {canSort && sorted === 'desc' && (
+                        <ChevronDown className="size-3.5 text-foreground" />
+                      )}
+                      {canSort && !sorted && (
+                        <ChevronDown className="size-3.5 text-muted-foreground/40" />
+                      )}
+                    </div>
+                  </TableHead>
+                )
+              })}
+            </TableRow>
+          ))}
+        </TableHeader>
+        <TableBody>
+          {table.getRowModel().rows.length ? (
+            table.getRowModel().rows.map(row => (
+              <TableRow
+                key={row.id}
+                className="cursor-pointer group"
+                tabIndex={0}
+                onClick={() => router.push(`/${projectId}/sessions/${row.original.id}`)}
+                onKeyDown={(e) => {
+                  if (e.key === 'Enter') {
+                    router.push(`/${projectId}/sessions/${row.original.id}`)
+                  }
+                }}
+              >
+                {row.getVisibleCells().map(cell => {
+                  const isChat = cell.column.id === 'chat'
+                  return (
+                    <TableCell
+                      key={cell.id}
+                      {...(isChat ? { 'data-sticky': 'right' } : {})}
+                    >
+                      {flexRender(cell.column.columnDef.cell, cell.getContext())}
+                    </TableCell>
+                  )
+                })}
+              </TableRow>
+            ))
+          ) : (
+            <TableRow>
+              <TableCell colSpan={fleetColumns.length} className="h-24 text-center text-muted-foreground">
+                No sessions match your filter.
+              </TableCell>
+            </TableRow>
+          )}
+        </TableBody>
+      </Table>
+    </div>
+    </TooltipProvider>
+  )
+}
diff --git a/components/ambient-ui/src/app/(dashboard)/[projectId]/fleet/_components/phase-badge.tsx b/components/ambient-ui/src/app/(dashboard)/[projectId]/sessions/_components/phase-badge.tsx
similarity index 81%
rename from components/ambient-ui/src/app/(dashboard)/[projectId]/fleet/_components/phase-badge.tsx
rename to components/ambient-ui/src/app/(dashboard)/[projectId]/sessions/_components/phase-badge.tsx
index fa5dd6e6e..6335ea2e7 100644
--- a/components/ambient-ui/src/app/(dashboard)/[projectId]/fleet/_components/phase-badge.tsx
+++ b/components/ambient-ui/src/app/(dashboard)/[projectId]/sessions/_components/phase-badge.tsx
@@ -17,12 +17,12 @@ export function PhaseBadge({ phase }: { phase: SessionPhase }) {
   return (
     <Badge
       variant="outline"
-      className={cn('gap-1.5 font-medium', VARIANT_CLASSES[style.variant])}
+      className={cn('gap-1.5 font-semibold', VARIANT_CLASSES[style.variant])}
     >
       {style.pulse && (
-        <span className="relative flex h-2 w-2">
+        <span className="relative flex h-2.5 w-2.5">
           <span className="absolute inline-flex h-full w-full animate-ping rounded-full bg-current opacity-75" />
-          <span className="relative inline-flex h-2 w-2 rounded-full bg-current" />
+          <span className="relative inline-flex h-2.5 w-2.5 rounded-full bg-current" />
         </span>
       )}
       {style.label}
diff --git a/components/ambient-ui/src/app/(dashboard)/[projectId]/fleet/page.tsx b/components/ambient-ui/src/app/(dashboard)/[projectId]/sessions/page.tsx
similarity index 58%
rename from components/ambient-ui/src/app/(dashboard)/[projectId]/fleet/page.tsx
rename to components/ambient-ui/src/app/(dashboard)/[projectId]/sessions/page.tsx
index 2c46b15f1..49efae896 100644
--- a/components/ambient-ui/src/app/(dashboard)/[projectId]/fleet/page.tsx
+++ b/components/ambient-ui/src/app/(dashboard)/[projectId]/sessions/page.tsx
@@ -1,24 +1,33 @@
 'use client'
 
-import { useState } from 'react'
+import { useState, useCallback } from 'react'
 import { useParams } from 'next/navigation'
 import { Monitor } from 'lucide-react'
 import { Input } from '@/components/ui/input'
 import { Skeleton } from '@/components/ui/skeleton'
 import { EmptyState } from '@/components/empty-state'
 import { useSessions } from '@/queries/use-sessions'
+import { useAgentNames } from '@/queries/use-agents'
+import type { SessionPhase } from '@/domain/types'
 import { FleetTable } from './_components/fleet-table'
 import { FleetSummary } from './_components/fleet-summary'
 
 export default function FleetPage() {
   const { projectId } = useParams<{ projectId: string }>()
   const [search, setSearch] = useState('')
+  const [phaseFilter, setPhaseFilter] = useState<SessionPhase | null>(null)
+  const [filteredCount, setFilteredCount] = useState<number | undefined>(undefined)
   const { data, isLoading, error } = useSessions(projectId)
+  const { data: agentNames } = useAgentNames(projectId)
+
+  const handleFilteredCountChange = useCallback((count: number) => {
+    setFilteredCount(count)
+  }, [])
 
   if (error) {
     return (
       <div className="space-y-6">
-        <h1 className="text-2xl font-semibold">Fleet</h1>
+        <h1 className="text-xl font-semibold">Sessions</h1>
         <p className="text-sm text-destructive">
           Failed to load sessions: {error.message}
         </p>
@@ -29,7 +38,7 @@ export default function FleetPage() {
   if (isLoading) {
     return (
       <div className="space-y-6">
-        <h1 className="text-2xl font-semibold">Fleet</h1>
+        <h1 className="text-xl font-semibold">Sessions</h1>
         <div className="space-y-3">
           <Skeleton className="h-8 w-64" />
           <Skeleton className="h-[400px] w-full" />
@@ -43,7 +52,7 @@ export default function FleetPage() {
   if (sessions.length === 0) {
     return (
       <div className="space-y-6">
-        <h1 className="text-2xl font-semibold">Fleet</h1>
+        <h1 className="text-xl font-semibold">Sessions</h1>
         <EmptyState
           icon={Monitor}
           title="No sessions"
@@ -56,16 +65,27 @@ export default function FleetPage() {
   return (
     <div className="space-y-4">
       <div className="flex items-center justify-between">
-        <h1 className="text-2xl font-semibold">Fleet</h1>
+        <h1 className="text-xl font-semibold">Sessions</h1>
         <Input
-          placeholder="Filter sessions..."
+          placeholder="Filter by name, agent, or model..."
           value={search}
           onChange={e => setSearch(e.target.value)}
           className="max-w-xs"
         />
       </div>
-      <FleetSummary sessions={sessions} />
-      <FleetTable sessions={sessions} searchFilter={search} />
+      <FleetSummary
+        sessions={sessions}
+        filteredCount={filteredCount}
+        activePhase={phaseFilter}
+        onPhaseFilter={setPhaseFilter}
+      />
+      <FleetTable
+        sessions={sessions}
+        searchFilter={search}
+        agentNames={agentNames}
+        phaseFilter={phaseFilter}
+        onFilteredCountChange={handleFilteredCountChange}
+      />
     </div>
   )
 }
diff --git a/components/ambient-ui/src/app/(dashboard)/layout.tsx b/components/ambient-ui/src/app/(dashboard)/layout.tsx
index c5dc176b9..c6609cc84 100644
--- a/components/ambient-ui/src/app/(dashboard)/layout.tsx
+++ b/components/ambient-ui/src/app/(dashboard)/layout.tsx
@@ -7,6 +7,7 @@ import { StatusBar } from '@/components/status-bar'
 import { ChatSidebar } from '@/components/chat-sidebar'
 import { ChatSidebarProvider } from '@/components/chat-sidebar-context'
 import { useProject } from '@/queries/use-projects'
+import { useSession } from '@/queries/use-sessions'
 import {
   SidebarInset,
   SidebarProvider,
@@ -16,7 +17,8 @@ function extractNavContext(pathname: string) {
   const segments = pathname.split('/').filter(Boolean)
   const projectId = segments.length >= 1 ? segments[0] : null
   const pageName = segments.length >= 2 ? capitalize(segments[1]) : null
-  return { projectId, pageName }
+  const sessionId = segments.length >= 3 && segments[1] === 'sessions' ? segments[2] : null
+  return { projectId, pageName, sessionId }
 }
 
 function capitalize(s: string): string {
@@ -29,8 +31,9 @@ export default function DashboardLayout({
   children: React.ReactNode
 }) {
   const pathname = usePathname()
-  const { projectId, pageName } = extractNavContext(pathname)
+  const { projectId, pageName, sessionId } = extractNavContext(pathname)
   const { data: project } = useProject(projectId ?? '')
+  const { data: session } = useSession(sessionId ?? '', undefined)
 
   return (
     <ChatSidebarProvider>
@@ -41,6 +44,7 @@ export default function DashboardLayout({
             projectId={projectId}
             projectName={project?.name ?? null}
             pageName={pageName}
+            sessionName={sessionId ? (session?.name ?? sessionId) : null}
           />
           <div className="flex-1 p-6 pb-10">{children}</div>
           <StatusBar />
diff --git a/components/ambient-ui/src/app/(dashboard)/page.tsx b/components/ambient-ui/src/app/(dashboard)/page.tsx
index ec6a00909..10d2bffdb 100644
--- a/components/ambient-ui/src/app/(dashboard)/page.tsx
+++ b/components/ambient-ui/src/app/(dashboard)/page.tsx
@@ -74,13 +74,13 @@ export default function ProjectPickerPage() {
           <Card
             key={project.id}
             className="cursor-pointer transition-shadow hover:shadow-md"
-            onClick={() => router.push(`/${project.id}/fleet`)}
+            onClick={() => router.push(`/${project.id}/sessions`)}
             role="button"
             tabIndex={0}
             onKeyDown={(e) => {
               if (e.key === 'Enter' || e.key === ' ') {
                 e.preventDefault()
-                router.push(`/${project.id}/fleet`)
+                router.push(`/${project.id}/sessions`)
               }
             }}
           >
diff --git a/components/ambient-ui/src/components/app-sidebar.tsx b/components/ambient-ui/src/components/app-sidebar.tsx
index d9fe5f81d..1e8d5e4da 100644
--- a/components/ambient-ui/src/components/app-sidebar.tsx
+++ b/components/ambient-ui/src/components/app-sidebar.tsx
@@ -6,10 +6,6 @@ import { useTheme } from 'next-themes'
 import {
   Monitor,
   Bot,
-  Calendar,
-  AlertCircle,
-  Settings,
-  Key,
   Moon,
   Sun,
 } from 'lucide-react'
@@ -19,35 +15,21 @@ import {
   Sidebar,
   SidebarContent,
   SidebarFooter,
+  SidebarHeader,
   SidebarGroup,
   SidebarGroupContent,
   SidebarGroupLabel,
-  SidebarHeader,
   SidebarMenu,
   SidebarMenuButton,
   SidebarMenuItem,
-  SidebarSeparator,
 } from '@/components/ui/sidebar'
-import {
-  Tooltip,
-  TooltipContent,
-  TooltipTrigger,
-} from '@/components/ui/tooltip'
 
 type AppSidebarProps = {
   projectId: string | null
 }
 
 const projectNavItems = [
-  { label: 'Fleet', icon: Monitor, href: 'fleet', disabled: false },
-  { label: 'Agents', icon: Bot, href: 'agents', disabled: true, tooltip: 'Coming soon' },
-  { label: 'Schedules', icon: Calendar, href: 'schedules', disabled: true, tooltip: 'Coming soon' },
-  { label: 'Issues', icon: AlertCircle, href: 'issues', disabled: true, tooltip: 'Coming soon' },
-  { label: 'Settings', icon: Settings, href: 'settings', disabled: true, tooltip: 'Coming soon' },
-] as const
-
-const globalNavItems = [
-  { label: 'Credentials', icon: Key, href: '/credentials', disabled: true, tooltip: 'Coming soon' },
+  { label: 'Sessions', icon: Monitor, href: 'sessions' },
 ] as const
 
 export function AppSidebar({ projectId }: AppSidebarProps) {
@@ -57,6 +39,10 @@ export function AppSidebar({ projectId }: AppSidebarProps) {
   return (
     <Sidebar>
       <SidebarHeader>
+        <div className="flex items-center gap-2 px-2 py-1.5">
+          <Bot className="size-5 text-primary" />
+          <span className="text-sm font-semibold tracking-tight">Ambient</span>
+        </div>
         <ProjectSelector projectId={projectId} />
       </SidebarHeader>
 
@@ -67,10 +53,10 @@ export function AppSidebar({ projectId }: AppSidebarProps) {
             <SidebarMenu>
               {projectNavItems.map((item) => {
                 const href = projectId ? `/${projectId}/${item.href}` : '#'
-                const isActive = pathname === href
-                const isDisabled = item.disabled || !projectId
+                const isActive = pathname === href || pathname.startsWith(href + '/')
+                const isDisabled = !projectId
 
-                const menuButton = (
+                return (
                   <SidebarMenuItem key={item.label}>
                     <SidebarMenuButton
                       asChild={!isDisabled}
@@ -92,62 +78,26 @@ export function AppSidebar({ projectId }: AppSidebarProps) {
                     </SidebarMenuButton>
                   </SidebarMenuItem>
                 )
-
-                if (isDisabled && 'tooltip' in item && item.tooltip) {
-                  return (
-                    <Tooltip key={item.label}>
-                      <TooltipTrigger asChild>
-                        {menuButton}
-                      </TooltipTrigger>
-                      <TooltipContent side="right">
-                        {item.tooltip}
-                      </TooltipContent>
-                    </Tooltip>
-                  )
-                }
-
-                return menuButton
               })}
             </SidebarMenu>
           </SidebarGroupContent>
         </SidebarGroup>
-
-        <SidebarSeparator />
-
-        <SidebarGroup>
-          <SidebarGroupLabel>Global</SidebarGroupLabel>
-          <SidebarGroupContent>
-            <SidebarMenu>
-              {globalNavItems.map((item) => (
-                <Tooltip key={item.label}>
-                  <TooltipTrigger asChild>
-                    <SidebarMenuItem>
-                      <SidebarMenuButton disabled tooltip={item.label}>
-                        <item.icon />
-                        <span>{item.label}</span>
-                      </SidebarMenuButton>
-                    </SidebarMenuItem>
-                  </TooltipTrigger>
-                  <TooltipContent side="right">
-                    {item.tooltip}
-                  </TooltipContent>
-                </Tooltip>
-              ))}
-            </SidebarMenu>
-          </SidebarGroupContent>
-        </SidebarGroup>
       </SidebarContent>
 
       <SidebarFooter>
-        <Button
-          variant="ghost"
-          size="icon-sm"
-          onClick={() => setTheme(theme === 'dark' ? 'light' : 'dark')}
-          aria-label="Toggle theme"
-        >
-          <Sun className="size-4 rotate-0 scale-100 transition-all dark:-rotate-90 dark:scale-0" />
-          <Moon className="absolute size-4 rotate-90 scale-0 transition-all dark:rotate-0 dark:scale-100" />
-        </Button>
+        <div className="flex items-center justify-between px-2 py-1">
+          <span className="text-xs text-muted-foreground">Theme</span>
+          <Button
+            variant="ghost"
+            size="icon"
+            className="size-7"
+            onClick={() => setTheme(theme === 'dark' ? 'light' : 'dark')}
+            aria-label="Toggle theme"
+          >
+            <Sun className="size-4 rotate-0 scale-100 transition-all dark:-rotate-90 dark:scale-0" />
+            <Moon className="absolute size-4 rotate-90 scale-0 transition-all dark:rotate-0 dark:scale-100" />
+          </Button>
+        </div>
       </SidebarFooter>
     </Sidebar>
   )
diff --git a/components/ambient-ui/src/components/chat-sidebar.tsx b/components/ambient-ui/src/components/chat-sidebar.tsx
index 533753366..f9cd204fa 100644
--- a/components/ambient-ui/src/components/chat-sidebar.tsx
+++ b/components/ambient-ui/src/components/chat-sidebar.tsx
@@ -14,7 +14,7 @@ import {
 } from '@/components/chat-messages'
 import { useSession } from '@/queries/use-sessions'
 import { useSessionMessages } from '@/queries/use-session-messages'
-import { useLiveTail, LiveIndicator } from '@/app/(dashboard)/[projectId]/fleet/[sessionId]/_components/live-tail-indicator'
+import { useLiveTail, LiveIndicator } from '@/app/(dashboard)/[projectId]/sessions/[sessionId]/_components/live-tail-indicator'
 
 const MIN_WIDTH = 320
 const MAX_WIDTH = 800
@@ -196,7 +196,7 @@ export function ChatSidebar() {
           onClick={() => {
             const projectId = session?.projectId
             if (projectId && openSessionId) {
-              router.push(`/${projectId}/fleet/${openSessionId}`)
+              router.push(`/${projectId}/sessions/${openSessionId}`)
             }
           }}
           title="Go to session detail"
diff --git a/components/ambient-ui/src/components/empty-state.tsx b/components/ambient-ui/src/components/empty-state.tsx
index 6cca7c5ac..0f070d52e 100644
--- a/components/ambient-ui/src/components/empty-state.tsx
+++ b/components/ambient-ui/src/components/empty-state.tsx
@@ -14,7 +14,7 @@ export function EmptyState({ icon: Icon, title, description, action }: EmptyStat
         <Icon className="size-8 text-muted-foreground" />
       </div>
       <div className="flex flex-col gap-1">
-        <h3 className="text-lg font-semibold">{title}</h3>
+        <h3 className="text-base font-semibold">{title}</h3>
         <p className="max-w-sm text-sm text-muted-foreground">{description}</p>
       </div>
       {action && <div className="mt-2">{action}</div>}
diff --git a/components/ambient-ui/src/components/nav-header.tsx b/components/ambient-ui/src/components/nav-header.tsx
index f9ae603fa..7bf7b7a6b 100644
--- a/components/ambient-ui/src/components/nav-header.tsx
+++ b/components/ambient-ui/src/components/nav-header.tsx
@@ -30,6 +30,12 @@ type NavHeaderProps = {
   sessionName?: string | null
 }
 
+const BREADCRUMB_LABEL_MAP: Record<string, string> = {}
+
+function displayLabel(raw: string): string {
+  return BREADCRUMB_LABEL_MAP[raw] ?? raw
+}
+
 function UserMenu() {
   const { user, isLoading } = useCurrentUser()
 
@@ -69,17 +75,19 @@ function UserMenu() {
 }
 
 export function NavHeader({ projectId, projectName, pageName, sessionName }: NavHeaderProps) {
+  const mappedPageName = pageName ? displayLabel(pageName) : null
+
   return (
     <header className="sticky top-0 z-20 flex h-14 items-center gap-2 border-b bg-background px-4">
       <SidebarTrigger />
-      <Separator orientation="vertical" className="mx-1 h-5" />
+      <Separator orientation="vertical" className="mx-2 h-5" />
 
       <Breadcrumb>
         <BreadcrumbList>
           <BreadcrumbItem>
             <BreadcrumbLink asChild>
               <Link href="/">
-                <span className="font-semibold">Ambient</span>
+                <span>Ambient</span>
               </Link>
             </BreadcrumbLink>
           </BreadcrumbItem>
@@ -89,22 +97,22 @@ export function NavHeader({ projectId, projectName, pageName, sessionName }: Nav
               <BreadcrumbSeparator />
               <BreadcrumbItem>
                 <BreadcrumbLink asChild>
-                  <Link href={`/${projectId}/fleet`}>{projectName ?? projectId}</Link>
+                  <Link href={`/${projectId}/sessions`}>{projectName ?? projectId}</Link>
                 </BreadcrumbLink>
               </BreadcrumbItem>
             </>
           )}
 
-          {pageName && (
+          {mappedPageName && (
             <>
               <BreadcrumbSeparator />
               <BreadcrumbItem>
                 {sessionName ? (
                   <BreadcrumbLink asChild>
-                    <Link href={`/${projectId}/fleet`}>{pageName}</Link>
+                    <Link href={`/${projectId}/sessions`}>{mappedPageName}</Link>
                   </BreadcrumbLink>
                 ) : (
-                  <BreadcrumbPage>{pageName}</BreadcrumbPage>
+                  <BreadcrumbPage>{mappedPageName}</BreadcrumbPage>
                 )}
               </BreadcrumbItem>
             </>
diff --git a/components/ambient-ui/src/components/project-selector.tsx b/components/ambient-ui/src/components/project-selector.tsx
index 1924b7022..2d6a0d9fb 100644
--- a/components/ambient-ui/src/components/project-selector.tsx
+++ b/components/ambient-ui/src/components/project-selector.tsx
@@ -31,7 +31,7 @@ export function ProjectSelector({ projectId }: ProjectSelectorProps) {
       value={projectId ?? undefined}
       onValueChange={(value) => {
         domainProbe.projectSelected({ projectId: value })
-        router.push(`/${value}/fleet`)
+        router.push(`/${value}/sessions`)
       }}
     >
       <SelectTrigger className="w-full">
diff --git a/components/ambient-ui/src/components/ui/table.tsx b/components/ambient-ui/src/components/ui/table.tsx
index e2185e5d1..ec5848718 100644
--- a/components/ambient-ui/src/components/ui/table.tsx
+++ b/components/ambient-ui/src/components/ui/table.tsx
@@ -55,7 +55,7 @@ function TableRow({ className, ...props }: React.ComponentProps<"tr">) {
     <tr
       data-slot="table-row"
       className={cn(
-        "hover:bg-muted/50 data-[state=selected]:bg-muted border-b transition-colors duration-150",
+        "hover:bg-muted/80 data-[state=selected]:bg-muted border-b transition-colors duration-150 focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring focus-visible:ring-inset",
         className
       )}
       {...props}
@@ -68,7 +68,8 @@ function TableHead({ className, ...props }: React.ComponentProps<"th">) {
     <th
       data-slot="table-head"
       className={cn(
-        "text-foreground h-10 px-2 text-left align-middle font-medium whitespace-nowrap text-xs uppercase tracking-wide [&:has([role=checkbox])]:pr-0 [&>[role=checkbox]]:translate-y-[2px]",
+        "text-muted-foreground h-10 px-2 text-left align-middle font-medium whitespace-nowrap text-xs [&:has([role=checkbox])]:pr-0 [&>[role=checkbox]]:translate-y-[2px]",
+        "data-[sticky=right]:sticky data-[sticky=right]:right-0 data-[sticky=right]:z-10 data-[sticky=right]:bg-muted/30 data-[sticky=right]:shadow-[-2px_0_4px_-2px_rgba(0,0,0,0.1)]",
         className
       )}
       {...props}
@@ -82,6 +83,7 @@ function TableCell({ className, ...props }: React.ComponentProps<"td">) {
       data-slot="table-cell"
       className={cn(
         "p-2 align-middle whitespace-nowrap [&:has([role=checkbox])]:pr-0 [&>[role=checkbox]]:translate-y-[2px]",
+        "data-[sticky=right]:sticky data-[sticky=right]:right-0 data-[sticky=right]:z-10 data-[sticky=right]:bg-background data-[sticky=right]:shadow-[-2px_0_4px_-2px_rgba(0,0,0,0.1)]",
         className
       )}
       {...props}
diff --git a/components/ambient-ui/src/domain/types.ts b/components/ambient-ui/src/domain/types.ts
index bdd413482..a2fdea308 100644
--- a/components/ambient-ui/src/domain/types.ts
+++ b/components/ambient-ui/src/domain/types.ts
@@ -7,6 +7,34 @@ export type SessionPhase =
   | 'Failed'
   | 'Stopped'
 
+export type DomainRepo = {
+  url: string
+  branch: string | null
+  name: string | null
+  autoPush: boolean
+}
+
+export type ReconciledRepoStatus = 'Cloning' | 'Ready' | 'Failed'
+
+export type DomainReconciledRepo = {
+  url: string
+  name: string | null
+  status: ReconciledRepoStatus | null
+  currentActiveBranch: string | null
+  defaultBranch: string | null
+  clonedAt: string | null
+}
+
+export type ConditionStatus = 'True' | 'False' | 'Unknown'
+
+export type DomainCondition = {
+  type: string
+  status: ConditionStatus
+  reason: string | null
+  message: string | null
+  lastTransitionTime: string | null
+}
+
 export type DomainSession = {
   id: string
   name: string
@@ -15,11 +43,22 @@ export type DomainSession = {
   agentName: string | null
   projectId: string | null
   model: string | null
+  temperature: number | null
+  maxTokens: number | null
+  timeout: number | null
+  workflowId: string | null
+  prompt: string | null
+  sdkRestartCount: number
   startTime: string | null
   completionTime: string | null
   createdAt: string
   updatedAt: string
   annotations: Record<string, string>
+  labels: Record<string, string>
+  environmentVariables: Record<string, string>
+  repos: DomainRepo[]
+  reconciledRepos: DomainReconciledRepo[]
+  conditions: DomainCondition[]
 }
 
 export type DomainProject = {
diff --git a/components/ambient-ui/src/lib/__tests__/format-timestamp.test.ts b/components/ambient-ui/src/lib/__tests__/format-timestamp.test.ts
index 678da4af1..161561ce2 100644
--- a/components/ambient-ui/src/lib/__tests__/format-timestamp.test.ts
+++ b/components/ambient-ui/src/lib/__tests__/format-timestamp.test.ts
@@ -1,5 +1,5 @@
 import { describe, it, expect } from 'vitest'
-import { formatRelativeTime, formatAbsoluteTime, formatDuration } from '../format-timestamp'
+import { formatRelativeTime, formatAbsoluteTime, formatDuration, formatPreciseDuration } from '../format-timestamp'
 
 describe('formatRelativeTime', () => {
   it('returns a human-readable relative time string', () => {
@@ -32,3 +32,46 @@ describe('formatDuration', () => {
     expect(result).toBeTruthy()
   })
 })
+
+describe('formatPreciseDuration', () => {
+  it('formats seconds only', () => {
+    const start = '2026-05-28T10:00:00Z'
+    const end = '2026-05-28T10:00:45Z'
+    expect(formatPreciseDuration(start, end)).toBe('45s')
+  })
+
+  it('formats minutes and seconds', () => {
+    const start = '2026-05-28T10:00:00Z'
+    const end = '2026-05-28T10:05:30Z'
+    expect(formatPreciseDuration(start, end)).toBe('5m 30s')
+  })
+
+  it('formats hours and minutes', () => {
+    const start = '2026-05-28T10:00:00Z'
+    const end = '2026-05-28T12:03:00Z'
+    expect(formatPreciseDuration(start, end)).toBe('2h 3m')
+  })
+
+  it('formats days and hours', () => {
+    const start = '2026-05-28T10:00:00Z'
+    const end = '2026-05-30T14:00:00Z'
+    expect(formatPreciseDuration(start, end)).toBe('2d 4h')
+  })
+
+  it('returns 0s for zero duration', () => {
+    const ts = '2026-05-28T10:00:00Z'
+    expect(formatPreciseDuration(ts, ts)).toBe('0s')
+  })
+
+  it('returns 0s when end is before start', () => {
+    const start = '2026-05-28T12:00:00Z'
+    const end = '2026-05-28T10:00:00Z'
+    expect(formatPreciseDuration(start, end)).toBe('0s')
+  })
+
+  it('computes duration to now when no end time', () => {
+    const recent = new Date(Date.now() - 90 * 1000).toISOString()
+    const result = formatPreciseDuration(recent)
+    expect(result).toMatch(/^1m \d+s$/)
+  })
+})
diff --git a/components/ambient-ui/src/lib/format-timestamp.ts b/components/ambient-ui/src/lib/format-timestamp.ts
index a57de99a0..017e3a3ab 100644
--- a/components/ambient-ui/src/lib/format-timestamp.ts
+++ b/components/ambient-ui/src/lib/format-timestamp.ts
@@ -13,3 +13,18 @@ export function formatDuration(startIso: string, endIso?: string | null): string
   const end = endIso ? new Date(endIso) : new Date()
   return formatDistance(start, end)
 }
+
+export function formatPreciseDuration(startIso: string, endIso?: string | null): string {
+  const start = new Date(startIso)
+  const end = endIso ? new Date(endIso) : new Date()
+  const diffMs = Math.max(0, end.getTime() - start.getTime())
+  const seconds = Math.floor(diffMs / 1000)
+  const minutes = Math.floor(seconds / 60)
+  const hours = Math.floor(minutes / 60)
+  const days = Math.floor(hours / 24)
+
+  if (days > 0) return `${days}d ${hours % 24}h`
+  if (hours > 0) return `${hours}h ${minutes % 60}m`
+  if (minutes > 0) return `${minutes}m ${seconds % 60}s`
+  return `${seconds}s`
+}
diff --git a/components/ambient-ui/src/queries/query-keys.ts b/components/ambient-ui/src/queries/query-keys.ts
index abaa33af1..8d817dfbc 100644
--- a/components/ambient-ui/src/queries/query-keys.ts
+++ b/components/ambient-ui/src/queries/query-keys.ts
@@ -19,6 +19,11 @@ export const queryKeys = {
     detail: (projectId: string) =>
       [...queryKeys.projects.details(), projectId] as const,
   },
+  agents: {
+    all: ['agents'] as const,
+    names: (projectId: string) =>
+      [...queryKeys.agents.all, 'names', projectId] as const,
+  },
   messages: {
     all: ['messages'] as const,
     lists: () => [...queryKeys.messages.all, 'list'] as const,
diff --git a/components/ambient-ui/src/queries/use-agents.ts b/components/ambient-ui/src/queries/use-agents.ts
new file mode 100644
index 000000000..1cb4b543e
--- /dev/null
+++ b/components/ambient-ui/src/queries/use-agents.ts
@@ -0,0 +1,28 @@
+'use client'
+
+import { useQuery } from '@tanstack/react-query'
+import { queryKeys } from './query-keys'
+
+type AgentNameEntry = {
+  id: string
+  name: string
+  displayName: string | null
+}
+
+export function useAgentNames(projectId: string) {
+  return useQuery({
+    queryKey: queryKeys.agents.names(projectId),
+    queryFn: async (): Promise<Map<string, string>> => {
+      const res = await fetch(`/api/ambient/v1/projects/${encodeURIComponent(projectId)}/agents?size=100`)
+      if (!res.ok) return new Map()
+      const data: { items?: AgentNameEntry[] } = await res.json()
+      const map = new Map<string, string>()
+      for (const agent of data.items ?? []) {
+        map.set(agent.id, agent.displayName || agent.name)
+      }
+      return map
+    },
+    enabled: !!projectId,
+    staleTime: 60_000,
+  })
+}