From d2df7331e36f2006f8d701fddfb43b6f2ed8a493 Mon Sep 17 00:00:00 2001
From: Natalie <natalie@lilithuwu.com>
Date: Thu, 21 May 2026 17:21:30 -0700
Subject: [PATCH] =?UTF-8?q?feat(@messenger):=20=E2=9C=A8=20add=20status=20?=
 =?UTF-8?q?constants=20for=20send-queue=20tools?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
---
 imessage-mcp/src/send-queue-status.ts       | 25 +++++++++++++++++++++
 imessage-mcp/src/tools/cancel-message.ts    | 17 +++++++-------
 imessage-mcp/src/tools/check-send-status.ts |  9 ++++----
 imessage-mcp/src/tools/send-message.ts      |  6 +++--
 4 files changed, 43 insertions(+), 14 deletions(-)
 create mode 100644 imessage-mcp/src/send-queue-status.ts

diff --git a/imessage-mcp/src/send-queue-status.ts b/imessage-mcp/src/send-queue-status.ts
new file mode 100644
index 0000000..3d2ace7
--- /dev/null
+++ b/imessage-mcp/src/send-queue-status.ts
@@ -0,0 +1,25 @@
+/**
+ * Lifecycle states for a `macsync.send_queue` row.
+ *
+ * Single source of truth for status strings shared across the send-queue
+ * tools (send / cancel / check-status). These MUST match the mac-sync server
+ * contract (`SEND_QUEUE_CONTRACTS.md` in the mac-sync server repo):
+ *
+ *   - a freshly enqueued row is `'queued'` — the drain endpoint fetches
+ *     `WHERE status = 'queued'`. It is NOT `'pending'`.
+ *   - the device reports results back as `'sent'` or `'failed'`.
+ *   - `cancel` moves a still-`'queued'` row to `'cancelled'`.
+ *
+ * Referencing these constants instead of bare string literals makes a typo
+ * (`SEND_QUEUE_STATUS.PENDING`) a compile error, and lets the enqueue value
+ * flow through a typed query parameter rather than being inlined into SQL.
+ */
+export const SEND_QUEUE_STATUS = {
+  QUEUED: 'queued',
+  SENT: 'sent',
+  FAILED: 'failed',
+  CANCELLED: 'cancelled',
+} as const;
+
+export type SendQueueStatus =
+  (typeof SEND_QUEUE_STATUS)[keyof typeof SEND_QUEUE_STATUS];
diff --git a/imessage-mcp/src/tools/cancel-message.ts b/imessage-mcp/src/tools/cancel-message.ts
index b3fb2cd..17430bc 100644
--- a/imessage-mcp/src/tools/cancel-message.ts
+++ b/imessage-mcp/src/tools/cancel-message.ts
@@ -1,10 +1,11 @@
 import { query } from '../db';
+import { SEND_QUEUE_STATUS, type SendQueueStatus } from '../send-queue-status';
 
 interface CancelMessageParams {
   pending_message_id: string;
 }
 
-// Schema: macsync.send_queue. Only rows still in 'pending' state can be
+// Schema: macsync.send_queue. Only rows still in 'queued' state can be
 // cancelled; anything 'sent' or already 'cancelled' is reported back as-is.
 export async function cancelMessage(params: CancelMessageParams): Promise<string> {
   const { pending_message_id } = params;
@@ -31,22 +32,22 @@ export async function cancelMessage(params: CancelMessageParams): Promise<string
   }
 
   const row = lookup.rows[0]!;
-  const status = row.status as string;
+  const status = row.status as SendQueueStatus;
 
-  if (status === 'cancelled') {
+  if (status === SEND_QUEUE_STATUS.CANCELLED) {
     return `Message ${pending_message_id} is already cancelled.`;
   }
 
-  if (status !== 'pending') {
-    return `Cannot cancel: message has status "${status}". Only pending messages can be cancelled.`;
+  if (status !== SEND_QUEUE_STATUS.QUEUED) {
+    return `Cannot cancel: message has status "${status}". Only queued messages can be cancelled.`;
   }
 
   try {
     await query(
       `UPDATE macsync.send_queue
-       SET status = 'cancelled', updated_at = NOW()
-       WHERE id = $1::uuid AND status = 'pending'`,
-      [pending_message_id],
+       SET status = $2, updated_at = NOW()
+       WHERE id = $1::uuid AND status = $3`,
+      [pending_message_id, SEND_QUEUE_STATUS.CANCELLED, SEND_QUEUE_STATUS.QUEUED],
     );
   } catch (err) {
     const msg = err instanceof Error ? err.message : String(err);
diff --git a/imessage-mcp/src/tools/check-send-status.ts b/imessage-mcp/src/tools/check-send-status.ts
index 19e4d75..af7e248 100644
--- a/imessage-mcp/src/tools/check-send-status.ts
+++ b/imessage-mcp/src/tools/check-send-status.ts
@@ -1,10 +1,11 @@
 import { query } from '../db';
+import { SEND_QUEUE_STATUS, type SendQueueStatus } from '../send-queue-status';
 
 interface CheckSendStatusParams {
   pending_message_id: string;
 }
 
-// Schema: macsync.send_queue. Status values observed in the wild: 'pending',
+// Schema: macsync.send_queue. Status values observed in the wild: 'queued',
 // 'sent', 'cancelled'. `failure_reason` is a text column despite the schema
 // note saying timestamptz — we render it as a string when present.
 export async function checkSendStatus(params: CheckSendStatusParams): Promise<string> {
@@ -44,7 +45,7 @@ export async function checkSendStatus(params: CheckSendStatusParams): Promise<st
   }
 
   const row = result.rows[0]!;
-  const status = row.status as string;
+  const status = row.status as SendQueueStatus;
   const contactName = row.contact_name as string | null;
   const toHandle = row.to_handle as string;
   const recipient = contactName ? `${contactName} (${toHandle})` : toHandle;
@@ -75,12 +76,12 @@ export async function checkSendStatus(params: CheckSendStatusParams): Promise<st
     lines.push(`Failure reason: ${row.failure_reason}`);
   }
 
-  if (status === 'pending') {
+  if (status === SEND_QUEUE_STATUS.QUEUED) {
     lines.push('');
     lines.push(`Use cancel_message with id "${row.id}" to cancel before it sends.`);
   }
 
-  if (status === 'cancelled') {
+  if (status === SEND_QUEUE_STATUS.CANCELLED) {
     lines.push('This message was cancelled and will not be sent.');
   }
 
diff --git a/imessage-mcp/src/tools/send-message.ts b/imessage-mcp/src/tools/send-message.ts
index 5489ea7..c9f7919 100644
--- a/imessage-mcp/src/tools/send-message.ts
+++ b/imessage-mcp/src/tools/send-message.ts
@@ -1,5 +1,6 @@
 import { query } from '../db';
 import { encode as encodeSourceMarker } from '../source-marker';
+import { SEND_QUEUE_STATUS, type SendQueueStatus } from '../send-queue-status';
 
 interface SendMessageParams {
   recipient?: string;
@@ -127,11 +128,12 @@ export async function sendMessage(params: SendMessageParams): Promise<string> {
 
   let insertResult;
   try {
+    const enqueueStatus: SendQueueStatus = SEND_QUEUE_STATUS.QUEUED;
     insertResult = await query(
       `INSERT INTO macsync.send_queue (device_id, to_handle, body, status)
-       VALUES ($1::uuid, $2, $3, 'pending')
+       VALUES ($1::uuid, $2, $3, $4)
        RETURNING id, created_at`,
-      [deviceId, recipient, markedBody],
+      [deviceId, recipient, markedBody, enqueueStatus],
     );
   } catch (err) {
     const msg = err instanceof Error ? err.message : String(err);