spectrum-ts 1.2.1 → 1.3.0

package/dist/providers/imessage/index.js

@@ -2,7 +2,7 @@ import {
   asGroup,
   asRichlink,
   groupSchema
-} from "../../chunk-K3CTEGCZ.js";
+} from "../../chunk-66GJ45ZZ.js";
 import {
   asPoll,
   asPollOption,
@@ -23,7 +23,7 @@ import {
   text,
   textSchema,
   toVCard
-} from "../../chunk-UQPIWAHH.js";
+} from "../../chunk-LH4YEBG3.js";
 
 // src/providers/imessage/index.ts
 import {
@@ -77,18 +77,36 @@ function effect(input, messageEffect) {
 }
 
 // src/providers/imessage/auth.ts
-import {
-  createClient
-} from "@photon-ai/advanced-imessage";
+import { createClient } from "@photon-ai/advanced-imessage";
 var RENEWAL_RATIO = 0.8;
 var EXPIRY_BUFFER_MS = 3e4;
 var RETRY_DELAY_MS = 3e4;
 var cloudAuthState = /* @__PURE__ */ new WeakMap();
+var requirePhone = (data, instanceId) => {
+  const phone = data.numbers?.[instanceId];
+  if (!phone) {
+    throw new Error(`iMessage instance ${instanceId} has no phone assigned`);
+  }
+  return phone;
+};
 async function createCloudClients(projectId, projectSecret) {
   let tokenData = await cloud.issueImessageTokens(projectId, projectSecret);
   let tokenExpiresAt = Date.now() + tokenData.expiresIn * 1e3;
   let disposed = false;
   let renewalTimer;
+  if (tokenData.type === "shared") {
+    throw UnsupportedError.action(
+      "multi-phone",
+      "iMessage shared mode",
+      "use dedicated-token cloud mode"
+    );
+  }
+  const records = [];
+  const syncPhones = (data) => {
+    for (const { entry, instanceId } of records) {
+      entry.phone = requirePhone(data, instanceId);
+    }
+  };
   const scheduleRenewal = () => {
     if (disposed) {
       return;
@@ -98,7 +116,15 @@ async function createCloudClients(projectId, projectSecret) {
     renewalTimer = setTimeout(async () => {
       try {
         tokenData = await cloud.issueImessageTokens(projectId, projectSecret);
+        if (tokenData.type === "shared") {
+          throw UnsupportedError.action(
+            "multi-phone",
+            "iMessage shared mode",
+            "use dedicated-token cloud mode"
+          );
+        }
         tokenExpiresAt = Date.now() + tokenData.expiresIn * 1e3;
+        syncPhones(tokenData);
         scheduleRenewal();
       } catch {
         renewalTimer = setTimeout(() => scheduleRenewal(), RETRY_DELAY_MS);
@@ -113,25 +139,22 @@ async function createCloudClients(projectId, projectSecret) {
       return;
     }
     tokenData = await cloud.issueImessageTokens(projectId, projectSecret);
+    if (tokenData.type === "shared") {
+      throw UnsupportedError.action(
+        "multi-phone",
+        "iMessage shared mode",
+        "use dedicated-token cloud mode"
+      );
+    }
     tokenExpiresAt = Date.now() + tokenData.expiresIn * 1e3;
+    syncPhones(tokenData);
     scheduleRenewal();
   };
-  const buildClients = () => {
-    if (tokenData.type === "shared") {
-      const address = process.env.SPECTRUM_IMESSAGE_ADDRESS ?? "imessage.spectrum.photon.codes:443";
-      return [
-        createClient({
-          address,
-          tls: true,
-          token: async () => {
-            await refreshIfNeeded();
-            return tokenData.token;
-          }
-        })
-      ];
-    }
-    return Object.entries(tokenData.auth).map(
-      ([instanceId, token]) => createClient({
+  const dedicated = tokenData;
+  for (const [instanceId, token] of Object.entries(dedicated.auth)) {
+    const entry = {
+      phone: requirePhone(dedicated, instanceId),
+      client: createClient({
         address: `${instanceId}.imsg.photon.codes:443`,
         tls: true,
         token: async () => {
@@ -140,10 +163,11 @@ async function createCloudClients(projectId, projectSecret) {
           return data.auth[instanceId] ?? token;
         }
       })
-    );
-  };
-  const clients = buildClients();
-  cloudAuthState.set(clients, {
+    };
+    records.push({ entry, instanceId });
+  }
+  const entries = records.map((r) => r.entry);
+  cloudAuthState.set(entries, {
     dispose: () => {
       disposed = true;
       if (renewalTimer !== void 0) {
@@ -152,7 +176,7 @@ async function createCloudClients(projectId, projectSecret) {
       }
     }
   });
-  return clients;
+  return entries;
 }
 async function disposeCloudAuth(clients) {
   const auth = cloudAuthState.get(clients);
@@ -230,7 +254,12 @@ var toMessages = async (message) => {
   }
   const base = {
     sender: { id: message.participant ?? "" },
-    space: { id: chatId, type: chatKind === "group" ? "group" : "dm" },
+    // Local mode has no concept of "which-of-my-phones"; phone is empty.
+    space: {
+      id: chatId,
+      type: chatKind === "group" ? "group" : "dm",
+      phone: ""
+    },
     timestamp: message.createdAt
   };
   if (message.attachments.length > 0) {
@@ -337,17 +366,6 @@ var messages2 = (client) => messages(client);
 var send2 = async (client, spaceId, content) => send(client, spaceId, content);
 var getMessage2 = async (client, id) => getMessage(client, id);
 
-// src/providers/imessage/remote/client.ts
-var REMOTE_CLIENT_MISSING = "No remote iMessage client available";
-var firstRemoteClient = (clients) => clients[0];
-var primaryRemoteClient = (clients) => {
-  const remote = firstRemoteClient(clients);
-  if (!remote) {
-    throw new Error(REMOTE_CLIENT_MISSING);
-  }
-  return remote;
-};
-
 // src/providers/imessage/remote/inbound.ts
 import {
   messageGuid,
@@ -520,13 +538,14 @@ var isIMessageMessage = (value) => {
   return typeof record.id === "string" && record.id.length > 0 && typeof record.content === "object" && record.content !== null && typeof record.sender === "object" && record.sender !== null && typeof record.space === "object" && record.space !== null;
 };
 var asProviderGroup = (items) => groupSchema.parse({ type: "group", items });
-var buildMessageBase = (message, chatGuidHint, timestamp) => {
+var buildMessageBase = (message, chatGuidHint, timestamp, phone) => {
   const chat = resolveChatGuid(message, chatGuidHint);
   return {
     sender: { id: resolveSenderId(message) },
     space: {
       id: chat,
-      type: chat.includes(";+;") ? "group" : "dm"
+      type: chat.includes(";+;") ? "group" : "dm",
+      phone
     },
     timestamp
   };
@@ -581,10 +600,10 @@ var toRichlinkMessage = (message, base, id) => {
     };
   }
 };
-var rebuildFromAppleMessage = async (client, message, chatGuidHint) => {
+var rebuildFromAppleMessage = async (client, message, phone, chatGuidHint) => {
   const messageGuidStr = message.guid;
   const timestamp = message.dateCreated ?? /* @__PURE__ */ new Date();
-  const base = buildMessageBase(message, chatGuidHint, timestamp);
+  const base = buildMessageBase(message, chatGuidHint, timestamp, phone);
   if (message.attachments.length === 1) {
     const info = message.attachments[0];
     if (!info) {
@@ -636,8 +655,13 @@ var cacheMessage = (cache, message) => {
     }
   }
 };
-var toInboundMessages = async (client, cache, event) => {
-  const base = buildMessageBase(event.message, event.chatGuid, event.timestamp);
+var toInboundMessages = async (client, cache, event, phone) => {
+  const base = buildMessageBase(
+    event.message,
+    event.chatGuid,
+    event.timestamp,
+    phone
+  );
   const messageGuidStr = event.message.guid;
   if (getBalloonBundleId(event.message) === URL_BALLOON_BUNDLE_ID) {
     const msg2 = toRichlinkMessage(event.message, base, messageGuidStr);
@@ -694,7 +718,7 @@ var toInboundMessages = async (client, cache, event) => {
   cacheMessage(cache, msg);
   return [msg];
 };
-var getMessage3 = async (remote, spaceId, msgId) => {
+var getMessage3 = async (remote, spaceId, msgId, phone) => {
   const cache = getMessageCache(remote);
   const cached = cache.get(msgId);
   if (cached) {
@@ -706,7 +730,12 @@ var getMessage3 = async (remote, spaceId, msgId) => {
       const fetched = await remote.messages.get(
         messageGuid(childRef.parentGuid)
       );
-      const parent = await rebuildFromAppleMessage(remote, fetched, spaceId);
+      const parent = await rebuildFromAppleMessage(
+        remote,
+        fetched,
+        phone,
+        spaceId
+      );
       cacheMessage(cache, parent);
       if (parent.content.type !== "group") {
         return;
@@ -722,7 +751,12 @@ var getMessage3 = async (remote, spaceId, msgId) => {
   }
   try {
     const fetched = await remote.messages.get(messageGuid(msgId));
-    const rebuilt = await rebuildFromAppleMessage(remote, fetched, spaceId);
+    const rebuilt = await rebuildFromAppleMessage(
+      remote,
+      fetched,
+      phone,
+      spaceId
+    );
     cacheMessage(cache, rebuilt);
     return rebuilt;
   } catch (err) {
@@ -785,12 +819,12 @@ var asProviderReaction = (emoji, target) => reactionSchema.parse({
   target,
   type: "reaction"
 });
-var resolveReactionTarget = async (client, cache, strippedGuid, partIndex) => {
+var resolveReactionTarget = async (client, cache, strippedGuid, partIndex, phone) => {
   let candidate = cache.get(strippedGuid);
   if (!candidate) {
     try {
       const fetched = await client.messages.get(messageGuid2(strippedGuid));
-      candidate = await rebuildFromAppleMessage(client, fetched);
+      candidate = await rebuildFromAppleMessage(client, fetched, phone);
       cacheMessage(cache, candidate);
     } catch {
       return;
@@ -806,7 +840,7 @@ var resolveReactionTarget = async (client, cache, strippedGuid, partIndex) => {
   }
   return candidate;
 };
-var toReactionMessages = async (client, cache, event, target) => {
+var toReactionMessages = async (client, cache, event, target, phone) => {
   const type = getAssociatedMessageType(event.message);
   if (type && isTapbackRemoval(type)) {
     return [];
@@ -823,7 +857,8 @@ var toReactionMessages = async (client, cache, event, target) => {
     client,
     cache,
     strippedGuid,
-    partIndex
+    partIndex,
+    phone
   );
   if (!resolved) {
     return [];
@@ -832,7 +867,12 @@ var toReactionMessages = async (client, cache, event, target) => {
   if (typeof messageId !== "string" || messageId.length === 0) {
     return [];
   }
-  const base = buildMessageBase(event.message, event.chatGuid, event.timestamp);
+  const base = buildMessageBase(
+    event.message,
+    event.chatGuid,
+    event.timestamp,
+    phone
+  );
   return [
     {
       ...base,
@@ -1545,7 +1585,8 @@ var buildPollOptionMessage = (input) => {
     sender: { id: input.senderAddress },
     space: {
       id: input.chatGuid,
-      type: input.chatGuid.includes(";+;") ? "group" : "dm"
+      type: input.chatGuid.includes(";+;") ? "group" : "dm",
+      phone: input.phone
     },
     timestamp: input.event.at,
     content: asPollOption({
@@ -1563,6 +1604,7 @@ var buildPollOptionMessages = (input) => {
       chatGuid: input.chatGuid,
       event: input.event,
       optionId: delta.optionId,
+      phone: input.phone,
       selected: delta.selected,
       senderAddress: input.senderAddress
     });
@@ -1587,7 +1629,7 @@ var refreshPollMetadata = async (client, pollCache, event, fallbackOptionIds) =>
     poll: refreshed
   };
 };
-var toPollVoteMessages = async (client, pollCache, event) => {
+var toPollVoteMessages = async (client, pollCache, event, phone) => {
   const senderAddress = event.actor.address;
   if (!senderAddress) {
     return [];
@@ -1630,6 +1672,7 @@ var toPollVoteMessages = async (client, pollCache, event) => {
     chatGuid: chatGuidStr,
     deltas,
     event,
+    phone,
     senderAddress
   });
   pollCache.commitActorSelection(
@@ -1640,7 +1683,7 @@ var toPollVoteMessages = async (client, pollCache, event) => {
   );
   return messages5;
 };
-var toPollUnvoteMessages = async (client, pollCache, event) => {
+var toPollUnvoteMessages = async (client, pollCache, event, phone) => {
   const senderAddress = event.actor.address;
   if (!senderAddress) {
     return [];
@@ -1660,17 +1703,18 @@ var toPollUnvoteMessages = async (client, pollCache, event) => {
     chatGuid: chatGuidStr,
     deltas,
     event,
+    phone,
     senderAddress
   });
   pollCache.commitActorSelection(pollId, senderAddress, [], event.at);
   return messages5;
 };
-var toPollDeltaMessages = async (client, pollCache, event) => {
+var toPollDeltaMessages = async (client, pollCache, event, phone) => {
   if (isVotedPollEvent(event)) {
-    return toPollVoteMessages(client, pollCache, event);
+    return toPollVoteMessages(client, pollCache, event, phone);
   }
   if (isUnvotedPollEvent(event)) {
-    return toPollUnvoteMessages(client, pollCache, event);
+    return toPollUnvoteMessages(client, pollCache, event, phone);
   }
   return [];
 };
@@ -1686,43 +1730,43 @@ var isRetryableIMessageStreamError = (error) => {
   }
   return false;
 };
-var toMessageItem = async (client, event, cursor) => {
+var toMessageItem = async (client, event, phone, cursor) => {
   const id = event.message.guid;
   if (event.message.isFromMe) {
     return { cursor, id, values: [] };
   }
   const cache = getMessageCache(client);
   const target = event.message.associatedMessageGuid;
-  const values = target ? await toReactionMessages(client, cache, event, target) : await toInboundMessages(client, cache, event);
+  const values = target ? await toReactionMessages(client, cache, event, target, phone) : await toInboundMessages(client, cache, event, phone);
   return { cursor, id, values };
 };
-var messageStream = (client) => resumableOrderedStream({
+var messageStream = (client, phone) => resumableOrderedStream({
   fetchMissed: (cursor, { limit }) => client.messages.fetchMissed(cursor, { limit }),
   isRetryableError: isRetryableIMessageStreamError,
-  processLive: (event) => toMessageItem(client, event, event.cursor),
-  processMissed: (message) => toMessageItem(client, receivedEventFromMessage(message)),
+  processLive: (event) => toMessageItem(client, event, phone, event.cursor),
+  processMissed: (message) => toMessageItem(client, receivedEventFromMessage(message), phone),
   subscribeLive: () => client.messages.subscribe("message.received")
 });
 var logPollStreamError = (error) => {
   console.error("[spectrum-ts][imessage][poll] stream failed", error);
 };
-var emitPollMessages = async (client, pollCache, event, emit) => {
+var emitPollMessages = async (client, pollCache, event, phone, emit) => {
   cachePollEvent(pollCache, event);
   if (event.actor.isFromMe) {
     return;
   }
-  const messages5 = await toPollDeltaMessages(client, pollCache, event);
+  const messages5 = await toPollDeltaMessages(client, pollCache, event, phone);
   for (const vote of messages5) {
     await emit(vote);
   }
 };
-var runPollSubscription = async (client, pollCache, subscription, emit, onEvent) => {
+var runPollSubscription = async (client, pollCache, subscription, phone, emit, onEvent) => {
   for await (const event of subscription) {
     onEvent();
-    await emitPollMessages(client, pollCache, event, emit);
+    await emitPollMessages(client, pollCache, event, phone, emit);
   }
 };
-var pollStream = (client, pollCache) => stream((emit, end) => {
+var pollStream = (client, pollCache, phone) => stream((emit, end) => {
   let active = client.polls.subscribe();
   let closed = false;
   let retryDelayMs = RECONNECT_INITIAL_DELAY_MS;
@@ -1750,9 +1794,16 @@ var pollStream = (client, pollCache) => stream((emit, end) => {
   const pump = (async () => {
     while (!closed) {
       try {
-        await runPollSubscription(client, pollCache, active, emit, () => {
-          retryDelayMs = RECONNECT_INITIAL_DELAY_MS;
-        });
+        await runPollSubscription(
+          client,
+          pollCache,
+          active,
+          phone,
+          emit,
+          () => {
+            retryDelayMs = RECONNECT_INITIAL_DELAY_MS;
+          }
+        );
       } catch (e) {
         if (!closed) {
           logPollStreamError(e);
@@ -1775,12 +1826,17 @@ var pollStream = (client, pollCache) => stream((emit, end) => {
     await pump;
   };
 });
-var clientStream = (client, pollCache) => {
-  return mergeStreams([messageStream(client), pollStream(client, pollCache)]);
+var clientStream = (client, pollCache, phone) => {
+  return mergeStreams([
+    messageStream(client, phone),
+    pollStream(client, pollCache, phone)
+  ]);
 };
 var messages3 = (clients) => {
   const pollCache = getPollCache(clients);
-  return mergeStreams(clients.map((client) => clientStream(client, pollCache)));
+  return mergeStreams(
+    clients.map((entry) => clientStream(entry.client, pollCache, entry.phone))
+  );
 };
 
 // src/providers/imessage/remote/typing.ts
@@ -1794,43 +1850,52 @@ var stopTyping = async (remote, spaceId) => {
 
 // src/providers/imessage/remote/api.ts
 var messages4 = (clients) => messages3(clients);
-var startTyping2 = async (clients, spaceId) => {
-  const remote = firstRemoteClient(clients);
-  if (!remote) {
-    return;
-  }
+var startTyping2 = async (remote, spaceId) => {
   await startTyping(remote, spaceId);
 };
-var stopTyping2 = async (clients, spaceId) => {
-  const remote = firstRemoteClient(clients);
-  if (!remote) {
-    return;
-  }
+var stopTyping2 = async (remote, spaceId) => {
   await stopTyping(remote, spaceId);
 };
-var send4 = async (clients, spaceId, content) => send3(primaryRemoteClient(clients), spaceId, content);
-var replyToMessage2 = async (clients, spaceId, msgId, content) => replyToMessage(primaryRemoteClient(clients), spaceId, msgId, content);
-var editMessage2 = async (clients, spaceId, msgId, content) => editMessage(primaryRemoteClient(clients), spaceId, msgId, content);
-var reactToMessage2 = async (clients, spaceId, target, reaction) => {
-  const remote = firstRemoteClient(clients);
-  if (!remote) {
-    return;
-  }
+var send4 = async (remote, spaceId, content) => send3(remote, spaceId, content);
+var replyToMessage2 = async (remote, spaceId, msgId, content) => replyToMessage(remote, spaceId, msgId, content);
+var editMessage2 = async (remote, spaceId, msgId, content) => editMessage(remote, spaceId, msgId, content);
+var reactToMessage2 = async (remote, spaceId, target, reaction) => {
   await reactToMessage(remote, spaceId, target, reaction);
 };
-var getMessage4 = async (clients, spaceId, msgId) => {
-  const remote = firstRemoteClient(clients);
-  if (!remote) {
-    return;
+var getMessage4 = async (remote, spaceId, msgId, phone) => getMessage3(remote, spaceId, msgId, phone);
+
+// src/providers/imessage/remote/client.ts
+var availablePhones = (clients) => clients.map((c) => c.phone);
+var clientForPhone = (clients, phone) => {
+  const entry = clients.find((c) => c.phone === phone);
+  if (!entry) {
+    const list = availablePhones(clients).join(", ") || "<none>";
+    throw new Error(
+      `No iMessage client serves phone ${phone}. Available: ${list}`
+    );
   }
-  return getMessage3(remote, spaceId, msgId);
+  return entry.client;
+};
+var randomPhone = (clients) => {
+  if (clients.length === 0) {
+    throw new Error("No iMessage phones configured for this account");
+  }
+  const entry = clients[Math.floor(Math.random() * clients.length)];
+  if (!entry) {
+    throw new Error("No iMessage phones configured for this account");
+  }
+  return entry.phone;
 };
 
 // src/providers/imessage/types.ts
 import { IMessageSDK } from "@photon-ai/imessage-kit";
 import z2 from "zod";
 var isLocal = (client) => client instanceof IMessageSDK;
-var clientEntry = z2.object({ address: z2.string(), token: z2.string() });
+var clientEntry = z2.object({
+  address: z2.string(),
+  token: z2.string(),
+  phone: z2.string()
+});
 var configSchema = z2.union([
   z2.object({ local: z2.literal(true) }),
   z2.object({
@@ -1841,7 +1906,11 @@ var configSchema = z2.union([
 var userSchema = z2.object({});
 var spaceSchema = z2.object({
   id: z2.string(),
-  type: z2.enum(["dm", "group"])
+  type: z2.enum(["dm", "group"]),
+  phone: z2.string()
+});
+var spaceParamsSchema = z2.object({
+  phone: z2.string().optional()
 });
 var messageSchema = z2.object({
   partIndex: z2.number().int().nonnegative().optional(),
@@ -1857,11 +1926,48 @@ var imessage = definePlatform("iMessage", {
       message: MessageEffect2
     }
   },
+  lifecycle: {
+    createClient: async ({
+      config,
+      projectId,
+      projectSecret
+    }) => {
+      if (config.local) {
+        return new IMessageSDK2();
+      }
+      if (config.clients) {
+        const entries = Array.isArray(config.clients) ? config.clients : [config.clients];
+        return entries.map((e) => ({
+          phone: e.phone,
+          client: createClient2({
+            address: e.address,
+            tls: true,
+            token: e.token
+          })
+        }));
+      }
+      if (!(projectId && projectSecret)) {
+        throw new Error(
+          "iMessage requires projectId and projectSecret. Either pass credentials to Spectrum(), use local mode: imessage.config({ local: true }), or provide explicit client config: imessage.config({ clients: [...] })"
+        );
+      }
+      return await createCloudClients(projectId, projectSecret);
+    },
+    destroyClient: async ({ client }) => {
+      if (isLocal(client)) {
+        await client.close();
+        return;
+      }
+      await disposeCloudAuth(client);
+      await Promise.all(client.map((entry) => entry.client.close()));
+    }
+  },
   user: {
     resolve: async ({ input }) => ({ id: input.userID })
   },
   space: {
     schema: spaceSchema,
+    params: spaceParamsSchema,
     resolve: async ({ input, client }) => {
       if (isLocal(client)) {
         throw UnsupportedError.action(
@@ -1873,55 +1979,26 @@ var imessage = definePlatform("iMessage", {
       if (input.users.length === 0) {
         throw new Error("iMessage space creation requires at least one user");
       }
+      if (client.length === 0) {
+        throw new Error("No iMessage clients configured");
+      }
+      const phone = input.params?.phone ?? randomPhone(client);
+      const remote = clientForPhone(client, phone);
       const addresses = input.users.map((u) => u.id);
       if (input.users.length === 1) {
         return {
           id: directChat(addresses[0] ?? ""),
-          type: "dm"
+          type: "dm",
+          phone
         };
       }
-      const remote = client[0];
-      if (!remote) {
-        throw new Error("No remote iMessage client available");
-      }
       const { chat } = await remote.chats.create(addresses);
-      return { id: chat.guid, type: "group" };
+      return { id: chat.guid, type: "group", phone };
     }
   },
   message: {
     schema: messageSchema
   },
-  lifecycle: {
-    createClient: async ({
-      config,
-      projectId,
-      projectSecret
-    }) => {
-      if (config.local) {
-        return new IMessageSDK2();
-      }
-      if (config.clients) {
-        const entries = Array.isArray(config.clients) ? config.clients : [config.clients];
-        return entries.map(
-          (e) => createClient2({ address: e.address, tls: true, token: e.token })
-        );
-      }
-      if (!(projectId && projectSecret)) {
-        throw new Error(
-          "iMessage requires projectId and projectSecret. Either pass credentials to Spectrum(), use local mode: imessage.config({ local: true }), or provide explicit client config: imessage.config({ clients: [...] })"
-        );
-      }
-      return await createCloudClients(projectId, projectSecret);
-    },
-    destroyClient: async ({ client }) => {
-      if (isLocal(client)) {
-        await client.close();
-        return;
-      }
-      await disposeCloudAuth(client);
-      await Promise.all(client.map((c) => c.close()));
-    }
-  },
   events: {
     messages: ({ client }) => isLocal(client) ? messages2(client) : messages4(client)
   },
@@ -1930,19 +2007,22 @@ var imessage = definePlatform("iMessage", {
       if (isLocal(client)) {
         return await send2(client, space.id, content);
       }
-      return await send4(client, space.id, content);
+      const remote = clientForPhone(client, space.phone);
+      return await send4(remote, space.id, content);
     },
     startTyping: async ({ space, client }) => {
       if (isLocal(client)) {
         return;
       }
-      await startTyping2(client, space.id);
+      const remote = clientForPhone(client, space.phone);
+      await startTyping2(remote, space.id);
     },
     stopTyping: async ({ space, client }) => {
       if (isLocal(client)) {
         return;
       }
-      await stopTyping2(client, space.id);
+      const remote = clientForPhone(client, space.phone);
+      await stopTyping2(remote, space.id);
     },
     reactToMessage: async ({ space, target, reaction, client }) => {
       if (isLocal(client)) {
@@ -1955,8 +2035,9 @@ var imessage = definePlatform("iMessage", {
           "iMessage polls do not support reactions"
         );
       }
+      const remote = clientForPhone(client, space.phone);
       await reactToMessage2(
-        client,
+        remote,
         space.id,
         target,
         reaction
@@ -1973,19 +2054,22 @@ var imessage = definePlatform("iMessage", {
           "iMessage polls do not support replies"
         );
       }
-      return await replyToMessage2(client, space.id, messageId, content);
+      const remote = clientForPhone(client, space.phone);
+      return await replyToMessage2(remote, space.id, messageId, content);
     },
     editMessage: async ({ space, messageId, content, client }) => {
       if (isLocal(client)) {
         throw UnsupportedError.action("edit", "iMessage (local mode)");
       }
-      await editMessage2(client, space.id, messageId, content);
+      const remote = clientForPhone(client, space.phone);
+      await editMessage2(remote, space.id, messageId, content);
     },
     getMessage: async ({ space, messageId, client }) => {
       if (isLocal(client)) {
         return getMessage2(client, messageId);
       }
-      return getMessage4(client, space.id, messageId);
+      const remote = clientForPhone(client, space.phone);
+      return getMessage4(remote, space.id, messageId, space.phone);
     }
   }
 });