@mgcrea/mcp-apple-messages 1.16.0 → 1.18.0

package/dist/cli.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { A as MESSAGES_SURFACE, V as BUILD_INFO, a as loadConfig, r as createServer } from "./server-CIacos3P.js";
+import { A as MESSAGES_SURFACE, V as BUILD_INFO, a as loadConfig, r as createServer } from "./server-BdWRSEL0.js";
 import { runStdioServer } from "@mgcrea/mcp-apple-core";
 //#region src/cli.ts
 const LOG_PREFIX = "apple-messages-mcp";

package/dist/index.d.ts

@@ -132,6 +132,15 @@ type RangeQuery = {
   fromApple?: number | undefined;
   toApple?: number | undefined;
   includeReactions?: boolean | undefined;
+  /**
+   * Narrow to one direction in SQL.
+   *
+   * `find_codes` wants received messages only, and used to get there by
+   * fetching `limit` rows and discarding the sent ones AFTERWARDS — so a busy
+   * few minutes of the user's own replies could push the code being looked for
+   * off the end of a page that was never about it.
+   */
+  direction?: "sent" | "received" | undefined;
   limit: number;
 };
 /**
@@ -148,7 +157,17 @@ declare const COUNT_GROUP_FIELDS: readonly ["day", "month", "chat", "handle", "d
 type CountGroupField = (typeof COUNT_GROUP_FIELDS)[number];
 type CountQuery = {
   chatGuid?: string | undefined;
-  /** Substring of a handle — a phone number or an email address. */
+  /**
+   * Exact store handles to count, already resolved by the client.
+   *
+   * Preferred over `handle` below. The client resolves what the caller typed
+   * through the same last-nine-digits rule `send_message` uses, so
+   * "06 12 34 56 78" and "+33612345678" reach the same rows — which the
+   * substring match could not do, while `send_message`'s own description
+   * promises exactly that.
+   */
+  handles?: string[] | undefined;
+  /** Substring of a handle. Only used when nothing resolved — see `handles`. */
   handle?: string | undefined;
   direction?: "sent" | "received" | undefined;
   fromApple?: number | undefined;
@@ -433,6 +452,7 @@ declare class AppleMessagesClient {
     fromApple?: number | undefined;
     toApple?: number | undefined;
     includeReactions?: boolean | undefined;
+    direction?: "sent" | "received" | undefined;
     limit?: number | undefined;
   }): RenderedMessage[];
   searchMessages(query: string, limit?: number): RenderedMessage[];

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","names":[],"sources":["../src/build-info.ts","../src/config.ts","../src/client/locate.ts","../src/client/store.ts","../src/client/messages.ts","../src/client/dates.ts","../src/client/errors.ts","../src/client/ref.ts","../src/client/typedstream.ts","../src/client/jxa/core.ts","../src/client/jxa/write.ts","../src/server.ts","../src/tools/index.ts"],"mappings":"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"}
+{"version":3,"file":"index.d.ts","names":[],"sources":["../src/build-info.ts","../src/config.ts","../src/client/locate.ts","../src/client/store.ts","../src/client/messages.ts","../src/client/dates.ts","../src/client/errors.ts","../src/client/ref.ts","../src/client/typedstream.ts","../src/client/jxa/core.ts","../src/client/jxa/write.ts","../src/server.ts","../src/tools/index.ts"],"mappings":"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"}

package/dist/index.js

@@ -1,2 +1,2 @@
-import { A as MESSAGES_SURFACE, B as toAppleSeconds, C as locateStore, D as ChatNotFoundError, E as AppleMessagesError, F as SendTargetNotFoundError, I as CORE_DATA_EPOCH_OFFSET, L as appleSecondsSql, M as MessagesUnavailableError, N as SchemaDriftError, O as IndexUnavailableError, P as SendFailedError, R as fromAppleSeconds, S as defaultStorePath, T as PRELUDE, V as BUILD_INFO, _ as decodeMessageRef, a as loadConfig, b as ATTACHMENTS_RELATIVE, c as introspect, d as decodeAttributedBody, f as outline, g as decodeChatRef, h as MESSAGE_REF_VERSION, i as registerTools, j as MessageNotFoundError, k as MESSAGES_BUNDLE_ID, l as openStore, m as InvalidMessageRefError, n as SERVER_VERSION, o as AppleMessagesClient, p as CHAT_REF_VERSION, r as createServer, s as MessagesStore, t as SERVER_NAME, u as reactionLabel, v as encodeChatRef, w as SEND_MESSAGE, x as STORE_RELATIVE, y as encodeMessageRef, z as renderInstant } from "./server-CIacos3P.js";
+import { A as MESSAGES_SURFACE, B as toAppleSeconds, C as locateStore, D as ChatNotFoundError, E as AppleMessagesError, F as SendTargetNotFoundError, I as CORE_DATA_EPOCH_OFFSET, L as appleSecondsSql, M as MessagesUnavailableError, N as SchemaDriftError, O as IndexUnavailableError, P as SendFailedError, R as fromAppleSeconds, S as defaultStorePath, T as PRELUDE, V as BUILD_INFO, _ as decodeMessageRef, a as loadConfig, b as ATTACHMENTS_RELATIVE, c as introspect, d as decodeAttributedBody, f as outline, g as decodeChatRef, h as MESSAGE_REF_VERSION, i as registerTools, j as MessageNotFoundError, k as MESSAGES_BUNDLE_ID, l as openStore, m as InvalidMessageRefError, n as SERVER_VERSION, o as AppleMessagesClient, p as CHAT_REF_VERSION, r as createServer, s as MessagesStore, t as SERVER_NAME, u as reactionLabel, v as encodeChatRef, w as SEND_MESSAGE, x as STORE_RELATIVE, y as encodeMessageRef, z as renderInstant } from "./server-BdWRSEL0.js";
 export { ATTACHMENTS_RELATIVE, AppleMessagesClient, AppleMessagesError, BUILD_INFO, CHAT_REF_VERSION, CORE_DATA_EPOCH_OFFSET, ChatNotFoundError, IndexUnavailableError, InvalidMessageRefError, MESSAGES_BUNDLE_ID, MESSAGES_SURFACE, MESSAGE_REF_VERSION, MessageNotFoundError, MessagesStore, MessagesUnavailableError, PRELUDE, SEND_MESSAGE, SERVER_NAME, SERVER_VERSION, STORE_RELATIVE, SchemaDriftError, SendFailedError, SendTargetNotFoundError, appleSecondsSql, createServer, decodeAttributedBody, decodeChatRef, decodeMessageRef, defaultStorePath, encodeChatRef, encodeMessageRef, fromAppleSeconds, introspect, loadConfig, locateStore, openStore, outline, reactionLabel, registerTools, renderInstant, toAppleSeconds };

package/dist/{server-CIacos3P.js → server-BdWRSEL0.js}

@@ -1,4 +1,4 @@
-import { AppleAutomationError, AppleAutomationError as AppleMessagesError, BaseConfigSchema, CORE_DATA_EPOCH_OFFSET, IndexUnavailableError, IndexUnavailableError as IndexUnavailableError$1, PreconditionError, SchemaDriftError, SchemaDriftError as SchemaDriftError$1, columnsOf, confirmArg, createOsascriptRunner, describeAggregation, describeStore, escapeLike, extractCode, fail, fingerprintSchema, groupByArg, limitArg, ok, openReadOnly, parseBool, parseConfig, parseIntOpt, promptArg, readPackageIdentity, registerSurfaceResources, registerWorkflowPrompt, requiredPromptArg, resolveLimit, trimmed, withBusyRetry, withLazyTools, wrap, wrapResult } from "@mgcrea/mcp-apple-core";
+import { AppleAutomationError, AppleAutomationError as AppleMessagesError, BaseConfigSchema, CORE_DATA_EPOCH_OFFSET, IndexUnavailableError, IndexUnavailableError as IndexUnavailableError$1, PreconditionError, SchemaDriftError, SchemaDriftError as SchemaDriftError$1, columnsOf, confirmArg, createOsascriptRunner, describeAggregation, describeStore, escapeLike, extractCode, fail, fingerprintSchema, groupByArg, limitArg, ok, openReadOnly, parseBool, parseBound, parseConfig, parseIntOpt, promptArg, readPackageIdentity, registerSurfaceResources, registerWorkflowPrompt, requiredPromptArg, resolveLimit, trimmed, withBusyRetry, withLazyTools, wrap, wrapResult } from "@mgcrea/mcp-apple-core";
 import { existsSync, mkdirSync, readFileSync, statSync, writeFileSync } from "node:fs";
 import { homedir } from "node:os";
 import { basename, isAbsolute, join, resolve, sep } from "node:path";
@@ -13,8 +13,8 @@ const pkg = readPackageIdentity(new URL("../package.json", import.meta.url), {
 const BUILD_INFO = {
 	name: pkg.name,
 	version: pkg.version,
-	gitCommit: "d70b8e4",
-	gitCommitDate: "2026-09-06T12:13:21+02:00"
+	gitCommit: "657cbf0",
+	gitCommitDate: "2026-09-07T21:40:45+02:00"
 };
 //#endregion
 //#region src/client/dates.ts
@@ -1055,6 +1055,10 @@ var MessagesStore = class {
 			params.push(q.toApple);
 		}
 		if (!q.includeReactions && m.has("associated_message_type")) where.push(`(m."associated_message_type" IS NULL OR m."associated_message_type" = 0)`);
+		if (q.direction && m.has("is_from_me")) {
+			where.push(`m."is_from_me" = ?`);
+			params.push(q.direction === "sent" ? 1 : 0);
+		}
 		const sql = `
       SELECT ${this.#messageColumns()}
         FROM "message" m
@@ -1082,26 +1086,29 @@ var MessagesStore = class {
 		const needle = `%${escapeLike(query)}%`;
 		const reactionFilter = !includeReactions && m.has("associated_message_type") ? `AND (m."associated_message_type" IS NULL OR m."associated_message_type" = 0)` : "";
 		const cap = Math.max(1, Math.trunc(limit));
-		const results = this.db.prepare(`SELECT ${this.#messageColumns()}
+		const column = this.db.prepare(`SELECT ${this.#messageColumns()}
            FROM "message" m
            ${this.#joins()}
           WHERE m."text" LIKE ? ESCAPE '\\' ${reactionFilter}
           ORDER BY m."date" DESC
           LIMIT ${cap}`).all(needle).map((r) => this.#toRow(r));
-		if (results.length >= cap || !m.has("attributedBody")) return results;
+		if (!m.has("attributedBody")) return column.slice(0, cap);
+		const floor = column.length >= cap ? column.at(-1)?.sentAt ?? null : null;
 		const blobOnly = this.db.prepare(`SELECT ${this.#messageColumns()}
            FROM "message" m
            ${this.#joins()}
           WHERE (m."text" IS NULL OR m."text" = '')
             AND m."attributedBody" IS NOT NULL ${reactionFilter}
-          ORDER BY m."date" DESC`).all();
+            ${floor === null ? "" : `AND ${appleSecondsSql("m.\"date\"")} >= ?`}
+          ORDER BY m."date" DESC`).all(...floor === null ? [] : [floor]);
 		const lowered = query.toLowerCase();
+		const decoded = [];
 		for (const raw of blobOnly) {
-			if (results.length >= cap) break;
 			const row = this.#toRow(raw);
-			if (row.text && row.text.toLowerCase().includes(lowered)) results.push(row);
+			if (row.text && row.text.toLowerCase().includes(lowered)) decoded.push(row);
 		}
-		return results.slice(0, cap);
+		if (decoded.length === 0) return column.slice(0, cap);
+		return [...column, ...decoded].toSorted((a, b) => (b.sentAt ?? -Infinity) - (a.sentAt ?? -Infinity)).slice(0, cap);
 	}
 	byGuid(guid) {
 		const rows = this.db.prepare(`SELECT ${this.#messageColumns()}
@@ -1368,7 +1375,7 @@ var MessagesStore = class {
 	*/
 	#countFrom(q, field) {
 		const parts = [];
-		if (q.handle || field === "handle") parts.push(`LEFT JOIN "handle" h ON h."ROWID" = m."handle_id"`);
+		if (q.handle || q.handles?.length || field === "handle") parts.push(`LEFT JOIN "handle" h ON h."ROWID" = m."handle_id"`);
 		if (q.chatGuid || field === "chat") parts.push(`LEFT JOIN "chat_message_join" cmj ON cmj."message_id" = m."ROWID"`, `LEFT JOIN "chat" c ON c."ROWID" = cmj."chat_id"`);
 		return parts.join("\n           ");
 	}
@@ -1384,7 +1391,10 @@ var MessagesStore = class {
 			where.push(`c."guid" = ?`);
 			params.push(q.chatGuid);
 		}
-		if (q.handle) {
+		if (q.handles?.length) {
+			where.push(`h."id" IN (${q.handles.map(() => "?").join(",")})`);
+			params.push(...q.handles);
+		} else if (q.handle) {
 			where.push(`h."id" LIKE ? ESCAPE '\\'`);
 			params.push(`%${escapeLike(q.handle)}%`);
 		}
@@ -1648,6 +1658,7 @@ var AppleMessagesClient = class {
 			...opts.fromApple === void 0 ? {} : { fromApple: opts.fromApple },
 			...opts.toApple === void 0 ? {} : { toApple: opts.toApple },
 			...opts.includeReactions === void 0 ? {} : { includeReactions: opts.includeReactions },
+			...opts.direction === void 0 ? {} : { direction: opts.direction },
 			limit: resolveLimit(opts.limit, this.#config.maxResults)
 		}));
 	}
@@ -1780,8 +1791,11 @@ var AppleMessagesClient = class {
 	* `searchMessages`, which has the decode pass that makes it complete.
 	*/
 	countMessages(q, groupBy) {
-		const result = this.#require().countMessages({
+		const store = this.#require();
+		const resolved = q.handle ? this.#handlesLike(q.handle) : [];
+		const result = store.countMessages({
 			...q,
+			...resolved.length ? { handles: resolved } : {},
 			limit: resolveLimit(q.limit, this.#config.maxResults)
 		}, groupBy);
 		if (!("groups" in result)) return renderCount(result);
@@ -1816,7 +1830,7 @@ var AppleMessagesClient = class {
 			return {
 				guid,
 				chat,
-				handle: chat?.participants[0] ?? null
+				handle: chat && !chat.isGroup ? chat.participants[0] ?? null : null
 			};
 		}
 		const to = input.to?.trim();
@@ -1830,15 +1844,7 @@ var AppleMessagesClient = class {
 			chat: null,
 			handle: to
 		};
-		const kind = handleKind(to);
-		const wantedSuffix = kind === "phone" ? suffixKey(to) : null;
-		const wantedEmail = kind === "email" ? emailKey(to) : null;
-		const candidates = store.handles().filter((h) => {
-			if (h === to) return true;
-			if (wantedEmail) return emailKey(h) === wantedEmail;
-			if (wantedSuffix) return suffixKey(h) === wantedSuffix;
-			return false;
-		});
+		const candidates = this.#handlesLike(to);
 		if (!candidates.length) return {
 			guid: null,
 			chat: null,
@@ -1852,6 +1858,30 @@ var AppleMessagesClient = class {
 		};
 	}
 	/**
+	* Every handle in the store that names the same correspondent.
+	*
+	* The last-nine-digits rule `packages/contacts` measured, so
+	* "06 12 34 56 78", "+33 6 12 34 56 78" and "+33612345678" all reach the same
+	* rows. Used by the send lane to pick a chat, and by `count_messages`, which
+	* used a substring LIKE instead — so counting by a locally-spelled number
+	* answered zero while `send_message` to that same string worked. One
+	* surface, two ideas of what a handle is.
+	*/
+	#handlesLike(handle) {
+		const store = this.store();
+		if (!store) return [];
+		const wanted = handle.trim();
+		const kind = handleKind(wanted);
+		const wantedSuffix = kind === "phone" ? suffixKey(wanted) : null;
+		const wantedEmail = kind === "email" ? emailKey(wanted) : null;
+		return store.handles().filter((h) => {
+			if (h === wanted) return true;
+			if (wantedEmail) return emailKey(h) === wantedEmail;
+			if (wantedSuffix) return suffixKey(h) === wantedSuffix;
+			return false;
+		});
+	}
+	/**
 	* Find the row Messages wrote, or say plainly that it was not found.
 	*
 	* `docs/messages.md` left this as an open question — "whether a send should
@@ -1885,7 +1915,7 @@ var AppleMessagesClient = class {
 			const store = this.store();
 			if (!store) return null;
 			const rows = store.sentSince([guid], since, 10);
-			const hit = (text === null ? void 0 : rows.find((r) => r.text !== null && r.text === text)) ?? rows[0];
+			const hit = text === null ? rows[0] : rows.find((r) => r.text === text);
 			if (hit) return this.#render([hit])[0] ?? null;
 			if (Date.now() >= deadline) return null;
 			await new Promise((resolve) => setTimeout(resolve, 250));
@@ -2280,8 +2310,18 @@ the blob-storage change described in the guide, not the end of the conversation
 //#region src/tools/util.ts
 const chatRefArg = z.string().optional().describe("An opaque chat ref from apple_messages_list_chats (looks like \"mc1:<guid>\"). Do not construct one by hand.");
 const messageRefArg = z.string().min(1).describe("An opaque message ref from a list or search result (looks like \"m1:<guid>\"). Do not construct one by hand.");
-const fromArg = z.string().optional().describe("Start of the window, ISO-8601 — \"2026-08-01\" or \"2026-08-01T09:00\".");
-const toArg = z.string().optional().describe("End of the window, ISO-8601. Defaults to 30 days after `from`, or to now when `from` is omitted too.");
+const fromArg = z.string().optional().describe("Start of the window — \"2026-08-01\" (a whole day, local), \"2026-08-01T09:00\", or a relative form like \"-7d\", \"yesterday\" or \"last monday\".");
+const toArg = z.string().optional().describe("End of the window, same forms as `from`. A bare day includes ALL of that day. Defaults to 30 days after `from`, or to now when `from` is omitted too.");
+/**
+* One bound, through the grammar every surface shares.
+*
+* This replaced two copies of a local `new Date(raw)`, which had the bug that
+* grammar exists to prevent: `new Date("2026-08-01")` is UTC midnight while
+* `new Date("2026-08-01T00:00")` is LOCAL midnight, so the two spellings the
+* descriptions above treat as equivalent bounded a query hours apart — and the
+* day and month buckets these windows feed are local calendar dates.
+*/
+const bound = (raw, field, edge) => raw === void 0 ? void 0 : parseBound(field, raw, edge);
 const includeReactionsArg = z.boolean().optional().describe("Include tapbacks as if they were messages. Off by default, and you almost never want it on: a tapback renders as `Liked \"see you at 8\"`, which nobody typed. Use apple_messages_get_message to see the reactions on a specific message instead.");
 //#endregion
 //#region src/tools/diagnostics.ts
@@ -2462,6 +2502,8 @@ CHECK \`ageSeconds\` BEFORE USING A CODE. An expired code is still in the store
 
 \`confidence\` says how the match was made and is not decoration. "high" means the code was bound to a domain (\`@site.com #123456\`) or sat directly against a word like "verification code" — safe to use. "medium" means the keyword was further away, or two candidates tied. "low" means there was no keyword at all and only the sender being a shortcode suggested it. On anything below high, read the message with apple_messages_get_message and confirm against the body before using the digits.
 
+\`service\` is a trust signal, not a detail. iMessage is authenticated against an Apple ID; SMS and RCS sender IDs are not, and can be forged. \`confidence\` measures how cleanly the code was EXTRACTED from the text — it says nothing about who sent it, so a spoofed SMS naming a domain scores "high" exactly like a real one. Most genuine codes do arrive by SMS, so this is not a reason to discard them; it is a reason not to treat a code as proof of anything. If a code arrives that the user did not just ask for, say which service delivered it instead of offering the digits.
+
 A \`matched\` value ending in \`-ambiguous\` means the message held more than one plausible code and this tool did not guess — confirm which one is wanted.
 
 Returning nothing is the normal result when no code has arrived. It does NOT mean the code was missed, and it is not a reason to re-run with a longer window: if a code was sent it is in the store within seconds. Prefer asking the user to trigger a new one.`,
@@ -2479,9 +2521,11 @@ Returning nothing is the normal result when no code has arrived. It does NOT mea
 		const since = /* @__PURE__ */ new Date(Date.now() - minutes * 6e4);
 		const { fromApple } = client.window(since);
 		const needle = service?.trim().toLowerCase();
+		const scan = needle ? client.config.maxResults : limit;
 		const codes = client.listMessages({
 			...fromApple === void 0 ? {} : { fromApple },
-			limit
+			direction: "received",
+			limit: scan
 		}).filter((m) => !m.fromMe).filter((m) => {
 			if (!needle) return true;
 			return `${m.from.name ?? ""} ${m.from.handle ?? ""} ${m.text ?? ""}`.toLowerCase().includes(needle);
@@ -2495,12 +2539,13 @@ Returning nothing is the normal result when no code has arrived. It does NOT mea
 				matched: match.matched,
 				...match.boundTo ? { boundTo: match.boundTo } : {},
 				from: m.from,
+				service: m.service,
 				sentAt: m.sentAt,
 				ageSeconds: Number.isNaN(sentAtMs) ? null : Math.max(0, Math.round((Date.now() - sentAtMs) / 1e3)),
 				ref: m.ref,
 				chat: m.chat
 			}];
-		});
+		}).slice(0, limit);
 		return {
 			windowMinutes: minutes,
 			searchedSince: since.toISOString(),
@@ -2511,13 +2556,6 @@ Returning nothing is the normal result when no code has arrived. It does NOT mea
 };
 //#endregion
 //#region src/tools/counts.ts
-/** ISO-8601 in, or a clear refusal. Same grammar as `list_messages`. */
-const parseBound$1 = (raw, field) => {
-	if (raw === void 0) return void 0;
-	const d = new Date(raw);
-	if (Number.isNaN(d.getTime())) throw new Error(`Could not read ${field} from ${JSON.stringify(raw)}. Use ISO-8601: "2026-08-01" or "2026-08-01T09:00".`);
-	return d;
-};
 /**
 * The cheap-answer lane on this surface: counts, and counts per group.
 *
@@ -2539,7 +2577,7 @@ const registerCountTools = (server, client) => {
 		description: "Count messages without reading them. Answers 'how many', 'how many did I send', 'who do I message most' and 'which month was busiest' as arithmetic the store does, rather than a page of conversations you tally by hand. Every result splits `sent` and `received`.\n\n`groupBy` counts per day, month, chat, handle or direction, over EVERY match rather than the first `limit` of them — `limit` caps how many groups come back. Grouping by handle is the one to reach for when a person has several conversations, since apple_messages_list_chats already gives you per-CHAT totals.\n\nCounts metadata only: there is no text filter here, because message bodies from 2026 onward live in an archived blob that SQL cannot see, and a count that quietly skipped them would look exactly like a correct one. Use apple_messages_search_messages for anything about what was said. Tapbacks are excluded unless you ask for them.",
 		inputSchema: {
 			chatRef: chatRefArg,
-			handle: z.string().optional().describe("Only messages with this correspondent — a phone number or email, matched as a substring. Spans every chat they appear in, which is the difference from chatRef."),
+			handle: z.string().optional().describe("Only messages with this correspondent — a phone number or email. Spellings of the same number match each other, so \"06 12 34 56 78\" and \"+33612345678\" are the same person, exactly as they are for send_message. A fragment that resolves to nobody falls back to a substring match. Spans every chat they appear in, which is the difference from chatRef."),
 			direction: z.enum(["sent", "received"]).optional().describe("Only what you sent, or only what you received. Omit for both."),
 			from: fromArg,
 			to: z.string().optional().describe("End of the window, ISO-8601, exclusive. Omit to count up to now."),
@@ -2549,7 +2587,7 @@ const registerCountTools = (server, client) => {
 		},
 		annotations: { readOnlyHint: true }
 	}, async ({ chatRef, handle, direction, from, to, includeReactions, groupBy, limit }) => wrap(async () => {
-		const window = client.window(parseBound$1(from, "from"), parseBound$1(to, "to"));
+		const window = client.window(bound(from, "from", "start"), bound(to, "to", "end"));
 		const result = client.countMessages({
 			...chatRef ? { chatGuid: decodeChatRef(chatRef) } : {},
 			...handle === void 0 ? {} : { handle },
@@ -2567,13 +2605,6 @@ const registerCountTools = (server, client) => {
 };
 //#endregion
 //#region src/tools/messages.ts
-/** ISO-8601 in, or a clear refusal. No relative grammar on this surface yet. */
-const parseBound = (raw, field) => {
-	if (raw === void 0) return void 0;
-	const d = new Date(raw);
-	if (Number.isNaN(d.getTime())) throw new Error(`Could not read ${field} from ${JSON.stringify(raw)}. Use ISO-8601: "2026-08-01" or "2026-08-01T09:00".`);
-	return d;
-};
 /**
 * Close a range that named only a start.
 *
@@ -2603,8 +2634,8 @@ const registerMessageTools = (server, client) => {
 		},
 		annotations: { readOnlyHint: true }
 	}, async ({ chatRef, from, to, includeReactions, limit }) => wrap(async () => {
-		const fromDate = parseBound(from, "from");
-		const window = client.window(fromDate, closeRange(fromDate, parseBound(to, "to"), client.config.defaultRangeDays));
+		const fromDate = bound(from, "from", "start");
+		const window = client.window(fromDate, closeRange(fromDate, bound(to, "to", "end"), client.config.defaultRangeDays));
 		return client.listMessages({
 			...chatRef ? { chatRef: decodeChatRef(chatRef) } : {},
 			...window,
@@ -2713,4 +2744,4 @@ const createServer = (opts) => {
 //#endregion
 export { MESSAGES_SURFACE as A, toAppleSeconds as B, locateStore as C, ChatNotFoundError as D, AppleMessagesError as E, SendTargetNotFoundError as F, CORE_DATA_EPOCH_OFFSET as I, appleSecondsSql as L, MessagesUnavailableError as M, SchemaDriftError$1 as N, IndexUnavailableError$1 as O, SendFailedError as P, fromAppleSeconds as R, defaultStorePath as S, PRELUDE as T, BUILD_INFO as V, decodeMessageRef as _, loadConfig$1 as a, ATTACHMENTS_RELATIVE as b, introspect as c, decodeAttributedBody as d, outline as f, decodeChatRef as g, MESSAGE_REF_VERSION as h, registerTools as i, MessageNotFoundError as j, MESSAGES_BUNDLE_ID as k, openStore as l, InvalidMessageRefError as m, SERVER_VERSION as n, AppleMessagesClient as o, CHAT_REF_VERSION as p, createServer as r, MessagesStore as s, SERVER_NAME as t, reactionLabel as u, encodeChatRef as v, SEND_MESSAGE as w, STORE_RELATIVE as x, encodeMessageRef as y, renderInstant as z };
 
-//# sourceMappingURL=server-CIacos3P.js.map
+//# sourceMappingURL=server-BdWRSEL0.js.map