@noteplanco/noteplan-mcp 1.1.21 → 1.1.24

package/dist/tools/notes.js

@@ -7,6 +7,8 @@ import { ensureTemplateFrontmatter } from './templates.js';
 import { issueConfirmationToken, validateAndConsumeConfirmationToken, } from '../utils/confirmation-tokens.js';
 import { parseParagraphLine, parseAllParagraphLines, buildParagraphLine } from '../noteplan/markdown-parser.js';
 import { normalizeFilename } from '../utils/filename-normalize.js';
+import { normalizePeriodicTitle, isCanonicalPeriodicTitle, parseFlexibleDate } from '../utils/date-utils.js';
+import { getBridgeClient } from '../transport/bridge-availability.js';
 function toBoundedInt(value, defaultValue, min, max) {
     const numeric = typeof value === 'number' ? value : Number(value);
     if (!Number.isFinite(numeric))
@@ -57,37 +59,37 @@ function confirmationFailureMessage(toolName, reason) {
     }
     return `Confirmation token is invalid for ${toolName}. ${refreshHint}`;
 }
-function resolveNoteTarget(id, filename, space) {
+async function resolveNoteTarget(id, filename, space) {
     const raw = (id && id.trim().length > 0 ? id : filename)?.trim();
     if (!raw) {
         return { identifier: '', note: null };
     }
     const identifier = normalizeFilename(raw);
     const note = id
-        ? store.getNote({ id: identifier, space }) ?? store.getNote({ filename: identifier, space })
-        : store.getNote({ filename: identifier, space });
+        ? (await await store.getNote({ id: identifier, space })) ?? (await await store.getNote({ filename: identifier, space }))
+        : await await store.getNote({ filename: identifier, space });
     return {
         identifier,
         note,
     };
 }
-export function resolveWritableNoteReference(input) {
+export async function resolveWritableNoteReference(input) {
     if (input.id && input.id.trim().length > 0) {
         const normalizedId = normalizeFilename(input.id.trim());
-        const note = store.getNote({ id: normalizedId, space: input.space?.trim() });
+        const note = await await store.getNote({ id: normalizedId, space: input.space?.trim() });
         return { note, error: note ? undefined : 'Note not found' };
     }
     if (input.filename && input.filename.trim().length > 0) {
         const normalizedFn = normalizeFilename(input.filename.trim());
-        const note = store.getNote({ filename: normalizedFn, space: input.space?.trim() });
+        const note = await await store.getNote({ filename: normalizedFn, space: input.space?.trim() });
         return { note, error: note ? undefined : 'Note not found' };
     }
     if (input.date && input.date.trim().length > 0) {
-        let note = store.getNote({ date: input.date.trim(), space: input.space?.trim() });
+        let note = await await store.getNote({ date: input.date.trim(), space: input.space?.trim() });
         if (!note) {
             // Auto-create calendar notes on the fly (matches NotePlan native behavior)
             try {
-                note = store.ensureCalendarNote(input.date.trim(), input.space?.trim());
+                note = await await store.ensureCalendarNote(input.date.trim(), input.space?.trim());
             }
             catch {
                 return { note: null, error: 'Failed to create calendar note for date' };
@@ -97,14 +99,14 @@ export function resolveWritableNoteReference(input) {
     }
     const textQuery = input.query?.trim() || input.title?.trim();
     if (textQuery) {
-        const resolved = resolveNote({
+        const resolved = (await resolveNote({
             query: textQuery,
             space: input.space?.trim(),
             types: ['note', 'calendar'],
             limit: 5,
             minScore: 0.88,
             ambiguityDelta: 0.06,
-        });
+        }));
         if (resolved.success !== true) {
             return { note: null, error: 'Could not resolve note query' };
         }
@@ -120,7 +122,7 @@ export function resolveWritableNoteReference(input) {
         if (!identifier) {
             return { note: null, error: 'Could not resolve note target' };
         }
-        const note = store.getNote({ id: identifier, space: input.space?.trim() }) ?? store.getNote({ filename: identifier, space: input.space?.trim() });
+        const note = (await await store.getNote({ id: identifier, space: input.space?.trim() })) ?? (await await store.getNote({ filename: identifier, space: input.space?.trim() }));
         return { note, error: note ? undefined : 'Resolved note no longer exists' };
     }
     return {
@@ -262,6 +264,11 @@ export const getNoteSchema = z.object({
         .optional()
         .default(280)
         .describe('Preview length when includeContent=false (default: 280)'),
+    format: z
+        .enum(['flat', 'lines', 'both'])
+        .optional()
+        .default('flat')
+        .describe('Response shape when includeContent=true. "flat" (default): only the joined "content" string — token-efficient, fine for reading. "lines": only the per-line "lines" array — use when you need line numbers for follow-up edits. "both": both fields (highest token cost; previous default).'),
 });
 export const listNotesSchema = z.object({
     folder: z
@@ -297,9 +304,17 @@ export const resolveNoteSchema = z.object({
         .describe('If top scores are within this delta, treat as ambiguous'),
 });
 export const createNoteSchema = z.object({
-    title: z.string().describe('Title for the new note'),
+    title: z.string().optional().describe('Title for the new note. Required for project notes. Ignored for calendar notes (their identifier comes from `date` or a periodic title).'),
+    date: z
+        .string()
+        .optional()
+        .describe('Periodic-note identifier — set this to create a calendar note at `Calendar/{date}.{ext}`. Accepts daily (`YYYY-MM-DD`, `YYYYMMDD`, `today`/`tomorrow`/`yesterday`), weekly (`YYYY-Www` — sloppy `2026-W4` is normalized to `2026-W04`), monthly (`YYYY-MM`), quarterly (`YYYY-Qn`), and yearly (`YYYY`). Title and folder are ignored when date is present.'),
+    filename: z
+        .string()
+        .optional()
+        .describe('Optional on-disk basename for the note (e.g. "_context.md"). Independent of title — the title still controls the H1 inside the file. Path separators are rejected; pass folder via the "folder" parameter. Extension is preserved if .md/.txt, otherwise the configured default extension is appended. Project notes only — space and calendar notes derive filenames automatically.'),
     content: z.string().optional().describe('Initial content for the note. Can include YAML frontmatter between --- delimiters for styling (icon, icon-color, bg-color, bg-color-dark, bg-pattern, status, priority, summary, type, domain)'),
-    folder: z.string().optional().describe('Folder to create the note in. Supports smart matching (e.g., "projects" matches "10 - Projects")'),
+    folder: z.string().optional().describe('Folder to create the note in. Supports smart matching (e.g., "projects" matches "10 - Projects"). Setting this to "Calendar" together with a periodic title (e.g. `2026-W16`) is treated as creating a calendar note.'),
     create_new_folder: z.boolean().optional().describe('Set to true to create a new folder instead of matching existing ones'),
     space: z.string().optional().describe('Space name or ID to create in (e.g., "My Team" or a UUID)'),
     noteType: z.enum(['note', 'template']).optional().default('note').describe('Type of note to create. Use "template" to create in @Templates with proper frontmatter'),
@@ -319,14 +334,6 @@ export const updateNoteSchema = z.object({
         .boolean()
         .optional()
         .describe('Required safety confirmation for whole-note rewrite. Must be true to proceed.'),
-    dryRun: z
-        .boolean()
-        .optional()
-        .describe('Preview full-rewrite impact and get confirmationToken without modifying the note'),
-    confirmationToken: z
-        .string()
-        .optional()
-        .describe('Confirmation token issued by dryRun for full note rewrite'),
     allowEmptyContent: z
         .boolean()
         .optional()
@@ -450,8 +457,8 @@ export const restoreNoteSchema = z.object({
     }
 });
 // Tool implementations
-export function getNote(params) {
-    const note = store.getNote(params);
+export async function getNote(params) {
+    const note = await store.getNote(params);
     if (!note) {
         return {
             success: false,
@@ -509,28 +516,44 @@ export function getNote(params) {
     result.limit = lineWindow.limit;
     result.hasMore = lineWindow.hasMore;
     result.nextCursor = lineWindow.nextCursor;
-    result.content = lineWindow.content;
-    result.lines = lineWindow.lines;
+    const format = params.format ?? 'flat';
+    if (format !== 'lines') {
+        result.content = lineWindow.content;
+    }
+    if (format !== 'flat') {
+        result.lines = lineWindow.lines;
+    }
     if (lineWindow.hasMore) {
         result.performanceHints = [NEXT_CURSOR_HINT];
     }
     return result;
 }
-export function listNotes(params) {
+export async function listNotes(params) {
     const input = params ?? {};
-    const notes = store.listNotes({
+    const notes = await store.listNotes({
         folder: input.folder,
         space: input.space,
     });
     const allowedTypes = input.types ? new Set(input.types) : null;
     const query = typeof input.query === 'string' ? input.query.trim().toLowerCase() : undefined;
+    // Pre-compute query tokens outside the per-note filter loop
+    const queryAlternatives = query
+        ? query.split('|').map((alt) => {
+            const words = alt.trim().replace(/_/g, ' ').split(/\s+/).filter(Boolean);
+            return words.length > 0 ? words : null;
+        }).filter((words) => words !== null)
+        : null;
     const filtered = notes.filter((note) => {
         if (allowedTypes && !allowedTypes.has(note.type))
             return false;
-        if (!query)
+        if (!queryAlternatives)
             return true;
-        const haystack = `${note.title} ${note.filename} ${note.folder || ''}`.toLowerCase();
-        return haystack.includes(query);
+        // Normalize underscores to spaces so "knuth_reviewer" matches "knuth reviewer"
+        const haystack = `${note.title} ${note.filename} ${note.folder || ''}`
+            .toLowerCase()
+            .replace(/_/g, ' ');
+        // OR across alternatives; AND within each alternative's words
+        return queryAlternatives.some((words) => words.every((word) => haystack.includes(word)));
     });
     const offset = toBoundedInt(input.cursor ?? input.offset, 0, 0, Number.MAX_SAFE_INTEGER);
     const limit = toBoundedInt(input.limit, 50, 1, 500);
@@ -590,7 +613,7 @@ function noteMatchScore(note, query, queryDateToken) {
         return 0.76;
     return 0;
 }
-export function resolveNote(params) {
+export async function resolveNote(params) {
     const query = typeof params?.query === 'string' ? params.query.trim() : '';
     if (!query) {
         return {
@@ -606,7 +629,7 @@ export function resolveNote(params) {
     const includeStageTimings = isDebugTimingsEnabled(params.debugTimings);
     const stageTimings = {};
     const listStart = Date.now();
-    const notes = store.listNotes({
+    const notes = await store.listNotes({
         folder: params.folder,
         space: params.space,
     });
@@ -703,17 +726,59 @@ export function resolveNote(params) {
     }
     return result;
 }
-export function createNote(params) {
+export async function createNote(params) {
     try {
+        // Auto-route to calendar only when intent is unambiguous. A project
+        // note titled "2026" would otherwise be hijacked, so sloppy variants
+        // (e.g. "2026-W4") require an explicit folder=Calendar or date.
+        const titlePeriodic = params.title ? normalizePeriodicTitle(params.title) : null;
+        const folderHintsCalendar = (params.folder ?? '').trim().toLowerCase() === 'calendar';
+        let calendarDate = null;
+        if (params.date) {
+            const normalizedDate = normalizePeriodicTitle(parseFlexibleDate(params.date));
+            if (!normalizedDate) {
+                throw new Error(`Invalid calendar date "${params.date}". Use a periodic identifier like "today", "2026-05-07", "20260507", "2026-W16", "2026-05", "2026-Q2", or "2026".`);
+            }
+            calendarDate = normalizedDate;
+        }
+        else if (folderHintsCalendar) {
+            if (!titlePeriodic) {
+                throw new Error('folder="Calendar" requires a periodic title (e.g. "2026-W16", "2026-05", "2026-Q2", "20260507") or pass `date` directly. Got title: ' +
+                    JSON.stringify(params.title ?? null));
+            }
+            calendarDate = titlePeriodic;
+        }
+        else if (params.title && isCanonicalPeriodicTitle(params.title)) {
+            calendarDate = params.title;
+        }
+        if (calendarDate) {
+            const result = await store.createNote(params.title ?? calendarDate, params.content, {
+                space: params.space,
+                filename: params.filename,
+                calendarDate,
+            });
+            return {
+                success: true,
+                tip: 'Calendar notes are auto-created when you write to them via noteplan_edit_content / noteplan_paragraphs with a `date` parameter — explicit create is rarely needed.',
+                note: {
+                    title: result.note.title,
+                    filename: result.note.filename,
+                    type: result.note.type,
+                    source: result.note.source,
+                    folder: result.note.folder,
+                },
+            };
+        }
         const isTemplate = params.noteType === 'template';
         const folder = isTemplate && !params.folder ? '@Templates' : params.folder;
         const content = isTemplate
-            ? ensureTemplateFrontmatter(params.title, params.content, params.templateTypes)
+            ? ensureTemplateFrontmatter(params.title ?? '', params.content, params.templateTypes)
             : params.content;
-        const result = store.createNote(params.title, content, {
+        const result = await store.createNote(params.title ?? '', content, {
             folder,
             space: params.space,
             createNewFolder: params.create_new_folder,
+            filename: params.filename,
         });
         return {
             success: true,
@@ -742,7 +807,7 @@ export function createNote(params) {
         };
     }
 }
-export function updateNote(params) {
+export async function updateNote(params) {
     try {
         if (params.fullReplace !== true) {
             return {
@@ -750,7 +815,7 @@ export function updateNote(params) {
                 error: 'Full note replacement is blocked for noteplan_update_note unless fullReplace=true. Prefer noteplan_search_paragraphs + noteplan_edit_line/insert_content/delete_lines for targeted edits.',
             };
         }
-        const noteRef = resolveWritableNoteReference(params);
+        const noteRef = await resolveWritableNoteReference(params);
         if (!noteRef.note) {
             return {
                 success: false,
@@ -765,45 +830,8 @@ export function updateNote(params) {
                 error: 'Empty content is blocked for noteplan_update_note. Use allowEmptyContent=true to override intentionally.',
             };
         }
-        // Use the resolved filename as the confirmation token target for consistency
-        const confirmationTarget = existingNote.filename;
-        if (isTrueBool(params.dryRun)) {
-            const token = issueConfirmationToken({
-                tool: 'noteplan_update_note',
-                target: confirmationTarget,
-                action: 'full_replace',
-            });
-            return {
-                success: true,
-                dryRun: true,
-                message: `Dry run: note ${existingNote.filename} would be fully replaced`,
-                note: {
-                    id: existingNote.id,
-                    title: existingNote.title,
-                    filename: existingNote.filename,
-                    type: existingNote.type,
-                    source: existingNote.source,
-                    folder: existingNote.folder,
-                    spaceId: existingNote.spaceId,
-                },
-                currentContentLength: existingNote.content.length,
-                newContentLength: params.content.length,
-                ...token,
-            };
-        }
-        const confirmation = validateAndConsumeConfirmationToken(params.confirmationToken, {
-            tool: 'noteplan_update_note',
-            target: confirmationTarget,
-            action: 'full_replace',
-        });
-        if (!confirmation.ok) {
-            return {
-                success: false,
-                error: confirmationFailureMessage('noteplan_update_note', confirmation.reason),
-            };
-        }
         const writeTarget = getWritableIdentifier(existingNote);
-        const note = store.updateNote(writeTarget.identifier, params.content, {
+        const note = await store.updateNote(writeTarget.identifier, params.content, {
             source: writeTarget.source,
         });
         return {
@@ -823,9 +851,9 @@ export function updateNote(params) {
         };
     }
 }
-export function deleteNote(params) {
+export async function deleteNote(params) {
     try {
-        const target = resolveNoteTarget(params.id, params.filename, params.space);
+        const target = await resolveNoteTarget(params.id, params.filename, params.space);
         const note = target.note;
         if (!note) {
             return {
@@ -866,7 +894,7 @@ export function deleteNote(params) {
                 error: confirmationFailureMessage('noteplan_delete_note', confirmation.reason),
             };
         }
-        const deleted = store.deleteNote(target.identifier);
+        const deleted = await store.deleteNote(target.identifier);
         return {
             success: true,
             message: deleted.source === 'space'
@@ -886,9 +914,9 @@ export function deleteNote(params) {
         };
     }
 }
-export function moveNote(params) {
+export async function moveNote(params) {
     try {
-        const noteRef = resolveWritableNoteReference(params);
+        const noteRef = await resolveWritableNoteReference(params);
         if (!noteRef.note) {
             return {
                 success: false,
@@ -897,7 +925,7 @@ export function moveNote(params) {
             };
         }
         const writable = getWritableIdentifier(noteRef.note);
-        const preview = store.previewMoveNote(writable.identifier, params.destinationFolder);
+        const preview = await store.previewMoveNote(writable.identifier, params.destinationFolder);
         const confirmationTarget = `${preview.fromFilename}=>${preview.toFilename}::${preview.destinationParentId ?? preview.destinationFolder}`;
         if (isTrueBool(params.dryRun)) {
             const token = issueConfirmationToken({
@@ -935,7 +963,7 @@ export function moveNote(params) {
                 error: confirmationFailureMessage('noteplan_move_note', confirmation.reason),
             };
         }
-        const moved = store.moveNote(writable.identifier, params.destinationFolder);
+        const moved = await store.moveNote(writable.identifier, params.destinationFolder);
         return {
             success: true,
             message: moved.note.source === 'space'
@@ -962,16 +990,16 @@ export function moveNote(params) {
         };
     }
 }
-export function restoreNote(params) {
+export async function restoreNote(params) {
     try {
-        const target = resolveNoteTarget(params.id, params.filename, params.space);
+        const target = await resolveNoteTarget(params.id, params.filename, params.space);
         if (!target.note) {
             return {
                 success: false,
                 error: 'Note not found',
             };
         }
-        const preview = store.previewRestoreNote(target.identifier, params.destinationFolder);
+        const preview = await store.previewRestoreNote(target.identifier, params.destinationFolder);
         const confirmationTarget = `${preview.fromIdentifier}=>${preview.toIdentifier}`;
         if (isTrueBool(params.dryRun)) {
             const token = issueConfirmationToken({
@@ -1009,7 +1037,7 @@ export function restoreNote(params) {
                 error: confirmationFailureMessage('noteplan_restore_note', confirmation.reason),
             };
         }
-        const restored = store.restoreNote(target.identifier, params.destinationFolder);
+        const restored = await store.restoreNote(target.identifier, params.destinationFolder);
         return {
             success: true,
             message: restored.source === 'space'
@@ -1035,10 +1063,10 @@ export function restoreNote(params) {
         };
     }
 }
-export function renameNoteFile(params) {
+export async function renameNoteFile(params) {
     try {
         // Resolve the note — supports id, filename, title, or query
-        const resolved = resolveWritableNoteReference(params);
+        const resolved = await resolveWritableNoteReference(params);
         if (!resolved.note) {
             return {
                 success: false,
@@ -1092,7 +1120,7 @@ export function renameNoteFile(params) {
                     error: confirmationFailureMessage('noteplan_rename_note_file', confirmation.reason),
                 };
             }
-            const renamed = store.renameSpaceNote(writeId, params.newTitle);
+            const renamed = await store.renameSpaceNote(writeId, params.newTitle);
             // Also update the # Title heading in the note content if it matches the old title
             if (renamed.note.content) {
                 const lines = renamed.note.content.split('\n');
@@ -1102,7 +1130,7 @@ export function renameNoteFile(params) {
                     if (oldHeadingTitle === renamed.fromTitle) {
                         lines[titleLineIndex] = `# ${params.newTitle}`;
                         const renamedWriteTarget = getWritableIdentifier(renamed.note);
-                        store.updateNote(renamedWriteTarget.identifier, lines.join('\n'), {
+                        await store.updateNote(renamedWriteTarget.identifier, lines.join('\n'), {
                             source: renamedWriteTarget.source,
                         });
                     }
@@ -1134,7 +1162,7 @@ export function renameNoteFile(params) {
             };
         }
         const keepExtension = params.keepExtension ?? true;
-        const preview = store.previewRenameNoteFile(note.filename, effectiveNewFilename, keepExtension);
+        const preview = await store.previewRenameNoteFile(note.filename, effectiveNewFilename, keepExtension);
         const confirmationTarget = `${preview.fromFilename}=>${preview.toFilename}`;
         if (isTrueBool(params.dryRun)) {
             const token = issueConfirmationToken({
@@ -1171,27 +1199,51 @@ export function renameNoteFile(params) {
                 error: confirmationFailureMessage('noteplan_rename_note_file', confirmation.reason),
             };
         }
-        const renamed = store.renameNoteFile(note.filename, effectiveNewFilename, keepExtension);
-        // Also update the # Title heading in the note content if it matches the old title
+        const renamed = await store.renameNoteFile(note.filename, effectiveNewFilename, keepExtension);
+        // Also update the # Title heading in the note content if it matches the old title.
+        // When the heading actually changes, propagate the rename to wikilinks across the
+        // vault via the bridge — matches what the NotePlan UI rename does.
         const newTitle = params.newTitle || params.newFilename;
+        let headingRewritten = false;
+        let oldHeadingTitle = null;
         if (newTitle && renamed.note.content) {
             const lines = renamed.note.content.split('\n');
             const titleLineIndex = lines.findIndex((l) => /^#\s+/.test(l));
             if (titleLineIndex !== -1) {
-                const oldHeadingTitle = lines[titleLineIndex].replace(/^#\s+/, '');
-                // Update heading if it matches the old note title (or old filename without extension)
+                const currentHeading = lines[titleLineIndex].replace(/^#\s+/, '');
                 const oldTitle = note.title || '';
                 const oldFilenameBase = note.filename.replace(/^.*\//, '').replace(/\.\w+$/, '');
-                if (oldHeadingTitle === oldTitle || oldHeadingTitle === oldFilenameBase) {
+                if (currentHeading === oldTitle || currentHeading === oldFilenameBase) {
                     lines[titleLineIndex] = `# ${newTitle}`;
                     const writeTarget = getWritableIdentifier(renamed.note);
-                    store.updateNote(writeTarget.identifier, lines.join('\n'), {
+                    await store.updateNote(writeTarget.identifier, lines.join('\n'), {
                         source: writeTarget.source,
                     });
+                    headingRewritten = true;
+                    oldHeadingTitle = currentHeading;
                 }
             }
         }
-        return {
+        let wikilinksUpdatedCount;
+        let wikilinkPropagationWarning;
+        if (headingRewritten && oldHeadingTitle && newTitle && oldHeadingTitle !== newTitle) {
+            const bridge = await getBridgeClient();
+            if (bridge) {
+                try {
+                    const res = await bridge.rewriteWikilinks(oldHeadingTitle, newTitle);
+                    wikilinksUpdatedCount = res.updatedCount;
+                }
+                catch (err) {
+                    wikilinkPropagationWarning =
+                        err instanceof Error ? err.message : 'Failed to update wikilinks';
+                }
+            }
+            else {
+                wikilinkPropagationWarning =
+                    'Wikilinks pointing to the old title were NOT updated because NotePlan is not running. Open NotePlan and re-run rename, or fix references manually.';
+            }
+        }
+        const result = {
             success: true,
             message: `Note renamed to ${renamed.toFilename}`,
             fromFilename: renamed.fromFilename,
@@ -1205,6 +1257,13 @@ export function renameNoteFile(params) {
                 folder: renamed.note.folder,
             },
         };
+        if (wikilinksUpdatedCount !== undefined) {
+            result.wikilinksUpdatedCount = wikilinksUpdatedCount;
+        }
+        if (wikilinkPropagationWarning) {
+            result.warnings = [wikilinkPropagationWarning];
+        }
+        return result;
     }
     catch (error) {
         return {
@@ -1304,8 +1363,8 @@ function annotateFromMeta(lineObj, meta) {
         ...(meta.scheduledDate !== undefined && { scheduledDate: meta.scheduledDate }),
     };
 }
-export function getParagraphs(params) {
-    const noteRef = resolveWritableNoteReference(params);
+export async function getParagraphs(params) {
+    const noteRef = await resolveWritableNoteReference(params);
     if (!noteRef.note) {
         return {
             success: false,
@@ -1401,7 +1460,7 @@ export function getParagraphs(params) {
     }
     return result;
 }
-export function searchParagraphs(params) {
+export async function searchParagraphs(params) {
     const query = typeof params?.query === 'string' ? params.query.trim() : '';
     if (!query) {
         return {
@@ -1415,7 +1474,7 @@ export function searchParagraphs(params) {
             error: 'Provide one note reference: id, title, filename, or date',
         };
     }
-    const note = store.getNote({
+    const note = await store.getNote({
         id: params.id,
         title: params.title,
         filename: params.filename,
@@ -1683,30 +1742,22 @@ export const replaceLinesSchema = z.object({
         .optional()
         .default('tabs')
         .describe('Indentation normalization for replacement list/task lines. Default: tabs'),
-    dryRun: z
-        .boolean()
-        .optional()
-        .describe('Preview line replacement and get confirmationToken without modifying the note'),
-    confirmationToken: z
-        .string()
-        .optional()
-        .describe('Confirmation token issued by dryRun for replace execution'),
     allowEmptyContent: z
         .boolean()
         .optional()
         .describe('Allow replacing selected lines with empty content (default: false). Prefer delete_lines for pure deletion.'),
 });
 // Granular note operation implementations
-export function setProperty(params) {
+export async function setProperty(params) {
     try {
-        const noteRef = resolveWritableNoteReference(params);
+        const noteRef = await resolveWritableNoteReference(params);
         if (!noteRef.note) {
             return { success: false, error: noteRef.error || 'Note not found', candidates: noteRef.candidates };
         }
         const note = noteRef.note;
         const newContent = frontmatter.setFrontmatterProperty(note.content, params.key, params.value);
         const writable = getWritableIdentifier(note);
-        store.updateNote(writable.identifier, newContent, { source: writable.source });
+        await store.updateNote(writable.identifier, newContent, { source: writable.source });
         return {
             success: true,
             message: `Property "${params.key}" set to "${params.value}"`,
@@ -1719,16 +1770,16 @@ export function setProperty(params) {
         };
     }
 }
-export function removeProperty(params) {
+export async function removeProperty(params) {
     try {
-        const noteRef = resolveWritableNoteReference(params);
+        const noteRef = await resolveWritableNoteReference(params);
         if (!noteRef.note) {
             return { success: false, error: noteRef.error || 'Note not found', candidates: noteRef.candidates };
         }
         const note = noteRef.note;
         const newContent = frontmatter.removeFrontmatterProperty(note.content, params.key);
         const writable = getWritableIdentifier(note);
-        store.updateNote(writable.identifier, newContent, { source: writable.source });
+        await store.updateNote(writable.identifier, newContent, { source: writable.source });
         return {
             success: true,
             message: `Property "${params.key}" removed`,
@@ -1741,9 +1792,9 @@ export function removeProperty(params) {
         };
     }
 }
-export function insertContent(params) {
+export async function insertContent(params) {
     try {
-        const resolved = resolveWritableNoteReference(params);
+        const resolved = await resolveWritableNoteReference(params);
         if (!resolved.note) {
             return {
                 success: false,
@@ -1807,7 +1858,7 @@ export function insertContent(params) {
             line: params.line,
         });
         const writeTarget = getWritableIdentifier(note);
-        store.updateNote(writeTarget.identifier, newContent, {
+        await store.updateNote(writeTarget.identifier, newContent, {
             source: writeTarget.source,
         });
         return {
@@ -1830,9 +1881,9 @@ export function insertContent(params) {
         };
     }
 }
-export function appendContent(params) {
+export async function appendContent(params) {
     try {
-        const resolved = resolveWritableNoteReference(params);
+        const resolved = await resolveWritableNoteReference(params);
         if (!resolved.note) {
             return {
                 success: false,
@@ -1848,7 +1899,7 @@ export function appendContent(params) {
             heading: params.heading,
         });
         const writeTarget = getWritableIdentifier(note);
-        store.updateNote(writeTarget.identifier, newContent, {
+        await store.updateNote(writeTarget.identifier, newContent, {
             source: writeTarget.source,
         });
         return {
@@ -1870,7 +1921,7 @@ export function appendContent(params) {
         };
     }
 }
-export function deleteLines(params) {
+export async function deleteLines(params) {
     try {
         // Validate required line params — MCP may deliver them as undefined when omitted
         const rawStart = params.startLine !== undefined && params.startLine !== null ? Number(params.startLine) : NaN;
@@ -1881,24 +1932,23 @@ export function deleteLines(params) {
         if (!Number.isFinite(rawEnd)) {
             return { success: false, error: 'endLine is required (1-indexed). Pass the same value as startLine to delete a single line.' };
         }
-        const resolved = resolveWritableNoteReference(params);
+        const resolved = await resolveWritableNoteReference(params);
         if (!resolved.note) {
             return { success: false, error: resolved.error || 'Note not found', candidates: resolved.candidates };
         }
         const note = resolved.note;
         const allLines = note.content.split('\n');
-        // Line numbers are absolute (1-indexed), matching get_notes/getParagraphs
         const totalLineCount = allLines.length;
         const fmLineCount = frontmatter.getFrontmatterLineCount(note.content);
-        const minLine = fmLineCount > 0 ? fmLineCount + 1 : 1;
-        const boundedStartLine = toBoundedInt(params.startLine, minLine, minLine, Math.max(minLine, totalLineCount));
-        const boundedEndLine = toBoundedInt(params.endLine, boundedStartLine, boundedStartLine, Math.max(boundedStartLine, totalLineCount));
-        if (boundedStartLine <= fmLineCount) {
+        if (fmLineCount > 0 && rawStart <= fmLineCount) {
             return {
                 success: false,
-                error: `Lines 1-${fmLineCount} are frontmatter and cannot be deleted. Content starts at line ${fmLineCount + 1}.`,
+                error: `Line ${rawStart} is inside frontmatter (lines 1-${fmLineCount}). Content starts at line ${fmLineCount + 1}.`,
             };
         }
+        const minLine = fmLineCount > 0 ? fmLineCount + 1 : 1;
+        const boundedStartLine = toBoundedInt(params.startLine, minLine, minLine, Math.max(minLine, totalLineCount));
+        const boundedEndLine = toBoundedInt(params.endLine, boundedStartLine, boundedStartLine, Math.max(boundedStartLine, totalLineCount));
         const lineCountToDelete = boundedEndLine - boundedStartLine + 1;
         const previewStartIndex = boundedStartLine - 1;
         const previewEndIndexExclusive = boundedEndLine;
@@ -1969,7 +2019,7 @@ export function deleteLines(params) {
         splicedLines.splice(boundedStartLine - 1, lineCountToDelete);
         const newContent = splicedLines.join('\n');
         const writeIdentifier = note.source === 'space' ? (note.id || note.filename) : note.filename;
-        store.updateNote(writeIdentifier, newContent, { source: note.source });
+        await store.updateNote(writeIdentifier, newContent, { source: note.source });
         return {
             success: true,
             message: `Lines ${boundedStartLine}-${boundedEndLine} deleted`,
@@ -1986,7 +2036,7 @@ export function deleteLines(params) {
         };
     }
 }
-export function editLine(params) {
+export async function editLine(params) {
     try {
         if (params.allowEmptyContent !== true && params.content.trim().length === 0) {
             return {
@@ -1994,7 +2044,7 @@ export function editLine(params) {
                 error: 'Empty line content is blocked for noteplan_edit_line. Use noteplan_delete_lines or set allowEmptyContent=true.',
             };
         }
-        const resolved = resolveWritableNoteReference(params);
+        const resolved = await resolveWritableNoteReference(params);
         if (!resolved.note) {
             return { success: false, error: resolved.error || 'Note not found', candidates: resolved.candidates };
         }
@@ -2033,7 +2083,7 @@ export function editLine(params) {
             warnings.push(buildAttachmentWarningMessage(removedAttachmentReferences.length));
         }
         const writeIdentifier = note.source === 'space' ? (note.id || note.filename) : note.filename;
-        store.updateNote(writeIdentifier, newContent, { source: note.source });
+        await store.updateNote(writeIdentifier, newContent, { source: note.source });
         return {
             success: true,
             message: `Line ${params.line} updated`,
@@ -2057,7 +2107,7 @@ export function editLine(params) {
         };
     }
 }
-export function replaceLines(params) {
+export async function replaceLines(params) {
     try {
         // Validate required line params — MCP may deliver them as undefined when omitted
         const rawStart = params.startLine !== undefined && params.startLine !== null ? Number(params.startLine) : NaN;
@@ -2068,24 +2118,23 @@ export function replaceLines(params) {
         if (!Number.isFinite(rawEnd)) {
             return { success: false, error: 'endLine is required (1-indexed). Pass the same value as startLine to replace a single line.' };
         }
-        const resolved = resolveWritableNoteReference(params);
+        const resolved = await resolveWritableNoteReference(params);
         if (!resolved.note) {
             return { success: false, error: resolved.error || 'Note not found', candidates: resolved.candidates };
         }
         const note = resolved.note;
         const allLines = note.content.split('\n');
         const originalLineCount = allLines.length;
-        // Line numbers are absolute (1-indexed), matching get_notes/getParagraphs
         const fmLineCount = frontmatter.getFrontmatterLineCount(note.content);
-        const minLine = fmLineCount > 0 ? fmLineCount + 1 : 1;
-        const boundedStartLine = toBoundedInt(params.startLine, minLine, minLine, Math.max(minLine, originalLineCount));
-        const boundedEndLine = toBoundedInt(params.endLine, boundedStartLine, boundedStartLine, Math.max(boundedStartLine, originalLineCount));
-        if (boundedStartLine <= fmLineCount) {
+        if (fmLineCount > 0 && rawStart <= fmLineCount) {
             return {
                 success: false,
-                error: `Lines 1-${fmLineCount} are frontmatter and cannot be replaced directly. Content starts at line ${fmLineCount + 1}.`,
+                error: `Line ${rawStart} is inside frontmatter (lines 1-${fmLineCount}). Content starts at line ${fmLineCount + 1}.`,
             };
         }
+        const minLine = fmLineCount > 0 ? fmLineCount + 1 : 1;
+        const boundedStartLine = toBoundedInt(params.startLine, minLine, minLine, Math.max(minLine, originalLineCount));
+        const boundedEndLine = toBoundedInt(params.endLine, boundedStartLine, boundedStartLine, Math.max(boundedStartLine, originalLineCount));
         let startIndex = boundedStartLine - 1;
         let lineCountToReplace = boundedEndLine - boundedStartLine + 1;
         const replacedText = allLines.slice(startIndex, boundedEndLine).join('\n');
@@ -2117,44 +2166,9 @@ export function replaceLines(params) {
         if (lineDelta !== 0) {
             warnings.push(`Line numbers shifted by ${lineDelta > 0 ? '+' : ''}${lineDelta} after this replacement. Re-read line numbers before the next mutation.`);
         }
-        const target = `${note.filename}:${boundedStartLine}-${boundedEndLine}:${replacementLines.length}:${normalized.content.length}`;
-        if (isTrueBool(params.dryRun)) {
-            const token = issueConfirmationToken({
-                tool: 'noteplan_replace_lines',
-                target,
-                action: 'replace_lines',
-            });
-            return {
-                success: true,
-                dryRun: true,
-                message: `Dry run: lines ${boundedStartLine}-${boundedEndLine} would be replaced`,
-                lineCountToReplace,
-                insertedLineCount: replacementLines.length,
-                lineDelta,
-                originalLineCount,
-                newLineCount,
-                indentationStyle,
-                linesRetabbed: normalized.linesRetabbed,
-                removedAttachmentReferences: removedAttachmentReferences.slice(0, 20),
-                removedAttachmentReferencesTruncated: removedAttachmentReferences.length > 20,
-                warnings: warnings.length > 0 ? warnings : undefined,
-                ...token,
-            };
-        }
-        const confirmation = validateAndConsumeConfirmationToken(params.confirmationToken, {
-            tool: 'noteplan_replace_lines',
-            target,
-            action: 'replace_lines',
-        });
-        if (!confirmation.ok) {
-            return {
-                success: false,
-                error: confirmationFailureMessage('noteplan_replace_lines', confirmation.reason),
-            };
-        }
         allLines.splice(startIndex, lineCountToReplace, ...replacementLines);
         const writeIdentifier = note.source === 'space' ? (note.id || note.filename) : note.filename;
-        store.updateNote(writeIdentifier, allLines.join('\n'), { source: note.source });
+        await store.updateNote(writeIdentifier, allLines.join('\n'), { source: note.source });
         return {
             success: true,
             message: `Lines ${boundedStartLine}-${boundedEndLine} replaced`,
@@ -2242,7 +2256,7 @@ export const searchParagraphsGlobalSchema = z.object({
     offset: z.number().min(0).optional().default(0).describe('Pagination offset'),
     cursor: z.string().optional().describe('Cursor token from previous page (preferred over offset)'),
 });
-export function searchParagraphsGlobal(params) {
+export async function searchParagraphsGlobal(params) {
     const query = typeof params?.query === 'string' ? params.query.trim() : '';
     if (!query) {
         return {
@@ -2264,7 +2278,7 @@ export function searchParagraphsGlobal(params) {
     const noteTypes = normalizeTypeList(params.noteTypes);
     const preferCalendar = params.preferCalendar === true;
     const periodicOnly = params.periodicOnly === true;
-    const allNotes = store.listNotes({
+    const allNotes = await store.listNotes({
         folder: params.folder,
         space: params.space,
     });