diff --git a/.changeset/no-apps-go-to-settings-target-3590.md b/.changeset/no-apps-go-to-settings-target-3590.md
new file mode 100644
index 000000000..4d4d4cafa
--- /dev/null
+++ b/.changeset/no-apps-go-to-settings-target-3590.md
@@ -0,0 +1,7 @@
+---
+'@object-ui/app-shell': patch
+---
+
+Point the "System Settings" entries at the system hub `/apps/setup/system` instead of the bare `/apps/setup` (objectui#3590).
+
+`AppContent` mounts the system hub only under `isSystemRoute`, which keys on a `/system` path segment. A bare `/apps/setup` therefore matched no pseudo-route except `isSetupRoute` and fell back into the "No Apps Configured" guard — i.e. on a zero-app deployment it *is* that empty state's own URL, so the empty state's `go-to-settings-btn` re-rendered the very screen it sits on. Retargeted three call sites: the empty state's CTA, `AppSidebar`'s no-active-app `sys-settings` fallback entry, and `UnifiedSidebar`'s `/home` Administration `sys-settings` entry. Every sibling entry in both clusters already spelled `/apps/setup/system/...`.
diff --git a/packages/app-shell/src/console/AppContent.tsx b/packages/app-shell/src/console/AppContent.tsx
index 92333202e..e898dd85b 100644
--- a/packages/app-shell/src/console/AppContent.tsx
+++ b/packages/app-shell/src/console/AppContent.tsx
@@ -593,7 +593,19 @@ export function AppContent({ extraRoutes, extraRoutesNoApp }: AppContentProps =
navigate(`/apps/${appName}/create-app`)} data-testid="create-first-app-btn">
{t('empty.createFirstApp')}
- navigate('/apps/setup')} data-testid="go-to-settings-btn">
+ {/* #3590 — the system hub lives at `/apps/setup/system`, NOT at the
+ bare `/apps/setup`. Being inside the `/apps/:appName/*` subtree is
+ necessary but NOT sufficient: `isSystemRoute` keys on a `/system`
+ segment, so bare `/apps/setup` fails every pseudo-route test above
+ except `isSetupRoute` and falls straight back into THIS guard —
+ i.e. it is this empty state's own URL, and the click was a no-op
+ loop. `/apps/setup/system` flips `isSystemRoute`, which is exactly
+ the switch that mounts `extraRoutesNoApp` (the branch just below)
+ where the host declares `system` → SystemHubPage. Spelled the same
+ absolute way as the sidebar's whole `sys-*` cluster
+ (`/apps/setup/system/...`); `appName` is provably `setup` here, so
+ the two forms coincide. */}
+ navigate('/apps/setup/system')} data-testid="go-to-settings-btn">
{t('empty.systemSettings')}
diff --git a/packages/app-shell/src/console/__tests__/AppContent.noAppsCta.test.tsx b/packages/app-shell/src/console/__tests__/AppContent.noAppsCta.test.tsx
index a6cf72210..012da8164 100644
--- a/packages/app-shell/src/console/__tests__/AppContent.noAppsCta.test.tsx
+++ b/packages/app-shell/src/console/__tests__/AppContent.noAppsCta.test.tsx
@@ -18,9 +18,13 @@
* /apps/setup and /apps/setup/
*
- * which is precisely where the sidebar's no-active-app system navigation and
- * the empty state's own `go-to-settings-btn` send a zero-app user
- * (`layout/AppSidebar.tsx` systemFallbackNavigation → `/apps/setup`).
+ * which is where a zero-app user still arrives from the remaining bare
+ * `/apps/setup` senders (`layout/AppSidebar.tsx`'s no-app sidebar header and
+ * user-menu "Settings", `console/ConsoleShell.tsx`'s legacy `/system` redirect)
+ * and from bookmarks. Note both CTA-shaped senders that used to point here have
+ * since been retargeted at the system hub: the empty state's own
+ * `go-to-settings-btn` and both sidebars' `sys-settings` entry (objectui#3590) —
+ * the ENTRY family below is unchanged, only who points at it.
*
* `/` is NOT such a URL: with zero apps `RootLandingRedirect` resolves to
* `/home` and `AppContent` never mounts. So the empty state always renders
@@ -138,6 +142,19 @@ function LocationProbe() {
return {location.pathname}
;
}
+/**
+ * The host's system routes, reduced to the one entry this file asserts on.
+ * `apps/console/src/AppContent.tsx` builds a `systemRoutes` fragment whose FIRST
+ * entry is `system hub} />
+);
+
/**
* The reference host's route tree, reduced to the parts that decide this
* question: the `/apps/:appName/*` subtree, the landing route, and the
@@ -149,7 +166,7 @@ function renderConsoleAt(initialUrl: string) {
- landing} />
home} />
>()),
+ useObjectTranslation: () => ({
+ t: (key: string, options?: Record) => String(options?.defaultValue ?? key),
+ }),
+ useObjectLabel: () => ({
+ objectLabel: ({ label }: { label?: string }) => label,
+ viewLabel: (_o: string, _v: string, fallback?: string) => fallback,
+ dashboardLabel: ({ label }: { label?: string }) => label,
+ navGroupLabel: (_a: string, _g: string, fallback?: string) => fallback,
+ }),
+}));
+
+// Both clusters below are admin surfaces — UnifiedSidebar's Administration group
+// is gated on `useIsWorkspaceAdmin`.
+vi.mock('@object-ui/auth', () => ({
+ useAuth: () => ({ user: null, signOut: vi.fn(), isAuthEnabled: false, activeOrganization: null }),
+ useIsWorkspaceAdmin: () => true,
+ getUserInitials: () => 'U',
+}));
+
+vi.mock('@object-ui/permissions', () => ({
+ usePermissions: () => ({ can: () => true, hasCapabilities: () => true }),
+}));
+
+/** The zero-app deployment this whole screen exists for. */
+vi.mock('../../providers/MetadataProvider', () => ({
+ useMetadata: () => ({ apps: [], objects: [] }),
+}));
+
+vi.mock('../../providers/ExpressionProvider', () => ({
+ useExpressionContext: () => ({ evaluator: null }),
+ evaluateVisibility: (expr: unknown) => expr !== false && expr !== 'false',
+}));
+
+vi.mock('../../utils', () => ({
+ resolveI18nLabel: (label: unknown) => (typeof label === 'string' ? label : ''),
+ matchAppBySegment: (apps: Array<{ name?: string }>, segment?: string) =>
+ apps.find((a) => a?.name === segment),
+ appRouteSegment: (app: { name?: string }) => app?.name,
+}));
+
+// Lazy lucide DynamicIcon would suspend mid-test; a null icon keeps each link's
+// accessible name equal to its label text.
+vi.mock('../../utils/getIcon', () => ({ getIcon: () => () => null }));
+
+vi.mock('../../hooks/useRecentItems', () => ({ useRecentItems: () => ({ recentItems: [] }) }));
+vi.mock('../../hooks/useFavorites', () => ({
+ useFavorites: () => ({ favorites: [], removeFavorite: vi.fn() }),
+}));
+vi.mock('../../hooks/useNavPins', () => ({
+ useNavPins: () => ({ togglePin: vi.fn(), applyPins: (items: unknown) => items }),
+}));
+vi.mock('../../hooks/useNavActionDispatch', () => ({
+ useNavActionDispatch: () => vi.fn(),
+}));
+// The `/home` shell — the context whose navigation carries the admin cluster.
+vi.mock('../../context/NavigationContext', () => ({
+ useNavigationContext: () => ({ context: 'home', currentAppName: undefined }),
+}));
+vi.mock('../ContextSelectors', () => ({
+ useAppContextSelectors: () => ({ contextValues: {}, element: null }),
+ contextSelectorQueryKey: (id: string) => (id === 'active_package' ? 'package' : id),
+ STUDIO_PACKAGE_SELECTOR_ID: 'active_package',
+}));
+vi.mock('../LocalizedSidebarTrigger', () => ({
+ LocalizedSidebarTrigger: () => null,
+}));
+
+import { SidebarProvider } from '@object-ui/components';
+import { AppSidebar } from '../AppSidebar';
+import { UnifiedSidebar } from '../UnifiedSidebar';
+
+/** The system hub — the reachable target, and what every sibling entry prefixes. */
+const SYSTEM_HUB = '/apps/setup/system';
+
+beforeEach(() => {
+ localStorage.clear();
+});
+
+describe('sidebar system-settings target (objectui#3590)', () => {
+ it('AppSidebar: the no-active-app fallback cluster heads at the system hub', () => {
+ render(
+
+
+ {}} />
+
+ ,
+ );
+
+ // Precondition: with zero apps this really is the fallback cluster, not an
+ // app's own navigation — otherwise the assertion below would be vacuous.
+ expect(screen.getByTestId('system-fallback-nav')).toBeInTheDocument();
+
+ expect(screen.getByRole('link', { name: 'System Settings' })).toHaveAttribute(
+ 'href',
+ SYSTEM_HUB,
+ );
+ // The regression: bare `/apps/setup` re-renders the empty state this cluster
+ // is displayed on top of.
+ expect(screen.getByRole('link', { name: 'System Settings' })).not.toHaveAttribute(
+ 'href',
+ '/apps/setup',
+ );
+ // The rest of the cluster was already hub-scoped; kept as the consistency
+ // anchor that made the head entry the odd one out.
+ expect(screen.getByRole('link', { name: 'Applications' })).toHaveAttribute(
+ 'href',
+ `${SYSTEM_HUB}/apps`,
+ );
+ });
+
+ it('MEASUREMENT: UnifiedSidebar renders the /home Administration cluster FLAT, so its retargeted entry is dormant', () => {
+ // Measured while retargeting `UnifiedSidebar`'s `sys-settings` entry: that
+ // entry is not reachable today, so the corrected URL is dormant rather than
+ // user-visible, and this file cannot honestly assert a navigation for it.
+ //
+ // Why: `UnifiedSidebar` runs ONE ternary on `context === 'app' && activeApp`
+ // (line ~437). Only the APP arm renders ``, which is what
+ // descends into `type: 'group'` children. The HOME arm hand-rolls
+ // `homeNavigation.map(item =>
+
+
+ ,
+ );
+
+ expect(screen.getByRole('link', { name: 'Administration' })).toHaveAttribute('href', '/home');
+ expect(screen.queryByRole('link', { name: 'System Settings' })).not.toBeInTheDocument();
+ expect(screen.queryByRole('link', { name: 'Applications' })).not.toBeInTheDocument();
+ });
+});