@agent-native/toolkit 0.214.0 → 0.217.0

package/src/app/settings/shell/routing.spec.ts

@@ -38,7 +38,15 @@ function resolve(
   rest: Partial<SettingsLocation> = {},
   pages: readonly SettingsPageDefinition[] = CORE_SETTINGS_PAGES,
 ) {
-  return resolveSettingsRoute({ pathname, hash, ...rest }, pages);
+  return resolveSettingsRoute({ pathname, hash, ...rest }, pages, {
+    templateTabPageIds: new Map(
+      pages.flatMap((page) =>
+        page.group === "app"
+          ? (page.legacyTabIds ?? []).map((tabId) => [tabId, page.id] as const)
+          : [],
+      ),
+    ),
+  });
 }
 
 describe("settings shell routing", () => {
@@ -244,6 +252,27 @@ describe("legacy settings links", () => {
         "recordings",
       ]),
     ).toMatchObject({ page: "app", sub: "recordings" });
+    const collidingPages = [...CORE_SETTINGS_PAGES, appPage("alerts")];
+    expect(
+      resolveSettingsTabValue("alerts", collidingPages, ["alerts"]),
+    ).toMatchObject({ page: "alerts", sub: null, legacy: false });
+    expect(
+      resolveSettingsRoute(
+        { pathname: "/settings", hash: "" },
+        collidingPages,
+        {
+          appAreaIds: ["alerts"],
+          tabValue: "alerts",
+        },
+      ),
+    ).toMatchObject({ page: "alerts", sub: null, legacy: false });
+    expect(
+      resolveSettingsRoute(
+        { pathname: "/settings/alerts", hash: "" },
+        collidingPages,
+        { appAreaIds: ["alerts"] },
+      ),
+    ).toMatchObject({ page: "alerts", sub: null, legacy: false });
     // Today's tab path for an area (Analytics' Alerts tab).
     expect(
       resolveSettingsRoute(
@@ -267,6 +296,67 @@ describe("legacy settings links", () => {
     ).toMatchObject({ page: "usage", legacy: false });
   });
 
+  it("keeps app and derived template pages addressable when ids collide", () => {
+    const pages = [
+      ...CORE_SETTINGS_PAGES,
+      appPage("app-drafting", "drafting"),
+      appPage("drafting"),
+    ];
+    expect(
+      resolveSettingsRoute(
+        { pathname: "/settings/drafting", hash: "" },
+        pages,
+        { templateTabPageIds: new Map([["drafting", "app-drafting"]]) },
+      ),
+    ).toEqual({
+      page: "drafting",
+      sub: null,
+      anchor: null,
+      legacy: false,
+    });
+    expect(
+      resolveSettingsRoute(
+        { pathname: "/settings/app-drafting", hash: "" },
+        pages,
+        { templateTabPageIds: new Map([["drafting", "app-drafting"]]) },
+      ),
+    ).toMatchObject({ page: "app-drafting", legacy: false });
+    expect(
+      resolveSettingsTabValue(
+        "drafting",
+        pages,
+        [],
+        new Map([["drafting", "app-drafting"]]),
+      ),
+    ).toMatchObject({ page: "app-drafting", legacy: true });
+    expect(
+      resolveSettingsRoute(
+        {
+          pathname: "/settings",
+          hash: "",
+          search: "?section=drafting",
+        },
+        pages,
+        { templateTabPageIds: new Map([["drafting", "app-drafting"]]) },
+      ),
+    ).toMatchObject({ page: "app-drafting", legacy: true });
+  });
+
+  it("preserves nested routes for app-owned page ids that match legacy patterns", () => {
+    const pages = [...CORE_SETTINGS_PAGES, appPage("secrets")];
+    expect(
+      resolveSettingsRoute(
+        { pathname: "/settings/secrets/credentials", hash: "" },
+        pages,
+      ),
+    ).toEqual({
+      page: "secrets",
+      sub: "credentials",
+      anchor: null,
+      legacy: false,
+    });
+  });
+
   it("prefers the agent panel's section over the hash it navigated to", () => {
     // The panel sends `secrets` to #integrations for today's Settings.
     expect(
@@ -284,6 +374,7 @@ describe("legacy settings links", () => {
     expect(
       resolveSettingsRoute({ pathname: "/settings", hash: "" }, MAIL_PAGES, {
         tabValue: "drafting",
+        templateTabPageIds: new Map([["drafting", "drafting"]]),
       }),
     ).toMatchObject({ page: "drafting", legacy: true });
   });

package/src/app/settings/shell/routing.ts

@@ -43,6 +43,8 @@ export interface ResolvedSettingsRoute extends SettingsRoute {
 export interface ResolveSettingsRouteOptions {
   /** Tabs on the app's General page, routed `/settings/app/<id>`. */
   appAreaIds?: readonly string[];
+  /** Legacy template tab ids map unless a direct page claims that path. */
+  templateTabPageIds?: ReadonlyMap<string, string>;
   /**
    * The tab a controlled template chose. A bare `/settings` opens it, which
    * covers the moment between a template stripping `?section=` from the URL
@@ -159,17 +161,30 @@ function pageForTabIds(
 }
 
 /**
- * The page a template's tab id opens. The template's own tabs win, because
- * its id space is its own: Mail's inbox `automations` tab is not the core
- * Automations page.
+ * The page a template's tab id opens. Direct page ids are canonical paths;
+ * template aliases still win over legacy redirects and core tab aliases.
  */
 export function resolveSettingsTabValue(
   value: string,
   pages: readonly SettingsPageDefinition[],
   appAreaIds: readonly string[] = [],
+  templateTabPageIds?: ReadonlyMap<string, string>,
 ): ResolvedSettingsRoute {
   const tab = value.trim();
   if (!tab) return NO_ROUTE;
+  const templatePage = templateTabPageIds?.get(tab);
+  if (templatePage && pages.some((page) => page.id === templatePage)) {
+    return { page: templatePage, sub: null, anchor: null, legacy: true };
+  }
+  const directAppPage = pages.find(
+    (page) => isAppPage(page) && page.id === tab,
+  );
+  if (directAppPage) {
+    return { page: directAppPage.id, sub: null, anchor: null, legacy: false };
+  }
+  if (appAreaIds.includes(tab)) {
+    return { page: "app", sub: tab, anchor: null, legacy: true };
+  }
   const appPage = pages.find(
     (page) =>
       isAppPage(page) && (page.id === tab || page.legacyTabIds?.includes(tab)),
@@ -177,9 +192,6 @@ export function resolveSettingsTabValue(
   if (appPage) {
     return { page: appPage.id, sub: null, anchor: null, legacy: true };
   }
-  if (appAreaIds.includes(tab)) {
-    return { page: "app", sub: tab, anchor: null, legacy: true };
-  }
   const redirect = resolveLegacySettingsId(tab, "tab");
   if (redirect) return redirectRoute(redirect, pages, null);
   const page =
@@ -206,7 +218,8 @@ export function resolveSettingsRoute(
   if (segments.length > 0) {
     const joined = segments.join(":");
     const pageId = segments[0]!;
-    if (pages.some((page) => page.id === pageId)) {
+    const directPage = pages.find((page) => page.id === pageId);
+    if (directPage && isCoreSettingsPageId(pageId)) {
       const pattern = segments.length > 1 && resolveSettingsIdPattern(joined);
       if (pattern) return redirectRoute(pattern, pages, hash || null);
       return {
@@ -216,6 +229,26 @@ export function resolveSettingsRoute(
         legacy: segments.length > 2,
       };
     }
+    if (directPage) {
+      return {
+        page: pageId,
+        sub: segments[1] ?? null,
+        anchor: hash || null,
+        legacy: segments.length > 2,
+      };
+    }
+    const templatePageId = options.templateTabPageIds?.get(pageId);
+    const templatePage = templatePageId
+      ? pages.find((page) => page.id === templatePageId)
+      : undefined;
+    if (templatePage) {
+      return {
+        page: templatePage.id,
+        sub: null,
+        anchor: hash || null,
+        legacy: true,
+      };
+    }
     // Today's tab link to an area that moved onto the app's General page
     // (`/settings/alerts`). Checked before the redirect table, like
     // `resolveSettingsTabValue`, because the area id is the template's own.
@@ -266,11 +299,21 @@ export function resolveSettingsRoute(
   }
   const section = settingsSectionParam(location.search);
   if (section) {
-    const route = resolveSettingsTabValue(section, pages, options.appAreaIds);
+    const route = resolveSettingsTabValue(
+      section,
+      pages,
+      options.appAreaIds,
+      options.templateTabPageIds,
+    );
     if (route.page) return route;
   }
   if (options.tabValue) {
-    return resolveSettingsTabValue(options.tabValue, pages, options.appAreaIds);
+    return resolveSettingsTabValue(
+      options.tabValue,
+      pages,
+      options.appAreaIds,
+      options.templateTabPageIds,
+    );
   }
   return NO_ROUTE;
 }