@djangocfg/layouts 2.1.596 → 2.1.598

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@djangocfg/layouts",
-  "version": "2.1.596",
+  "version": "2.1.598",
   "description": "Simple, straightforward layout components for Next.js - import and use with props",
   "keywords": [
     "layouts",
@@ -91,11 +91,11 @@
     "test": "vitest run"
   },
   "peerDependencies": {
-    "@djangocfg/analytics": "^2.1.596",
-    "@djangocfg/api": "^2.1.596",
-    "@djangocfg/devtools": "^2.1.596",
-    "@djangocfg/i18n": "^2.1.596",
-    "@djangocfg/ui-core": "^2.1.596",
+    "@djangocfg/analytics": "^2.1.598",
+    "@djangocfg/api": "^2.1.598",
+    "@djangocfg/devtools": "^2.1.598",
+    "@djangocfg/i18n": "^2.1.598",
+    "@djangocfg/ui-core": "^2.1.598",
     "@hookform/resolvers": "^5.2.2",
     "consola": "^3.4.2",
     "lucide-react": "^0.545.0",
@@ -125,12 +125,12 @@
     "uuid": "^11.1.1"
   },
   "devDependencies": {
-    "@djangocfg/analytics": "^2.1.596",
-    "@djangocfg/api": "^2.1.596",
-    "@djangocfg/devtools": "^2.1.596",
-    "@djangocfg/i18n": "^2.1.596",
-    "@djangocfg/typescript-config": "^2.1.596",
-    "@djangocfg/ui-core": "^2.1.596",
+    "@djangocfg/analytics": "^2.1.598",
+    "@djangocfg/api": "^2.1.598",
+    "@djangocfg/devtools": "^2.1.598",
+    "@djangocfg/i18n": "^2.1.598",
+    "@djangocfg/typescript-config": "^2.1.598",
+    "@djangocfg/ui-core": "^2.1.598",
     "@storybook/react-vite": "^10.5.0",
     "@types/node": "^25.9.5",
     "@types/react": "19.2.15",

package/src/layouts/SettingsLayout/SettingsDialog.tsx

@@ -13,6 +13,7 @@ import { useIsMobile } from '@djangocfg/ui-core/hooks';
 import { cn } from '@djangocfg/ui-core/lib';
 
 import { SettingsForm } from './SettingsForm';
+import { useGuestIntentRedirect } from './hooks/useGuestIntentRedirect';
 import { useSettingsUrl } from './hooks/useSettingsUrl';
 import { useSettingsCopy } from './i18n';
 import { buildBuiltinSections } from './sections';
@@ -77,6 +78,7 @@ export const SettingsDialog: React.FC<SettingsDialogProps> = ({
   );
 
   useSettingsUrl({ urlKey, enabled: syncUrl && isAuthenticated, resolveSection });
+  useGuestIntentRedirect(urlKey ?? 'settings', syncUrl !== false);
 
   const resolvedTitle = title ?? copy.nav.title;
 

package/src/layouts/SettingsLayout/hooks/useGuestIntentRedirect.ts

@@ -0,0 +1,31 @@
+'use client';
+
+/**
+ * useGuestIntentRedirect — a guest who arrives on `#settings/<section>?<intent>` is sent to sign-in and brought back.
+ *
+ * The dialog only opens for a signed-in user, so without this an assistant's consent link (`#settings/mcp?request=…`)
+ * lands on a page where nothing happens. The full address, fragment included, is saved as the post-sign-in
+ * destination, so the dialog reads the same intent once the session exists. A plain `#settings` (no intent) is left
+ * alone: a guest opening it has nothing pending.
+ */
+
+import { useEffect, useRef } from 'react';
+
+import { useAuth, useCfgRouter } from '@djangocfg/api/auth';
+
+import { carriesIntent } from '../intent/parseSettingsHash';
+
+export function useGuestIntentRedirect(urlKey: string, enabled: boolean): void {
+  const { isAuthenticated, isLoading, saveRedirectUrl, routes } = useAuth();
+  const router = useCfgRouter();
+  const sent = useRef(false);
+
+  useEffect(() => {
+    if (!enabled || isLoading || isAuthenticated || sent.current) return;
+    if (!carriesIntent(window.location.hash.slice(1), urlKey)) return;
+    sent.current = true;
+    const { pathname, search, hash } = window.location;
+    saveRedirectUrl(`${pathname}${search}${hash}`);
+    router.push(routes.auth);
+  }, [enabled, isLoading, isAuthenticated, saveRedirectUrl, router, routes.auth, urlKey]);
+}

package/src/layouts/SettingsLayout/hooks/useSettingsUrl.ts

@@ -27,7 +27,7 @@ import { useEffect, useRef } from 'react';
 
 import { useHashState } from '@djangocfg/ui-core/hooks';
 
-import { buildSettingsHash as buildHash, parseSettingsHash as parseHash } from '../intent/parseSettingsHash';
+import { buildSettingsHash as buildHash, parseSettingsHash as parseHash, sectionToOpen } from '../intent/parseSettingsHash';
 import { useSettingsDialogStore } from '../store';
 
 export interface UseSettingsUrlOptions {
@@ -37,7 +37,8 @@ export interface UseSettingsUrlOptions {
   enabled?: boolean;
   /**
    * Validate / normalize a section id read from the URL. Return null to reject
-   * an unknown id (dialog still opens, on the fallback section). The shell
+   * an unknown id (dialog still opens, on the fallback section; the id stays in
+   * the address so a section registered a moment later can claim it). The shell
    * passes the set of known section ids here.
    */
   resolveSection?: (id: string | null) => string | null;
@@ -73,9 +74,8 @@ export function useSettingsUrl(options: UseSettingsUrlOptions = {}): void {
     const parsed = parseHash(fragment, urlKey);
 
     if (parsed.open) {
-      const resolved = resolveSection
-        ? resolveSection(parsed.section)
-        : parsed.section;
+      // A section the host does not know *yet* stays in the address (see `sectionToOpen`).
+      const resolved = sectionToOpen(parsed.section, resolveSection ? resolveSection(parsed.section) : parsed.section);
       // open() preserves the current section when called without one, so only
       // pass a section when the URL actually named a (valid) one.
       open(resolved ?? undefined);

package/src/layouts/SettingsLayout/intent/parseSettingsHash.test.ts

@@ -1,6 +1,6 @@
 import { describe, expect, it } from 'vitest';
 
-import { buildSettingsHash, parseSettingsHash } from './parseSettingsHash';
+import { buildSettingsHash, carriesIntent, parseSettingsHash, sectionToOpen } from './parseSettingsHash';
 
 describe('parseSettingsHash', () => {
   it('is closed for an empty or foreign fragment', () => {
@@ -38,3 +38,27 @@ describe('buildSettingsHash', () => {
     expect(buildSettingsHash('settings', null)).toBe('settings');
   });
 });
+
+describe('sectionToOpen', () => {
+  it('uses the host-resolved id when there is one', () => {
+    expect(sectionToOpen('mcp', 'mcp')).toBe('mcp');
+  });
+
+  it('keeps the requested id while the section is not registered yet (cold deep link)', () => {
+    expect(sectionToOpen('mcp', null)).toBe('mcp');
+  });
+
+  it('is null for a bare #settings', () => {
+    expect(sectionToOpen(null, null)).toBeNull();
+  });
+});
+
+describe('carriesIntent', () => {
+  it('is true only for a settings link with a query', () => {
+    expect(carriesIntent('settings/mcp?request=abc&client=Claude', 'settings')).toBe(true);
+    expect(carriesIntent('settings/mcp', 'settings')).toBe(false);
+    expect(carriesIntent('settings', 'settings')).toBe(false);
+    expect(carriesIntent('other/mcp?request=abc', 'settings')).toBe(false);
+    expect(carriesIntent('', 'settings')).toBe(false);
+  });
+});

package/src/layouts/SettingsLayout/intent/parseSettingsHash.ts

@@ -42,3 +42,20 @@ export function parseSettingsHash(fragment: string, urlKey: string): ParsedSetti
 export function buildSettingsHash(urlKey: string, section: string | null): string {
   return section ? `${urlKey}/${section}` : urlKey;
 }
+
+/**
+ * The section to open for a parsed fragment. `resolved` is the host's check against the sections it knows *right now*;
+ * it is null both for a typo and for a section that has not registered yet (a host adds its MCP section once a
+ * backend answer arrives, after the dialog has already read a deep link on a cold load). Dropping the id in the
+ * second case made the dialog write `#settings` over the link and open on the first section, so the id is kept: an
+ * unknown one only shows the fallback section, a late one is picked up as soon as it registers.
+ */
+export function sectionToOpen(requested: string | null, resolved: string | null): string | null {
+  return resolved ?? requested;
+}
+
+/** True when the fragment is a Settings deep link that carries an arrival intent (`#settings/mcp?request=…`). */
+export function carriesIntent(fragment: string, urlKey: string): boolean {
+  const parsed = parseSettingsHash(fragment, urlKey);
+  return parsed.open && Object.keys(parsed.params).length > 0;
+}