Fix recent issue regressions

callumalpass · callumalpass · commit edf0cae94993 · 2026-04-26T19:43:16.000+10:00
diff --git a/docs/releases/unreleased.md b/docs/releases/unreleased.md
@@ -40,6 +40,12 @@ Example:
 
 ## Fixed
 
+- (#1778) Fixed MCP initialize requests using newer protocol versions such as `2025-11-25` failing instead of negotiating down to TaskNotes' supported MCP version.
+  - Thanks to @SakulaPor for reporting.
+- (#1781) Fixed duplicate metadata properties on Bases task cards when bare and `note.`-prefixed property IDs map to the same TaskNotes field.
+  - Thanks to @loukandr for reporting and tracing the issue.
+- (#1787) Removed the "(click to change)" helper text from recurrence tooltips on task cards.
+  - Thanks to @kazerniel for reporting.
 - (#1828) Fixed subtask creation from a task card dropping the parent task project when natural-language input also adds projects.
   - Thanks to @prepare4robots for reporting.
 - (#1786) Fixed TaskNotes task cards and relationships/subtasks widgets appearing inside embedded task-note heading or block sections.
@@ -63,7 +69,8 @@ Example:
   - Thanks to @martin-forge for reporting and the PR.
 - (#1764) Fixed Google Calendar sync using stale task metadata after rapid task updates, and fixed late recurring completions/skips recording the completion day instead of the scheduled occurrence date.
   - Thanks to @martin-forge for the PR and to @jpmoo for reporting the recurring completion issues.
-- Fixed CI test runs resolving the NLP parser package from a local sibling checkout instead of the published dependency.
+- (#1782) Fixed CI test runs resolving the NLP parser package from a local sibling checkout instead of the published dependency.
+  - Thanks to @martin-forge for reporting.
 - Published [`mdbase-tasknotes`](https://github.com/callumalpass/mdbase-tasknotes) 0.1.3 with compatibility fixes for TaskNotes-generated mdbase schemas.
   - Includes clearer create-path diagnostics, natural-language `mtn list --due` filters, timer log datetime filters, home-directory path expansion, project wikilink preservation, and correct `mtn --version` reporting.
   - Thanks to @tparsons9, @anomatomato, @npondel, @plashal, and @waspeer for the reports and PR.
diff --git a/src/bases/PropertyMappingService.ts b/src/bases/PropertyMappingService.ts
@@ -213,10 +213,23 @@ export class PropertyMappingService {
 	 * Simply maps each property - no filtering.
 	 * If a property is in the Bases config, it will be shown.
 	 *
-	 * @param basesPropertyIds - Property IDs from Bases config
-	 * @returns TaskCard property IDs for rendering
-	 */
-	mapVisibleProperties(basesPropertyIds: string[]): TaskCardPropertyId[] {
-		return basesPropertyIds.map((id) => this.basesToTaskCardProperty(id));
-	}
-}
+	 * @param basesPropertyIds - Property IDs from Bases config
+	 * @returns TaskCard property IDs for rendering
+	 */
+	mapVisibleProperties(basesPropertyIds: string[]): TaskCardPropertyId[] {
+		const seen = new Set<TaskCardPropertyId>();
+		const visibleProperties: TaskCardPropertyId[] = [];
+
+		for (const id of basesPropertyIds) {
+			const mappedId = this.basesToTaskCardProperty(id);
+			if (seen.has(mappedId)) {
+				continue;
+			}
+
+			seen.add(mappedId);
+			visibleProperties.push(mappedId);
+		}
+
+		return visibleProperties;
+	}
+}
diff --git a/src/i18n/resources/de.ts b/src/i18n/resources/de.ts
@@ -2940,7 +2940,7 @@ export const de: TranslationTree = {
 			blockingToggle: "Blockiert {count} Aufgaben",
 			priorityAriaLabel: "Priorität: {label}",
 			taskOptions: "Aufgabenoptionen",
-			recurrenceTooltip: "{label}: {value} (zum Ändern klicken)",
+			recurrenceTooltip: "{label}: {value}",
 			reminderTooltipOne: "1 Erinnerung gesetzt (zum Verwalten klicken)",
 			reminderTooltipMany: "{count} Erinnerungen gesetzt (zum Verwalten klicken)",
 			projectTooltip: "Diese Aufgabe wird als Projekt verwendet (zum Filtern von Unteraufgaben klicken)",
diff --git a/src/i18n/resources/en.ts b/src/i18n/resources/en.ts
@@ -3013,7 +3013,7 @@ export const en: TranslationTree = {
 			blockingToggle: "Blocking {count} tasks",
 			priorityAriaLabel: "Priority: {label}",
 			taskOptions: "Task options",
-			recurrenceTooltip: "{label}: {value} (click to change)",
+			recurrenceTooltip: "{label}: {value}",
 			reminderTooltipOne: "1 reminder set (click to manage)",
 			reminderTooltipMany: "{count} reminders set (click to manage)",
 			projectTooltip: "This task is used as a project (click to filter subtasks)",
diff --git a/src/i18n/resources/es.ts b/src/i18n/resources/es.ts
@@ -2940,7 +2940,7 @@ export const es: TranslationTree = {
 			blockingToggle: "Bloqueando {count} tareas",
 			priorityAriaLabel: "Prioridad: {label}",
 			taskOptions: "Opciones de tarea",
-			recurrenceTooltip: "{label}: {value} (clic para cambiar)",
+			recurrenceTooltip: "{label}: {value}",
 			reminderTooltipOne: "1 recordatorio configurado (clic para gestionar)",
 			reminderTooltipMany: "{count} recordatorios configurados (clic para gestionar)",
 			projectTooltip: "Esta tarea se usa como proyecto (clic para filtrar subtareas)",
diff --git a/src/i18n/resources/fr.ts b/src/i18n/resources/fr.ts
@@ -2940,7 +2940,7 @@ export const fr: TranslationTree = {
 			blockingToggle: "Bloque {count} tâches",
 			priorityAriaLabel: "Priorité : {label}",
 			taskOptions: "Options de tâche",
-			recurrenceTooltip: "{label}: {value} (cliquer pour modifier)",
+			recurrenceTooltip: "{label}: {value}",
 			reminderTooltipOne: "1 rappel défini (cliquer pour gérer)",
 			reminderTooltipMany: "{count} rappels définis (cliquer pour gérer)",
 			projectTooltip: "Cette tâche est utilisée comme projet (cliquer pour filtrer les sous-tâches)",
diff --git a/src/i18n/resources/ja.ts b/src/i18n/resources/ja.ts
@@ -2940,7 +2940,7 @@ export const ja: TranslationTree = {
 			blockingToggle: "{count} 件のタスクをブロック",
 			priorityAriaLabel: "優先度: {label}",
 			taskOptions: "タスクオプション",
-			recurrenceTooltip: "{label}: {value} (クリックして変更)",
+			recurrenceTooltip: "{label}: {value}",
 			reminderTooltipOne: "リマインダーが1件設定されています (クリックして管理)",
 			reminderTooltipMany: "{count}件のリマインダーが設定されています (クリックして管理)",
 			projectTooltip: "このタスクはプロジェクトとして使用されています（サブタスクをフィルタするにはクリック）",
diff --git a/src/i18n/resources/ko.ts b/src/i18n/resources/ko.ts
@@ -2894,7 +2894,7 @@ export const ko: TranslationTree = {
 			blockingToggle: "{count}개의 작업을 차단 중",
 			priorityAriaLabel: "우선순위: {label}",
 			taskOptions: "작업 옵션",
-			recurrenceTooltip: "{label}: {value} (변경하려면 클릭)",
+			recurrenceTooltip: "{label}: {value}",
 			reminderTooltipOne: "알림 1개 설정됨 (관리하려면 클릭)",
 			reminderTooltipMany: "{count}개 알림 설정됨 (관리하려면 클릭)",
 			projectTooltip: "이 작업은 프로젝트로 사용됩니다 (하위 작업을 필터링하려면 클릭)",
diff --git a/src/i18n/resources/pt.ts b/src/i18n/resources/pt.ts
@@ -2954,7 +2954,7 @@ export const pt: TranslationTree = {
 			blockingToggle: "Bloqueando {count} tarefas",
 			priorityAriaLabel: "Prioridade: {label}",
 			taskOptions: "Opções da tarefa",
-			recurrenceTooltip: "{label}: {value} (clique para alterar)",
+			recurrenceTooltip: "{label}: {value}",
 			reminderTooltipOne: "1 lembrete definido (clique para gerenciar)",
 			reminderTooltipMany: "{count} lembretes definidos (clique para gerenciar)",
 			projectTooltip: "Esta tarefa é usada como projeto (clique para filtrar subtarefas)",
diff --git a/src/i18n/resources/ru.ts b/src/i18n/resources/ru.ts
@@ -2940,7 +2940,7 @@ export const ru: TranslationTree = {
 			blockingToggle: "Блокирует {count} задач",
 			priorityAriaLabel: "Приоритет: {label}",
 			taskOptions: "Параметры задачи",
-			recurrenceTooltip: "{label}: {value} (нажмите, чтобы изменить)",
+			recurrenceTooltip: "{label}: {value}",
 			reminderTooltipOne: "1 напоминание установлено (нажмите, чтобы управлять)",
 			reminderTooltipMany: "{count} напоминаний установлено (нажмите, чтобы управлять)",
 			projectTooltip: "Эта задача используется как проект (нажмите, чтобы отфильтровать подзадачи)",
diff --git a/src/i18n/resources/zh.ts b/src/i18n/resources/zh.ts
@@ -2939,7 +2939,7 @@ export const zh: TranslationTree = {
 			blockingToggle: "阻塞 {count} 个任务",
 			priorityAriaLabel: "优先级: {label}",
 			taskOptions: "任务选项",
-			recurrenceTooltip: "{label}: {value}（点击更改）",
+			recurrenceTooltip: "{label}: {value}",
 			reminderTooltipOne: "已设置 1 个提醒（点击管理）",
 			reminderTooltipMany: "已设置 {count} 个提醒（点击管理）",
 			projectTooltip: "此任务用作项目（点击可筛选子任务）",
diff --git a/src/services/MCPService.ts b/src/services/MCPService.ts
@@ -24,6 +24,10 @@ import {
 } from "../utils/timeTrackingUtils";
 import { collectCalendarEvents } from "../utils/calendarUtils";
 import { buildTaskCreationDataFromParsed } from "../utils/buildTaskCreationDataFromParsed";
+import {
+	JsonRpcBody,
+	normalizeMcpInitializeProtocol,
+} from "./mcpProtocol";
 
 /**
  * MCP (Model Context Protocol) server for TaskNotes.
@@ -46,7 +50,7 @@ export class MCPService {
 	async handleRequest(
 		req: IncomingMessage,
 		res: ServerResponse,
-		parsedBody: Record<string, unknown>
+		parsedBody: JsonRpcBody
 	): Promise<void> {
 		if (req.method !== "POST") {
 			res.writeHead(405, { Allow: "POST" });
@@ -61,6 +65,8 @@ export class MCPService {
 		}
 
 		try {
+			normalizeMcpInitializeProtocol(parsedBody);
+
 			const transport = new StreamableHTTPServerTransport({
 				sessionIdGenerator: undefined, // stateless mode
 			});
diff --git a/src/services/mcpProtocol.ts b/src/services/mcpProtocol.ts
@@ -0,0 +1,30 @@
+export const TASKNOTES_MCP_PROTOCOL_VERSION = "2025-06-18";
+
+const TASKNOTES_SUPPORTED_MCP_PROTOCOL_VERSIONS = new Set([
+	TASKNOTES_MCP_PROTOCOL_VERSION,
+	"2025-03-26",
+	"2024-11-05",
+	"2024-10-07",
+]);
+
+export type JsonRpcBody = Record<string, unknown> | Record<string, unknown>[];
+
+export function normalizeMcpInitializeProtocol<T extends JsonRpcBody>(body: T): T {
+	const messages = Array.isArray(body) ? body : [body];
+
+	for (const message of messages) {
+		const params = message.params as Record<string, unknown> | undefined;
+		if (
+			message.method !== "initialize" ||
+			!params ||
+			typeof params.protocolVersion !== "string" ||
+			TASKNOTES_SUPPORTED_MCP_PROTOCOL_VERSIONS.has(params.protocolVersion)
+		) {
+			continue;
+		}
+
+		params.protocolVersion = TASKNOTES_MCP_PROTOCOL_VERSION;
+	}
+
+	return body;
+}
diff --git a/src/utils/viewOptimizations.ts b/src/utils/viewOptimizations.ts
@@ -113,7 +113,13 @@ export function shouldRefreshForPropertyBasedView(
  * This can be used by TaskListView, KanbanView, etc.
  */
 export async function selectiveUpdateForListView(
-	view: ItemView & { taskElements?: Map<string, HTMLElement>; plugin: TaskNotesPlugin },
+	view: ItemView & {
+		taskElements?: Map<string, HTMLElement>;
+		plugin: TaskNotesPlugin;
+		getCurrentVisibleProperties?: () => string[];
+		getVisibleProperties?: () => string[];
+		getVisiblePropertyLabels?: () => Record<string, string>;
+	},
 	taskPath: string,
 	operation: "update" | "delete" | "create"
 ): Promise<void> {
@@ -132,18 +138,22 @@ export async function selectiveUpdateForListView(
 				const updatedTask = await view.plugin.cacheManager.getTaskInfo(taskPath);
 				if (updatedTask) {
 					// Get visible properties from the view instead of extracting from DOM
-					const visibleProperties = (view as any).getCurrentVisibleProperties?.() || [
-						"due",
-						"scheduled",
-						"projects",
-						"contexts",
-						"tags",
-					];
+					const visibleProperties =
+						view.getCurrentVisibleProperties?.() ||
+						view.getVisibleProperties?.() || [
+							"due",
+							"scheduled",
+							"projects",
+							"contexts",
+							"tags",
+						];
+					const propertyLabels = view.getVisiblePropertyLabels?.();
 					await updateTaskElementInPlace(
 						taskElement,
 						updatedTask,
 						view.plugin,
-						visibleProperties
+						visibleProperties,
+						propertyLabels
 					);
 				} else {
 					// Task was deleted, remove from view
@@ -176,13 +186,14 @@ async function updateTaskElementInPlace(
 	element: HTMLElement,
 	taskInfo: TaskInfo,
 	plugin: TaskNotesPlugin,
-	visibleProperties: string[]
+	visibleProperties: string[],
+	propertyLabels?: Record<string, string>
 ): Promise<void> {
 	try {
 		// Use the existing updateTaskCard function if available
 		const { updateTaskCard } = await import("../ui/TaskCard");
 
-		updateTaskCard(element, taskInfo, plugin, visibleProperties);
+		updateTaskCard(element, taskInfo, plugin, visibleProperties, { propertyLabels });
 
 		// Add update animation
 		element.classList.add("task-card--updated");
diff --git a/tests/unit/issues/issue-1778-mcp-protocol-negotiation.test.ts b/tests/unit/issues/issue-1778-mcp-protocol-negotiation.test.ts
@@ -0,0 +1,63 @@
+import { normalizeMcpInitializeProtocol } from "../../../src/services/mcpProtocol";
+
+describe("Issue #1778: MCP initialize protocol negotiation", () => {
+	it("downgrades newer initialize protocol versions to TaskNotes' supported version", () => {
+		const body = {
+			jsonrpc: "2.0",
+			id: 1,
+			method: "initialize",
+			params: {
+				protocolVersion: "2025-11-25",
+				capabilities: {},
+				clientInfo: { name: "claude-desktop", version: "current" },
+			},
+		};
+
+		normalizeMcpInitializeProtocol(body);
+
+		expect(body.params.protocolVersion).toBe("2025-06-18");
+	});
+
+	it("leaves supported initialize protocol versions unchanged", () => {
+		const body = {
+			jsonrpc: "2.0",
+			id: 1,
+			method: "initialize",
+			params: {
+				protocolVersion: "2025-06-18",
+				capabilities: {},
+				clientInfo: { name: "test-client", version: "1.0.0" },
+			},
+		};
+
+		normalizeMcpInitializeProtocol(body);
+
+		expect(body.params.protocolVersion).toBe("2025-06-18");
+	});
+
+	it("handles batched messages without changing non-initialize requests", () => {
+		const body = [
+			{
+				jsonrpc: "2.0",
+				id: 1,
+				method: "tools/list",
+				params: { protocolVersion: "2025-11-25" },
+			},
+			{
+				jsonrpc: "2.0",
+				id: 2,
+				method: "initialize",
+				params: {
+					protocolVersion: "2025-11-25",
+					capabilities: {},
+					clientInfo: { name: "test-client", version: "1.0.0" },
+				},
+			},
+		];
+
+		normalizeMcpInitializeProtocol(body);
+
+		expect(body[0].params.protocolVersion).toBe("2025-11-25");
+		expect(body[1].params.protocolVersion).toBe("2025-06-18");
+	});
+});
diff --git a/tests/unit/issues/issue-1781-bases-card-metadata-dedupe.test.ts b/tests/unit/issues/issue-1781-bases-card-metadata-dedupe.test.ts
@@ -0,0 +1,28 @@
+import { PropertyMappingService } from "../../../src/bases/PropertyMappingService";
+
+describe("Issue #1781: Bases card metadata property dedupe", () => {
+	const fieldMapperStub = {
+		isRecognizedProperty: jest.fn((propertyId: string) =>
+			["due", "scheduled"].includes(propertyId)
+		),
+		getMapping: jest.fn(() => ({})),
+		toUserField: jest.fn((key: string) => key),
+		fromUserField: jest.fn(() => null),
+	};
+
+	it("deduplicates bare and note-prefixed properties after mapping", () => {
+		const mapper = new PropertyMappingService({} as any, fieldMapperStub as any);
+
+		expect(
+			mapper.mapVisibleProperties(["scheduled", "due", "note.due", "note.scheduled"])
+		).toEqual(["scheduled", "due"]);
+	});
+
+	it("preserves the first occurrence order for unique mapped properties", () => {
+		const mapper = new PropertyMappingService({} as any, fieldMapperStub as any);
+
+		expect(
+			mapper.mapVisibleProperties(["note.due", "scheduled", "file.tasks", "formula.checklistProgress"])
+		).toEqual(["due", "scheduled", "checklistProgress"]);
+	});
+});
diff --git a/tests/unit/issues/issue-1787-recurrence-tooltip-clutter.test.ts b/tests/unit/issues/issue-1787-recurrence-tooltip-clutter.test.ts
@@ -0,0 +1,41 @@
+/**
+ * Issue #1787: Remove "(click to change)" from recurrence display on task cards.
+ *
+ * @see https://github.com/callumalpass/tasknotes/issues/1787
+ */
+
+import { describe, expect, it } from "@jest/globals";
+import { en } from "../../../src/i18n/resources/en";
+import { getRecurrenceTooltip } from "../../../src/ui/taskCardHelpers";
+
+function createPlugin(): any {
+	return {
+		fieldMapper: {
+			lookupMappingKey: () => null,
+		},
+		i18n: {
+			translate: (key: string, vars?: Record<string, string | number>) => {
+				if (key === "ui.taskCard.labels.recurrence") {
+					return en.ui.taskCard.labels.recurrence;
+				}
+
+				if (key === "ui.taskCard.recurrenceTooltip") {
+					return en.ui.taskCard.recurrenceTooltip
+						.replace("{label}", String(vars?.label ?? ""))
+						.replace("{value}", String(vars?.value ?? ""));
+				}
+
+				return key;
+			},
+		},
+	};
+}
+
+describe("Issue #1787: recurrence tooltip clutter", () => {
+	it("does not include the click-to-change helper text", () => {
+		const tooltip = getRecurrenceTooltip(createPlugin(), "FREQ=DAILY");
+
+		expect(tooltip).toBe("Recurring: every day");
+		expect(tooltip).not.toContain("click to change");
+	});
+});
