feat: indexes

* autojoiner

* fix marked

* return clipboardTextSerializer as markdown

* fix clipboardTextSerializer for single lines

* cleanup two preceeding spaces in ordered lists item

* fix extra paragraph in task list

* don't zip sinple page exports

apps/client/public/locales/en-US/translation.json

@@ -733,7 +733,5 @@
   "Publish": "Publish.",
   "Security": "Security.",
   "Enforce SSO": "Enforce SSO.",
-  "Once enforced, members will not be able to login with email and password.": "Once enforced, members will not be able to log in with email and password.",
+  "Once enforced, members will not be able to login with email and password.": "Once enforced, members will not be able to log in with email and password."
-  "Uploading {{name}}": "Uploading {{name}}",
-  "Uploading file": "Uploading file"
 }

apps/client/src/features/comment/components/comment-menu.tsx

@@ -75,7 +75,7 @@ function CommentMenu({
               {isResolved ? t("Re-open comment") : t("Resolve comment")}
             </Menu.Item>
           ) : (
-            <Tooltip label={upgradeLabel} position="left" withPortal={false}>
+            <Tooltip label={upgradeLabel} position="left" withinPortal={false}>
               <Menu.Item disabled leftSection={<IconCircleCheck size={14} />}>
                 {t("Resolve comment")}
               </Menu.Item>

apps/client/src/features/editor/extensions/autojoiner.ts

@@ -0,0 +1,105 @@
+// https://github.com/NiclasDev63/tiptap-extension-auto-joiner - MIT
+import { Extension } from "@tiptap/core";
+import { Plugin, PluginKey } from "@tiptap/pm/state";
+import { canJoin } from "@tiptap/pm/transform";
+import { getNodeType } from "@tiptap/react";
+import { NodeType } from "@tiptap/pm/model";
+import { Transaction } from "@tiptap/pm/state";
+
+// https://discuss.prosemirror.net/t/how-to-autojoin-all-the-time/2957/4
+// Adapted from prosemirror-commands wrapDispatchForJoin
+function autoJoin(
+  transactions: readonly Transaction[],
+  newTr: Transaction,
+  nodeTypes: NodeType[]
+) {
+  // Collect changed ranges across all transactions, mapping earlier ranges
+  // forward through later mappings so every position lands in newTr.doc space.
+  let ranges: number[] = [];
+  for (const tr of transactions) {
+    for (let i = 0; i < tr.mapping.maps.length; i++) {
+      let map = tr.mapping.maps[i];
+      if (!map) continue;
+      for (let j = 0; j < ranges.length; j++) ranges[j] = map.map(ranges[j]!);
+      map.forEach((_s, _e, from, to) => ranges.push(from, to));
+    }
+  }
+
+  // Figure out which joinable points exist inside those ranges,
+  // by checking all node boundaries in their parent nodes.
+  // Resolve against newTr.doc — the same document we will join on.
+  let joinable: number[] = [];
+  for (let i = 0; i < ranges.length; i += 2) {
+    let from = ranges[i]!,
+      to = ranges[i + 1]!;
+    let $from = newTr.doc.resolve(from),
+      depth = $from.sharedDepth(to),
+      parent = $from.node(depth);
+    for (
+      let index = $from.indexAfter(depth), pos = $from.after(depth + 1);
+      pos <= to;
+      ++index
+    ) {
+      let after = parent.maybeChild(index);
+      if (!after) break;
+      if (index && joinable.indexOf(pos) == -1) {
+        let before = parent.child(index - 1);
+        if (before.type == after.type && nodeTypes.includes(before.type))
+          joinable.push(pos);
+      }
+      pos += after.nodeSize;
+    }
+  }
+
+  // Join the joinable points (reverse order to preserve earlier positions)
+  let joined = false;
+  joinable.sort((a, b) => a - b);
+  for (let i = joinable.length - 1; i >= 0; i--) {
+    if (canJoin(newTr.doc, joinable[i]!)) {
+      newTr.join(joinable[i]!);
+      joined = true;
+    }
+  }
+
+  return joined;
+}
+
+export interface AutoJoinerOptions {
+  elementsToJoin: string[];
+}
+
+const AutoJoiner = Extension.create<AutoJoinerOptions>({
+  name: "autoJoiner",
+
+  addOptions() {
+    return {
+      elementsToJoin: [],
+    };
+  },
+
+  addProseMirrorPlugins() {
+    const plugin = new PluginKey(this.name);
+    const joinableNodes = [
+      this.editor.schema.nodes.bulletList,
+      this.editor.schema.nodes.orderedList,
+    ];
+    this.options.elementsToJoin.forEach((element) => {
+      const nodeTyp = getNodeType(element, this.editor.schema);
+      joinableNodes.push(nodeTyp);
+    });
+
+    return [
+      new Plugin({
+        key: plugin,
+        appendTransaction(transactions, _, newState) {
+          let newTr = newState.tr;
+          if (autoJoin(transactions, newTr, joinableNodes as NodeType[])) {
+            return newTr;
+          }
+        },
+      }),
+    ];
+  },
+});
+
+export default AutoJoiner;

apps/client/src/features/editor/extensions/extensions.ts

@@ -49,7 +49,7 @@ import {
   SharedStorage,
   Columns,
   Column,
-  Status
+  Status,
 } from "@docmost/editor-ext";
 import {
   randomElement,
@@ -97,6 +97,7 @@ import i18n from "@/i18n.ts";
 import { MarkdownClipboard } from "@/features/editor/extensions/markdown-clipboard.ts";
 import EmojiCommand from "./emoji-command";
 import { countWords } from "alfaaz";
+import AutoJoiner from "@/features/editor/extensions/autojoiner.ts";
 
 const lowlight = createLowlight(common);
 lowlight.register("mermaid", plaintext);
@@ -353,6 +354,9 @@ export const mainExtensions = [
   }).configure(),
   Columns,
   Column,
+  AutoJoiner.configure({
+    elementsToJoin: [],
+  }),
 ] as any;
 
 type CollabExtensions = (provider: HocuspocusProvider, user: IUser) => any[];

apps/client/src/features/editor/extensions/markdown-clipboard.ts

@@ -1,9 +1,9 @@
 // adapted from: https://github.com/aguingand/tiptap-markdown/blob/main/src/extensions/tiptap/clipboard.js - MIT
 import { Extension } from "@tiptap/core";
-import { Plugin, PluginKey } from "@tiptap/pm/state";
+import { Plugin, PluginKey, TextSelection } from "@tiptap/pm/state";
-import { DOMParser, Fragment, Slice } from "@tiptap/pm/model";
+import { DOMParser, DOMSerializer, Fragment, Slice } from "@tiptap/pm/model";
 import { find } from "linkifyjs";
-import { markdownToHtml } from "@docmost/editor-ext";
+import { markdownToHtml, htmlToMarkdown } from "@docmost/editor-ext";
 
 export const MarkdownClipboard = Extension.create({
   name: "markdownClipboard",
@@ -19,6 +19,27 @@ export const MarkdownClipboard = Extension.create({
       new Plugin({
         key: new PluginKey("markdownClipboard"),
         props: {
+          clipboardTextSerializer: (slice) => {
+            const listTypes = ["bulletList", "orderedList", "taskList"];
+            let topLevelCount = 0;
+            let hasList = false;
+            slice.content.forEach((node) => {
+              if (listTypes.includes(node.type.name)) {
+                hasList = true;
+                topLevelCount += node.childCount;
+              } else {
+                topLevelCount++;
+              }
+            });
+
+            if (!hasList || topLevelCount < 2) return null;
+
+            const div = document.createElement("div");
+            const serializer = DOMSerializer.fromSchema(this.editor.schema);
+            const fragment = serializer.serializeFragment(slice.content);
+            div.appendChild(fragment);
+            return htmlToMarkdown(div.innerHTML);
+          },
           handlePaste: (view, event, slice) => {
             if (!event.clipboardData) {
               return false;
@@ -29,26 +50,46 @@ export const MarkdownClipboard = Extension.create({
             }
 
             const text = event.clipboardData.getData("text/plain");
+            const html = event.clipboardData.getData("text/html");
             const vscode = event.clipboardData.getData("vscode-editor-data");
             const vscodeData = vscode ? JSON.parse(vscode) : undefined;
             const language = vscodeData?.mode;
 
-            if (language !== "markdown") {
+            const isVscodeMarkdown = language === "markdown";
+            const isPlainTextOnly = !html && !vscode && !!text;
+
+            if (!isVscodeMarkdown && !isPlainTextOnly) {
               return false;
             }
 
+            if (isPlainTextOnly) {
+              if ((view as any).input?.shiftKey || !this.options.transformPastedText) {
+                return false;
+              }
+
+              const link = find(text, {
+                defaultProtocol: "http",
+              }).find((item) => item.isLink && item.value === text);
+
+              if (link) {
+                return false;
+              }
+            }
+
             const { tr } = view.state;
             const { from, to } = view.state.selection;
 
-            const html = markdownToHtml(text.replace(/\n+$/, ""));
+            const parsed = markdownToHtml(text.replace(/\n+$/, ""));
 
             const contentNodes = DOMParser.fromSchema(
               this.editor.schema,
-            ).parseSlice(elementFromString(html), {
+            ).parseSlice(elementFromString(parsed), {
               preserveWhitespace: true,
             });
 
             tr.replaceRange(from, to, contentNodes);
+            const insertEnd = tr.mapping.map(from, 1);
+            tr.setSelection(TextSelection.near(tr.doc.resolve(Math.max(from, insertEnd - 2)), -1));
             tr.setMeta('paste', true)
             view.dispatch(tr);
             return true;
@@ -84,26 +125,6 @@ export const MarkdownClipboard = Extension.create({
 
             return slice;
           },
-          clipboardTextParser: (text, context, plainText) => {
-            const link = find(text, {
-              defaultProtocol: "http",
-            }).find((item) => item.isLink && item.value === text);
-
-            if (plainText || !this.options.transformPastedText || link) {
-              // don't parse plaintext link to allow link paste handler to work
-              // pasting with shift key prevents formatting
-              return null;
-            }
-
-            const parsed = markdownToHtml(text.replace(/\n+$/, ""));
-            return DOMParser.fromSchema(this.editor.schema).parseSlice(
-              elementFromString(parsed),
-              {
-                preserveWhitespace: true,
-                context,
-              },
-            );
-          },
         },
       }),
     ];

apps/server/src/database/migrations/20260329T163516-add-new-indexes.ts

@@ -0,0 +1,333 @@
+import { type Kysely, sql } from 'kysely';
+
+export async function up(db: Kysely<any>): Promise<void> {
+  await db.schema
+    .createIndex('idx_group_users_user_id')
+    .ifNotExists()
+    .on('group_users')
+    .column('user_id')
+    .execute();
+
+  await db.schema
+    .createIndex('idx_space_members_user_id')
+    .ifNotExists()
+    .on('space_members')
+    .column('user_id')
+    .execute();
+
+  await db.schema
+    .createIndex('idx_space_members_group_id')
+    .ifNotExists()
+    .on('space_members')
+    .column('group_id')
+    .execute();
+
+  // Page tree
+  await sql`
+    CREATE INDEX IF NOT EXISTS idx_pages_space_parent_position
+    ON pages (space_id, parent_page_id, position COLLATE "C")
+    WHERE deleted_at IS NULL
+  `.execute(db);
+
+  await sql`
+    CREATE INDEX IF NOT EXISTS idx_pages_parent_page_id
+    ON pages (parent_page_id)
+    WHERE deleted_at IS NULL
+  `.execute(db);
+
+  // Recent pages query
+  await sql`
+    CREATE INDEX IF NOT EXISTS idx_pages_space_updated
+    ON pages (space_id, updated_at DESC)
+    WHERE deleted_at IS NULL
+  `.execute(db);
+
+  // Trash view
+  await sql`
+    CREATE INDEX IF NOT EXISTS idx_pages_space_deleted
+    ON pages (space_id, deleted_at DESC)
+    WHERE deleted_at IS NOT NULL
+  `.execute(db);
+
+  await sql`
+    CREATE UNIQUE INDEX IF NOT EXISTS idx_workspaces_hostname_lower
+    ON workspaces (LOWER(hostname))
+  `.execute(db);
+
+  await db.schema
+    .createIndex('idx_workspaces_created_at')
+    .ifNotExists()
+    .on('workspaces')
+    .column('created_at')
+    .execute();
+
+  await db.schema
+    .createIndex('idx_users_workspace_deleted')
+    .ifNotExists()
+    .on('users')
+    .columns(['workspace_id', 'deleted_at'])
+    .execute();
+
+  await sql`
+    CREATE UNIQUE INDEX IF NOT EXISTS idx_spaces_slug_lower_workspace
+    ON spaces (LOWER(slug), workspace_id)
+  `.execute(db);
+
+  await db.schema
+    .createIndex('idx_spaces_workspace_id')
+    .ifNotExists()
+    .on('spaces')
+    .column('workspace_id')
+    .execute();
+
+  await sql`
+    CREATE UNIQUE INDEX IF NOT EXISTS idx_groups_name_lower_workspace
+    ON groups (LOWER(name), workspace_id)
+  `.execute(db);
+
+  await db.schema
+    .createIndex('idx_groups_workspace_id')
+    .ifNotExists()
+    .on('groups')
+    .column('workspace_id')
+    .execute();
+
+  await db.schema
+    .createIndex('idx_shares_page_id')
+    .ifNotExists()
+    .on('shares')
+    .column('page_id')
+    .execute();
+
+  await db.schema
+    .createIndex('idx_attachments_page_id')
+    .ifNotExists()
+    .on('attachments')
+    .column('page_id')
+    .execute();
+
+  await db.schema
+    .createIndex('idx_attachments_space_id')
+    .ifNotExists()
+    .on('attachments')
+    .column('space_id')
+    .execute();
+
+  await db.schema
+    .createIndex('idx_comments_page_id')
+    .ifNotExists()
+    .on('comments')
+    .column('page_id')
+    .execute();
+
+  await db.schema
+    .createIndex('idx_comments_parent_comment_id')
+    .ifNotExists()
+    .on('comments')
+    .column('parent_comment_id')
+    .execute();
+
+  await sql`
+    CREATE INDEX IF NOT EXISTS idx_page_history_page_created
+    ON page_history (page_id, created_at DESC)
+  `.execute(db);
+
+  await db.schema
+    .createIndex('idx_attachments_workspace_id')
+    .ifNotExists()
+    .on('attachments')
+    .column('workspace_id')
+    .execute();
+
+  await db.schema
+    .createIndex('idx_backlinks_target_page_id')
+    .ifNotExists()
+    .on('backlinks')
+    .column('target_page_id')
+    .execute();
+
+  await db.schema
+    .createIndex('idx_pages_workspace_id')
+    .ifNotExists()
+    .on('pages')
+    .column('workspace_id')
+    .execute();
+
+  await db.schema
+    .createIndex('idx_pages_creator_id')
+    .ifNotExists()
+    .on('pages')
+    .column('creator_id')
+    .execute();
+
+  // Notifications: FK cascade from pages, spaces, comments
+  await db.schema
+    .createIndex('idx_notifications_page_id')
+    .ifNotExists()
+    .on('notifications')
+    .column('page_id')
+    .execute();
+
+  await db.schema
+    .createIndex('idx_notifications_space_id')
+    .ifNotExists()
+    .on('notifications')
+    .column('space_id')
+    .execute();
+
+  await db.schema
+    .createIndex('idx_notifications_comment_id')
+    .ifNotExists()
+    .on('notifications')
+    .column('comment_id')
+    .execute();
+
+  // Watchers: cleanup queries and FK cascade
+  await db.schema
+    .createIndex('idx_watchers_user_workspace')
+    .ifNotExists()
+    .on('watchers')
+    .columns(['user_id', 'workspace_id'])
+    .execute();
+
+  await db.schema
+    .createIndex('idx_watchers_space_id')
+    .ifNotExists()
+    .on('watchers')
+    .column('space_id')
+    .execute();
+
+  // Auth providers: all queries filter by workspaceId
+  await db.schema
+    .createIndex('idx_auth_providers_workspace_id')
+    .ifNotExists()
+    .on('auth_providers')
+    .column('workspace_id')
+    .execute();
+
+  // Auth accounts: SSO login lookup by provider user
+  await db.schema
+    .createIndex('idx_auth_accounts_provider_user_id')
+    .ifNotExists()
+    .on('auth_accounts')
+    .columns(['provider_user_id', 'auth_provider_id'])
+    .execute();
+
+  // Workspace invitations: listing and SSO lookup
+  await db.schema
+    .createIndex('idx_workspace_invitations_workspace_id')
+    .ifNotExists()
+    .on('workspace_invitations')
+    .column('workspace_id')
+    .execute();
+
+  // API keys: query and FK cascade
+  await db.schema
+    .createIndex('idx_api_keys_workspace_id')
+    .ifNotExists()
+    .on('api_keys')
+    .column('workspace_id')
+    .execute();
+
+  // User sessions: delete queries and FK cascade on all session states
+  await db.schema
+    .createIndex('idx_user_sessions_user_workspace')
+    .ifNotExists()
+    .on('user_sessions')
+    .columns(['user_id', 'workspace_id'])
+    .execute();
+}
+
+export async function down(db: Kysely<any>): Promise<void> {
+  await db.schema.dropIndex('idx_group_users_user_id').ifExists().execute();
+  await db.schema.dropIndex('idx_space_members_user_id').ifExists().execute();
+  await db.schema.dropIndex('idx_space_members_group_id').ifExists().execute();
+  await db.schema
+    .dropIndex('idx_pages_space_parent_position')
+    .ifExists()
+    .execute();
+  await db.schema.dropIndex('idx_pages_parent_page_id').ifExists().execute();
+  await db.schema.dropIndex('idx_pages_space_updated').ifExists().execute();
+  await db.schema.dropIndex('idx_pages_space_deleted').ifExists().execute();
+  await db.schema
+    .dropIndex('idx_workspaces_hostname_lower')
+    .ifExists()
+    .execute();
+  await db.schema.dropIndex('idx_workspaces_created_at').ifExists().execute();
+  await db.schema
+    .dropIndex('idx_users_workspace_deleted')
+    .ifExists()
+    .execute();
+  await db.schema
+    .dropIndex('idx_spaces_slug_lower_workspace')
+    .ifExists()
+    .execute();
+  await db.schema
+    .dropIndex('idx_spaces_workspace_id')
+    .ifExists()
+    .execute();
+  await db.schema
+    .dropIndex('idx_groups_name_lower_workspace')
+    .ifExists()
+    .execute();
+  await db.schema.dropIndex('idx_groups_workspace_id').ifExists().execute();
+  await db.schema.dropIndex('idx_shares_page_id').ifExists().execute();
+  await db.schema.dropIndex('idx_attachments_page_id').ifExists().execute();
+  await db.schema.dropIndex('idx_attachments_space_id').ifExists().execute();
+  await db.schema.dropIndex('idx_comments_page_id').ifExists().execute();
+  await db.schema
+    .dropIndex('idx_comments_parent_comment_id')
+    .ifExists()
+    .execute();
+  await db.schema
+    .dropIndex('idx_page_history_page_created')
+    .ifExists()
+    .execute();
+  await db.schema
+    .dropIndex('idx_attachments_workspace_id')
+    .ifExists()
+    .execute();
+  await db.schema
+    .dropIndex('idx_backlinks_target_page_id')
+    .ifExists()
+    .execute();
+  await db.schema.dropIndex('idx_pages_workspace_id').ifExists().execute();
+  await db.schema.dropIndex('idx_pages_creator_id').ifExists().execute();
+  await db.schema
+    .dropIndex('idx_notifications_page_id')
+    .ifExists()
+    .execute();
+  await db.schema
+    .dropIndex('idx_notifications_space_id')
+    .ifExists()
+    .execute();
+  await db.schema
+    .dropIndex('idx_notifications_comment_id')
+    .ifExists()
+    .execute();
+  await db.schema
+    .dropIndex('idx_watchers_user_workspace')
+    .ifExists()
+    .execute();
+  await db.schema.dropIndex('idx_watchers_space_id').ifExists().execute();
+  await db.schema
+    .dropIndex('idx_auth_providers_workspace_id')
+    .ifExists()
+    .execute();
+  await db.schema
+    .dropIndex('idx_auth_accounts_provider_user_id')
+    .ifExists()
+    .execute();
+  await db.schema
+    .dropIndex('idx_workspace_invitations_workspace_id')
+    .ifExists()
+    .execute();
+  await db.schema
+    .dropIndex('idx_api_keys_workspace_id')
+    .ifExists()
+    .execute();
+  await db.schema
+    .dropIndex('idx_user_sessions_user_workspace')
+    .ifExists()
+    .execute();
+}

apps/server/src/integrations/export/export.controller.ts

@@ -61,7 +61,7 @@ export class ExportController {
 
     await this.pageAccessService.validateCanView(page, user);
 
-    const zipFileStream = await this.exportService.exportPages(
+    const result = await this.exportService.exportPages(
       dto.pageId,
       dto.format,
       dto.includeAttachments,
@@ -83,15 +83,29 @@ export class ExportController {
       },
     });
 
-    const fileName = sanitize(page.title || 'untitled') + '.zip';
+    if (result.type === 'file') {
+      const ext = getExportExtension(dto.format);
+      const fileName = sanitize(page.title || 'untitled') + ext;
+      const contentType = getMimeType(path.extname(fileName));
 
-    res.headers({
+      res.headers({
-      'Content-Type': 'application/zip',
+        'Content-Type': contentType,
-      'Content-Disposition':
+        'Content-Disposition':
-        'attachment; filename="' + encodeURIComponent(fileName) + '"',
+          'attachment; filename="' + encodeURIComponent(fileName) + '"',
-    });
+      });
 
-    res.send(zipFileStream);
+      res.send(result.content);
+    } else {
+      const fileName = sanitize(page.title || 'untitled') + '.zip';
+
+      res.headers({
+        'Content-Type': 'application/zip',
+        'Content-Disposition':
+          'attachment; filename="' + encodeURIComponent(fileName) + '"',
+      });
+
+      res.send(result.stream);
+    }
   }
 
   @UseGuards(JwtAuthGuard)

apps/server/src/integrations/export/export.service.ts

@@ -150,6 +150,13 @@ export class ExportService {
     // set to null to make export of pages with parentId work
     pages[parentPageIndex].parentPageId = null;
 
+    const isSinglePage = pages.length === 1 && !includeAttachments;
+
+    if (isSinglePage) {
+      const pageContent = await this.exportPage(format, pages[0], true);
+      return { type: 'file' as const, content: pageContent, page: pages[0] };
+    }
+
     const tree = buildTree(pages as Page[]);
 
     const baseUrl = await this.getWorkspaceBaseUrl(pages[0].workspaceId);
@@ -170,7 +177,7 @@ export class ExportService {
       compression: 'DEFLATE',
     });
 
-    return zipFile;
+    return { type: 'zip' as const, stream: zipFile, page: pages[0] };
   }
 
   async exportSpace(

packages/editor-ext/package.json

@@ -9,5 +9,7 @@
   "main": "dist/index.js",
   "module": "./src/index.ts",
   "types": "dist/index.d.ts",
-  "dependencies": {}
+  "dependencies": {
+    "marked": "17.0.5"
+  }
 }

packages/editor-ext/src/lib/markdown/utils/marked.utils.ts

@@ -5,18 +5,23 @@ import { mathInlineExtension } from "./math-inline.marked";
 
 marked.use({
   renderer: {
-    // @ts-ignore
+    list({ ordered, start, items }) {
-    list(body: string, isOrdered: boolean, start: number) {
+      let body = "";
-      if (isOrdered) {
+      for (const item of items) {
-        const startAttr = start !== 1 ? ` start="${start}"` : "";
+        body += this.listitem(item);
-        return `<ol ${startAttr}>\n${body}</ol>\n`;
       }
 
-      const dataType = body.includes(`<input`) ? ' data-type="taskList"' : "";
+      if (ordered) {
+        const startAttr = start !== 1 ? ` start="${start}"` : "";
+        return `<ol${startAttr}>\n${body}</ol>\n`;
+      }
+
+      const isTaskList = items.some((item) => item.task);
+      const dataType = isTaskList ? ' data-type="taskList"' : "";
       return `<ul${dataType}>\n${body}</ul>\n`;
     },
-    // @ts-ignore
+    listitem({ tokens, task: isTask, checked: isChecked }) {
-    listitem({ text, raw, task: isTask, checked: isChecked }): string {
+      const text = this.parser.parse(tokens);
       if (!isTask) {
         return `<li>${text}</li>\n`;
       }

packages/editor-ext/src/lib/markdown/utils/turndown.utils.ts

@@ -21,6 +21,7 @@ export function htmlToMarkdown(html: string): string {
     callout,
     preserveDetail,
     listParagraph,
+    orderedListItem,
     mathInline,
     mathBlock,
     iframeEmbed,
@@ -41,6 +42,40 @@ function listParagraph(turndownService: _TurndownService) {
   });
 }
 
+function orderedListItem(turndownService: _TurndownService) {
+  turndownService.addRule('orderedListItem', {
+    filter: function (node: HTMLInputElement) {
+      return node.nodeName === 'LI' && node.getAttribute('data-type') !== 'taskItem';
+    },
+    replacement: (content: string, node: HTMLInputElement, options: any) => {
+      const parent = node.parentNode as HTMLElement;
+      if (parent.nodeName !== 'OL' && parent.nodeName !== 'UL') {
+        return content;
+      }
+
+      content = content
+        .replace(/^\n+/, '')
+        .replace(/\n+$/, '\n')
+        .replace(/\n/gm, '\n  ');
+
+      let prefix: string;
+      if (parent.nodeName === 'OL') {
+        const start = parseInt(parent.getAttribute('start') || '1', 10);
+        const index = Array.prototype.indexOf.call(parent.children, node);
+        prefix = `${start + index}. `;
+      } else {
+        prefix = `${options.bulletListMarker} `;
+      }
+
+      return (
+        prefix +
+        content +
+        (node.nextSibling && !/\n$/.test(content) ? '\n' : '')
+      );
+    },
+  });
+}
+
 function callout(turndownService: _TurndownService) {
   turndownService.addRule('callout', {
     filter: function (node: HTMLInputElement) {
@@ -63,25 +98,17 @@ function taskList(turndownService: _TurndownService) {
         node.parentNode.nodeName === 'UL'
       );
     },
-    replacement: function (content: string, node: HTMLInputElement) {
+    replacement: function (_content: string, node: HTMLInputElement) {
-      const checkbox = node.querySelector(
+      const isChecked = node.getAttribute('data-checked') === 'true';
-        'input[type="checkbox"]',
+      const div = node.querySelector('div');
-      ) as HTMLInputElement;
+      const text = div ? div.textContent.trim() : node.textContent.trim();
-      const isChecked = checkbox.checked;
 
-      // Process content like regular list items
-      content = content
-        .replace(/^\n+/, '') // remove leading newlines
-        .replace(/\n+$/, '\n') // replace trailing newlines with just a single one
-        .replace(/\n/gm, '\n  '); // indent nested content with 2 spaces
-
-      // Create the checkbox prefix
       const prefix = `- ${isChecked ? '[x]' : '[ ]'} `;
 
       return (
         prefix +
-        content +
+        text +
-        (node.nextSibling && !/\n$/.test(content) ? '\n' : '')
+        (node.nextSibling && !/\n$/.test(text) ? '\n' : '')
       );
     },
   });

pnpm-lock.yaml

@@ -801,7 +801,11 @@ importers:
         specifier: ^8.57.1
         version: 8.57.1(eslint@9.39.4(jiti@2.4.2))(typescript@5.9.3)
 
-  packages/editor-ext: {}
+  packages/editor-ext:
+    dependencies:
+      marked:
+        specifier: 17.0.5
+        version: 17.0.5
 
 packages: