diff --git a/apps/web/src/components/os/apps/ChatWindowInstance.model-refresh.test.tsx b/apps/web/src/components/os/apps/ChatWindowInstance.model-refresh.test.tsx index f42bf97..8ad8ddd 100644 --- a/apps/web/src/components/os/apps/ChatWindowInstance.model-refresh.test.tsx +++ b/apps/web/src/components/os/apps/ChatWindowInstance.model-refresh.test.tsx @@ -5,7 +5,6 @@ const mocks = vi.hoisted(() => ({ getModels: vi.fn(), getModel: vi.fn(), getSettings: vi.fn(), - getTeamMembers: vi.fn(), patchWorkspace: vi.fn(), useChat: vi.fn(), toast: vi.fn(), @@ -59,7 +58,6 @@ beforeEach(() => { .mockResolvedValueOnce(['openai/model-released-while-open']); mocks.getModel.mockResolvedValue('openai/existing-model'); mocks.getSettings.mockResolvedValue({}); - mocks.getTeamMembers.mockResolvedValue([]); mocks.patchWorkspace.mockResolvedValue(undefined); mocks.useChat.mockReturnValue(chatState); }); diff --git a/apps/web/src/components/os/apps/MissionControlApp.tsx b/apps/web/src/components/os/apps/MissionControlApp.tsx index 057d730..1c82f34 100644 --- a/apps/web/src/components/os/apps/MissionControlApp.tsx +++ b/apps/web/src/components/os/apps/MissionControlApp.tsx @@ -1,7 +1,6 @@ import { useState, useEffect } from 'react'; -import { Play, Pause, Square, Radio, Clock, Zap, RefreshCw, Users, Plus, Rocket, AlertCircle } from 'lucide-react'; +import { Play, Pause, Square, Radio, Clock, Zap, RefreshCw, Plus, Rocket, AlertCircle } from 'lucide-react'; import { adapter } from '@/lib/adapter'; -import { DATE_LOCALE } from '@/lib/date-locale'; import type { FleetSession, Workspace } from '@/lib/types'; import { Button } from '@/components/ui/button'; @@ -21,45 +20,24 @@ interface ToolInventoryCounts { hooked: number; } -/** - * Per-tab load errors (error-as-empty rule, notes/error-as-empty.md): each - * data tab needs an ERROR render distinct from its EMPTY render so a fetch - * failure never masquerades as a genuinely empty fleet/team/activity feed. - */ -interface SectionErrors { - fleet: string | null; - team: string | null; - activity: string | null; -} - -const NO_ERRORS: SectionErrors = { fleet: null, team: null, activity: null }; - const MissionControlApp = ({ onSpawnOpen }: MissionControlAppProps) => { const [sessions, setSessions] = useState([]); const [loading, setLoading] = useState(true); - const [teamMembers, setTeamMembers] = useState<{ id: string; name: string; status: string }[]>([]); - const [activity, setActivity] = useState<{ id: string; user: string; action: string; timestamp: string }[]>([]); - const [tab, setTab] = useState<'fleet' | 'team' | 'activity'>('fleet'); const [toolCounts, setToolCounts] = useState(null); - const [errors, setErrors] = useState(NO_ERRORS); - - const reason = (r: PromiseRejectedResult, fallback: string): string => - r.reason instanceof Error ? r.reason.message : fallback; + // Load error kept distinct from the empty fleet (error-as-empty rule, + // notes/error-as-empty.md) so a fetch failure never reads as "no sessions". + const [fleetError, setFleetError] = useState(null); const refresh = async () => { - // Reset loading + clear stale errors so Retry gives visible feedback that + // Reset loading + clear a stale error so Retry gives visible feedback that // the re-fetch fired (otherwise the error panel lingers with no spinner). setLoading(true); - setErrors(NO_ERRORS); - const [fleet, members, act, tools] = await Promise.allSettled([ + setFleetError(null); + const [fleet, tools] = await Promise.allSettled([ adapter.getFleet(), - adapter.getTeamMembers(), - adapter.getTeamActivity(), adapter.detectTools(), ]); if (fleet.status === 'fulfilled') setSessions(fleet.value); - if (members.status === 'fulfilled') setTeamMembers(members.value); - if (act.status === 'fulfilled') setActivity(act.value); if (tools.status === 'fulfilled' && tools.value) { const ts = tools.value.tools; setToolCounts({ @@ -68,13 +46,9 @@ const MissionControlApp = ({ onSpawnOpen }: MissionControlAppProps) => { hooked: ts.filter((t) => t.hooksInstalled).length, }); } - // Thread each tab's load error so the ERROR render stays distinct from the - // EMPTY render (error-as-empty rule); clear on success. - setErrors({ - fleet: fleet.status === 'rejected' ? reason(fleet, 'Failed to load fleet sessions') : null, - team: members.status === 'rejected' ? reason(members, 'Failed to load team members') : null, - activity: act.status === 'rejected' ? reason(act, 'Failed to load activity') : null, - }); + if (fleet.status === 'rejected') { + setFleetError(fleet.reason instanceof Error ? fleet.reason.message : 'Failed to load fleet sessions'); + } setLoading(false); }; @@ -145,136 +119,63 @@ const MissionControlApp = ({ onSpawnOpen }: MissionControlAppProps) => { )} - {/* Tabs */} -
- {(['fleet', 'team', 'activity'] as const).map(t => ( - +
+ ) : sessions.length === 0 && !loading && ( +
+ +

No active fleet sessions

+ + Spawn your first agent + +
+ )} +
+ {sessions.map(s => ( +
+
+
+
+ {s.workspaceName} + {s.status} +
+
+ {s.status === 'active' && ( + + )} + {s.status === 'paused' && ( + + )} + +
+
+
+ {Math.round((s.duration ?? 0) / 60)}m + {s.toolCount ?? 0} tools + {s.model ?? 'default'} + {(s.tokenUsage ?? 0).toLocaleString()} tokens +
+
))}
- - {tab === 'fleet' && ( - <> - {errors.fleet && sessions.length === 0 ? ( -
- -

Couldn't load fleet sessions

-

This is a load error, not an empty fleet. {errors.fleet}

- -
- ) : sessions.length === 0 && !loading && ( -
- -

No active fleet sessions

- -
- )} -
- {sessions.map(s => ( -
-
-
-
- {s.workspaceName} - {s.status} -
-
- {s.status === 'active' && ( - - )} - {s.status === 'paused' && ( - - )} - -
-
-
- {Math.round((s.duration ?? 0) / 60)}m - {s.toolCount ?? 0} tools - {s.model ?? 'default'} - {(s.tokenUsage ?? 0).toLocaleString()} tokens -
-
- ))} -
- - )} - - {tab === 'team' && ( -
- {errors.team && teamMembers.length === 0 ? ( -
- -

Couldn't load team members

-

This is a load error, not an empty team. {errors.team}

- -
- ) : teamMembers.length === 0 && ( -
- -

No team members

-

Connect to a team server in Settings

-
- )} - {teamMembers.map(m => ( -
-
- {m.name} - {m.status} -
- ))} -
- )} - - {tab === 'activity' && ( -
- {errors.activity && activity.length === 0 ? ( -
- -

Couldn't load activity

-

This is a load error, not an empty feed. {errors.activity}

- -
- ) : activity.length === 0 && ( -
-

No activity

-
- )} - {activity.map(a => ( -
- {a.user} - {a.action} - {new Date(a.timestamp).toLocaleTimeString(DATE_LOCALE)} -
- ))} -
- )}
); }; diff --git a/apps/web/src/lib/adapter.ts b/apps/web/src/lib/adapter.ts index 88bb97e..170ae01 100644 --- a/apps/web/src/lib/adapter.ts +++ b/apps/web/src/lib/adapter.ts @@ -1429,16 +1429,6 @@ class LocalAdapter { return res.json(); } - async searchTeamMemory(query: string, limit = 20): Promise> { - try { - const res = await this.fetch(`/api/team/memory/search?q=${encodeURIComponent(query)}&limit=${limit}`); - const data = await res.json(); - return data.results ?? []; - } catch { - return []; - } - } - async getLocalInferenceHardware(): Promise<{ hardware: Record; source: string }> { const res = await this.fetch('/api/local-inference/hardware'); return res.json(); @@ -2948,31 +2938,6 @@ class LocalAdapter { return res.json(); } - // --- Team --- - async getTeamMembers(): Promise<{ id: string; name: string; status: string; avatar?: string }[]> { - try { - const res = await this.fetch('/api/team/members'); - if (!res.ok) return []; - return unwrapArray(await res.json()); - } catch (err) { console.error('[adapter] getTeamMembers failed:', err); return []; } - } - - async getTeamActivity(): Promise<{ id: string; user: string; action: string; timestamp: string }[]> { - try { - const res = await this.fetch('/api/team/activity'); - if (!res.ok) return []; - return unwrapArray(await res.json()); - } catch (err) { console.error('[adapter] getTeamActivity failed:', err); return []; } - } - - async getTeamMessages(workspaceId: string): Promise { - try { - const res = await this.fetch(`/api/team/messages?workspaceId=${workspaceId}`); - if (!res.ok) return []; - return unwrapArray(await res.json()); - } catch (err) { console.error('[adapter] getTeamMessages failed:', err); return []; } - } - // --- Costs --- async getCosts(): Promise { const res = await this.fetch('/api/costs'); diff --git a/apps/web/src/test/lane-hm-hero-morph.test.tsx b/apps/web/src/test/lane-hm-hero-morph.test.tsx index 16d72ab..db8b5af 100644 --- a/apps/web/src/test/lane-hm-hero-morph.test.tsx +++ b/apps/web/src/test/lane-hm-hero-morph.test.tsx @@ -74,7 +74,6 @@ const mocks = vi.hoisted(() => ({ getWorkspaceContext: vi.fn(), getWorkspaceState: vi.fn(), getWorkspaceActivity: vi.fn(), - getTeamMembers: vi.fn(), getWorkspaceFiles: vi.fn(), uploadFile: vi.fn(), }, @@ -171,7 +170,6 @@ describe('Lane HM · workspace surface (destination)', () => { mocks.adapter.getWorkspaceContext.mockResolvedValue(okCtx); mocks.adapter.getWorkspaceState.mockResolvedValue({ pending: [], blocked: [] }); mocks.adapter.getWorkspaceActivity.mockResolvedValue({ events: [] }); - mocks.adapter.getTeamMembers.mockResolvedValue([]); mocks.adapter.getWorkspaceFiles.mockResolvedValue([]); const { default: WorkspaceDesktopApp } = await import('@/components/os/apps/WorkspaceDesktopApp'); @@ -203,7 +201,6 @@ describe('Lane HM · workspace surface (destination)', () => { mocks.adapter.getWorkspaceContext.mockResolvedValue(okCtx); mocks.adapter.getWorkspaceState.mockResolvedValue({ pending: [], blocked: [] }); mocks.adapter.getWorkspaceActivity.mockResolvedValue({ events: [] }); - mocks.adapter.getTeamMembers.mockResolvedValue([]); mocks.adapter.getWorkspaceFiles.mockResolvedValue([]); const { default: WorkspaceDesktopApp } = await import('@/components/os/apps/WorkspaceDesktopApp'); diff --git a/apps/web/src/test/mission-control-a11y.test.tsx b/apps/web/src/test/mission-control-a11y.test.tsx index 0f06d50..a2b0de7 100644 --- a/apps/web/src/test/mission-control-a11y.test.tsx +++ b/apps/web/src/test/mission-control-a11y.test.tsx @@ -6,8 +6,6 @@ import type { FleetSession } from '@/lib/types'; const mocks = vi.hoisted(() => ({ adapter: { getFleet: vi.fn(), - getTeamMembers: vi.fn(), - getTeamActivity: vi.fn(), detectTools: vi.fn(), fleetAction: vi.fn(), }, @@ -31,8 +29,6 @@ beforeEach(() => { session('w-active', 'Alpha Workspace', 'active'), session('w-paused', 'Beta Workspace', 'paused'), ]); - mocks.adapter.getTeamMembers.mockResolvedValue([]); - mocks.adapter.getTeamActivity.mockResolvedValue([]); mocks.adapter.detectTools.mockResolvedValue({ tools: [] }); mocks.adapter.fleetAction.mockResolvedValue(undefined); }); @@ -56,4 +52,14 @@ describe('MissionControlApp accessibility', () => { expect(control.className).toContain('focus-visible:ring-[var(--focus-ring)]'); } }); + + it('shows only the fleet view: team mode is not part of the community edition', async () => { + render(); + + await screen.findByText('Alpha Workspace'); + + expect(screen.queryByRole('button', { name: /^team$/i })).toBeNull(); + expect(screen.queryByRole('button', { name: /^activity$/i })).toBeNull(); + expect(screen.queryByText(/team server/i)).toBeNull(); + }); }); diff --git a/apps/web/src/test/p1a-chat-state.test.tsx b/apps/web/src/test/p1a-chat-state.test.tsx index 7b2df0d..6a47a90 100644 --- a/apps/web/src/test/p1a-chat-state.test.tsx +++ b/apps/web/src/test/p1a-chat-state.test.tsx @@ -28,7 +28,6 @@ const mocks = vi.hoisted(() => ({ getWorkspaceContext: vi.fn(), getWorkspaceState: vi.fn(), getWorkspaceActivity: vi.fn(), - getTeamMembers: vi.fn(), getWorkspaceFiles: vi.fn(), getWorkspaceTasks: vi.fn().mockResolvedValue([]), }, @@ -55,7 +54,6 @@ beforeEach(() => { pending: [{ id: 't1', content: 'Draft the launch brief' }], blocked: [], completed: [], }); mocks.adapter.getWorkspaceActivity.mockResolvedValue({ events: [] }); - mocks.adapter.getTeamMembers.mockResolvedValue([]); mocks.adapter.getWorkspaceFiles.mockResolvedValue([]); }); afterEach(() => { diff --git a/apps/web/src/test/p2-home-desktop.test.tsx b/apps/web/src/test/p2-home-desktop.test.tsx index d2e1f61..234da79 100644 --- a/apps/web/src/test/p2-home-desktop.test.tsx +++ b/apps/web/src/test/p2-home-desktop.test.tsx @@ -26,7 +26,6 @@ const mocks = vi.hoisted(() => ({ getWorkspaceContext: vi.fn(), getWorkspaceState: vi.fn(), getWorkspaceActivity: vi.fn(), - getTeamMembers: vi.fn(), getWorkspaceFiles: vi.fn(), getWorkspaceTasks: vi.fn().mockResolvedValue([]), listMemories: vi.fn(), @@ -219,7 +218,6 @@ describe('WorkspaceDesktopApp error states (P2)', () => { function mockFeedsOk() { mocks.adapter.getWorkspaceState.mockResolvedValue(null); mocks.adapter.getWorkspaceActivity.mockResolvedValue({ events: [] }); - mocks.adapter.getTeamMembers.mockResolvedValue([]); mocks.adapter.getWorkspaceFiles.mockResolvedValue([]); } diff --git a/apps/web/src/test/p3-memory-center-app.test.tsx b/apps/web/src/test/p3-memory-center-app.test.tsx index ed74adf..9776aa0 100644 --- a/apps/web/src/test/p3-memory-center-app.test.tsx +++ b/apps/web/src/test/p3-memory-center-app.test.tsx @@ -25,7 +25,6 @@ const mocks = vi.hoisted(() => ({ getWorkspaceContext: vi.fn(), getWorkspaceState: vi.fn(), getWorkspaceActivity: vi.fn(), - getTeamMembers: vi.fn(), getWorkspaceFiles: vi.fn(), }, shell: { @@ -248,7 +247,6 @@ describe('WorkspaceDesktopApp memory tab embed (P3/D2, S02-FR2)', () => { }); mocks.adapter.getWorkspaceState.mockResolvedValue({ pending: [], blocked: [] }); mocks.adapter.getWorkspaceActivity.mockResolvedValue([]); - mocks.adapter.getTeamMembers.mockResolvedValue([]); mocks.adapter.getWorkspaceFiles.mockResolvedValue([]); const { default: WorkspaceDesktopApp } = await import('@/components/os/apps/WorkspaceDesktopApp');