Skip to content

Beautiful, AI-native markdown IDE and LLM wiki

fix(ok): rebind the open tab when a document moves on disk (PRD-8486) (#4063)

shagun-singh-inkeepcf05f5f12ed4
diff --git a/.changeset/outline-external-rename-strands-tab.md b/.changeset/outline-external-rename-strands-tab.md
new file mode 100644
index 000000000..2036aae86
--- /dev/null
+++ b/.changeset/outline-external-rename-strands-tab.md
@@ -0,0 +1,12 @@
+---
+"@inkeep/open-knowledge": patch
+---
+
+A document that moved on disk while you had it open no longer strands the tab.
+
+When a git-sync pull (or an external `mv`) reorganized folders underneath you, the open tab stayed bound to the document's old path. The editor kept rendering the content it already had, but the Outline panel queried a path that no longer existed and showed a red "Page not found." next to a heading count left over from before the move. That error never cleared, because once the old path dropped out of the page list the panel could no longer refetch it.
+
+Two things changed:
+
+- **The tab follows the document.** A move seen by the file watcher now closes the agent sessions and client connections holding that document, as a move made from the sidebar already did. The existing rename-redirect handshake then points each tab at the new path. Moving the document back works too: the tab follows it home and keeps saving, where before the returning path was served a stale copy that silently refused every write. Edits that had not yet reached disk when the move landed are written to the rescue buffer rather than discarded, though reaching them still needs support: they do not yet appear in the Timeline of the document you are rebound to.
+- **Panel headers stop disagreeing with their bodies.** The Outline, Backlinks, Outgoing, and Local files counts are hidden whenever that section is showing an error, and each of those panels now says plainly that the page is no longer at this path instead of reporting a confident zero. A document that leaves the page list also stops leaving a stale Outline result cached behind it. This covers any failed fetch, not just a move.
diff --git a/knip.config.ts b/knip.config.ts
index 68adb81cc..a0ba1bf42 100644
--- a/knip.config.ts
+++ b/knip.config.ts
@@ -127,9 +127,7 @@ export default {
'packages/server': {
entry: ['src/**/*.test.ts', 'src/parse-worker.ts'],
project: 'src/**',
- ignoreDependencies: [
- '@types/shell-quote',
- ],
+ ignoreDependencies: ['@types/shell-quote'],
},
'packages/cli': {
entry: ['src/**/*.test.ts', 'scripts/*.ts', 'tests/**/*.ts', 'src/parse-worker.ts'],
diff --git a/packages/app/src/components/LinksPanel.dom.test.tsx b/packages/app/src/components/LinksPanel.dom.test.tsx
index b3b7cc2fd..e38a57643 100644
--- a/packages/app/src/components/LinksPanel.dom.test.tsx
+++ b/packages/app/src/components/LinksPanel.dom.test.tsx
@@ -31,6 +31,7 @@ vi.doMock('@/editor/source-editor-navigation', () => ({
vi.doMock('@/components/PageListContext', () => ({
usePageList: () => ({
+ error: null,
pages: new Set(['notes']),
folderPaths: new Set<string>(),
pagesBySlug: new Map<string, string>(),
@@ -45,6 +46,7 @@ const { LinksPanel } = await import('./LinksPanel');
type FetchResult = { ok: boolean; status: number; body: unknown };
let forwardLinksResult: FetchResult;
+let backlinksResult: FetchResult;
const navEvents: LintNavDetail[] = [];
function onNav(e: Event) {
@@ -92,12 +94,11 @@ beforeEach(() => {
navEvents.length = 0;
window.addEventListener(LINT_NAV_EVENT, onNav);
forwardLinksResult = { ok: true, status: 200, body: forwardLinksBody() };
+ backlinksResult = { ok: true, status: 200, body: { docName: 'notes', backlinks: [] } };
global.fetch = vi.fn(async (input: RequestInfo | URL) => {
const url = String(input);
if (url.startsWith('/api/forward-links')) return fakeResponse(forwardLinksResult);
- if (url.startsWith('/api/backlinks')) {
- return fakeResponse({ ok: true, status: 200, body: { docName: 'notes', backlinks: [] } });
- }
+ if (url.startsWith('/api/backlinks')) return fakeResponse(backlinksResult);
return fakeResponse({ ok: false, status: 404, body: null });
}) as unknown as typeof fetch;
});
@@ -246,6 +247,46 @@ describe('LinksPanel Local files section', () => {
expect((await screen.findAllByText('Local file index is not ready')).length).toBeGreaterThan(0);
});
+ test('a failed section drops its count while a healthy sibling keeps one', async () => {
+ backlinksResult = {
+ ok: false,
+ status: 503,
+ body: {
+ type: 'urn:ok:error:backlink-index-not-configured',
+ title: 'Backlink index is not ready',
+ status: 503,
+ },
+ };
+ render(<LinksPanel docName="notes" />);
+ await screen.findByText('Backlink index is not ready');
+
+ const countFor = (title: string) =>
+ screen.getByText(title).closest('button')?.querySelector('[data-slot="panel-count"]') ?? null;
+ expect(countFor('Backlinks')).toBeNull();
+ expect(countFor('Outgoing')?.textContent).toBe('0');
+ });
+
+ test('a section whose fetch failed shows no count beside its error', async () => {
+ forwardLinksResult = {
+ ok: false,
+ status: 503,
+ body: {
+ type: 'urn:ok:error:derived-index-unavailable',
+ title: 'Local file index is not ready',
+ status: 503,
+ },
+ };
+ render(<LinksPanel docName="notes" />);
+ await screen.findAllByText('Local file index is not ready');
+ await screen.findByText('No pages link here yet.');
+
+ const countFor = (title: string) =>
+ screen.getByText(title).closest('button')?.querySelector('[data-slot="panel-count"]') ?? null;
+ expect(countFor('Backlinks')?.textContent).toBe('0');
+ expect(countFor('Outgoing')).toBeNull();
+ expect(countFor('Local files')).toBeNull();
+ });
+
test('a partial response (no localTargets) is called out without hiding document relationships', async () => {
forwardLinksResult.body = {
docName: 'notes',
diff --git a/packages/app/src/components/LinksPanel.tsx b/packages/app/src/components/LinksPanel.tsx
index 345868a13..3fdb5debd 100644
--- a/packages/app/src/components/LinksPanel.tsx
+++ b/packages/app/src/components/LinksPanel.tsx
@@ -7,7 +7,6 @@ import {
type ForwardLinkLocalTarget,
type ForwardLinksSuccess,
ForwardLinksSuccessSchema,
- isManagedArtifactDocName,
ProblemDetailsSchema,
} from '@inkeep/open-knowledge-core';
import { t } from '@lingui/core/macro';
@@ -28,6 +27,7 @@ import { toast } from 'sonner';
import { resolveLinkTargetIntent } from '@/components/link-target-intent';
import { usePageList } from '@/components/PageListContext';
import { LINT_NAV_EVENT, type LintNavDetail } from '@/components/ProblemsPanel';
+import { isKnownPageDocName } from '@/components/page-membership';
import { Badge } from '@/components/ui/badge';
import { Collapsible, CollapsibleContent, CollapsibleTrigger } from '@/components/ui/collapsible';
import {
@@ -111,7 +111,7 @@ function SectionTrigger({
isLoading,
}: {
title: string;
- count: number;
+ count: number | null;
isLoading: boolean;
}) {
return (
@@ -120,7 +120,7 @@ function SectionTrigger({
<ChevronDown className="size-3.5 text-muted-foreground transition-transform group-data-[state=closed]:-rotate-90" />
<PanelTitle>{title}</PanelTitle>
</span>
- {!isLoading && <PanelCount>{count}</PanelCount>}
+ {!isLoading && count !== null && <PanelCount>{count}</PanelCount>}
</CollapsibleTrigger>
);
}
@@ -253,16 +253,22 @@ function LinkRow({
function BacklinksSection({ docName }: { docName: string }) {
const { t } = useLingui();
- const { folderPaths, pages, pagesBySlug, pagesByBasename, loading } = usePageList();
const {
- data: backlinks = [],
- isLoading,
- error,
- } = useQuery({
+ folderPaths,
+ pages,
+ pagesBySlug,
+ pagesByBasename,
+ loading,
+ error: pageListError,
+ } = usePageList();
+ const { data, isLoading, error } = useQuery({
queryKey: ['backlinks', docName],
queryFn: () => fetchBacklinks(docName),
- enabled: !loading && (pages.has(docName) || isManagedArtifactDocName(docName)),
+ enabled: !loading && isKnownPageDocName(pages, docName),
});
+ const backlinks = data ?? [];
+ const isUnresolvable =
+ !loading && pageListError === null && !isKnownPageDocName(pages, docName) && data !== undefined;
const [expanded, setExpanded] = useState(false);
const [prevDocName, setPrevDocName] = useState(docName);
if (prevDocName !== docName) {
@@ -273,10 +279,20 @@ function BacklinksSection({ docName }: { docName: string }) {
return (
<Collapsible defaultOpen>
- <SectionTrigger title={t`Backlinks`} count={backlinks.length} isLoading={isLoading} />
+ <SectionTrigger
+ title={t`Backlinks`}
+ count={error !== null || isUnresolvable ? null : backlinks.length}
+ isLoading={isLoading}
+ />
<CollapsibleContent>
<div className="px-2 pb-3" aria-busy={isLoading}>
- {error ? (
+ {isUnresolvable ? (
+ <div className="px-3">
+ <PanelEmpty role="status">
+ <Trans>This page is no longer at this path.</Trans>
+ </PanelEmpty>
+ </div>
+ ) : error ? (
<div className="px-3">
<PanelError>
{error instanceof Error ? error.message : t`Failed to load backlinks`}
@@ -335,13 +351,19 @@ function ForwardLinksSection({ docName }: { docName: string }) {
pagesBySlug,
pagesByBasename,
loading: pagesLoading,
+ error: pageListError,
} = usePageList();
const { data, isLoading, error } = useQuery({
queryKey: ['forward-links', docName],
queryFn: () => fetchForwardLinks(docName),
- enabled: !pagesLoading && (pages.has(docName) || isManagedArtifactDocName(docName)),
+ enabled: !pagesLoading && isKnownPageDocName(pages, docName),
});
const links = data?.forwardLinks ?? [];
+ const isUnresolvable =
+ !pagesLoading &&
+ pageListError === null &&
+ !isKnownPageDocName(pages, docName) &&
+ data !== undefined;
const [creatingKey, setCreatingKey] = useState<string | null>(null);
const [expanded, setExpanded] = useState(false);
const [prevDocName, setPrevDocName] = useState(docName);
@@ -466,10 +488,20 @@ function ForwardLinksSection({ docName }: { docName: string }) {
return (
<Collapsible defaultOpen>
- <SectionTrigger title={t`Outgoing`} count={links.length} isLoading={isLoading} />
+ <SectionTrigger
+ title={t`Outgoing`}
+ count={error !== null || isUnresolvable ? null : links.length}
+ isLoading={isLoading}
+ />
<CollapsibleContent>
<div className="px-2 pb-3" aria-busy={isLoading}>
- {error ? (
+ {isUnresolvable ? (
+ <div className="px-3">
+ <PanelEmpty role="status">
+ <Trans>This page is no longer at this path.</Trans>
+ </PanelEmpty>
+ </div>
+ ) : error ? (
<div className="px-3">
<PanelError>
{error instanceof Error ? error.message : t`Failed to load outgoing links`}
@@ -499,12 +531,17 @@ function ForwardLinksSection({ docName }: { docName: string }) {
function LocalFilesSection({ docName }: { docName: string }) {
const { t } = useLingui();
- const { pages, loading: pagesLoading } = usePageList();
+ const { pages, loading: pagesLoading, error: pageListError } = usePageList();
const { data, isLoading, error } = useQuery({
queryKey: ['forward-links', docName],
queryFn: () => fetchForwardLinks(docName),
- enabled: !pagesLoading && (pages.has(docName) || isManagedArtifactDocName(docName)),
+ enabled: !pagesLoading && isKnownPageDocName(pages, docName),
});
+ const isUnresolvable =
+ !pagesLoading &&
+ pageListError === null &&
+ !isKnownPageDocName(pages, docName) &&
+ data !== undefined;
const [expanded, setExpanded] = useState(false);
const [prevDocName, setPrevDocName] = useState(docName);
if (prevDocName !== docName) {
@@ -564,10 +601,20 @@ function LocalFilesSection({ docName }: { docName: string }) {
return (
<Collapsible defaultOpen>
- <SectionTrigger title={t`Local files`} count={rows.length} isLoading={isLoading} />
+ <SectionTrigger
+ title={t`Local files`}
+ count={error !== null || isUnresolvable ? null : rows.length}
+ isLoading={isLoading}
+ />
<CollapsibleContent>
<div className="px-2 pb-3" aria-busy={isLoading}>
- {error ? (
+ {isUnresolvable ? (
+ <div className="px-3">
+ <PanelEmpty role="status">
+ <Trans>This page is no longer at this path.</Trans>
+ </PanelEmpty>
+ </div>
+ ) : error ? (
<div className="px-3">
<PanelError>
{error instanceof Error ? error.message : t`Failed to load local files`}
diff --git a/packages/app/src/components/OutlinePanel.query-semantics.test.ts b/packages/app/src/components/OutlinePanel.query-semantics.test.ts
new file mode 100644
index 000000000..4b13e37c0
--- /dev/null
+++ b/packages/app/src/components/OutlinePanel.query-semantics.test.ts
@@ -0,0 +1,51 @@
+import { QueryClient, QueryObserver } from '@tanstack/react-query';
+import { describe, expect, test, vi } from 'vitest';
+
+const QUERY_KEY = ['page-headings', 'offsite/liveblocks/liveblocks'];
+
+describe('@tanstack/react-query keeps the last successful data beside a refetch error', () => {
+ test('a failed refetch retains data while setting error, so the panel must gate its count', async () => {
+ const client = new QueryClient({
+ defaultOptions: { queries: { retry: false, staleTime: Number.POSITIVE_INFINITY } },
+ });
+
+ let shouldFail = false;
+ const headings = Array.from({ length: 7 }, (_, i) => ({
+ level: 2,
+ text: `h${i}`,
+ slug: `h${i}`,
+ }));
+
+ const observer = new QueryObserver(client, {
+ queryKey: QUERY_KEY,
+ queryFn: async () => {
+ if (shouldFail) throw new Error('Page not found.');
+ return headings;
+ },
+ retry: false,
+ staleTime: Number.POSITIVE_INFINITY,
+ });
+
+ const unsubscribe = observer.subscribe(() => {});
+
+ await client.fetchQuery({ queryKey: QUERY_KEY, queryFn: async () => headings });
+
+ const ok = observer.getCurrentResult();
+ expect((ok.data as unknown[]).length).toBe(7);
+ expect(ok.error).toBeNull();
+
+ shouldFail = true;
+ await client.invalidateQueries({ queryKey: QUERY_KEY }).catch(() => {});
+ await vi.waitFor(() => {
+ expect(observer.getCurrentResult().error).not.toBeNull();
+ });
+
+ const failed = observer.getCurrentResult();
+ expect((failed.data as unknown[]).length).toBe(7);
+ expect((failed.error as Error).message).toBe('Page not found.');
+ expect(failed.isLoading).toBe(false);
+
+ unsubscribe();
+ client.clear();
+ });
+});
diff --git a/packages/app/src/components/OutlinePanel.stale-result.dom.test.tsx b/packages/app/src/components/OutlinePanel.stale-result.dom.test.tsx
new file mode 100644
index 000000000..2a23f47ca
--- /dev/null
+++ b/packages/app/src/components/OutlinePanel.stale-result.dom.test.tsx
@@ -0,0 +1,206 @@
+// @vitest-environment jsdom
+
+import * as actualLinguiMacro from '@lingui/react/macro';
+import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
+import { act, cleanup, render, screen, waitFor } from '@testing-library/react';
+import type { ReactNode } from 'react';
+import { afterEach, beforeEach, describe, expect, test, vi } from 'vitest';
+import { renderLinguiTemplate } from '@/test-utils/lingui-mock';
+
+const DOC_NAME = 'offsite/liveblocks/liveblocks';
+const HEADINGS = [
+ { level: 1, text: 'Liveblocks', slug: 'liveblocks' },
+ { level: 2, text: 'What is it', slug: 'what-is-it' },
+ { level: 2, text: 'Comments', slug: 'comments' },
+];
+const REPLACEMENT_HEADINGS = [{ level: 1, text: 'Restored', slug: 'restored' }];
+
+let pageSet = new Set<string>([DOC_NAME]);
+let headingsResponse = HEADINGS;
+let respondNotFound = false;
+let pageListError: string | null = null;
+
+vi.doMock('@lingui/core/macro', () => ({
+ ...actualLinguiMacro,
+ t: renderLinguiTemplate,
+ msg: renderLinguiTemplate,
+}));
+vi.doMock('@lingui/react/macro', () => ({
+ ...actualLinguiMacro,
+ Trans: ({ children }: { children: ReactNode }) => <>{children}</>,
+ useLingui: () => ({ t: renderLinguiTemplate }),
+}));
+vi.doMock('@/components/PageListContext', () => ({
+ usePageList: () => ({ loading: false, pages: pageSet, error: pageListError }),
+}));
+vi.doMock('@/editor/DocumentContext', () => ({
+ useDocumentContext: () => ({ activeProvider: null, activeDocName: DOC_NAME }),
+}));
+vi.doMock('@/hooks/useActiveHeading', () => ({
+ useActiveHeading: () => null,
+}));
+
+const { OutlinePanel } = await import('./OutlinePanel');
+
+const HEADINGS_KEY = ['page-headings', DOC_NAME];
+
+function countBadge(): HTMLElement | null {
+ return document.querySelector('[data-slot="panel-count"]');
+}
+
+function errorText(): string | null {
+ return document.querySelector('[data-slot="panel-error"]')?.textContent ?? null;
+}
+
+describe('OutlinePanel does not present a result it can no longer refresh', () => {
+ let originalFetch: typeof fetch;
+
+ beforeEach(() => {
+ pageSet = new Set<string>([DOC_NAME]);
+ headingsResponse = HEADINGS;
+ respondNotFound = false;
+ pageListError = null;
+ originalFetch = globalThis.fetch;
+ globalThis.fetch = vi.fn(async (input: RequestInfo | URL) => {
+ if (!String(input).startsWith('/api/page-headings')) {
+ return Response.json({}, { status: 404 });
+ }
+ if (respondNotFound) {
+ return Response.json(
+ { type: 'urn:ok:error:doc-not-found', title: 'Page not found.', status: 404 },
+ { status: 404 },
+ );
+ }
+ return Response.json({ docName: DOC_NAME, headings: headingsResponse });
+ }) as unknown as typeof fetch;
+ });
+
+ afterEach(() => {
+ cleanup();
+ globalThis.fetch = originalFetch;
+ vi.restoreAllMocks();
+ });
+
+ function makeClient() {
+ return new QueryClient({ defaultOptions: { queries: { retry: false } } });
+ }
+
+ async function renderPanel(client: QueryClient) {
+ const view = render(
+ <QueryClientProvider client={client}>
+ <OutlinePanel docName={DOC_NAME} isSourceMode={false} />
+ </QueryClientProvider>,
+ );
+ await screen.findByRole('button', { name: 'Liveblocks' });
+ return view;
+ }
+
+ test('a failed refetch clears the heading count instead of pairing it with the error', async () => {
+ const client = makeClient();
+ await renderPanel(client);
+ expect(countBadge()?.textContent).toBe('3');
+
+ respondNotFound = true;
+ await act(async () => {
+ await client.invalidateQueries({ queryKey: HEADINGS_KEY }).catch(() => {});
+ });
+
+ await screen.findByText('Page not found.');
+ expect(errorText()).toBe('Page not found.');
+ expect(countBadge()).toBeNull();
+ });
+
+ test('a page list that failed to load is not mistaken for a document that moved', async () => {
+ const client = makeClient();
+ await renderPanel(client);
+ expect(countBadge()?.textContent).toBe('3');
+
+ pageSet = new Set<string>();
+ pageListError = 'Failed to load pages';
+ const view = render(
+ <QueryClientProvider client={client}>
+ <OutlinePanel docName={DOC_NAME} isSourceMode={false} />
+ </QueryClientProvider>,
+ );
+ await waitFor(() => {
+ expect(screen.queryAllByRole('status')).toHaveLength(0);
+ });
+ view.unmount();
+ });
+
+ test('a document that leaves the page list after a successful load stops serving its headings', async () => {
+ const client = makeClient();
+ const view = await renderPanel(client);
+ expect(countBadge()?.textContent).toBe('3');
+
+ pageSet = new Set<string>();
+ await act(async () => {
+ view.rerender(
+ <QueryClientProvider client={client}>
+ <OutlinePanel docName={DOC_NAME} isSourceMode={false} />
+ </QueryClientProvider>,
+ );
+ });
+ await waitFor(() => {
+ expect(screen.getByRole('status')).toBeTruthy();
+ });
+ expect(screen.queryByRole('button', { name: 'Liveblocks' })).toBeNull();
+
+ view.unmount();
+ pageSet = new Set<string>([DOC_NAME]);
+ headingsResponse = REPLACEMENT_HEADINGS;
+ const reopened = render(
+ <QueryClientProvider client={client}>
+ <OutlinePanel docName={DOC_NAME} isSourceMode={false} />
+ </QueryClientProvider>,
+ );
+ await screen.findByRole('button', { name: 'Restored' });
+ expect(screen.queryByRole('button', { name: 'Liveblocks' })).toBeNull();
+ expect(countBadge()?.textContent).toBe('1');
+ reopened.unmount();
+ });
+
+ test('a docName that leaves the page list drops both the error and the stale count without claiming the document is empty', async () => {
+ const client = makeClient();
+ const view = await renderPanel(client);
+
+ respondNotFound = true;
+ await act(async () => {
+ await client.invalidateQueries({ queryKey: HEADINGS_KEY }).catch(() => {});
+ });
+ await screen.findByText('Page not found.');
+ expect(errorText()).toBe('Page not found.');
+
+ pageSet = new Set<string>();
+ await act(async () => {
+ view.rerender(
+ <QueryClientProvider client={client}>
+ <OutlinePanel docName={DOC_NAME} isSourceMode={false} />
+ </QueryClientProvider>,
+ );
+ });
+
+ await waitFor(() => {
+ expect(errorText()).toBeNull();
+ });
+ expect(countBadge()).toBeNull();
+ expect(screen.queryByText('No headings yet.')).toBeNull();
+ expect(screen.queryByRole('button', { name: 'Liveblocks' })).toBeNull();
+ expect(screen.getByRole('status').textContent).toBe('This page is no longer at this path.');
+
+ view.unmount();
+ pageSet = new Set<string>([DOC_NAME]);
+ respondNotFound = false;
+ headingsResponse = REPLACEMENT_HEADINGS;
+
+ const reopened = render(
+ <QueryClientProvider client={client}>
+ <OutlinePanel docName={DOC_NAME} isSourceMode={false} />
+ </QueryClientProvider>,
+ );
+ await screen.findByRole('button', { name: 'Restored' });
+ expect(errorText()).toBeNull();
+ expect(countBadge()?.textContent).toBe('1');
+ reopened.unmount();
+ });
+});
diff --git a/packages/app/src/components/OutlinePanel.tsx b/packages/app/src/components/OutlinePanel.tsx
index 5ed1d894f..e0d59ae7c 100644
--- a/packages/app/src/components/OutlinePanel.tsx
+++ b/packages/app/src/components/OutlinePanel.tsx
@@ -2,7 +2,6 @@
// biome-ignore-all lint/plugin/no-physical-direction-utility: pre-rule backlog — physical margin/padding/inset utilities predate the rule; drain by swapping ml/mr → ms/me, pl/pr → ps/pe, left/right → start/end, then deleting this line. See https://github.com/inkeep/open-knowledge/blob/main/biome-plugins/README.md#no-physical-direction-utilitygrit
import {
type HeadingEntry,
- isManagedArtifactDocName,
PageHeadingsSuccessSchema,
ProblemDetailsSchema,
} from '@inkeep/open-knowledge-core';
@@ -11,6 +10,7 @@ import { Trans, useLingui } from '@lingui/react/macro';
import { useQuery, useQueryClient } from '@tanstack/react-query';
import { useEffect } from 'react';
import { usePageList } from '@/components/PageListContext';
+import { isKnownPageDocName } from '@/components/page-membership';
import {
Panel,
PanelBody,
@@ -106,9 +106,12 @@ function OutlinePanelInner({
className?: string;
}) {
const { t } = useLingui();
- const { pages, loading } = usePageList();
+ const { pages, loading, error: pageListError } = usePageList();
const queryClient = useQueryClient();
const { activeProvider, activeDocName } = useDocumentContext();
+ const isKnownPage = isKnownPageDocName(pages, docName);
+ const hadResult = queryClient.getQueryState(['page-headings', docName]) !== undefined;
+ const isUnresolvable = !loading && pageListError === null && !isKnownPage && hadResult;
const {
data: headings = [],
isLoading,
@@ -116,10 +119,15 @@ function OutlinePanelInner({
} = useQuery({
queryKey: ['page-headings', docName],
queryFn: () => fetchHeadings(docName),
- enabled: !loading && (pages.has(docName) || isManagedArtifactDocName(docName)),
+ enabled: !loading && isKnownPage,
staleTime: Number.POSITIVE_INFINITY,
});
+ useEffect(() => {
+ if (!isUnresolvable) return;
+ void queryClient.resetQueries({ queryKey: ['page-headings', docName] });
+ }, [isUnresolvable, docName, queryClient]);
+
useEffect(() => {
if (!activeProvider || activeDocName !== docName) return;
const doc = activeProvider.document;
@@ -138,6 +146,7 @@ function OutlinePanelInner({
};
}, [activeProvider, activeDocName, docName, queryClient]);
+ const isResolving = loading || isLoading;
const slugs = headings.map((h) => h.slug);
const activeSlug = useActiveHeading(slugs, { isSourceMode, docName });
const activeIndex = activeSlug ? headings.findIndex((h) => h.slug === activeSlug) : -1;
@@ -173,14 +182,18 @@ function OutlinePanelInner({
<PanelTitle>
<Trans>Outline</Trans>
</PanelTitle>
- {!isLoading && <PanelCount>{headings.length}</PanelCount>}
+ {!isResolving && !error && !isUnresolvable && <PanelCount>{headings.length}</PanelCount>}
</PanelHeader>
- <PanelBody className="px-3 py-2" aria-busy={isLoading}>
- {error ? (
+ <PanelBody className="px-3 py-2" aria-busy={isResolving}>
+ {isUnresolvable ? (
+ <PanelEmpty className="px-2" role="status">
+ <Trans>This page is no longer at this path.</Trans>
+ </PanelEmpty>
+ ) : error ? (
<PanelError className="px-2">
{error instanceof Error ? error.message : t`Failed to load headings`}
</PanelError>
- ) : headings.length === 0 && !isLoading ? (
+ ) : headings.length === 0 && !isResolving ? (
<PanelEmpty className="px-2">
<Trans>No headings yet.</Trans>
</PanelEmpty>
diff --git a/packages/app/src/components/page-membership.ts b/packages/app/src/components/page-membership.ts
new file mode 100644
index 000000000..ea05bd169
--- /dev/null
+++ b/packages/app/src/components/page-membership.ts
@@ -0,0 +1,5 @@
+import { isManagedArtifactDocName } from '@inkeep/open-knowledge-core';
+
+export function isKnownPageDocName(pages: ReadonlySet<string>, docName: string): boolean {
+ return pages.has(docName) || isManagedArtifactDocName(docName);
+}
diff --git a/packages/app/src/editor/extensions/source-dirty-fold-atomicity.dom.test.tsx b/packages/app/src/editor/extensions/source-dirty-fold-atomicity.dom.test.tsx
index 3a15d1233..9e043d02b 100644
--- a/packages/app/src/editor/extensions/source-dirty-fold-atomicity.dom.test.tsx
+++ b/packages/app/src/editor/extensions/source-dirty-fold-atomicity.dom.test.tsx
@@ -1,4 +1,3 @@
-
import { sharedExtensions as coreExtensions, MarkdownManager } from '@inkeep/open-knowledge-core';
import { type ObserverDispatchKind, setupServerObservers } from '@inkeep/open-knowledge-server';
import { cleanup } from '@testing-library/react';
diff --git a/packages/app/src/locales/ar/messages.json b/packages/app/src/locales/ar/messages.json
index db25335ab..5c4cb5b7b 100644
--- a/packages/app/src/locales/ar/messages.json
+++ b/packages/app/src/locales/ar/messages.json
@@ -153,6 +153,7 @@
"0t0bbC": ["تعذّر حفظ تفضيل المزامنة: ", ["detail"]],
"0uTHCg": ["ابدأ مشروع OpenKnowledge جديدًا."],
"0wswKc": ["خط أفقي يفصل بين الأقسام."],
+ "0x9smA": ["لم تعد هذه الصفحة في هذا المسار."],
"0xnQ_X": ["تتدفق التحديثات إلى الداخل"],
"0xnmlQ": ["اسم المستودع"],
"0ySP5u": ["تُحفظ التغييرات تلقائيًا في هذه السمة."],
diff --git a/packages/app/src/locales/ar/messages.po b/packages/app/src/locales/ar/messages.po
index db6c09a4f..5a1c7f766 100644
--- a/packages/app/src/locales/ar/messages.po
+++ b/packages/app/src/locales/ar/messages.po
@@ -13826,6 +13826,11 @@ msgstr "هذه الصفحة غير موجودة بعد. افتحها لإنشا
msgid "This page doesn't link to anything yet."
msgstr "هذه الصفحة لا ترتبط بشيء بعد."
+#: src/components/LinksPanel.tsx
+#: src/components/OutlinePanel.tsx
+msgid "This page is no longer at this path."
+msgstr "لم تعد هذه الصفحة في هذا المسار."
+
#: src/components/LinksPanel.tsx
msgid "This page references no local files or images."
msgstr "لا تشير هذه الصفحة إلى أي ملفات أو صور محلية."
diff --git a/packages/app/src/locales/bn/messages.json b/packages/app/src/locales/bn/messages.json
index d8c62f7aa..98cc2130a 100644
--- a/packages/app/src/locales/bn/messages.json
+++ b/packages/app/src/locales/bn/messages.json
@@ -128,6 +128,7 @@
"0t0bbC": ["সিঙ্ক পছন্দ সংরক্ষণ করা যায়নি: ", ["detail"]],
"0uTHCg": ["একটি নতুন OpenKnowledge প্রকল্প শুরু করুন।"],
"0wswKc": ["বিভাগ ভাগ করে দেওয়া অনুভূমিক রেখা।"],
+ "0x9smA": ["এই পৃষ্ঠাটি আর এই পাথে নেই।"],
"0xnQ_X": ["হালনাগাদ আসতে থাকে"],
"0xnmlQ": ["রিপোজিটরির নাম"],
"0ySP5u": ["পরিবর্তনগুলি এই থিমে স্বয়ংক্রিয়ভাবে সংরক্ষিত হয়।"],
diff --git a/packages/app/src/locales/bn/messages.po b/packages/app/src/locales/bn/messages.po
index e1c24df16..03533368d 100644
--- a/packages/app/src/locales/bn/messages.po
+++ b/packages/app/src/locales/bn/messages.po
@@ -13822,6 +13822,11 @@ msgstr "এই পাতাটি এখনও নেই। সম্পাদ
msgid "This page doesn't link to anything yet."
msgstr "এই পাতাটি এখনও কোনো কিছুর সঙ্গে লিংক করে না।"
+#: src/components/LinksPanel.tsx
+#: src/components/OutlinePanel.tsx
+msgid "This page is no longer at this path."
+msgstr "এই পৃষ্ঠাটি আর এই পাথে নেই।"
+
#: src/components/LinksPanel.tsx
msgid "This page references no local files or images."
msgstr "এই পাতাটি কোনো স্থানীয় ফাইল বা ছবি উল্লেখ করে না।"
diff --git a/packages/app/src/locales/en/messages.json b/packages/app/src/locales/en/messages.json
index 5a9f17086..dd953fe8d 100644
--- a/packages/app/src/locales/en/messages.json
+++ b/packages/app/src/locales/en/messages.json
@@ -132,6 +132,7 @@
"0t0bbC": ["Could not save sync preference: ", ["detail"]],
"0uTHCg": ["Start a new OpenKnowledge project."],
"0wswKc": ["Horizontal rule that divides sections."],
+ "0x9smA": ["This page is no longer at this path."],
"0xnQ_X": ["Updates flow in"],
"0xnmlQ": ["Repository name"],
"0ySP5u": ["Changes save automatically to this theme."],
diff --git a/packages/app/src/locales/en/messages.po b/packages/app/src/locales/en/messages.po
index 26c073ae0..df4d06950 100644
--- a/packages/app/src/locales/en/messages.po
+++ b/packages/app/src/locales/en/messages.po
@@ -13826,6 +13826,11 @@ msgstr "This page doesn't exist yet. Open it to create the page in the editor an
msgid "This page doesn't link to anything yet."
msgstr "This page doesn't link to anything yet."
+#: src/components/LinksPanel.tsx
+#: src/components/OutlinePanel.tsx
+msgid "This page is no longer at this path."
+msgstr "This page is no longer at this path."
+
#: src/components/LinksPanel.tsx
msgid "This page references no local files or images."
msgstr "This page references no local files or images."
diff --git a/packages/app/src/locales/es/messages.json b/packages/app/src/locales/es/messages.json
index 365dfd1de..0b135b55d 100644
--- a/packages/app/src/locales/es/messages.json
+++ b/packages/app/src/locales/es/messages.json
@@ -150,6 +150,7 @@
"0t0bbC": ["No se pudo guardar la preferencia de sincronización: ", ["detail"]],
"0uTHCg": ["Empieza un proyecto de OpenKnowledge."],
"0wswKc": ["Línea horizontal que separa secciones."],
+ "0x9smA": ["Esta página ya no está en esta ruta."],
"0xnQ_X": ["Las actualizaciones llegan solas"],
"0xnmlQ": ["Nombre del repositorio"],
"0ySP5u": ["Los cambios se guardan automáticamente en este tema."],
diff --git a/packages/app/src/locales/es/messages.po b/packages/app/src/locales/es/messages.po
index 32c4559c7..2fc50f136 100644
--- a/packages/app/src/locales/es/messages.po
+++ b/packages/app/src/locales/es/messages.po
@@ -13826,6 +13826,11 @@ msgstr "Esta página todavía no existe. Ábrela para crearla en el editor y con
msgid "This page doesn't link to anything yet."
msgstr "Esta página todavía no enlaza a nada."
+#: src/components/LinksPanel.tsx
+#: src/components/OutlinePanel.tsx
+msgid "This page is no longer at this path."
+msgstr "Esta página ya no está en esta ruta."
+
#: src/components/LinksPanel.tsx
msgid "This page references no local files or images."
msgstr "Esta página no hace referencia a ningún archivo o imagen local."
diff --git a/packages/app/src/locales/fr/messages.json b/packages/app/src/locales/fr/messages.json
index 7ba4d7d5f..fefebba81 100644
--- a/packages/app/src/locales/fr/messages.json
+++ b/packages/app/src/locales/fr/messages.json
@@ -152,6 +152,7 @@
"0t0bbC": ["Impossible d'enregistrer la préférence de synchronisation : ", ["detail"]],
"0uTHCg": ["Démarrez un nouveau projet OpenKnowledge."],
"0wswKc": ["Filet horizontal qui sépare les sections."],
+ "0x9smA": ["Cette page ne se trouve plus à ce chemin."],
"0xnQ_X": ["Les mises à jour arrivent"],
"0xnmlQ": ["Nom du dépôt"],
"0ySP5u": ["Les modifications sont automatiquement enregistrées dans ce thème."],
diff --git a/packages/app/src/locales/fr/messages.po b/packages/app/src/locales/fr/messages.po
index 366535c56..499188b0b 100644
--- a/packages/app/src/locales/fr/messages.po
+++ b/packages/app/src/locales/fr/messages.po
@@ -13826,6 +13826,11 @@ msgstr "Cette page n'existe pas encore. Ouvrez-la pour la créer dans l'éditeur
msgid "This page doesn't link to anything yet."
msgstr "Cette page ne renvoie encore vers rien."
+#: src/components/LinksPanel.tsx
+#: src/components/OutlinePanel.tsx
+msgid "This page is no longer at this path."
+msgstr "Cette page ne se trouve plus à ce chemin."
+
#: src/components/LinksPanel.tsx
msgid "This page references no local files or images."
msgstr "Cette page ne référence aucun fichier ou image local."
diff --git a/packages/app/src/locales/hi/messages.json b/packages/app/src/locales/hi/messages.json
index a4499c632..8ef246805 100644
--- a/packages/app/src/locales/hi/messages.json
+++ b/packages/app/src/locales/hi/messages.json
@@ -130,6 +130,7 @@
"0t0bbC": ["सिंक वरीयता नहीं सहेजी जा सकी: ", ["detail"]],
"0uTHCg": ["एक नया OpenKnowledge प्रोजेक्ट शुरू करें।"],
"0wswKc": ["अनुभागों को विभाजित करने वाली क्षैतिज रेखा।"],
+ "0x9smA": ["यह पेज अब इस पाथ पर नहीं है।"],
"0xnQ_X": ["अपडेट आते रहते हैं"],
"0xnmlQ": ["रिपॉज़िटरी का नाम"],
"0ySP5u": ["बदलाव इस थीम में अपने आप सहेजे जाते हैं।"],
diff --git a/packages/app/src/locales/hi/messages.po b/packages/app/src/locales/hi/messages.po
index 93ab6f5ba..fb7581c89 100644
--- a/packages/app/src/locales/hi/messages.po
+++ b/packages/app/src/locales/hi/messages.po
@@ -13822,6 +13822,11 @@ msgstr "यह पेज अभी मौजूद नहीं है। सं
msgid "This page doesn't link to anything yet."
msgstr "यह पेज अभी किसी से लिंक नहीं करता।"
+#: src/components/LinksPanel.tsx
+#: src/components/OutlinePanel.tsx
+msgid "This page is no longer at this path."
+msgstr "यह पेज अब इस पाथ पर नहीं है।"
+
#: src/components/LinksPanel.tsx
msgid "This page references no local files or images."
msgstr "यह पेज किसी स्थानीय फ़ाइल या छवि को संदर्भित नहीं करता।"
diff --git a/packages/app/src/locales/id/messages.json b/packages/app/src/locales/id/messages.json
index 5131dc498..20d4f61fa 100644
--- a/packages/app/src/locales/id/messages.json
+++ b/packages/app/src/locales/id/messages.json
@@ -132,6 +132,7 @@
"0t0bbC": ["Preferensi sinkronisasi tidak dapat disimpan: ", ["detail"]],
"0uTHCg": ["Mulai proyek OpenKnowledge baru."],
"0wswKc": ["Garis mendatar yang memisahkan bagian."],
+ "0x9smA": ["Halaman ini tidak lagi berada di jalur ini."],
"0xnQ_X": ["Pembaruan mengalir masuk"],
"0xnmlQ": ["Nama repositori"],
"0ySP5u": ["Perubahan disimpan otomatis ke tema ini."],
diff --git a/packages/app/src/locales/id/messages.po b/packages/app/src/locales/id/messages.po
index c14938456..1bda5187c 100644
--- a/packages/app/src/locales/id/messages.po
+++ b/packages/app/src/locales/id/messages.po
@@ -13822,6 +13822,11 @@ msgstr "Halaman ini belum ada. Buka untuk membuat halamannya di penyunting dan m
msgid "This page doesn't link to anything yet."
msgstr "Halaman ini belum menaut ke apa pun."
+#: src/components/LinksPanel.tsx
+#: src/components/OutlinePanel.tsx
+msgid "This page is no longer at this path."
+msgstr "Halaman ini tidak lagi berada di jalur ini."
+
#: src/components/LinksPanel.tsx
msgid "This page references no local files or images."
msgstr "Halaman ini tidak merujuk ke berkas atau gambar lokal apa pun."
diff --git a/packages/app/src/locales/ko/messages.json b/packages/app/src/locales/ko/messages.json
index 30defebc9..1ceedf691 100644
--- a/packages/app/src/locales/ko/messages.json
+++ b/packages/app/src/locales/ko/messages.json
@@ -125,6 +125,7 @@
"0t0bbC": ["동기화 환경설정을 저장할 수 없습니다: ", ["detail"]],
"0uTHCg": ["새 OpenKnowledge 프로젝트를 시작합니다."],
"0wswKc": ["섹션을 나누는 가로줄입니다."],
+ "0x9smA": ["이 페이지는 더 이상 이 경로에 없습니다."],
"0xnQ_X": ["업데이트가 들어옴"],
"0xnmlQ": ["저장소 이름"],
"0ySP5u": ["변경사항이 이 테마에 자동으로 저장됩니다."],
diff --git a/packages/app/src/locales/ko/messages.po b/packages/app/src/locales/ko/messages.po
index 86fb0bc15..a1a6f835d 100644
--- a/packages/app/src/locales/ko/messages.po
+++ b/packages/app/src/locales/ko/messages.po
@@ -13826,6 +13826,11 @@ msgstr "이 페이지는 아직 존재하지 않습니다. 열어서 편집기
msgid "This page doesn't link to anything yet."
msgstr "이 페이지는 아직 아무것도 연결하지 않습니다."
+#: src/components/LinksPanel.tsx
+#: src/components/OutlinePanel.tsx
+msgid "This page is no longer at this path."
+msgstr "이 페이지는 더 이상 이 경로에 없습니다."
+
#: src/components/LinksPanel.tsx
msgid "This page references no local files or images."
msgstr "이 페이지는 로컬 파일이나 이미지를 참조하지 않습니다."
diff --git a/packages/app/src/locales/pseudo/messages.json b/packages/app/src/locales/pseudo/messages.json
index 4674ec31d..54f75e015 100644
--- a/packages/app/src/locales/pseudo/messages.json
+++ b/packages/app/src/locales/pseudo/messages.json
@@ -132,6 +132,7 @@
"0t0bbC": ["Ćōũĺď ńōţ śàvē śŷńć ƥŕēƒēŕēńćē: ", ["detail"]],
"0uTHCg": ["Śţàŕţ à ńēŵ ŌƥēńĶńōŵĺēďĝē ƥŕōĴēćţ."],
"0wswKc": ["Ĥōŕĩźōńţàĺ ŕũĺē ţĥàţ ďĩvĩďēś śēćţĩōńś."],
+ "0x9smA": ["Ţĥĩś ƥàĝē ĩś ńō ĺōńĝēŕ àţ ţĥĩś ƥàţĥ."],
"0xnQ_X": ["Ũƥďàţēś ƒĺōŵ ĩń"],
"0xnmlQ": ["Ŕēƥōśĩţōŕŷ ńàḿē"],
"0ySP5u": ["Ćĥàńĝēś śàvē àũţōḿàţĩćàĺĺŷ ţō ţĥĩś ţĥēḿē."],
diff --git a/packages/app/src/locales/pseudo/messages.po b/packages/app/src/locales/pseudo/messages.po
index e743ed194..536a3d504 100644
--- a/packages/app/src/locales/pseudo/messages.po
+++ b/packages/app/src/locales/pseudo/messages.po
@@ -13822,6 +13822,11 @@ msgstr ""
msgid "This page doesn't link to anything yet."
msgstr ""
+#: src/components/LinksPanel.tsx
+#: src/components/OutlinePanel.tsx
+msgid "This page is no longer at this path."
+msgstr ""
+
#: src/components/LinksPanel.tsx
msgid "This page references no local files or images."
msgstr ""
diff --git a/packages/app/src/locales/pt-BR/messages.json b/packages/app/src/locales/pt-BR/messages.json
index 542e47afe..ca2a6db44 100644
--- a/packages/app/src/locales/pt-BR/messages.json
+++ b/packages/app/src/locales/pt-BR/messages.json
@@ -146,6 +146,7 @@
"0t0bbC": ["Não foi possível salvar a preferência de sincronização: ", ["detail"]],
"0uTHCg": ["Comece um projeto do OpenKnowledge."],
"0wswKc": ["Linha horizontal que separa seções."],
+ "0x9smA": ["Esta página não está mais neste caminho."],
"0xnQ_X": ["As atualizações chegam sozinhas"],
"0xnmlQ": ["Nome do repositório"],
"0ySP5u": ["As alterações são salvas automaticamente neste tema."],
diff --git a/packages/app/src/locales/pt-BR/messages.po b/packages/app/src/locales/pt-BR/messages.po
index 2ff4717d3..6cfe2a5ae 100644
--- a/packages/app/src/locales/pt-BR/messages.po
+++ b/packages/app/src/locales/pt-BR/messages.po
@@ -13822,6 +13822,11 @@ msgstr "Esta página ainda não existe. Abra para criá-la no editor e recolher
msgid "This page doesn't link to anything yet."
msgstr "Esta página ainda não aponta para nada."
+#: src/components/LinksPanel.tsx
+#: src/components/OutlinePanel.tsx
+msgid "This page is no longer at this path."
+msgstr "Esta página não está mais neste caminho."
+
#: src/components/LinksPanel.tsx
msgid "This page references no local files or images."
msgstr "Esta página não faz referência a nenhum arquivo ou imagem local."
diff --git a/packages/app/src/locales/ur/messages.json b/packages/app/src/locales/ur/messages.json
index 16564adfc..e376eafdf 100644
--- a/packages/app/src/locales/ur/messages.json
+++ b/packages/app/src/locales/ur/messages.json
@@ -130,6 +130,7 @@
"0t0bbC": ["مطابقت پذیری کی ترجیح محفوظ نہیں ہو سکی: ", ["detail"]],
"0uTHCg": ["نیا OpenKnowledge پروجیکٹ شروع کریں۔"],
"0wswKc": ["افقی لکیر جو سیکشنز کو الگ کرتی ہے۔"],
+ "0x9smA": ["یہ صفحہ اب اس راستے پر نہیں ہے۔"],
"0xnQ_X": ["اپ ڈیٹس آتی رہتی ہیں"],
"0xnmlQ": ["ریپازٹری کا نام"],
"0ySP5u": ["تبدیلیاں خودکار طور پر اس تھیم میں محفوظ ہو جاتی ہیں۔"],
diff --git a/packages/app/src/locales/ur/messages.po b/packages/app/src/locales/ur/messages.po
index 1eb4f47e5..ff7d4cb0f 100644
--- a/packages/app/src/locales/ur/messages.po
+++ b/packages/app/src/locales/ur/messages.po
@@ -13826,6 +13826,11 @@ msgstr "یہ صفحہ ابھی موجود نہیں۔ ایڈیٹر میں صفح
msgid "This page doesn't link to anything yet."
msgstr "یہ صفحہ ابھی کسی چیز سے لنک نہیں کرتا۔"
+#: src/components/LinksPanel.tsx
+#: src/components/OutlinePanel.tsx
+msgid "This page is no longer at this path."
+msgstr "یہ صفحہ اب اس راستے پر نہیں ہے۔"
+
#: src/components/LinksPanel.tsx
msgid "This page references no local files or images."
msgstr "یہ صفحہ کسی مقامی فائل یا تصویر کا حوالہ نہیں دیتا۔"
diff --git a/packages/app/src/locales/zh-Hans/messages.json b/packages/app/src/locales/zh-Hans/messages.json
index d0e3a15ff..1731486a7 100644
--- a/packages/app/src/locales/zh-Hans/messages.json
+++ b/packages/app/src/locales/zh-Hans/messages.json
@@ -121,6 +121,7 @@
"0t0bbC": ["无法保存同步偏好:", ["detail"]],
"0uTHCg": ["开始一个新的 OpenKnowledge 项目。"],
"0wswKc": ["用于分隔章节的水平分割线。"],
+ "0x9smA": ["此页面已不在该路径下。"],
"0xnQ_X": ["更新会自动流入"],
"0xnmlQ": ["仓库名"],
"0ySP5u": ["更改会自动保存到此主题。"],
diff --git a/packages/app/src/locales/zh-Hans/messages.po b/packages/app/src/locales/zh-Hans/messages.po
index 45eb64ab7..e6bb51b3d 100644
--- a/packages/app/src/locales/zh-Hans/messages.po
+++ b/packages/app/src/locales/zh-Hans/messages.po
@@ -13826,6 +13826,11 @@ msgstr "这个页面还不存在。打开它即可在编辑器中创建该页面
msgid "This page doesn't link to anything yet."
msgstr "这个页面还没有链接到任何地方。"
+#: src/components/LinksPanel.tsx
+#: src/components/OutlinePanel.tsx
+msgid "This page is no longer at this path."
+msgstr "此页面已不在该路径下。"
+
#: src/components/LinksPanel.tsx
msgid "This page references no local files or images."
msgstr "此页面未引用任何本地文件或图片。"
diff --git a/packages/app/src/locales/zh-Hant/messages.json b/packages/app/src/locales/zh-Hant/messages.json
index aec15149a..a57b4ebce 100644
--- a/packages/app/src/locales/zh-Hant/messages.json
+++ b/packages/app/src/locales/zh-Hant/messages.json
@@ -121,6 +121,7 @@
"0t0bbC": ["無法儲存同步偏好設定:", ["detail"]],
"0uTHCg": ["開始一個新的 OpenKnowledge 專案。"],
"0wswKc": ["用來分隔章節的水平分隔線。"],
+ "0x9smA": ["此頁面已不在該路徑下。"],
"0xnQ_X": ["更新會自動流入"],
"0xnmlQ": ["儲存庫名稱"],
"0ySP5u": ["變更會自動儲存到這個主題。"],
diff --git a/packages/app/src/locales/zh-Hant/messages.po b/packages/app/src/locales/zh-Hant/messages.po
index a5f5c1398..f3d7d76aa 100644
--- a/packages/app/src/locales/zh-Hant/messages.po
+++ b/packages/app/src/locales/zh-Hant/messages.po
@@ -13826,6 +13826,11 @@ msgstr "這個頁面還不存在。開啟它就能在編輯器中建立這個頁
msgid "This page doesn't link to anything yet."
msgstr "這個頁面還沒有連到任何地方。"
+#: src/components/LinksPanel.tsx
+#: src/components/OutlinePanel.tsx
+msgid "This page is no longer at this path."
+msgstr "此頁面已不在該路徑下。"
+
#: src/components/LinksPanel.tsx
msgid "This page references no local files or images."
msgstr "此頁面未引用任何本機檔案或圖片。"
diff --git a/packages/app/tests/dom/input-rule-atom-ranges.dom.test.tsx b/packages/app/tests/dom/input-rule-atom-ranges.dom.test.tsx
index 65162a22f..f81d64a77 100644
--- a/packages/app/tests/dom/input-rule-atom-ranges.dom.test.tsx
+++ b/packages/app/tests/dom/input-rule-atom-ranges.dom.test.tsx
@@ -1,4 +1,3 @@
-
import { cleanup } from '@testing-library/react';
import { Editor, getSchema } from '@tiptap/core';
import type { MarkType, Node as PMNode } from '@tiptap/pm/model';
diff --git a/packages/app/tests/dom/jsx-interior-input-rule-suppression.dom.test.tsx b/packages/app/tests/dom/jsx-interior-input-rule-suppression.dom.test.tsx
index c5b8ad023..c4c510031 100644
--- a/packages/app/tests/dom/jsx-interior-input-rule-suppression.dom.test.tsx
+++ b/packages/app/tests/dom/jsx-interior-input-rule-suppression.dom.test.tsx
@@ -1,4 +1,3 @@
-
import { cleanup } from '@testing-library/react';
import { Editor, type JSONContent } from '@tiptap/core';
import type { Node as PMNode } from '@tiptap/pm/model';
diff --git a/packages/app/tests/dom/plain-text-clipboard.dom.test.tsx b/packages/app/tests/dom/plain-text-clipboard.dom.test.tsx
index 65b32f4b3..931aaa880 100644
--- a/packages/app/tests/dom/plain-text-clipboard.dom.test.tsx
+++ b/packages/app/tests/dom/plain-text-clipboard.dom.test.tsx
@@ -1,4 +1,3 @@
-
import { cleanup } from '@testing-library/react';
import { Editor } from '@tiptap/core';
import type { Node as PMNode } from '@tiptap/pm/model';
diff --git a/packages/app/tests/dom/serializer-seam-rederive.dom.test.tsx b/packages/app/tests/dom/serializer-seam-rederive.dom.test.tsx
index 2ab40357a..c9744993d 100644
--- a/packages/app/tests/dom/serializer-seam-rederive.dom.test.tsx
+++ b/packages/app/tests/dom/serializer-seam-rederive.dom.test.tsx
@@ -1,4 +1,3 @@
-
import { MarkdownManager, stripFrontmatter } from '@inkeep/open-knowledge-core';
import { cleanup } from '@testing-library/react';
import { Editor, type JSONContent } from '@tiptap/core';
diff --git a/packages/app/tests/dom/task-list-input-rule.dom.test.tsx b/packages/app/tests/dom/task-list-input-rule.dom.test.tsx
index 1db8b25a9..e01856aac 100644
--- a/packages/app/tests/dom/task-list-input-rule.dom.test.tsx
+++ b/packages/app/tests/dom/task-list-input-rule.dom.test.tsx
@@ -1,4 +1,3 @@
-
import { cleanup } from '@testing-library/react';
import type { Editor } from '@tiptap/core';
import type { Node as PMNode } from '@tiptap/pm/model';
diff --git a/packages/app/tests/dom/underline-round-trip.dom.test.tsx b/packages/app/tests/dom/underline-round-trip.dom.test.tsx
index 652d75f43..f0bea3f33 100644
--- a/packages/app/tests/dom/underline-round-trip.dom.test.tsx
+++ b/packages/app/tests/dom/underline-round-trip.dom.test.tsx
@@ -1,4 +1,3 @@
-
import { MarkdownManager, sharedExtensions, stripFrontmatter } from '@inkeep/open-knowledge-core';
import { cleanup } from '@testing-library/react';
import { Editor, getSchema, type JSONContent } from '@tiptap/core';
diff --git a/packages/app/tests/integration/api-error-envelope/create-folder.test.ts b/packages/app/tests/integration/api-error-envelope/create-folder.test.ts
index 079b42e9a..49257d365 100644
--- a/packages/app/tests/integration/api-error-envelope/create-folder.test.ts
+++ b/packages/app/tests/integration/api-error-envelope/create-folder.test.ts
@@ -1,4 +1,3 @@
-
import { CreateFolderSuccessSchema, ProblemDetailsSchema } from '@inkeep/open-knowledge-core';
import { afterAll, beforeAll, describe, expect, test } from 'vitest';
import { HARNESS_BOOT_TIMEOUT_MS } from '../harness-boot-timeout';
diff --git a/packages/app/tests/integration/bug3-source-mode-writeback.test.ts b/packages/app/tests/integration/bug3-source-mode-writeback.test.ts
index a28cc2b18..8a60e5826 100644
--- a/packages/app/tests/integration/bug3-source-mode-writeback.test.ts
+++ b/packages/app/tests/integration/bug3-source-mode-writeback.test.ts
@@ -1,4 +1,3 @@
-
import { readFileSync } from 'node:fs';
import { join } from 'node:path';
import { setTimeout as wait } from 'node:timers/promises';
diff --git a/packages/app/tests/integration/indented-jsx-byte-sacred.test.ts b/packages/app/tests/integration/indented-jsx-byte-sacred.test.ts
index 4fc2c11f9..6fcdc23f2 100644
--- a/packages/app/tests/integration/indented-jsx-byte-sacred.test.ts
+++ b/packages/app/tests/integration/indented-jsx-byte-sacred.test.ts
@@ -1,4 +1,3 @@
-
import { setTimeout as wait } from 'node:timers/promises';
import { normalizeBridge } from '@inkeep/open-knowledge-core';
import { updateYFragment } from '@tiptap/y-tiptap';
diff --git a/packages/app/tests/integration/interior-edit-freshness.test.ts b/packages/app/tests/integration/interior-edit-freshness.test.ts
index 9f2f6feb6..40b5cdfd6 100644
--- a/packages/app/tests/integration/interior-edit-freshness.test.ts
+++ b/packages/app/tests/integration/interior-edit-freshness.test.ts
@@ -1,4 +1,3 @@
-
import { setTimeout as wait } from 'node:timers/promises';
import { updateYFragment, yXmlFragmentToProseMirrorRootNode } from '@tiptap/y-tiptap';
import { afterAll, beforeAll, describe, expect, test } from 'vitest';
diff --git a/packages/app/tests/integration/keystroke-cadence-danger-space.test.ts b/packages/app/tests/integration/keystroke-cadence-danger-space.test.ts
index 2a085742b..93666af70 100644
--- a/packages/app/tests/integration/keystroke-cadence-danger-space.test.ts
+++ b/packages/app/tests/integration/keystroke-cadence-danger-space.test.ts
@@ -1,4 +1,3 @@
-
import { setTimeout as wait } from 'node:timers/promises';
import { updateYFragment, yXmlFragmentToProseMirrorRootNode } from '@tiptap/y-tiptap';
import { afterAll, beforeAll, describe, expect, test } from 'vitest';
diff --git a/packages/app/tests/integration/managed-rename-closes-open-client.test.ts b/packages/app/tests/integration/managed-rename-closes-open-client.test.ts
new file mode 100644
index 000000000..a7cf623e2
--- /dev/null
+++ b/packages/app/tests/integration/managed-rename-closes-open-client.test.ts
@@ -0,0 +1,70 @@
+import { afterAll, beforeAll, describe, expect, test } from 'vitest';
+import {
+ BODY,
+ BODY_HEADING_COUNT,
+ getHeadings,
+ NEW_DOC,
+ NEW_FOLDER,
+ NEW_PARENT,
+ OLD_DOC,
+ OLD_FOLDER,
+ post,
+} from './rename-rebinding.test-helper.ts';
+import {
+ agentWriteMd,
+ createTestClient,
+ createTestServer,
+ pollUntil,
+ type TestClient,
+ type TestServer,
+} from './test-harness.ts';
+
+describe('the managed rename spine closes the socket, so the tab is not stranded (PRD-8486 control)', () => {
+ let server: TestServer;
+ let client: TestClient;
+ const closeEvents: unknown[] = [];
+
+ beforeAll(async () => {
+ server = await createTestServer();
+ await post(server.port, '/api/create-folder', { path: OLD_FOLDER });
+ await post(server.port, '/api/create-page', { path: OLD_DOC });
+ await agentWriteMd(server.port, BODY, { docName: OLD_DOC, position: 'replace' });
+ await pollUntil(async () => (await getHeadings(server.port, OLD_DOC)).status === 200, 15_000);
+ client = await createTestClient(server.port, OLD_DOC, { skipInvariantWatcher: true });
+ client.provider.on('close', (event: unknown) => {
+ closeEvents.push(event);
+ });
+ }, 60_000);
+
+ afterAll(async () => {
+ await client?.cleanup().catch(() => {});
+ await server?.cleanup().catch(() => {});
+ });
+
+ test('POST /api/rename-path disconnects the client, as the watcher path now also does', async () => {
+ const before = await getHeadings(server.port, OLD_DOC);
+ expect(before.status).toBe(200);
+ expect((before.body.headings as unknown[]).length).toBe(BODY_HEADING_COUNT);
+ expect(client.provider.isSynced).toBe(true);
+ expect(client.provider.isAuthenticated).toBe(true);
+
+ await post(server.port, '/api/create-folder', { path: NEW_PARENT });
+ const renamed = await post(server.port, '/api/rename-path', {
+ kind: 'folder',
+ fromPath: OLD_FOLDER,
+ toPath: NEW_FOLDER,
+ });
+ expect(renamed.status).toBe(200);
+
+ await pollUntil(async () => closeEvents.length > 0, 15_000, 100, 'a server-driven close');
+
+ const lifecycle = client.doc.getMap('lifecycle').toJSON();
+ expect(lifecycle).not.toHaveProperty('newPath');
+
+ const after = await getHeadings(server.port, OLD_DOC);
+ expect(after.status).toBe(404);
+
+ const newOk = await getHeadings(server.port, NEW_DOC);
+ expect(newOk.status).toBe(200);
+ }, 90_000);
+});
diff --git a/packages/app/tests/integration/producer-guard-wiring.test.ts b/packages/app/tests/integration/producer-guard-wiring.test.ts
index 878d5196b..867598d34 100644
--- a/packages/app/tests/integration/producer-guard-wiring.test.ts
+++ b/packages/app/tests/integration/producer-guard-wiring.test.ts
@@ -1,4 +1,3 @@
-
import { setTimeout as wait } from 'node:timers/promises';
import { updateYFragment, yXmlFragmentToProseMirrorRootNode } from '@tiptap/y-tiptap';
import { afterAll, beforeAll, describe, expect, test } from 'vitest';
diff --git a/packages/app/tests/integration/qa-039-reconciliation-counters-http.test.ts b/packages/app/tests/integration/qa-039-reconciliation-counters-http.test.ts
index 4ada3cf26..0970ac12f 100644
--- a/packages/app/tests/integration/qa-039-reconciliation-counters-http.test.ts
+++ b/packages/app/tests/integration/qa-039-reconciliation-counters-http.test.ts
@@ -1,4 +1,3 @@
-
import { randomUUID } from 'node:crypto';
import { afterEach, describe, expect, test } from 'vitest';
import { agentWriteMd, createTestServer, type TestServer } from './test-harness';
diff --git a/packages/app/tests/integration/qa-045-restore-after-gc.test.ts b/packages/app/tests/integration/qa-045-restore-after-gc.test.ts
index cbe2b705f..b632185e1 100644
--- a/packages/app/tests/integration/qa-045-restore-after-gc.test.ts
+++ b/packages/app/tests/integration/qa-045-restore-after-gc.test.ts
@@ -1,4 +1,3 @@
-
import { execFileSync } from 'node:child_process';
import { randomUUID } from 'node:crypto';
import { join } from 'node:path';
diff --git a/packages/app/tests/integration/qa-050-rollback-undo-shipped-path.test.ts b/packages/app/tests/integration/qa-050-rollback-undo-shipped-path.test.ts
index 89bc9b4d9..c530ce4ba 100644
--- a/packages/app/tests/integration/qa-050-rollback-undo-shipped-path.test.ts
+++ b/packages/app/tests/integration/qa-050-rollback-undo-shipped-path.test.ts
@@ -1,4 +1,3 @@
-
import { randomUUID } from 'node:crypto';
import { afterAll, afterEach, beforeAll, describe, expect, test } from 'vitest';
import type * as Y from 'yjs';
diff --git a/packages/app/tests/integration/removal-phantom-resurrection.test.ts b/packages/app/tests/integration/removal-phantom-resurrection.test.ts
index b9182bf40..c044f5fdc 100644
--- a/packages/app/tests/integration/removal-phantom-resurrection.test.ts
+++ b/packages/app/tests/integration/removal-phantom-resurrection.test.ts
@@ -405,7 +405,7 @@ describe('RecentlyRemovedDocs — cache lifecycle', () => {
expect(existsSync(join(server.contentDir, `${docName}.md`))).toBe(false);
}, 30_000);
- test.skip("active-tab end-to-end: server-side rename of an open doc fires authenticationFailed with 'rename-redirect:<newDocName>'", async () => {
+ test("active-tab end-to-end: server-side rename of an open doc fires authenticationFailed with 'rename-redirect:<newDocName>'", async () => {
const { HocuspocusProvider } = await import('@hocuspocus/provider');
const Y = await import('yjs');
@@ -430,8 +430,9 @@ describe('RecentlyRemovedDocs — cache lifecycle', () => {
});
});
+ let closed = false;
provider.on('close', () => {
- void provider.sendToken();
+ closed = true;
});
const rejectionPromise = new Promise<{ reason: string }>((resolve, reject) => {
@@ -447,6 +448,9 @@ describe('RecentlyRemovedDocs — cache lifecycle', () => {
expect((await renamePath(server.port, fromName, toName)).status).toBe(200);
+ await pollUntilAsync(async () => closed, 10_000);
+ await provider.sendToken();
+
const failed = await rejectionPromise;
const parsed = parseAuthRejectionWire(failed.reason);
expect(parsed.kind).toBe('rename-redirect');
diff --git a/packages/app/tests/integration/rename-rebinding.test-helper.ts b/packages/app/tests/integration/rename-rebinding.test-helper.ts
new file mode 100644
index 000000000..c406ea555
--- /dev/null
+++ b/packages/app/tests/integration/rename-rebinding.test-helper.ts
@@ -0,0 +1,68 @@
+import { mkdirSync, mkdtempSync, writeFileSync } from 'node:fs';
+import { tmpdir } from 'node:os';
+import { join } from 'node:path';
+
+export const OLD_FOLDER = 'offsite/liveblocks';
+export const NEW_PARENT = 'offsite/2026-08-31-day-1';
+export const NEW_FOLDER = `${NEW_PARENT}/liveblocks`;
+export const OLD_DOC = `${OLD_FOLDER}/liveblocks`;
+export const NEW_DOC = `${NEW_FOLDER}/liveblocks`;
+
+export const BODY = [
+ '# Liveblocks',
+ '',
+ '## What is it',
+ '',
+ 'A real-time collaboration platform.',
+ '',
+ '## Core collaboration features',
+ '',
+ '### Multiplayer editing',
+ '',
+ 'Build real-time editors.',
+ '',
+ '## Why // Is it cool?',
+ '',
+ 'Architecture.',
+ '',
+ '## What can you do with it?',
+ '',
+ '### Comments',
+ '',
+ 'Threaded comments.',
+ '',
+].join('\n');
+
+export const BODY_HEADING_COUNT = 7;
+
+export async function post(port: number, path: string, body: unknown) {
+ const res = await fetch(`http://127.0.0.1:${port}${path}`, {
+ method: 'POST',
+ headers: { 'Content-Type': 'application/json' },
+ body: JSON.stringify(body),
+ });
+ return { status: res.status, body: (await res.json().catch(() => null)) as unknown };
+}
+
+export async function getHeadings(port: number, docName: string) {
+ const res = await fetch(
+ `http://127.0.0.1:${port}/api/page-headings?docName=${encodeURIComponent(docName)}`,
+ );
+ return {
+ status: res.status,
+ body: (await res.json().catch(() => null)) as Record<string, unknown>,
+ };
+}
+
+export function seedRenameFixtureContentDir(prefix: string): string {
+ const dir = mkdtempSync(join(tmpdir(), prefix));
+ /* STOP: every folder these tests rename into must exist before the server
+ boots. The watcher arms its recursive watch at subscribe time, so a folder
+ created after boot can miss the events for files moved into it, and the
+ file index has no prune path that recovers from a missed delete. */
+ for (const folder of [OLD_FOLDER, NEW_FOLDER]) {
+ mkdirSync(join(dir, folder), { recursive: true });
+ }
+ writeFileSync(join(dir, `${OLD_DOC}.md`), BODY, 'utf-8');
+ return dir;
+}
diff --git a/packages/app/tests/integration/undo-after-rollback.test.ts b/packages/app/tests/integration/undo-after-rollback.test.ts
index a78aeb0e4..d3767adc9 100644
--- a/packages/app/tests/integration/undo-after-rollback.test.ts
+++ b/packages/app/tests/integration/undo-after-rollback.test.ts
@@ -1,4 +1,3 @@
-
import { ROLLBACK_ORIGIN } from '@inkeep/open-knowledge-server';
import { afterAll, beforeAll, describe, expect, test } from 'vitest';
import * as Y from 'yjs';
diff --git a/packages/app/tests/integration/undo-recycle-reset.test.ts b/packages/app/tests/integration/undo-recycle-reset.test.ts
index 39e64a221..be1a29fbc 100644
--- a/packages/app/tests/integration/undo-recycle-reset.test.ts
+++ b/packages/app/tests/integration/undo-recycle-reset.test.ts
@@ -1,4 +1,3 @@
-
import { writeFileSync } from 'node:fs';
import { join } from 'node:path';
import { setTimeout as wait } from 'node:timers/promises';
diff --git a/packages/app/tests/integration/undo-rederive-survival.test.ts b/packages/app/tests/integration/undo-rederive-survival.test.ts
index 9ddcd0730..7935e35f8 100644
--- a/packages/app/tests/integration/undo-rederive-survival.test.ts
+++ b/packages/app/tests/integration/undo-rederive-survival.test.ts
@@ -1,4 +1,3 @@
-
import { prependFrontmatter } from '@inkeep/open-knowledge-core';
import { Plugin, PluginKey } from '@tiptap/pm/state';
import { updateYFragment, yXmlFragmentToProseMirrorRootNode } from '@tiptap/y-tiptap';
diff --git a/packages/app/tests/integration/watcher-rename-rebinds-open-client.test.ts b/packages/app/tests/integration/watcher-rename-rebinds-open-client.test.ts
new file mode 100644
index 000000000..17176ac59
--- /dev/null
+++ b/packages/app/tests/integration/watcher-rename-rebinds-open-client.test.ts
@@ -0,0 +1,188 @@
+import { renameSync } from 'node:fs';
+import { join } from 'node:path';
+import { getMetrics } from '@inkeep/open-knowledge-server';
+import { afterAll, beforeAll, describe, expect, test } from 'vitest';
+import {
+ BODY,
+ BODY_HEADING_COUNT,
+ getHeadings,
+ NEW_DOC,
+ OLD_DOC,
+ seedRenameFixtureContentDir,
+} from './rename-rebinding.test-helper.ts';
+import {
+ awaitFileWatcherIndexed,
+ createTestClient,
+ createTestServer,
+ pollUntil,
+ readTestDoc,
+ type TestClient,
+ type TestServer,
+} from './test-harness.ts';
+
+const CLIENT_FORCED_CLOSE_REASON = 'forced';
+
+function lifecycleStatus(server: TestServer, docName: string): unknown {
+ return server.instance.hocuspocus.documents.get(docName)?.getMap('lifecycle').get('status');
+}
+
+async function attachClient(server: TestServer, docName: string) {
+ const client = await createTestClient(server.port, docName, { skipInvariantWatcher: true });
+ const closeEvents: Array<{ event?: { code?: number; reason?: string } }> = [];
+ const authFailures: string[] = [];
+ client.provider.on('close', (event: { event?: { code?: number; reason?: string } }) => {
+ closeEvents.push(event);
+ });
+ client.provider.on('authenticationFailed', ({ reason }: { reason: string }) => {
+ authFailures.push(reason);
+ });
+ return { client, closeEvents, authFailures };
+}
+
+describe('an external (git-sync/watcher) move rebinds the open tab (PRD-8486)', () => {
+ let server: TestServer;
+ let oldClient: TestClient | undefined;
+ let newClient: TestClient | undefined;
+ let reboundClient: TestClient | undefined;
+
+ beforeAll(async () => {
+ server = await createTestServer({
+ contentDir: seedRenameFixtureContentDir('ok-watcher-rename-'),
+ });
+ await awaitFileWatcherIndexed(server, OLD_DOC);
+ await pollUntil(async () => (await getHeadings(server.port, OLD_DOC)).status === 200, 15_000);
+ }, 60_000);
+
+ afterAll(async () => {
+ await oldClient?.cleanup().catch(() => {});
+ await newClient?.cleanup().catch(() => {});
+ await reboundClient?.cleanup().catch(() => {});
+ await server?.cleanup().catch(() => {});
+ });
+
+ test('a raw on-disk move disconnects the open client and redirects it to the new docName', async () => {
+ const attached = await attachClient(server, OLD_DOC);
+ oldClient = attached.client;
+ const { closeEvents, authFailures } = attached;
+
+ const before = await getHeadings(server.port, OLD_DOC);
+ expect(before.status).toBe(200);
+ expect((before.body.headings as unknown[]).length).toBe(BODY_HEADING_COUNT);
+ expect(oldClient.provider.isSynced).toBe(true);
+ expect(oldClient.provider.isAuthenticated).toBe(true);
+
+ renameSync(join(server.contentDir, `${OLD_DOC}.md`), join(server.contentDir, `${NEW_DOC}.md`));
+
+ await pollUntil(async () => (await getHeadings(server.port, NEW_DOC)).status === 200, 30_000);
+ await pollUntil(async () => closeEvents.length > 0, 20_000, 100, 'a server-driven close');
+
+ const first = closeEvents[0];
+ expect(first.event?.reason).toBeTruthy();
+ expect(first.event?.reason).not.toBe(CLIENT_FORCED_CLOSE_REASON);
+ expect(oldClient.provider.isAuthenticated).toBe(false);
+
+ await oldClient.provider.sendToken();
+ await pollUntil(async () => authFailures.length > 0, 30_000, 100, 'an auth rejection');
+ expect(authFailures[0]).toBe(`rename-redirect:${NEW_DOC}`);
+
+ const after = await getHeadings(server.port, OLD_DOC);
+ expect(after.status).toBe(404);
+ expect(after.body.type).toBe('urn:ok:error:doc-not-found');
+ expect(after.body.title).toBe('Page not found.');
+
+ const newOk = await getHeadings(server.port, NEW_DOC);
+ expect(newOk.status).toBe(200);
+ }, 120_000);
+
+ test('moving the document back does not trap the rebound client in a redirect cycle', async () => {
+ const attached = await attachClient(server, NEW_DOC);
+ newClient = attached.client;
+ const { closeEvents, authFailures } = attached;
+ expect(newClient.provider.isAuthenticated).toBe(true);
+
+ renameSync(join(server.contentDir, `${NEW_DOC}.md`), join(server.contentDir, `${OLD_DOC}.md`));
+
+ await pollUntil(async () => (await getHeadings(server.port, OLD_DOC)).status === 200, 30_000);
+ await pollUntil(async () => closeEvents.length > 0, 20_000, 100, 'a server-driven close');
+ expect(newClient.provider.isAuthenticated).toBe(false);
+
+ await newClient.provider.sendToken();
+ await pollUntil(async () => authFailures.length > 0, 30_000, 100, 'an auth rejection');
+ expect(authFailures[0]).toBe(`rename-redirect:${OLD_DOC}`);
+ expect(getMetrics().removalRedirectChainCycles).toBe(0);
+
+ expect(lifecycleStatus(server, OLD_DOC)).toBeUndefined();
+
+ reboundClient = await createTestClient(server.port, OLD_DOC, { skipInvariantWatcher: true });
+ await pollUntil(
+ () => reboundClient?.ytext.toString().includes('# Liveblocks') ?? false,
+ 15_000,
+ 100,
+ 'the reopened document to sync',
+ );
+
+ const marker = 'Written after the move back.';
+ reboundClient.ytext.insert(reboundClient.ytext.length, `\n${marker}\n`);
+ await pollUntil(
+ () => readTestDoc(server.contentDir, OLD_DOC).includes(marker),
+ 20_000,
+ 100,
+ 'the post-move-back write to reach disk',
+ );
+ }, 120_000);
+});
+
+describe('an external move of a document with unflushed edits rescues them (PRD-8486)', () => {
+ let server: TestServer;
+ let client: TestClient | undefined;
+
+ beforeAll(async () => {
+ server = await createTestServer({
+ contentDir: seedRenameFixtureContentDir('ok-watcher-rename-rescue-'),
+ gitEnabled: true,
+ debounce: 60_000,
+ maxDebounce: 120_000,
+ });
+ await awaitFileWatcherIndexed(server, OLD_DOC);
+ }, 60_000);
+
+ afterAll(async () => {
+ await client?.cleanup().catch(() => {});
+ await server?.cleanup().catch(() => {});
+ });
+
+ test('edits typed inside the persistence debounce window land in a rescue checkpoint', async () => {
+ client = await createTestClient(server.port, OLD_DOC, { skipInvariantWatcher: true });
+ await pollUntil(() => client?.ytext.toString() === BODY, 15_000, 100, 'initial sync');
+
+ const unflushed = 'Typed after the last flush.';
+ client.ytext.insert(client.ytext.length, `\n${unflushed}\n`);
+ await pollUntil(
+ () =>
+ server.instance.hocuspocus.documents
+ .get(OLD_DOC)
+ ?.getText('source')
+ .toString()
+ .includes(unflushed) ?? false,
+ 15_000,
+ 100,
+ 'the server doc to carry the edit',
+ );
+
+ const rescuesBefore = getMetrics().rescueBufferCount;
+ renameSync(join(server.contentDir, `${OLD_DOC}.md`), join(server.contentDir, `${NEW_DOC}.md`));
+
+ await pollUntil(() => lifecycleStatus(server, OLD_DOC) === 'renamed', 30_000);
+ await pollUntil(
+ () => getMetrics().rescueBufferCount > rescuesBefore,
+ 15_000,
+ 100,
+ 'a rescue checkpoint',
+ );
+
+ const res = await fetch(`http://127.0.0.1:${server.port}/api/rescue`);
+ expect(res.status).toBe(200);
+ const entries = (await res.json()) as Array<{ docName: string; source: string }>;
+ expect(entries.some((e) => e.docName === OLD_DOC && e.source === 'timeline')).toBe(true);
+ }, 120_000);
+});
diff --git a/packages/core/src/bridge/compose.ts b/packages/core/src/bridge/compose.ts
index 2a597ec3d..f4cc8a286 100644
--- a/packages/core/src/bridge/compose.ts
+++ b/packages/core/src/bridge/compose.ts
@@ -1,4 +1,3 @@
-
import { prependFrontmatter, stripFrontmatter } from '../extensions/frontmatter.ts';
export type ComposeAdjustment = 'none' | 'body' | 'frontmatter' | 'unresolved';
diff --git a/packages/core/src/bridge/doc-boundary-space.ts b/packages/core/src/bridge/doc-boundary-space.ts
index 01ef76a9f..8fb428b90 100644
--- a/packages/core/src/bridge/doc-boundary-space.ts
+++ b/packages/core/src/bridge/doc-boundary-space.ts
@@ -1,4 +1,3 @@
-
import { FRONTMATTER_RE, stripFrontmatter } from '../extensions/frontmatter.ts';
import { carriedEdgeEmpties, type DocEdgeEmpties } from '../markdown/doc-edge-blank-runs.ts';
diff --git a/packages/core/src/markdown/comment-promoter.ts b/packages/core/src/markdown/comment-promoter.ts
index 20a68d2a1..bfbd5a2e8 100644
--- a/packages/core/src/markdown/comment-promoter.ts
+++ b/packages/core/src/markdown/comment-promoter.ts
@@ -1,4 +1,3 @@
-
import type { Nodes, Paragraph, PhrasingContent, Root, RootContent, Text } from 'mdast';
import { SKIP, visit } from 'unist-util-visit';
import type { VFile } from 'vfile';
diff --git a/packages/core/src/markdown/fixtures/index.ts b/packages/core/src/markdown/fixtures/index.ts
index 6931623c7..00f5771ee 100644
--- a/packages/core/src/markdown/fixtures/index.ts
+++ b/packages/core/src/markdown/fixtures/index.ts
@@ -1,4 +1,3 @@
-
import { readFileSync } from 'node:fs';
import { dirname, resolve } from 'node:path';
import { fileURLToPath } from 'node:url';
@@ -9,7 +8,6 @@ function fixturePath(...segments: string[]): string {
return resolve(FIXTURES_DIR, ...segments);
}
-
interface GfmExample {
section: string;
markdown: string;
@@ -19,7 +17,6 @@ export function loadGfmExamples(): GfmExample[] {
return JSON.parse(readFileSync(fixturePath('gfm', 'examples.json'), 'utf8')) as GfmExample[];
}
-
interface MdxCrashEntry {
id: string;
input: string;
@@ -71,7 +68,6 @@ export function loadLargeEmbedFixtures(): LargeEmbedFixture[] {
) as LargeEmbedFixture[];
}
-
export function loadPrd6955Before(): string {
return readFileSync(fixturePath('regression', 'prd-6955-before.md'), 'utf8');
}
@@ -80,7 +76,6 @@ export function loadPrd6955CorruptedTriplicated(): string {
return readFileSync(fixturePath('regression', 'prd-6955-corrupted-triplicated.md'), 'utf8');
}
-
export interface NgPinnedCase {
id: string;
name: string;
@@ -97,7 +92,6 @@ export function loadNgPinnedCases(): NgPinnedCase[] {
) as NgPinnedCase[];
}
-
export function loadLargeRealistic(): string {
return readFileSync(fixturePath('perf', 'large-realistic.md'), 'utf8');
}
diff --git a/packages/core/src/markdown/fixtures/perf/generate.ts b/packages/core/src/markdown/fixtures/perf/generate.ts
index daa3ef82b..8b1eb8519 100644
--- a/packages/core/src/markdown/fixtures/perf/generate.ts
+++ b/packages/core/src/markdown/fixtures/perf/generate.ts
@@ -1,4 +1,3 @@
-
import { writeFileSync } from 'node:fs';
import { dirname, resolve } from 'node:path';
import { fileURLToPath } from 'node:url';
@@ -11,7 +10,6 @@ const BASELINE_ONLY_COUNTS = [500, 2500] as const;
const SEED = 0xf1de1117;
-
function mulberry32(seed: number): () => number {
let a = seed >>> 0;
return () => {
@@ -38,7 +36,6 @@ function pickWeighted<T>(rand: () => number, items: readonly [T, number][]): T {
return items[items.length - 1][0];
}
-
const WORDS = [
'lorem',
'ipsum',
@@ -156,7 +153,6 @@ function mdxBlock(rand: () => number): string {
return `<${name}>\n\n${sentence(rand)}\n\n</${name}>`;
}
-
type BlockKind = 'paragraph' | 'heading' | 'list' | 'code' | 'table' | 'mdx';
const MIX: readonly [BlockKind, number][] = [
@@ -195,7 +191,6 @@ function generateDocument(blockCount: number, seed: number): string {
return `${blocks.join('\n\n')}\n`;
}
-
function main(): void {
for (const count of [...BLOCK_COUNTS, ...BASELINE_ONLY_COUNTS]) {
const doc = generateDocument(count, SEED);
diff --git a/packages/core/src/markdown/image-promoter.ts b/packages/core/src/markdown/image-promoter.ts
index 994eb6917..706fa9afb 100644
--- a/packages/core/src/markdown/image-promoter.ts
+++ b/packages/core/src/markdown/image-promoter.ts
@@ -1,4 +1,3 @@
-
import type { Image, Paragraph, Root } from 'mdast';
import type { MdxJsxAttribute, MdxJsxFlowElement } from 'mdast-util-mdx';
import { visit } from 'unist-util-visit';
diff --git a/packages/core/src/markdown/math-promoter.ts b/packages/core/src/markdown/math-promoter.ts
index bd79424c7..a5b511f25 100644
--- a/packages/core/src/markdown/math-promoter.ts
+++ b/packages/core/src/markdown/math-promoter.ts
@@ -1,4 +1,3 @@
-
import type { Code, Root } from 'mdast';
import type { Math as MdastMath } from 'mdast-util-math';
import type { MdxJsxAttribute, MdxJsxFlowElement } from 'mdast-util-mdx';
diff --git a/packages/core/src/markdown/merged-walker.ts b/packages/core/src/markdown/merged-walker.ts
index fa3cfcd86..bfd7e3109 100644
--- a/packages/core/src/markdown/merged-walker.ts
+++ b/packages/core/src/markdown/merged-walker.ts
@@ -1,4 +1,3 @@
-
import type { Nodes, Parent, Root } from 'mdast';
import { SKIP, visit } from 'unist-util-visit';
import type { VFile } from 'vfile';
diff --git a/packages/core/src/markdown/safe-url.ts b/packages/core/src/markdown/safe-url.ts
index 8be632ba4..4d3250d3a 100644
--- a/packages/core/src/markdown/safe-url.ts
+++ b/packages/core/src/markdown/safe-url.ts
@@ -1,4 +1,3 @@
-
export const SAFE_URL_SCHEMES = ['https', 'http', 'mailto', 'tel', 'ftp', 'sms'] as const;
const SCHEME_ALT = SAFE_URL_SCHEMES.map((s) => `${s}:`).join('|');
diff --git a/packages/server/src/checkpoint-retention-tie.test.ts b/packages/server/src/checkpoint-retention-tie.test.ts
index 0a43a2773..8a5d82998 100644
--- a/packages/server/src/checkpoint-retention-tie.test.ts
+++ b/packages/server/src/checkpoint-retention-tie.test.ts
@@ -1,4 +1,3 @@
-
import { execFileSync } from 'node:child_process';
import { mkdirSync, mkdtempSync, rmSync } from 'node:fs';
import { tmpdir } from 'node:os';
diff --git a/packages/server/src/qa-degradation-matrix.test.ts b/packages/server/src/qa-degradation-matrix.test.ts
index 00bb6efe7..84e3e5297 100644
--- a/packages/server/src/qa-degradation-matrix.test.ts
+++ b/packages/server/src/qa-degradation-matrix.test.ts
@@ -1,4 +1,3 @@
-
import { afterEach, beforeEach, describe, expect, test, vi } from 'vitest';
import type * as Y from 'yjs';
import { createBridgeDeriveLossReporter } from './bridge-loss-detector.ts';
diff --git a/packages/server/src/qa-gc-budget-isolation.test.ts b/packages/server/src/qa-gc-budget-isolation.test.ts
index b65c4693e..a800ca9f3 100644
--- a/packages/server/src/qa-gc-budget-isolation.test.ts
+++ b/packages/server/src/qa-gc-budget-isolation.test.ts
@@ -1,4 +1,3 @@
-
import { mkdirSync, mkdtempSync, rmSync } from 'node:fs';
import { tmpdir } from 'node:os';
import { join, resolve } from 'node:path';
diff --git a/packages/server/src/qa-watcher-intake-lens.test.ts b/packages/server/src/qa-watcher-intake-lens.test.ts
index 4669d1b98..2337e6c3c 100644
--- a/packages/server/src/qa-watcher-intake-lens.test.ts
+++ b/packages/server/src/qa-watcher-intake-lens.test.ts
@@ -1,4 +1,3 @@
-
import { Hocuspocus } from '@hocuspocus/server';
import { afterEach, beforeEach, describe, expect, test, vi } from 'vitest';
import * as Y from 'yjs';
diff --git a/packages/server/src/server-factory.ts b/packages/server/src/server-factory.ts
index b784ad8b6..e96a9aefb 100644
--- a/packages/server/src/server-factory.ts
+++ b/packages/server/src/server-factory.ts
@@ -2117,6 +2117,36 @@ export function createServer(options: ServerOptions): ServerInstance {
}
}
+ const rescueUnflushedEditsBeforeTeardown = (
+ docName: string,
+ branch: string,
+ site: 'delete' | 'rename' | 'branch-switch',
+ ): boolean => {
+ const base = getReconciledBase(docName) ?? '';
+ const ours = serializeDoc(docName) ?? '';
+ const isDirty = ours !== base;
+ if (!isDirty || !shadowRef.current) return isDirty;
+ const shadowForCheckpoint = shadowRef.current;
+ queueMicrotask(() => {
+ saveInMemoryCheckpoint(shadowForCheckpoint, contentRoot ?? '', {
+ kind: 'external-change-rescue',
+ docName,
+ contents: ours,
+ label: `External change recovered @ ${new Date().toISOString()}`,
+ branch,
+ metadata: { incomingDiskSha: '' },
+ })
+ .then(() => {
+ incrementRescueBuffer();
+ log.info({ docName, site }, `[reconcile] rescue checkpoint saved (${site}): ${docName}`);
+ })
+ .catch((e: unknown) => {
+ log.error({ docName, err: e }, `[reconcile] rescue checkpoint write failed: ${docName}`);
+ });
+ });
+ return isDirty;
+ };
+
async function handleDiskEvent(event: DiskEvent): Promise<void> {
try {
switch (event.kind) {
@@ -2261,34 +2291,11 @@ export function createServer(options: ServerOptions): ServerInstance {
return;
}
- const base = getReconciledBase(docName) ?? '';
- const ours = serializeDoc(docName) ?? '';
- const isDirty = ours !== base;
-
- if (isDirty && shadowRef.current) {
- const shadowForCheckpoint = shadowRef.current;
- const branch = headWatcher?.getLastKnownBranch() ?? 'main';
- queueMicrotask(() => {
- saveInMemoryCheckpoint(shadowForCheckpoint, contentRoot ?? '', {
- kind: 'external-change-rescue',
- docName,
- contents: ours,
- label: `External change recovered @ ${new Date().toISOString()}`,
- branch,
- metadata: { incomingDiskSha: '' },
- })
- .then(() => {
- incrementRescueBuffer();
- log.info({ docName }, `[reconcile] rescue checkpoint saved (delete): ${docName}`);
- })
- .catch((e: unknown) => {
- log.error(
- { docName, err: e },
- `[reconcile] rescue checkpoint write failed: ${docName}`,
- );
- });
- });
- }
+ const isDirty = rescueUnflushedEditsBeforeTeardown(
+ docName,
+ headWatcher?.getLastKnownBranch() ?? 'main',
+ 'delete',
+ );
const lifecycleMap = document.getMap('lifecycle');
lifecycleMap.set('status', 'deleted-upstream');
@@ -2315,21 +2322,70 @@ export function createServer(options: ServerOptions): ServerInstance {
case 'rename': {
const { oldDocName, newDocName, content } = event;
- const document = hocuspocus.documents.get(oldDocName);
-
- if (document) {
- const lifecycleMap = document.getMap('lifecycle');
+ const freezeAsRenamed = (doc: Document): void => {
+ const lifecycleMap = doc.getMap('lifecycle');
lifecycleMap.set('status', 'renamed');
lifecycleMap.set('newPath', newDocName);
- }
+ };
+ const loadedBeforeIndex = hocuspocus.documents.get(oldDocName);
+ const isDirty = loadedBeforeIndex
+ ? rescueUnflushedEditsBeforeTeardown(
+ oldDocName,
+ headWatcher?.getLastKnownBranch() ?? 'main',
+ 'rename',
+ )
+ : false;
+ if (loadedBeforeIndex) freezeAsRenamed(loadedBeforeIndex);
deleteReconciledBase(oldDocName);
setReconciledBase(newDocName, content);
- await derivedDocumentIndex.recordDiskRename(oldDocName, newDocName, content);
- log.info({ oldDocName, newDocName }, `[reconcile] rename: ${oldDocName} → ${newDocName}`);
+ log.info(
+ { oldDocName, newDocName, isDirty },
+ `[reconcile] rename: ${oldDocName} → ${newDocName} (dirty=${isDirty})`,
+ );
signalChannel('files');
+ onUpstreamAdd(newDocName);
onUpstreamRename(oldDocName, newDocName);
+
+ try {
+ await derivedDocumentIndex.recordDiskRename(oldDocName, newDocName, content);
+ } catch (err) {
+ log.error(
+ { oldDocName, newDocName, err },
+ `[reconcile] rename: index update failed for ${oldDocName} → ${newDocName}; completing client teardown anyway`,
+ );
+ }
+
+ const document = hocuspocus.documents.get(oldDocName);
+ if (document && document !== loadedBeforeIndex) freezeAsRenamed(document);
+
+ const resident = hocuspocus.documents.get(newDocName);
+ if (resident && resident.getMap('lifecycle').get('status') === 'renamed') {
+ const residentLifecycle = resident.getMap('lifecycle');
+ residentLifecycle.delete('status');
+ residentLifecycle.delete('newPath');
+ applyToDoc(newDocName, content);
+ log.info(
+ { newDocName },
+ `[reconcile] rename: cleared stale renamed lifecycle on ${newDocName}`,
+ );
+ }
+
+ await sessionManager.closeAllForDoc(oldDocName);
+ const closedConnections = document?.getConnectionsCount() ?? 0;
+ /* WARN: the `delete` branch above and `captureAndCloseDocuments` pair their
+ close with `forceUnloadDocument`; this branch does not, so the frozen doc
+ stays resident under the old name and template-watcher-capabilities.test.ts
+ pins that residency. The destination clear above is what stops a move back
+ to this path from being served that stale frozen doc. */
+ hocuspocus.closeConnections(oldDocName);
+ if (closedConnections > 0) {
+ log.info(
+ { oldDocName, newDocName, closedConnections },
+ `[reconcile] rename: closed ${closedConnections} connection(s) on ${oldDocName}`,
+ );
+ }
console.info(
JSON.stringify({
event: 'recently-removed-docs-populate',
@@ -3543,36 +3599,7 @@ export function createServer(options: ServerOptions): ServerInstance {
try {
const filePath = safeContentPath(docName, contentDir);
if (!existsSync(filePath)) {
- const base = getReconciledBase(docName) ?? '';
- const ours = serializeDoc(docName) ?? '';
- const isDirty = ours !== base;
-
- if (isDirty && shadowRef.current) {
- const shadowForCheckpoint = shadowRef.current;
- queueMicrotask(() => {
- saveInMemoryCheckpoint(shadowForCheckpoint, contentRoot ?? '', {
- kind: 'external-change-rescue',
- docName,
- contents: ours,
- label: `External change recovered @ ${new Date().toISOString()}`,
- branch: newBranch,
- metadata: { incomingDiskSha: '' },
- })
- .then(() => {
- incrementRescueBuffer();
- log.info(
- { docName },
- `[reconcile] rescue checkpoint saved on branch switch: ${docName}`,
- );
- })
- .catch((e: unknown) => {
- log.error(
- { docName, err: e },
- `[reconcile] rescue checkpoint write failed: ${docName}`,
- );
- });
- });
- }
+ rescueUnflushedEditsBeforeTeardown(docName, newBranch, 'branch-switch');
const lifecycleMap = document.getMap('lifecycle');
lifecycleMap.set('status', 'deleted-upstream');