Open-source AI teammates in Slack, Teams, Discord, Telegram and Mattermost. Self-host it, with any agent harness and any model.
Python agent-orchestrationaiai-agentschatopsdiscordlangchainmcpmicrosoft-teamsmulti-agentopen-sourceopenaiself-hostedslack
Admin keeps only what the web gateway does not have yet
Simon Flack274efc7d3f22
diff --git a/console/apps/switch-console-desktop/src/renderer/features/admin/admin-frame.tsx b/console/apps/switch-console-desktop/src/renderer/features/admin/admin-frame.tsxindex aa579c5e5..9bed9589c 100644--- a/console/apps/switch-console-desktop/src/renderer/features/admin/admin-frame.tsx+++ b/console/apps/switch-console-desktop/src/renderer/features/admin/admin-frame.tsx@@ -1,6 +1,6 @@import { observer } from 'mobx-react-lite';import type { ReactNode } from 'react';-import { ManagedServerDot } from '@renderer/features/switch-servers/managed-server-dot';+import { servesWebGateway } from '@renderer/features/switch-servers/server-gateway';import { switchServersStore } from '@renderer/features/switch-servers/switch-servers-store';import {administersWorkspaceInScope,@@ -16,7 +16,7 @@ import { useNavigate } from '@renderer/lib/layout/navigation-provider';import {ADMIN_MENU_LABELS,type AdminGroup,- type AdminMenuItem,+ type AdminSection,adminGroups,} from './admin-sections';@@ -25,21 +25,16 @@ const WIDTH = 1120;/** The Admin menu's entries for the signed-in account on `serverId`. */export function adminGroupsInScope(serverId: string, serviceConnections: boolean): AdminGroup[] {+ const server = switchServersStore.servers.find((s) => s.id === serverId);return adminGroups({administers: administersWorkspaceInScope(serverId),- operator: operatesServer(serverId),+ operatesGatewaylessServer:+ operatesServer(serverId) && server !== undefined && !servesWebGateway(server),serviceConnections,- managed: switchServersStore.servers.find((s) => s.id === serverId)?.managed ?? false,});}-/**- * The Admin page's side menu with one entry's content beside it. The page's- * own sections are the `admin` view's; the server's status is the- * `managedServer` view's, so each entry navigates to whichever view draws it- * and both look like one page. The status entry carries the server's dot,- * as the sidebar's Admin item does.- */+/** The Admin page's side menu with one section's content beside it. */export const AdminFrame = observer(function AdminFrame({serverId,groups,@@ -48,7 +43,7 @@ export const AdminFrame = observer(function AdminFrame({}: {serverId: string;groups: AdminGroup[];- active: AdminMenuItem;+ active: AdminSection;children: ReactNode;}) {const { navigate } = useNavigate();@@ -57,15 +52,10 @@ export const AdminFrame = observer(function AdminFrame({workspace: workspacesStore.onServerInScope(serverId)?.name ?? '',server: server?.name ?? 'This server',};- const menu: PageSidebarGroup<AdminMenuItem>[] = groups.map((group) => ({+ const menu: PageSidebarGroup<AdminSection>[] = groups.map((group) => ({label: group.scope === 'workspace' ? 'Workspace' : 'Server',detail: detail[group.scope],- items: group.items.map((id) => ({- id,- label: ADMIN_MENU_LABELS[id],- trailing:- id === 'status' && server?.managed ? <ManagedServerDot server={server} size={6} /> : null,- })),+ items: group.items.map((id) => ({ id, label: ADMIN_MENU_LABELS[id] })),}));return (@@ -76,10 +66,7 @@ export const AdminFrame = observer(function AdminFrame({<PageSidebarGroupsgroups={menu}activeId={active}- onSelect={(item) => {- if (item.id === 'status') navigate('managedServer', { serverId });- else navigate('admin', { serverId, section: item.id });- }}+ onSelect={(item) => navigate('admin', { serverId, section: item.id })}/>}>diff --git a/console/apps/switch-console-desktop/src/renderer/features/admin/admin-sections.ts b/console/apps/switch-console-desktop/src/renderer/features/admin/admin-sections.tsindex fa86543a1..169ab84e0 100644--- a/console/apps/switch-console-desktop/src/renderer/features/admin/admin-sections.ts+++ b/console/apps/switch-console-desktop/src/renderer/features/admin/admin-sections.ts@@ -1,38 +1,31 @@export type AdminSection = 'connectors' | 'apps';-/**- * An entry in the Admin page's side menu: one of the page's own sections, or- * the status of a server this Console runs, which is a view of its own- * (`managedServer`) drawn beside the same menu.- */-export type AdminMenuItem = AdminSection | 'status';-export type AdminScope = 'workspace' | 'server';export const ADMIN_MENU_LABELS = {connectors: 'Connectors',apps: 'Connector apps',- status: 'Status',-} as const satisfies Record<AdminMenuItem, string>;+} as const satisfies Record<AdminSection, string>;-export type AdminGroup = { scope: AdminScope; items: AdminMenuItem[] };+export type AdminGroup = { scope: AdminScope; items: AdminSection[] };/*** The Admin menu's entries the signed-in account may use, grouped by what* they reach. Each is there only for the role that may use it, so nobody is- * shown a control the server would refuse: the workspace's connector- * switches are its admins' (the server's operator administers every- * workspace), and the apps connectors sign in through are the operator's- * alone, both only where the server has service connections on. A server- * this Console runs has its status here for whoever runs it, whatever their- * role on it: it is started, stopped and updated on their own computer or- * host. A group with nothing in it is left out.+ * shown a control the server would refuse, and only where the server has+ * service connections on.+ *+ * Admin holds only what the web gateway does not have yet. The workspace's+ * connector switches are its admins' (the server's operator administers every+ * workspace). The apps connectors sign in through are the operator's, and are+ * in the gateway, so they are here only for a Switch that serves no gateway:+ * one this Console runs without Docker. A server's status is in Settings.+ * A group with nothing in it is left out.*/export function adminGroups(person: {administers: boolean;- operator: boolean;+ operatesGatewaylessServer: boolean;serviceConnections: boolean;- managed: boolean;}): AdminGroup[] {const { serviceConnections } = person;const groups: AdminGroup[] = [@@ -42,27 +35,21 @@ export function adminGroups(person: {},{scope: 'server',- items: [- ...(person.managed ? (['status'] as const) : []),- ...(serviceConnections && person.operator ? (['apps'] as const) : []),- ],+ items: serviceConnections && person.operatesGatewaylessServer ? ['apps'] : [],},];return groups.filter((group) => group.items.length > 0);}/**- * The Admin page's own section to show: the one asked for when the person may- * use it, otherwise the first they may. Null when they may use none, though- * the menu may still hold the server's status.+ * The section to show: the one asked for when the person may use it,+ * otherwise the first they may. Null when they may use none.*/export function shownAdminSection(groups: AdminGroup[],asked: AdminSection | undefined): AdminSection | null {- const sections = groups- .flatMap((group) => group.items)- .filter((item): item is AdminSection => item !== 'status');+ const sections = groups.flatMap((group) => group.items);if (asked !== undefined && sections.includes(asked)) return asked;return sections[0] ?? null;}diff --git a/console/apps/switch-console-desktop/src/renderer/features/admin/admin-view.tsx b/console/apps/switch-console-desktop/src/renderer/features/admin/admin-view.tsxindex 933a31d77..776daf9b3 100644--- a/console/apps/switch-console-desktop/src/renderer/features/admin/admin-view.tsx+++ b/console/apps/switch-console-desktop/src/renderer/features/admin/admin-view.tsx@@ -10,7 +10,6 @@ import {import { ServerPage } from '@renderer/features/switch-servers/server-page';import { ServerSectionTitlebar } from '@renderer/features/switch-servers/server-section-titlebar';import { switchServersStore } from '@renderer/features/switch-servers/switch-servers-store';-import { operatesServer } from '@renderer/features/switch-servers/workspace-admin';import { workspacesStore } from '@renderer/features/workspaces/workspaces-store';import { PageHeader } from '@renderer/lib/components/page-header';import { PageContent } from '@renderer/lib/components/page-layout';@@ -43,14 +42,12 @@ const AdminTitlebar = observer(function AdminTitlebar() {});/**- * What the workspace's admins, and the server's operator, manage for other- * people. Laid out like Settings: its sections down the side, grouped by- * what they reach, each shown only to the role that may use it. Its own- * sections are about connectors, so like the Connectors page they are behind- * the server's `service_connections` flag. A server this Console runs also- * has its status in the menu, drawn by the `managedServer` view: whoever has- * no section of their own here is sent there, and, where there is no status- * either and the flag is off, to Your Agents.+ * What the workspace's admins, and whoever runs a Switch with no gateway,+ * manage for other people that the web gateway does not have yet. Laid out+ * like Settings: its sections down the side, grouped by what they reach,+ * each shown only to the role that may use it. Its sections are about+ * connectors, so like the Connectors page they are behind the server's+ * `service_connections` flag; with the flag off it sends you to Your Agents.*/const AdminPanel = observer(function AdminPanel() {const { params } = useParams('admin');@@ -60,15 +57,8 @@ const AdminPanel = observer(function AdminPanel() {const workspace = workspacesStore.onServerInScope(serverId);const groups = adminGroupsInScope(serverId, access === 'shown');const section = shownAdminSection(groups, params.section);- const hasStatus = groups.some((group) => group.items.includes('status'));const redirect =- access === 'loading' || section !== null- ? null- : hasStatus- ? 'managedServer'- : access === 'absent'- ? 'serverAgents'- : null;+ access === 'loading' || section !== null ? null : access === 'absent' ? 'serverAgents' : null;useEffect(() => {if (redirect !== null) navigate(redirect, { serverId });}, [redirect, navigate, serverId]);@@ -79,7 +69,8 @@ const AdminPanel = observer(function AdminPanel() {<Spinner /></ServerPage>);- const operator = operatesServer(serverId);+ // The apps are read only where the menu offers them.+ const operator = groups.some((group) => group.items.includes('apps'));if (section === null)return (<ServerPage width={880} title="Admin" description="Ask a workspace admin to change these.">diff --git a/console/apps/switch-console-desktop/src/renderer/features/deeplinks/open-console-link.ts b/console/apps/switch-console-desktop/src/renderer/features/deeplinks/open-console-link.tsindex c914bec49..8eec608fa 100644--- a/console/apps/switch-console-desktop/src/renderer/features/deeplinks/open-console-link.ts+++ b/console/apps/switch-console-desktop/src/renderer/features/deeplinks/open-console-link.ts@@ -155,8 +155,9 @@ function openServerSettings(serverId: string): void {}/**- * Admin is for the workspace's admins, and for whoever runs the server, who- * finds its Status page there; anyone else lands on the home and is told why.+ * Admin is for the workspace's admins. Whoever runs the server without+ * administering it is looking for its status, and is sent there; anyone else+ * lands on the home and is told why.*/function openAdmin(serverId: string, tab: string | null): void {if (!administersWorkspaceInScope(serverId)) {diff --git a/console/apps/switch-console-desktop/src/renderer/features/switch-servers/managed-server-view.tsx b/console/apps/switch-console-desktop/src/renderer/features/switch-servers/managed-server-view.tsxindex 669e837c6..a2cfa70ac 100644--- a/console/apps/switch-console-desktop/src/renderer/features/switch-servers/managed-server-view.tsx+++ b/console/apps/switch-console-desktop/src/renderer/features/switch-servers/managed-server-view.tsx@@ -3,11 +3,9 @@ import { ArrowUpCircle, Power, ShieldCheck } from 'lucide-react';import { observer } from 'mobx-react-lite';import { useEffect, useState } from 'react';import { type GuardResult, type ViewDefinition } from '@renderer/app/view-registry';-import { AdminFrame, adminGroupsInScope } from '@renderer/features/admin/admin-frame';import { hostReachabilityStore } from '@renderer/features/remote-hosts/host-reachability-store';import { useAppSettingsKey } from '@renderer/features/settings/use-app-settings-key';import { workspacesStore } from '@renderer/features/workspaces/workspaces-store';-import { useFeatureFlags } from '@renderer/lib/hooks/useFeatureFlags';import { rpc } from '@renderer/lib/ipc';import { useParams } from '@renderer/lib/layout/navigation-provider';import { Switch } from '@renderer/lib/ui/switch';@@ -31,11 +29,7 @@ import {stopManagedServer,} from './managed-server-actions';import { WorkingSpinner } from './managed-server-dot';-import {- type ManagedServerState,- isFrozenServer,- managedServerState,-} from './managed-server-state';+import { type ManagedServerState, managedServerState } from './managed-server-state';import { managedTelemetryNotice } from './managed-telemetry-notice';import { remoteServerStore } from './remote-server-store';import { serverIcon } from './server-icon';@@ -115,25 +109,12 @@ const ManagedServerMainPanel = observer(function ManagedServerMainPanel() {</div>);}- return <ManagedServerInAdmin server={server} />;-});--/**- * The page as the Admin menu's Status entry. While the server can't answer- * the menu holds only this entry: the rest need the server, and the way to- * start it is all that stays live.- */-const ManagedServerInAdmin = observer(function ManagedServerInAdmin({- server,-}: {- server: SwitchServer;-}) {- const serviceConnections = useFeatureFlags(server.id).service_connections;- const groups = adminGroupsInScope(server.id, serviceConnections && !isFrozenServer(server));return (- <AdminFrame serverId={server.id} groups={groups} active="status">- <ManagedServerPage server={server} />- </AdminFrame>+ <div className="relative z-10 flex min-h-0 flex-1 overflow-auto bg-background">+ <div className="mx-auto w-full max-w-[880px] px-8">+ <ManagedServerPage server={server} />+ </div>+ </div>);});diff --git a/console/apps/switch-console-desktop/src/renderer/features/switch-servers/view.tsx b/console/apps/switch-console-desktop/src/renderer/features/switch-servers/view.tsxindex 9ab986366..edd8d9809 100644--- a/console/apps/switch-console-desktop/src/renderer/features/switch-servers/view.tsx+++ b/console/apps/switch-console-desktop/src/renderer/features/switch-servers/view.tsx@@ -32,13 +32,11 @@ import {DropdownMenuTrigger,} from '@renderer/lib/ui/dropdown-menu';import { Spinner } from '@renderer/lib/ui/spinner';-import { dashboardOrigin, type SwitchServer } from '@shared/core/switch-servers/switch-servers';+import { type SwitchServer } from '@shared/core/switch-servers/switch-servers';import { GuardrailsSection } from './GuardrailsSection';import { localServerStore } from './local-server-store';import { MessagingAppsCard } from './MessagingAppsCard';-import { openServerPage } from './open-server-page';import { remoteServerStore } from './remote-server-store';-import { servesWebGateway } from './server-gateway';import { serverIcon } from './server-icon';import { serverPlacementLabel } from './server-presentation';import { ServerSectionTitlebar } from './server-section-titlebar';@@ -54,6 +52,7 @@ import { isSwitchCloudServer } from './switch-cloud-store';import { switchRoomsStore } from './switch-rooms-store';import { switchServersStore } from './switch-servers-store';import { myIdentitiesQueryKey } from './use-my-identities';+import { administersWorkspaceInScope } from './workspace-admin';/** Whether a managed server's stack is currently running (via the store that* owns its lifecycle). Non-managed servers are always "reachable". */@@ -178,7 +177,6 @@ const ServerMainPanel = observer(function ServerMainPanel() {// button asks for, so the page should not look idle while one is in flight.const busy = refreshingPage || store.refreshing.has(serverId);const unreachable = store.isUnreachable(serverId);- const servesNoDashboard = !servesWebGateway(server);const PlacementIcon = serverIcon(server);const title = workspaceTitle(server);@@ -306,37 +304,22 @@ const ServerMainPanel = observer(function ServerMainPanel() {)}{connected && <ServerStatTiles serverId={serverId} />}- {connected && <MessagingAppsCard serverId={serverId} />}+ {/* Your own accounts in each app are linked in Settings; what is+ left here is the workspace's side, for its admins. */}+ {connected && administersWorkspaceInScope(serverId) && (+ <MessagingAppsCard serverId={serverId} />+ )}{connected && <GuardrailsSection serverId={serverId} />}</>)}-- {detailsVisible && !unreachable && !servesNoDashboard && (- <div className="flex items-center justify-between gap-3">- <div className="min-w-0 space-y-0.5">- <h3 className="text-sm font-medium text-foreground">Full admin interface</h3>- <p className="text-xs text-foreground-muted">- Configure resources, API keys and users.- </p>- </div>- <Button- variant="outline"- size="sm"- className="shrink-0"- onClick={() => void openServerPage(server.id, dashboardOrigin(server))}- >- <ExternalLink className="size-4" />- Open- </Button>- </div>- )}</div></div>);});/**- * Who you are on this server, and the way out.+ * Who you are on this server. Signing out and the rest of your account are in+ * Settings.** The account leads with a face and a name because that is the question being* answered — which of your identities this server sees — rather than with the@@ -345,8 +328,7 @@ const ServerMainPanel = observer(function ServerMainPanel() {const SignedInCard = observer(function SignedInCard({ serverId }: { serverId: string }) {const store = switchServersStore;const user = store.statusFor(serverId)?.user;- const showDeleteAccount = useShowModal('deleteAccountModal');- const serverName = store.serverById(serverId)?.name ?? 'this server';+ const { navigate } = useNavigate();const displayName = user?.name || user?.email || 'Signed in';const initial = displayName.trim().charAt(0).toUpperCase() || '?';@@ -368,18 +350,12 @@ const SignedInCard = observer(function SignedInCard({ serverId }: { serverId: st</div><div className="flex shrink-0 items-center gap-2">{user?.role && <Badge variant="secondary">{user.role}</Badge>}- {user?.email && (- <Button- variant="ghost"- size="sm"- className="text-destructive hover:text-destructive"- onClick={() => showDeleteAccount({ serverId, serverName, email: user.email })}- >- Delete account- </Button>- )}- <Button variant="outline" size="sm" onClick={() => void store.logout(serverId)}>- Sign out+ <Button+ variant="outline"+ size="sm"+ onClick={() => navigate('settings', { tab: 'account' })}+ >+ Your account</Button></div></div>diff --git a/console/apps/switch-console-desktop/src/renderer/tests/admin.test.ts b/console/apps/switch-console-desktop/src/renderer/tests/admin.test.tsindex 6020c6091..f5824bf39 100644--- a/console/apps/switch-console-desktop/src/renderer/tests/admin.test.ts+++ b/console/apps/switch-console-desktop/src/renderer/tests/admin.test.ts@@ -44,55 +44,42 @@ function entry(slug: string, category: string): ConnectionCatalogEntry {describe('the Admin page’s sections', () => {const person = {administers: false,- operator: false,+ operatesGatewaylessServer: false,serviceConnections: true,- managed: false,};- it('shows the workspace switches to its admins, and the apps under Server to the operator alone', () => {+ it('shows the workspace switches to its admins', () => {expect(adminGroups({ ...person, administers: true })).toEqual([{ scope: 'workspace', items: ['connectors'] },]);- expect(adminGroups({ ...person, administers: true, operator: true })).toEqual([- { scope: 'workspace', items: ['connectors'] },- { scope: 'server', items: ['apps'] },- ]);expect(adminGroups(person)).toEqual([]);});- it('puts the status of a server this Console runs first under Server, for whoever runs it', () => {- expect(adminGroups({ ...person, administers: true, operator: true, managed: true })).toEqual([+ it('keeps the connector apps only for whoever runs a Switch with no gateway to set them in', () => {+ expect(adminGroups({ ...person, administers: true, operatesGatewaylessServer: true })).toEqual([{ scope: 'workspace', items: ['connectors'] },- { scope: 'server', items: ['status', 'apps'] },- ]);- expect(adminGroups({ ...person, managed: true })).toEqual([- { scope: 'server', items: ['status'] },+ { scope: 'server', items: ['apps'] },]);});- it('keeps the connector sections behind service connections, but not the status', () => {- const off = { ...person, serviceConnections: false, administers: true, operator: true };- expect(adminGroups(off)).toEqual([]);- expect(adminGroups({ ...off, managed: true })).toEqual([- { scope: 'server', items: ['status'] },- ]);+ it('keeps every section behind service connections', () => {+ expect(+ adminGroups({+ administers: true,+ operatesGatewaylessServer: true,+ serviceConnections: false,+ })+ ).toEqual([]);});it('opens the section asked for when the person may use it, otherwise the first', () => {- const operator = adminGroups({ ...person, administers: true, operator: true });+ const operator = adminGroups({ ...person, administers: true, operatesGatewaylessServer: true });const admin = adminGroups({ ...person, administers: true });expect(shownAdminSection(operator, 'apps')).toBe('apps');expect(shownAdminSection(admin, 'apps')).toBe('connectors');expect(shownAdminSection(admin, undefined)).toBe('connectors');expect(shownAdminSection([], 'connectors')).toBeNull();});-- it('never opens the status as one of the page’s own sections', () => {- const runner = adminGroups({ ...person, managed: true });- expect(shownAdminSection(runner, undefined)).toBeNull();- const operator = adminGroups({ ...person, administers: true, operator: true, managed: true });- expect(shownAdminSection(operator, undefined)).toBe('connectors');- });});describe('the workspace switches as tiles', () => {diff --git a/console/apps/switch-console-desktop/src/renderer/tests/browser/admin-page.test.tsx b/console/apps/switch-console-desktop/src/renderer/tests/browser/admin-page.test.tsxindex c690e99ad..3cb815714 100644--- a/console/apps/switch-console-desktop/src/renderer/tests/browser/admin-page.test.tsx+++ b/console/apps/switch-console-desktop/src/renderer/tests/browser/admin-page.test.tsx@@ -3,8 +3,8 @@* under what they reach, and a workspace admin's switch for each service,* drawn as tiles. A switch asks before it reaches other people, shows what* the server says rather than what was asked, and keeps its place when it- * flips. The server's operator also has the apps connectors sign in- * through, under Server, each opening to its own profile. Someone who+ * flips. Whoever runs a Switch with no web gateway also has the apps+ * connectors sign in through, under Server, each opening to its own profile. Someone who* administers nothing is told whom to ask.*/import { QueryClient, QueryClientProvider } from '@tanstack/react-query';@@ -36,7 +36,7 @@ const switchServers = vi.hoisted(() => ({saveConnectorApp: vi.fn(),getConnectorAppImpact: vi.fn(),}));-const admin = vi.hoisted(() => ({ administers: true, operator: false }));+const admin = vi.hoisted(() => ({ administers: true, operator: false, servesGateway: false }));/** The dialogs asked for, by id; each is answered by the test. */const modals = vi.hoisted(() =>@@ -69,6 +69,11 @@ vi.mock('@renderer/features/switch-servers/switch-servers-store', () => ({switchServersStore: { servers: [{ id: 'server', name: 'Dev Server' }] },}));+// Connector apps are in the web gateway; Admin keeps them for a Switch without one.+vi.mock('@renderer/features/switch-servers/server-gateway', () => ({+ servesWebGateway: () => admin.servesGateway,+}));+vi.mock('@renderer/features/switch-servers/workspace-admin', () => ({administersWorkspaceInScope: () => admin.administers || admin.operator,operatesServer: () => admin.operator,@@ -142,6 +147,7 @@ beforeEach(() => {navigation.reset();admin.administers = true;admin.operator = false;+ admin.servesGateway = false;modals.length = 0;for (const mock of Object.values(workspaces)) mock.mockReset();for (const mock of Object.values(switchServers)) mock.mockReset();@@ -369,6 +375,17 @@ it("gives the server's operator Connector apps under Server, the app needing set});});+it('leaves the apps to the web gateway where the server serves one', async () => {+ admin.operator = true;+ admin.servesGateway = true;+ workspaces.getWorkspaceServices.mockResolvedValue(SERVICES);+ const page = await render();+ await vi.waitFor(() => expect(tiles(page)).not.toBeNull());++ expect(page.querySelector('nav [role="group"][aria-label="Server"]')).toBeNull();+ expect(switchServers.getConnectorApps).not.toHaveBeenCalled();+});+it('keeps the apps from a workspace admin who does not run the server', async () => {workspaces.getWorkspaceServices.mockResolvedValue(SERVICES);const page = await render();diff --git a/console/apps/switch-console-desktop/src/renderer/tests/browser/managed-server-view.test.tsx b/console/apps/switch-console-desktop/src/renderer/tests/browser/managed-server-view.test.tsxindex 740b29255..d865e4cbc 100644--- a/console/apps/switch-console-desktop/src/renderer/tests/browser/managed-server-view.test.tsx+++ b/console/apps/switch-console-desktop/src/renderer/tests/browser/managed-server-view.test.tsx@@ -249,28 +249,14 @@ async function click(element: HTMLElement): Promise<void> {await act(async () => element.click());}-describe('in the Admin menu', () => {- function menuGroup(label: string): Element | null {- return container?.querySelector(`nav [role="group"][aria-label="${label}"]`) ?? null;- }-- it('is the Status entry under Server, with its dot, for whoever runs it', async () => {- await render();-- const server = menuGroup('Server')!;- expect(server.textContent).toContain('Server · Local dev');- expect(server.querySelector('[aria-current="page"]')!.textContent).toContain('Status');- expect(server.querySelector('[aria-current="page"] [role="img"]')).not.toBeNull();- expect(menuGroup('Workspace')).toBeNull();- });-- it('sits beside the connector sections for an admin where service connections are on', async () => {+describe('its own page', () => {+ it('stands alone, with no Admin menu beside it, whatever the person administers', async () => {state.serviceConnections = true;state.administers = true;await render();- expect(menuGroup('Workspace')!.textContent).toContain('Connectors');- expect(menuGroup('Server')!.textContent).toContain('StatusConnector apps');+ expect(container?.querySelector('nav [role="group"]')).toBeNull();+ expect(container?.textContent).toContain('Local dev');});});diff --git a/console/apps/switch-console-desktop/src/shared/core/deeplinks/console-links.ts b/console/apps/switch-console-desktop/src/shared/core/deeplinks/console-links.tsindex cb73ec08a..af7330b8e 100644--- a/console/apps/switch-console-desktop/src/shared/core/deeplinks/console-links.ts+++ b/console/apps/switch-console-desktop/src/shared/core/deeplinks/console-links.ts@@ -59,7 +59,7 @@ export const CONSOLE_PAGES = {invite: { description: 'Invite people to the workspace.' },admin: {description:- "Admin, for the workspace's admins: which connectors the workspace offers, and the apps they sign in through.",+ "Admin, for the workspace's admins: which connectors the workspace offers, and, on a Switch with no web gateway, the apps they sign in through.",tabs: ['connectors', 'apps'],},settings: {diff --git a/core/switch_core/official_templates/switch-buddy/AGENT.md b/core/switch_core/official_templates/switch-buddy/AGENT.mdindex 066bac3b6..2b4834199 100644--- a/core/switch_core/official_templates/switch-buddy/AGENT.md+++ b/core/switch_core/official_templates/switch-buddy/AGENT.md@@ -217,7 +217,7 @@ per place, at the moment it is needed; not a list of every page.| Connect a messaging app | `switchdash://open/messaging-apps/connect` || Connectors: services such as GitHub | `switchdash://open/connections` || Invite people to the workspace | `switchdash://open/invite` |-| Admin, for workspace admins and whoever runs the server: which connectors the workspace offers (`tab=connectors`), the apps they sign in through (`tab=apps`, for whoever runs the server), and the server's own Status page | `switchdash://open/admin` |+| Admin, for workspace admins: which connectors the workspace offers (`tab=connectors`), and the apps they sign in through (`tab=apps`, only for whoever runs a Switch on their own computer without Docker; elsewhere they are in the web gateway). A server's status is in settings (`tab=status`) | `switchdash://open/admin` || Switch Console's settings (`tab=preferences`, `messaging-apps` to link their own accounts, `clis-models` for agent providers, `api-keys`, `devices` for their machines and SSH hosts, `managed-agents`, `status` or `account`) | `switchdash://open/settings` |- Ids come from your tools: an agent's id from `list_managed_agents` or@@ -354,8 +354,9 @@ Be clear about what that means:**Connectors on a server Switch Console runs** — the server's address is plain`http://127.0.0.1`. Atlassian and Google sign-ins work there with an up-to-date-Switch Console, once the server's admin has set up the vendor app ("Set up" on-its card in [Connector apps](switchdash://open/admin?tab=apps)). GitHub does not: GitHub Apps require an https address. For GitHub,+Switch Console, once the server's admin has set up the vendor app: on the web+gateway's Connectors page, or, for a Switch running without Docker, "Set up" on+its card in [Connector apps](switchdash://open/admin?tab=apps). GitHub does not: GitHub Apps require an https address. For GitHub,the computer's own access above is the way.**Which server they're on** changes the advice: