Fix subpage title renaming

Preserve nested page paths when renaming visible page titles, allow the Tauri filesystem rename command, suppress rename-only page transition animation, and surface filesystem rename errors in the page header.

Author: ComputelessComputer

apps/desktop/src-tauri/capabilities/default.json

@@ -42,6 +42,13 @@
         { "path": "$HOME/Library/Application Support/com.philo.dev/**" }
       ]
     },
+    {
+      "identifier": "fs:allow-rename",
+      "allow": [
+        { "path": "$APPDATA/**" },
+        { "path": "$HOME/Library/Application Support/com.philo.dev/**" }
+      ]
+    },
     {
       "identifier": "fs:allow-exists",
       "allow": [

apps/desktop/src/components/layout/AppLayout.tsx

@@ -63,10 +63,12 @@ import {
   buildPageLinkTarget,
   getJournalDir,
   getNotePath,
+  getPageDisplayTitle,
   getPagePath,
   getPagesDir,
   initJournalScope,
   parseDateFromNoteLinkTarget,
+  parsePageTitleFromLinkTarget,
   parsePageTitleFromPath,
   sanitizePageTitle,
 } from "../../services/paths";
@@ -1357,10 +1359,11 @@ function PageView({
     || resolvedPage.linkKind === "github_issue"
     || resolvedPage.linkKind === "github_commit"
   );
+  const pageEditableTitle = resolvedPage ? getPageDisplayTitle(resolvedPage.title,) : getPageDisplayTitle(title,);
   const pageHeading = resolvedPage
-    ? (pageIsUrlSummary ? resolvedPage.linkTitle ?? resolvedPage.title : resolvedPage.title)
-    : title;
-  const canEditTitle = !!resolvedPage && pageHeading === resolvedPage.title && !!onRenameTitle;
+    ? (pageIsUrlSummary ? resolvedPage.linkTitle ?? pageEditableTitle : pageEditableTitle)
+    : pageEditableTitle;
+  const canEditTitle = !!resolvedPage && pageHeading === pageEditableTitle && !!onRenameTitle;
   const titleInputWidthCh = Math.max(draftTitle.length, 1,) + 1;
   const meetingLocation = resolvedPage?.type === "meeting" ? resolvedPage.location?.trim() ?? "" : "";
   const summaryUpdatedAt = formatSummaryUpdatedAt(resolvedPage?.summaryUpdatedAt ?? null,);
@@ -1390,25 +1393,27 @@ function PageView({
     setIsEditingTitle(false,);
 
     if (!nextTitle) {
-      setDraftTitle(resolvedPage.title,);
+      setDraftTitle(pageEditableTitle,);
       return;
     }
 
-    if (nextTitle === resolvedPage.title) {
-      setDraftTitle(nextTitle,);
+    if (nextTitle === pageEditableTitle || nextTitle === resolvedPage.title) {
+      setDraftTitle(pageEditableTitle,);
       setTitleEditError(null,);
       return;
     }
 
     try {
       setTitleEditError(null,);
       const renamedPage = await onRenameTitle(resolvedPage, nextTitle,);
-      setDraftTitle(renamedPage?.title ?? nextTitle,);
+      setDraftTitle(getPageDisplayTitle(renamedPage?.title ?? nextTitle,),);
     } catch (error) {
-      setDraftTitle(resolvedPage.title,);
-      setTitleEditError(error instanceof Error ? error.message : "Could not rename page.",);
+      setDraftTitle(pageEditableTitle,);
+      setTitleEditError(
+        error instanceof Error ? error.message : typeof error === "string" ? error : "Could not rename page.",
+      );
     }
-  }, [canEditTitle, draftTitle, onRenameTitle, resolvedPage,],);
+  }, [canEditTitle, draftTitle, onRenameTitle, pageEditableTitle, resolvedPage,],);
 
   if (!resolvedPage) {
     return (
@@ -1456,7 +1461,7 @@ function PageView({
                 onClick={() => {
                   if (!canEditTitle) return;
                   setTitleEditError(null,);
-                  setDraftTitle(resolvedPage.title,);
+                  setDraftTitle(pageEditableTitle,);
                   setIsEditingTitle(true,);
                 }}
                 onContextMenu={(event,) => {
@@ -1639,6 +1644,7 @@ export default function AppLayout() {
   const searchNavigationModeRef = useRef<"mouse" | "keyboard">("mouse",);
   const hasMountedViewRef = useRef(false,);
   const nextViewAnimationDirectionRef = useRef<"forward" | "backward" | null>(null,);
+  const skipNextViewAnimationRef = useRef(false,);
   const viewAnimationFrameRef = useRef<number | null>(null,);
   const viewAnimationResetRef = useRef<number | null>(null,);
   const currentView = viewState.history[viewState.index] ?? { kind: "home", };
@@ -1750,6 +1756,17 @@ export default function AppLayout() {
       return;
     }
 
+    if (skipNextViewAnimationRef.current) {
+      skipNextViewAnimationRef.current = false;
+      nextViewAnimationDirectionRef.current = null;
+      setViewTransitionStyle({
+        opacity: 1,
+        transform: "translateX(0px)",
+        transition: "none",
+      },);
+      return;
+    }
+
     if (typeof window === "undefined" || window.matchMedia("(prefers-reduced-motion: reduce)",).matches) {
       setViewTransitionStyle({
         opacity: 1,
@@ -2603,7 +2620,7 @@ export default function AppLayout() {
     closeGlobalSearch();
 
     if (result.kind === "page") {
-      const title = parsePageTitleFromPath(result.path,);
+      const title = parsePageTitleFromLinkTarget(result.relativePath,) ?? parsePageTitleFromPath(result.path,);
       if (title) {
         trackEvent("search_result_opened", {
           kind: result.kind,
@@ -3096,6 +3113,7 @@ export default function AppLayout() {
     currentPageRef.current = renamedPage;
     setActivePage(renamedPage,);
     setPagesRevision((value,) => value + 1);
+    skipNextViewAnimationRef.current = true;
     setViewState((current,) => ({
       ...current,
       history: current.history.map((view,) => (

apps/desktop/src/services/paths.ts

@@ -172,16 +172,40 @@ function decodePathTarget(target: string,): string {
   }
 }
 
-const INVALID_PAGE_TITLE_RE = /[\/\\\u0000-\u001F]+/g;
+const INVALID_PAGE_TITLE_SEGMENT_RE = /[\\\u0000-\u001F]+/g;
 
-export function sanitizePageTitle(title: string,): string {
-  return title
-    .replace(INVALID_PAGE_TITLE_RE, " ",)
+function sanitizePageTitleSegment(segment: string,): string {
+  return segment
+    .replace(INVALID_PAGE_TITLE_SEGMENT_RE, " ",)
     .replace(/\s+/g, " ",)
     .replace(/^\.+|\.+$/g, "",)
     .trim();
 }
 
+export function sanitizePageTitle(title: string,): string {
+  return title
+    .replace(/\\/g, "/",)
+    .split("/",)
+    .map((segment,) => sanitizePageTitleSegment(segment,))
+    .filter(Boolean,)
+    .join("/",);
+}
+
+export function getPageDisplayTitle(title: string,): string {
+  const normalizedTitle = sanitizePageTitle(title,);
+  return normalizedTitle.split("/",).pop() ?? normalizedTitle;
+}
+
+export function replacePageTitleBasename(currentTitle: string, nextTitle: string,): string {
+  const normalizedNextTitle = sanitizePageTitle(nextTitle,);
+  if (!normalizedNextTitle) return "";
+  if (normalizedNextTitle.includes("/",)) return normalizedNextTitle;
+
+  const currentSegments = sanitizePageTitle(currentTitle,).split("/",).filter(Boolean,);
+  const parentTitle = currentSegments.slice(0, -1,).join("/",);
+  return parentTitle ? `${parentTitle}/${normalizedNextTitle}` : normalizedNextTitle;
+}
+
 function joinNoteLinkSegments(parts: string[],): string {
   return parts
     .map((part,) => part.trim().replace(/^\/+|\/+$/g, "",))
@@ -291,7 +315,12 @@ export async function getPagePath(title: string,): Promise<string> {
   }
 
   const pagesDir = await getPagesDir();
-  return await join(pagesDir, `${normalizedTitle}.md`,);
+  const segments = normalizedTitle.split("/",);
+  const filename = segments.pop();
+  if (!filename) {
+    throw new Error("Page title is required.",);
+  }
+  return await join(pagesDir, ...segments, `${filename}.md`,);
 }
 
 export function parsePageTitleFromPath(path: string,): string | null {
@@ -315,7 +344,17 @@ export function buildPageMarkdownHref(title: string,): string {
     throw new Error("Page title is required.",);
   }
 
-  return `pages/${encodeURIComponent(normalizedTitle,)}.md`;
+  const segments = normalizedTitle.split("/",);
+  const filename = segments.pop();
+  if (!filename) {
+    throw new Error("Page title is required.",);
+  }
+
+  return [
+    "pages",
+    ...segments.map((segment,) => encodeURIComponent(segment,)),
+    `${encodeURIComponent(filename,)}.md`,
+  ].join("/",);
 }
 
 export function isExplicitPageLinkTarget(target: string,): boolean {
@@ -347,10 +386,14 @@ export function parsePageTitleFromLinkTarget(target: string,): string | null {
 
   const withoutExtension = stripMdExtension(decoded,);
   const withoutPagesPrefix = withoutExtension.replace(/^pages\//i, "",);
-  if (withoutPagesPrefix.includes("/",) || withoutPagesPrefix.includes("\\",)) {
+  const rawSegments = withoutPagesPrefix.split(/[\\/]+/,).map((segment,) => segment.trim()).filter(Boolean,);
+  if (rawSegments.some((segment,) => segment === "." || segment === "..")) {
     return null;
   }
-  const normalizedTitle = sanitizePageTitle(withoutPagesPrefix,);
+  const normalizedTitle = rawSegments
+    .map((segment,) => sanitizePageTitleSegment(segment,))
+    .filter(Boolean,)
+    .join("/",);
   return normalizedTitle || null;
 }
 

apps/desktop/src/services/storage.ts

@@ -1,6 +1,6 @@
 import { invoke, } from "@tauri-apps/api/core";
-import { join, } from "@tauri-apps/api/path";
-import { exists, readDir, rename, } from "@tauri-apps/plugin-fs";
+import { dirname, join, } from "@tauri-apps/api/path";
+import { exists, mkdir, readDir, rename, } from "@tauri-apps/plugin-fs";
 import { EMPTY_DOC, json2md, md2json, parseJsonContent, } from "../lib/markdown";
 import {
   AttachedPage,
@@ -37,6 +37,7 @@ import {
   parseDateFromNoteLinkTarget,
   parsePageTitleFromLinkTarget,
   parsePageTitleFromPath,
+  replacePageTitleBasename,
   sanitizePageTitle,
 } from "./paths";
 import {
@@ -784,7 +785,15 @@ export async function loadPage(title: string,): Promise<PageNote | null> {
 }
 
 export async function loadPageByPath(path: string,): Promise<PageNote | null> {
-  const title = parsePageTitleFromPath(path,);
+  const pagesDir = await getPagesDir().catch(() => null);
+  const normalizedPath = path.replace(/\\/g, "/",);
+  const normalizedPagesDir = pagesDir?.replace(/\\/g, "/",).replace(/\/+$/, "",);
+  const relativePath = normalizedPagesDir && normalizedPath.startsWith(`${normalizedPagesDir}/`,)
+    ? normalizedPath.slice(normalizedPagesDir.length + 1,)
+    : null;
+  const title = relativePath
+    ? parsePageTitleFromLinkTarget(relativePath,)
+    : parsePageTitleFromPath(path,);
   if (!title) return null;
   return await loadPage(title,);
 }
@@ -799,7 +808,7 @@ export async function savePage(page: PageNote,): Promise<void> {
 
 export async function renamePage(page: PageNote, nextTitle: string,): Promise<PageNote> {
   const currentTitle = sanitizePageTitle(page.title,);
-  const normalizedNextTitle = sanitizePageTitle(nextTitle,);
+  const normalizedNextTitle = replacePageTitleBasename(currentTitle, nextTitle,);
   if (!normalizedNextTitle) {
     throw new Error("Page title is required.",);
   }
@@ -817,6 +826,10 @@ export async function renamePage(page: PageNote, nextTitle: string,): Promise<Pa
   }
 
   if (currentPath !== nextPath && await exists(currentPath,)) {
+    const nextDir = await dirname(nextPath,);
+    if (!await exists(nextDir,)) {
+      await mkdir(nextDir, { recursive: true, },);
+    }
     await rename(currentPath, nextPath,);
   }
 
@@ -856,7 +869,7 @@ export async function createAttachedPage({
 }: {
   title: string;
 },): Promise<PageNote> {
-  const normalizedTitle = sanitizePageTitle(title.replace(/\.md$/i, "",),);
+  const normalizedTitle = parsePageTitleFromLinkTarget(title,) ?? sanitizePageTitle(title.replace(/\.md$/i, "",),);
   if (!normalizedTitle) {
     throw new Error("Page title is required.",);
   }