Skip to content

Beautiful, AI-native markdown IDE and LLM wiki

Preserve completed bulk deletions after a later failure (#5609)

Nick Gomeze84b75f51c42
diff --git a/.changeset/preserve-partial-deletions.md b/.changeset/preserve-partial-deletions.md
new file mode 100644
index 000000000..94fb789a0
--- /dev/null
+++ b/.changeset/preserve-partial-deletions.md
@@ -0,0 +1,5 @@
+---
+"@inkeep/open-knowledge": patch
+---
+
+Keep successfully deleted items out of the sidebar and close their tabs when a later deletion fails.
diff --git a/packages/app/src/components/FileTree.tsx b/packages/app/src/components/FileTree.tsx
index 32631f798..a413e967c 100644
--- a/packages/app/src/components/FileTree.tsx
+++ b/packages/app/src/components/FileTree.tsx
@@ -2643,37 +2643,53 @@ export function FileTree({ ref }: { ref?: Ref<FileTreeHandle | null> }) {
const handleImportTemplateEvent = useEffectEvent(handleImportTemplate);
- async function hardDeleteTargets(targets: readonly FileTreeTarget[]): Promise<boolean> {
+ async function hardDeleteTargets(targets: readonly FileTreeTarget[]): Promise<void> {
const deletedDocNames: string[] = [];
const deletedFolderPaths: string[] = [];
const successfulTargets: FileTreeTarget[] = [];
- for (const target of targets) {
- const kind = target.kind;
- setBusyPath(target.path);
- const res = await fetch('/api/delete-path', {
- method: 'POST',
- headers: { 'Content-Type': 'application/json' },
- body: JSON.stringify({ kind, path: target.path }),
- });
- const parsed = await parseServerResponse(res, t`Failed to delete path`);
- if (!parsed.ok) {
- if (successfulTargets.length > 0) {
- await applyDeleteAftermath(successfulTargets, deletedDocNames, deletedFolderPaths);
+ async function deleteSequentially(): Promise<string | null> {
+ for (const target of targets) {
+ const kind = target.kind;
+ setBusyPath(target.path);
+ const res = await fetch('/api/delete-path', {
+ method: 'POST',
+ headers: { 'Content-Type': 'application/json' },
+ body: JSON.stringify({ kind, path: target.path }),
+ });
+ const parsed = await parseServerResponse(res, t`Failed to delete path`);
+ if (!parsed.ok) {
+ return parsed.title;
}
- toast.error(parsed.title);
- return false;
+ const success = parseSuccessOrWarn(DeletePathSuccessSchema, parsed.body, 'delete-path', {
+ deletedDocNames: [],
+ });
+ deletedDocNames.push(...success.deletedDocNames);
+ if (kind === 'folder') {
+ deletedFolderPaths.push(target.path);
+ }
+ successfulTargets.push(target);
}
- const success = parseSuccessOrWarn(DeletePathSuccessSchema, parsed.body, 'delete-path', {
- deletedDocNames: [],
- });
- deletedDocNames.push(...success.deletedDocNames);
- if (kind === 'folder') {
- deletedFolderPaths.push(target.path);
+ return null;
+ }
+ async function applyCompletedDeletions(deletionFailed: boolean) {
+ if (successfulTargets.length === 0) return;
+ try {
+ await applyDeleteAftermath(successfulTargets, deletedDocNames, deletedFolderPaths);
+ } catch (aftermathError) {
+ if (!deletionFailed) throw aftermathError;
+ console.warn('[FileTree] delete aftermath failed:', aftermathError);
}
- successfulTargets.push(target);
}
- await applyDeleteAftermath(successfulTargets, deletedDocNames, deletedFolderPaths);
- return true;
+ return deleteSequentially().then(
+ async (failureTitle) => {
+ await applyCompletedDeletions(failureTitle !== null);
+ if (failureTitle !== null) toast.error(failureTitle);
+ },
+ async (deleteError: unknown) => {
+ await applyCompletedDeletions(true);
+ throw deleteError;
+ },
+ );
}
async function trashTargetsViaShell(
@@ -2818,16 +2834,14 @@ export function FileTree({ ref }: { ref?: Ref<FileTreeHandle | null> }) {
}
setBusyPath(null);
} else {
- const ok = await hardDeleteTargets(deleteTargets);
+ await hardDeleteTargets(deleteTargets);
setBusyPath(null);
- if (!ok) resetModelToDocuments();
}
} catch (err) {
const detail = err instanceof Error ? err.message : String(err);
console.warn('[FileTree] delete failed:', err);
toast.error(t`Could not complete delete`, { description: detail });
setBusyPath(null);
- resetModelToDocuments();
}
}
@@ -2841,15 +2855,13 @@ export function FileTree({ ref }: { ref?: Ref<FileTreeHandle | null> }) {
if (targetsToHardDelete.length === 0) return;
setBusyPath(targetsToHardDelete[0]?.path ?? null);
try {
- const ok = await hardDeleteTargets(targetsToHardDelete);
+ await hardDeleteTargets(targetsToHardDelete);
setBusyPath(null);
- if (!ok) resetModelToDocuments();
} catch (err) {
const detail = err instanceof Error ? err.message : String(err);
console.warn('[FileTree] hard-delete fallback failed:', err);
toast.error(t`Could not complete delete`, { description: detail });
setBusyPath(null);
- resetModelToDocuments();
}
}
diff --git a/packages/app/tests/stress/file-tree-create.e2e.ts b/packages/app/tests/stress/file-tree-create.e2e.ts
index ee44c5f62..668ff31e9 100644
--- a/packages/app/tests/stress/file-tree-create.e2e.ts
+++ b/packages/app/tests/stress/file-tree-create.e2e.ts
@@ -1,7 +1,6 @@
import { existsSync, readdirSync, rmSync, statSync } from 'node:fs';
import { join } from 'node:path';
import type { Page } from '@playwright/test';
-import { expectKnownBug } from '../../../../test-support/known-bug.test-helper';
import type { EditorTabSessionState } from '../../src/editor/editor-tabs';
import {
type ApiHelpers,
@@ -874,82 +873,151 @@ test.describe('FileTree sidebar create', () => {
test.describe('FileTree bulk delete with a partial failure', () => {
test.describe.configure({ retries: 0 });
- test('bulk delete closes tabs already deleted before a later delete fails', {
- tag: '@known-bug',
- annotation: [
- { type: 'issue', description: 'https://github.com/inkeep/agents-private/issues/1056' },
- { type: 'owner', description: 'get-main-green' },
- { type: 'until', description: '2026-12-15' },
- ],
- }, async ({ page, workerServer, api }) => {
- const firstDoc = 'zz-partial-delete-a';
- const secondDoc = 'zz-partial-delete-b';
-
- await deletePathIfExists(workerServer.baseURL, 'file', firstDoc);
- await deletePathIfExists(workerServer.baseURL, 'file', secondDoc);
- await api.createPage(`${firstDoc}.md`);
- await api.createPage(`${secondDoc}.md`);
-
- await page.route('**/api/delete-path', async (route) => {
- const body = route.request().postDataJSON() as { path?: string } | null;
- if (body?.path === secondDoc) {
- await route.fulfill({
- status: 500,
- contentType: 'application/json',
- body: JSON.stringify({ ok: false, error: 'Injected delete failure' }),
- });
- return;
- }
- await route.fallback();
- });
-
- try {
- await gotoRootAndAwaitSidebar(page);
+ for (const scenario of [
+ {
+ name: 'bulk delete closes tabs already deleted before a later delete fails',
+ failure: 'response',
+ trashFallback: false,
+ },
+ {
+ name: 'bulk delete preserves completed deletions when a later request disconnects',
+ failure: 'disconnect',
+ trashFallback: false,
+ },
+ {
+ name: 'permanent delete fallback preserves completed deletions after a later failure',
+ failure: 'response',
+ trashFallback: true,
+ },
+ {
+ name: 'permanent delete fallback preserves completed deletions when a request disconnects',
+ failure: 'disconnect',
+ trashFallback: true,
+ },
+ ] as const) {
+ test(scenario.name, async ({ page, workerServer, api }) => {
+ const firstDoc = 'zz-partial-delete-a';
+ const secondDoc = 'zz-partial-delete-b';
+ const refreshGate = Promise.withResolvers<void>();
- await sidebarTreeItem(page, `${firstDoc}.md`).click();
- await expect(page.getByRole('button', { name: `${firstDoc}.md`, exact: true })).toBeVisible({
- timeout: 10_000,
- });
- await sidebarTreeItem(page, `${secondDoc}.md`).click();
- await expect(page.getByRole('button', { name: `${secondDoc}.md`, exact: true })).toBeVisible({
- timeout: 10_000,
+ await deletePathIfExists(workerServer.baseURL, 'file', firstDoc);
+ await deletePathIfExists(workerServer.baseURL, 'file', secondDoc);
+ await api.createPage(`${firstDoc}.md`);
+ await api.createPage(`${secondDoc}.md`);
+
+ await page.route('**/api/delete-path', async (route) => {
+ const body = route.request().postDataJSON() as { path?: string } | null;
+ if (body?.path === secondDoc) {
+ if (scenario.failure === 'disconnect') {
+ await route.abort('connectionreset');
+ return;
+ }
+ await route.fulfill({
+ status: 500,
+ contentType: 'application/json',
+ body: JSON.stringify({ ok: false, error: 'Injected delete failure' }),
+ });
+ return;
+ }
+ await route.fallback();
});
- await sidebarTreeItem(page, `${firstDoc}.md`).click();
- await sidebarTreeItem(page, `${secondDoc}.md`).click({
- modifiers: [process.platform === 'darwin' ? 'Meta' : 'Control'],
- });
- await expect(sidebarTreeItem(page, `${firstDoc}.md`)).toHaveAttribute(
- 'aria-selected',
- 'true',
- );
- await expect(sidebarTreeItem(page, `${secondDoc}.md`)).toHaveAttribute(
- 'aria-selected',
- 'true',
- );
-
- await sidebarTreeItem(page, `${firstDoc}.md`).click({ button: 'right' });
- await page.getByRole('menuitem', { name: /^Delete/ }).click({ timeout: 5_000 });
- await expect(page.getByRole('alertdialog', { name: /Delete selected items/i })).toBeVisible({
- timeout: 5_000,
- });
- await page.getByRole('button', { name: /^Delete$/ }).click();
+ try {
+ if (scenario.trashFallback) {
+ await installDelayedDesktopSessionBridge(page, workerServer, {
+ panes: [
+ {
+ id: 'pane-main',
+ openTabs: [firstDoc, secondDoc],
+ pinnedTabIds: [],
+ activeTabId: firstDoc,
+ size: 100,
+ },
+ ],
+ focusedPaneId: 'pane-main',
+ });
+ }
+ await gotoRootAndAwaitSidebar(page);
+ if (scenario.trashFallback) {
+ await page.evaluate(() => {
+ const bridge = window.okDesktop;
+ if (!bridge) throw new Error('Desktop session bridge was not installed');
+ bridge.shell.trashItem = async () => ({ ok: false, reason: 'system-error' });
+ });
+ }
+
+ await sidebarTreeItem(page, `${firstDoc}.md`).click();
+ await expect(page.getByRole('button', { name: `${firstDoc}.md`, exact: true })).toBeVisible(
+ {
+ timeout: 10_000,
+ },
+ );
+ await sidebarTreeItem(page, `${secondDoc}.md`).click();
+ await expect(
+ page.getByRole('button', { name: `${secondDoc}.md`, exact: true }),
+ ).toBeVisible({
+ timeout: 10_000,
+ });
- await expect(page.getByRole('button', { name: `${firstDoc}.md`, exact: true })).toHaveCount(
- 0,
- { timeout: 10_000 },
- );
- await expectKnownBug(/Expected: 0\s+Received: 1/, async () => {
+ await page.route('**/api/documents?*', async (route) => {
+ await refreshGate.promise;
+ await route.fallback();
+ });
+
+ await sidebarTreeItem(page, `${firstDoc}.md`).click();
+ await sidebarTreeItem(page, `${secondDoc}.md`).click({
+ modifiers: [process.platform === 'darwin' ? 'Meta' : 'Control'],
+ });
+ await expect(sidebarTreeItem(page, `${firstDoc}.md`)).toHaveAttribute(
+ 'aria-selected',
+ 'true',
+ );
+ await expect(sidebarTreeItem(page, `${secondDoc}.md`)).toHaveAttribute(
+ 'aria-selected',
+ 'true',
+ );
+
+ await sidebarTreeItem(page, `${firstDoc}.md`).click({ button: 'right' });
+ await page.getByRole('menuitem', { name: /^Delete/ }).click({ timeout: 5_000 });
+ await expect(
+ page.getByRole('alertdialog', {
+ name: scenario.trashFallback
+ ? /Are you sure you want to delete the following/
+ : /Delete selected items/i,
+ }),
+ ).toBeVisible({ timeout: 5_000 });
+ await page
+ .getByRole('button', {
+ name: scenario.trashFallback ? /^Move to Trash$/ : /^Delete$/,
+ })
+ .click();
+ if (scenario.trashFallback) {
+ await page.getByTestId('trash-failure-modal-delete-permanently').click();
+ }
+
+ await page
+ .getByText(
+ scenario.failure === 'response' ? 'Failed to delete path' : 'Could not complete delete',
+ { exact: true },
+ )
+ .waitFor();
+
+ expect(existsSync(join(workerServer.contentDir, `${firstDoc}.md`))).toBe(false);
+ expect(existsSync(join(workerServer.contentDir, `${secondDoc}.md`))).toBe(true);
+
+ await expect(page.getByRole('button', { name: `${firstDoc}.md`, exact: true })).toHaveCount(
+ 0,
+ { timeout: 10_000 },
+ );
await expect(sidebarTreeItem(page, `${firstDoc}.md`)).toHaveCount(0, { timeout: 10_000 });
- });
- await expect(sidebarTreeItem(page, `${secondDoc}.md`)).toBeVisible();
- expect(existsSync(join(workerServer.contentDir, `${firstDoc}.md`))).toBe(false);
- expect(existsSync(join(workerServer.contentDir, `${secondDoc}.md`))).toBe(true);
- } finally {
- await page.unroute('**/api/delete-path');
- await deletePathIfExists(workerServer.baseURL, 'file', firstDoc);
- await deletePathIfExists(workerServer.baseURL, 'file', secondDoc);
- await restoreRequiredFixtureEntries(workerServer.baseURL, api);
- }
- });
+ await expect(sidebarTreeItem(page, `${secondDoc}.md`)).toBeVisible();
+ } finally {
+ refreshGate.resolve();
+ await page.unrouteAll({ behavior: 'wait' });
+ await deletePathIfExists(workerServer.baseURL, 'file', firstDoc);
+ await deletePathIfExists(workerServer.baseURL, 'file', secondDoc);
+ await restoreRequiredFixtureEntries(workerServer.baseURL, api);
+ }
+ });
+ }
});