@elizaos/plugin-signal 2.0.0-beta.1 → 2.0.3-beta.3

package/dist/index.js

@@ -4334,7 +4334,7 @@ function normalizeAccountId(accountId) {
   return trimmed || DEFAULT_ACCOUNT_ID;
 }
 function getMultiAccountConfig(runtime) {
-  const characterSignal = runtime.character?.settings?.signal;
+  const characterSignal = runtime.character.settings?.signal;
   return {
     enabled: characterSignal?.enabled,
     account: characterSignal?.account,
@@ -4436,7 +4436,7 @@ function purposeForAccount(_account) {
   return ["messaging"];
 }
 function accessGateForAccount(account) {
-  const dmPolicy = account.config?.dm?.policy;
+  const dmPolicy = account.config.dm?.policy;
   if (dmPolicy === "disabled")
     return "disabled";
   if (dmPolicy === "pairing")
@@ -4463,8 +4463,8 @@ function toConnectorAccount(account) {
     metadata: {
       phoneNumber: account.account,
       baseUrl: account.baseUrl,
-      dmPolicy: account.config?.dm?.policy ?? "pairing",
-      groupPolicy: account.config?.group?.policy ?? "open"
+      dmPolicy: account.config.dm?.policy ?? "pairing",
+      groupPolicy: account.config.group?.policy ?? "open"
     }
   };
 }
@@ -4506,6 +4506,7 @@ import {
   ChannelType,
   createMessageMemory,
   createUniqueUuid,
+  EventType,
   lifeOpsPassiveConnectorsEnabled,
   Service,
   stringToUuid
@@ -4963,7 +4964,7 @@ class SignalPairingSession {
     let qrCode;
     try {
       const importedQrCode = await Promise.resolve().then(() => __toESM(require_server(), 1));
-      qrCode = importedQrCode.default ?? importedQrCode;
+      qrCode = importedQrCode.default;
     } catch (err) {
       const message = `Failed to load QR dependency: ${String(err)}`;
       this.lastError = message;
@@ -5217,11 +5218,9 @@ var SignalEventTypes;
   SignalEventTypes2["REACTION_RECEIVED"] = "SIGNAL_REACTION_RECEIVED";
   SignalEventTypes2["GROUP_JOINED"] = "SIGNAL_GROUP_JOINED";
   SignalEventTypes2["GROUP_LEFT"] = "SIGNAL_GROUP_LEFT";
-  SignalEventTypes2["TYPING_STARTED"] = "SIGNAL_TYPING_STARTED";
-  SignalEventTypes2["TYPING_STOPPED"] = "SIGNAL_TYPING_STOPPED";
-  SignalEventTypes2["READ_RECEIPT"] = "SIGNAL_READ_RECEIPT";
 })(SignalEventTypes ||= {});
 var SIGNAL_SERVICE_NAME = "signal";
+
 class SignalPluginError extends Error {
   code;
   constructor(message, code) {
@@ -5592,70 +5591,80 @@ class SignalService extends Service {
   accountScopedKey(accountId, kind, value) {
     return accountId === DEFAULT_ACCOUNT_ID ? `signal-${kind}-${value}` : `signal-${kind}-${accountId}-${value}`;
   }
-  static async start(runtime) {
-    const service = new SignalService(runtime);
-    const accounts = listEnabledSignalAccounts(runtime);
+  static resolveStartupConfig(runtime) {
     const rawAuthDir = runtime.getSetting("SIGNAL_AUTH_DIR");
     const defaultAuthDir = typeof rawAuthDir === "string" && rawAuthDir.trim().length > 0 ? rawAuthDir.trim() : defaultSignalAuthDir();
     const configuredCliPath = runtime.getSetting("SIGNAL_CLI_PATH") || DEFAULT_SIGNAL_CLI_PATH;
     const parsedStartupTimeout = Number.parseInt(String(runtime.getSetting("SIGNAL_STARTUP_TIMEOUT_MS") ?? ""), 10);
     const startupTimeoutMs = Number.isFinite(parsedStartupTimeout) && parsedStartupTimeout > 0 ? Math.min(parsedStartupTimeout, 120000) : DEFAULT_SIGNAL_DAEMON_STARTUP_TIMEOUT_MS;
+    return { defaultAuthDir, configuredCliPath, startupTimeoutMs };
+  }
+  async initializeConfiguredAccount(account, config) {
+    const accountNumber = account.account;
+    if (!accountNumber) {
+      this.runtime.logger.warn({ src: "plugin:signal", agentId: this.runtime.agentId, accountId: account.accountId }, "Signal account is missing account number, skipping");
+      return;
+    }
+    const normalizedNumber = normalizeE164(accountNumber);
+    if (!normalizedNumber) {
+      this.runtime.logger.error({
+        src: "plugin:signal",
+        agentId: this.runtime.agentId,
+        accountId: account.accountId,
+        accountNumber
+      }, "Invalid Signal account number format");
+      return;
+    }
+    const baseUrl = normalizeBaseUrl2(account.baseUrl);
+    const authDir = account.config.authDir?.trim() || config.defaultAuthDir;
+    const accountCliPath = account.config.cliPath?.trim() || config.configuredCliPath;
+    if (!account.config.httpUrl?.trim() && !await this.ensureAccountDaemon(account, accountCliPath, authDir, baseUrl, config)) {
+      return;
+    }
+    const client = new SignalApiClient(baseUrl, normalizedNumber);
+    this.clients.set(account.accountId, client);
+    this.accountNumbers.set(account.accountId, normalizedNumber);
+    if (account.accountId === this.defaultAccountId || !this.client) {
+      this.client = client;
+      this.accountNumber = normalizedNumber;
+    }
+  }
+  async ensureAccountDaemon(account, cliPath, authDir, baseUrl, config) {
+    if (!fs2.existsSync(authDir)) {
+      this.runtime.logger.warn({
+        src: "plugin:signal",
+        agentId: this.runtime.agentId,
+        accountId: account.accountId,
+        authDir
+      }, "Signal auth directory does not exist yet — run `signal-cli -a <number> link` (or set SIGNAL_AUTH_DIR to a pre-existing install) before starting the plugin");
+      return false;
+    }
+    try {
+      await this.ensureDaemonRunning(cliPath, authDir, baseUrl, config.startupTimeoutMs);
+      return true;
+    } catch (error) {
+      this.runtime.logger.error({
+        src: "plugin:signal",
+        agentId: this.runtime.agentId,
+        accountId: account.accountId,
+        error: String(error),
+        authDir,
+        cliPath
+      }, "Failed to start signal-cli daemon");
+      return false;
+    }
+  }
+  static async start(runtime) {
+    const service = new SignalService(runtime);
+    const accounts = listEnabledSignalAccounts(runtime);
+    const startupConfig = SignalService.resolveStartupConfig(runtime);
     if (accounts.length === 0) {
       runtime.logger.warn({ src: "plugin:signal", agentId: runtime.agentId }, "SIGNAL_ACCOUNT_NUMBER not provided, Signal service will not start");
       return service;
     }
     service.defaultAccountId = resolveDefaultSignalAccountId(runtime);
     for (const account of accounts) {
-      const accountNumber = account.account;
-      if (!accountNumber) {
-        runtime.logger.warn({ src: "plugin:signal", agentId: runtime.agentId, accountId: account.accountId }, "Signal account is missing account number, skipping");
-        continue;
-      }
-      const normalizedNumber = normalizeE164(accountNumber);
-      if (!normalizedNumber) {
-        runtime.logger.error({
-          src: "plugin:signal",
-          agentId: runtime.agentId,
-          accountId: account.accountId,
-          accountNumber
-        }, "Invalid Signal account number format");
-        continue;
-      }
-      const baseUrl = normalizeBaseUrl2(account.baseUrl);
-      const explicitHttpUrl = Boolean(account.config.httpUrl?.trim());
-      const authDir = account.config.authDir?.trim() || defaultAuthDir;
-      const accountCliPath = account.config.cliPath?.trim() || configuredCliPath;
-      if (!explicitHttpUrl) {
-        if (!fs2.existsSync(authDir)) {
-          runtime.logger.warn({
-            src: "plugin:signal",
-            agentId: runtime.agentId,
-            accountId: account.accountId,
-            authDir
-          }, "Signal auth directory does not exist yet — run `signal-cli -a <number> link` (or set SIGNAL_AUTH_DIR to a pre-existing install) before starting the plugin");
-          continue;
-        }
-        try {
-          await service.ensureDaemonRunning(accountCliPath, authDir, baseUrl, startupTimeoutMs);
-        } catch (error) {
-          runtime.logger.error({
-            src: "plugin:signal",
-            agentId: runtime.agentId,
-            accountId: account.accountId,
-            error: String(error),
-            authDir,
-            cliPath: accountCliPath
-          }, "Failed to start signal-cli daemon");
-          continue;
-        }
-      }
-      const client = new SignalApiClient(baseUrl, normalizedNumber);
-      service.clients.set(account.accountId, client);
-      service.accountNumbers.set(account.accountId, normalizedNumber);
-      if (account.accountId === service.defaultAccountId || !service.client) {
-        service.client = client;
-        service.accountNumber = normalizedNumber;
-      }
+      await service.initializeConfiguredAccount(account, startupConfig);
     }
     if (service.clients.size === 0) {
       runtime.logger.warn({ src: "plugin:signal", agentId: runtime.agentId }, "No configured Signal accounts could be initialized");
@@ -5794,7 +5803,10 @@ class SignalService extends Service {
               }
             });
           },
-          getUser: service.getConnectorUser.bind(service),
+          getUser: (handlerRuntime, params) => service.getConnectorUser(handlerRuntime, {
+            ...params,
+            target: params.target ? params.target.accountId ? params.target : { ...params.target, accountId: connectorAccountId } : { source: SIGNAL_SERVICE_NAME, accountId: connectorAccountId }
+          }),
           getChatContext: async (target, context) => {
             const targetAccountId = service.normalizeAccountId(target.accountId ?? context.accountId ?? connectorAccountId);
             const room = target.roomId ? await context.runtime.getRoom(target.roomId) : null;
@@ -5802,7 +5814,8 @@ class SignalService extends Service {
             if (!channelId) {
               return null;
             }
-            const recentMessages = (await service.getRecentMessages(50, targetAccountId).catch(() => [])).filter((recent) => recent.channelId === channelId || recent.roomId === target.roomId).slice(0, 10).map((recent) => ({
+            const signalRecentMessages = await service.getRecentMessages(50, targetAccountId).catch(() => []);
+            const recentMessages = signalRecentMessages.filter((recent) => recent.channelId === channelId || recent.roomId === target.roomId).slice(0, 10).map((recent) => ({
               name: recent.speakerName,
               text: recent.text,
               timestamp: recent.createdAt,
@@ -6014,39 +6027,47 @@ class SignalService extends Service {
   }
   static unwrapEnvelope(raw) {
     if (!("envelope" in raw)) {
-      if (typeof raw.sender !== "string" || typeof raw.timestamp !== "number") {
-        return null;
-      }
-      return {
-        sender: raw.sender,
-        senderUuid: typeof raw.senderUuid === "string" ? raw.senderUuid : undefined,
-        message: typeof raw.message === "string" ? raw.message : undefined,
-        timestamp: raw.timestamp,
-        groupId: typeof raw.groupId === "string" ? raw.groupId : undefined,
-        attachments: Array.isArray(raw.attachments) ? raw.attachments : [],
-        reaction: raw.reaction,
-        expiresInSeconds: typeof raw.expiresInSeconds === "number" ? raw.expiresInSeconds : undefined,
-        viewOnce: raw.viewOnce === true,
-        quote: raw.quote
-      };
+      return SignalService.unwrapFlatMessage(raw);
     }
-    const env = raw.envelope;
-    const dm = env.dataMessage || {};
-    const groupInfo = dm.groupInfo;
-    const sender = env.sourceNumber || env.source;
-    const timestamp = dm.timestamp || env.timestamp;
+    if (!isRecord(raw.envelope)) {
+      return null;
+    }
+    return SignalService.unwrapEnvelopeMessage(raw.envelope);
+  }
+  static unwrapFlatMessage(raw) {
+    if (typeof raw.sender !== "string" || typeof raw.timestamp !== "number") {
+      return null;
+    }
+    return {
+      sender: raw.sender,
+      senderUuid: typeof raw.senderUuid === "string" ? raw.senderUuid : undefined,
+      message: typeof raw.message === "string" ? raw.message : undefined,
+      timestamp: raw.timestamp,
+      groupId: typeof raw.groupId === "string" ? raw.groupId : undefined,
+      attachments: Array.isArray(raw.attachments) ? raw.attachments : [],
+      reaction: raw.reaction,
+      expiresInSeconds: typeof raw.expiresInSeconds === "number" ? raw.expiresInSeconds : undefined,
+      viewOnce: raw.viewOnce === true,
+      quote: raw.quote
+    };
+  }
+  static unwrapEnvelopeMessage(env) {
+    const dm = isRecord(env.dataMessage) ? env.dataMessage : {};
+    const groupInfo = isRecord(dm.groupInfo) ? dm.groupInfo : undefined;
+    const sender = typeof env.sourceNumber === "string" && env.sourceNumber || typeof env.source === "string" && env.source || "";
+    const timestamp = typeof dm.timestamp === "number" && dm.timestamp || typeof env.timestamp === "number" && env.timestamp || 0;
     if (!sender || !timestamp)
       return null;
     return {
       sender,
-      senderUuid: env.source,
-      message: dm.message,
+      senderUuid: typeof env.source === "string" ? env.source : undefined,
+      message: typeof dm.message === "string" ? dm.message : undefined,
       timestamp,
-      groupId: groupInfo?.groupId,
-      attachments: dm.attachments || [],
+      groupId: typeof groupInfo?.groupId === "string" ? groupInfo.groupId : undefined,
+      attachments: Array.isArray(dm.attachments) ? dm.attachments : [],
       reaction: dm.reaction,
-      expiresInSeconds: dm.expiresInSeconds || 0,
-      viewOnce: dm.viewOnce || false,
+      expiresInSeconds: typeof dm.expiresInSeconds === "number" ? dm.expiresInSeconds : 0,
+      viewOnce: dm.viewOnce === true,
       quote: dm.quote
     };
   }
@@ -6159,9 +6180,16 @@ class SignalService extends Service {
       this.runtime.logger.warn({ src: "plugin:signal", accountId: normalizedAccountId, roomId, sender: msg.sender }, "Room not found after ensureConnection, creating via ensureRoomExists");
       room = await this.ensureRoomExists(msg.sender, msg.groupId, normalizedAccountId);
     }
-    if (this.settings.autoReply && !lifeOpsPassiveConnectorsEnabled(this.runtime)) {
+    const autoReply = this.settings.autoReply && !lifeOpsPassiveConnectorsEnabled(this.runtime);
+    if (autoReply) {
       await this.processMessage(memory, room, msg.sender, msg.groupId, normalizedAccountId);
+      return;
     }
+    await this.runtime.emitEvent(EventType.MESSAGE_RECEIVED, {
+      runtime: this.runtime,
+      message: memory,
+      source: "signal"
+    });
   }
   async handleReaction(msg, accountId = this.defaultAccountId) {
     if (!msg.reaction)
@@ -6386,7 +6414,7 @@ class SignalService extends Service {
     const accountId = this.normalizeAccountId(args.accountId);
     const roomId = await this.getRoomId(args.isGroup ? this.getAccountNumberForAccount(accountId) || "signal-agent" : args.channelId, args.isGroup ? args.channelId : undefined, accountId);
     const worldId = createUniqueUuid(this.runtime, accountId === DEFAULT_ACCOUNT_ID ? "signal-world" : `signal-world-${accountId}`);
-    const displayName = this.character?.name || "Agent";
+    const displayName = this.character.name || "Agent";
     await this.runtime.ensureConnection({
       entityId: this.runtime.agentId,
       roomId,
@@ -6514,11 +6542,11 @@ class SignalService extends Service {
       roomIds,
       limit: requestedLimit * 4
     });
-    return memories.filter((memory) => memory.content?.source === "signal").filter((memory) => this.memoryMatchesAccount(memory, normalizedAccountId)).filter((memory) => typeof memory.content?.text === "string" && memory.content.text.trim().length > 0).sort((left, right) => Number(right.createdAt ?? 0) - Number(left.createdAt ?? 0)).slice(0, requestedLimit).map((memory) => {
+    return memories.filter((memory) => memory.content.source === "signal").filter((memory) => this.memoryMatchesAccount(memory, normalizedAccountId)).filter((memory) => typeof memory.content.text === "string" && memory.content.text.trim().length > 0).sort((left, right) => Number(right.createdAt ?? 0) - Number(left.createdAt ?? 0)).slice(0, requestedLimit).map((memory) => {
       const room = roomsById.get(memory.roomId);
       const isGroup = room?.type === ChannelType.GROUP || Boolean(room?.metadata?.isGroup);
       const text = String(memory.content.text ?? "").trim();
-      const speakerName = memory.entityId === this.runtime.agentId ? this.character?.name || "Agent" : typeof memory.content.name === "string" && memory.content.name.trim().length > 0 ? memory.content.name.trim() : room?.name || room?.channelId || "Unknown";
+      const speakerName = memory.entityId === this.runtime.agentId ? this.character.name || "Agent" : typeof memory.content.name === "string" && memory.content.name.trim().length > 0 ? memory.content.name.trim() : room?.name || room?.channelId || "Unknown";
       return {
         id: String(memory.id),
         roomId: String(memory.roomId),
@@ -6578,7 +6606,7 @@ class SignalService extends Service {
     });
     const before = params.before ? Number(params.before) : undefined;
     const after = params.after ? Number(params.after) : undefined;
-    return memories.filter((memory) => memory.content?.source === "signal").filter((memory) => this.memoryMatchesAccount(memory, accountId)).filter((memory) => {
+    return memories.filter((memory) => memory.content.source === "signal").filter((memory) => this.memoryMatchesAccount(memory, accountId)).filter((memory) => {
       const createdAt = Number(memory.createdAt ?? 0);
       if (before !== undefined && Number.isFinite(before) && createdAt >= before) {
         return false;
@@ -6599,12 +6627,23 @@ class SignalService extends Service {
       limit: Math.max(params.limit ?? 100, 100)
     });
     return memories.filter((memory) => {
-      const text = String(memory.content?.text ?? "").toLowerCase();
-      const name = String(memory.content?.name ?? "").toLowerCase();
+      const text = String(memory.content.text ?? "").toLowerCase();
+      const name = String(memory.content.name ?? "").toLowerCase();
       return text.includes(query) || name.includes(query);
     }).slice(0, params.limit ?? 25);
   }
   async reactConnectorMessage(runtime, params) {
+    const reactionTarget = await this.resolveReactionTarget(runtime, params);
+    if (!params.emoji) {
+      throw new Error("Signal reaction requires emoji, targetTimestamp, and targetAuthor.");
+    }
+    if (params.remove) {
+      await this.removeReaction(reactionTarget.recipient, params.emoji, reactionTarget.targetTimestamp, reactionTarget.targetAuthor, reactionTarget.accountId);
+      return;
+    }
+    await this.sendReaction(reactionTarget.recipient, params.emoji, reactionTarget.targetTimestamp, reactionTarget.targetAuthor, reactionTarget.accountId);
+  }
+  async resolveReactionTarget(runtime, params) {
     const target = params.target;
     const accountId = this.normalizeAccountId(target?.accountId);
     const room = params.roomId || target?.roomId ? await runtime.getRoom(params.roomId ?? target?.roomId) : null;
@@ -6612,23 +6651,21 @@ class SignalService extends Service {
     if (!recipient) {
       throw new Error("Signal reaction requires a target recipient or room.");
     }
-    let targetTimestamp = params.targetTimestamp;
-    let targetAuthor = params.targetAuthor;
-    if ((!targetTimestamp || !targetAuthor) && params.messageId) {
-      const memory = await runtime.getMemoryById(params.messageId).catch(() => null);
-      const metadata = memory?.metadata;
-      const sender = metadata?.sender;
-      targetTimestamp = targetTimestamp ?? Number(metadata?.messageIdFull ?? metadata?.timestamp ?? memory?.createdAt);
-      targetAuthor = targetAuthor ?? (typeof sender?.id === "string" ? sender.id : typeof metadata?.fromId === "string" ? metadata.fromId : undefined);
-    }
-    if (!params.emoji || !targetTimestamp || !targetAuthor) {
+    const fallback = params.messageId ? await this.lookupReactionTargetFromMemory(runtime, params.messageId) : {};
+    const targetTimestamp = params.targetTimestamp ?? fallback.targetTimestamp;
+    const targetAuthor = params.targetAuthor ?? fallback.targetAuthor;
+    if (!targetTimestamp || !targetAuthor) {
       throw new Error("Signal reaction requires emoji, targetTimestamp, and targetAuthor.");
     }
-    if (params.remove) {
-      await this.removeReaction(recipient, params.emoji, targetTimestamp, targetAuthor, accountId);
-      return;
-    }
-    await this.sendReaction(recipient, params.emoji, targetTimestamp, targetAuthor, accountId);
+    return { recipient, accountId, targetTimestamp, targetAuthor };
+  }
+  async lookupReactionTargetFromMemory(runtime, messageId) {
+    const memory = await runtime.getMemoryById(messageId).catch(() => null);
+    const metadata = memory?.metadata;
+    const sender = metadata?.sender;
+    const targetTimestamp = Number(metadata?.messageIdFull ?? metadata?.timestamp ?? memory?.createdAt);
+    const targetAuthor = typeof sender?.id === "string" ? sender.id : typeof metadata?.fromId === "string" ? metadata.fromId : undefined;
+    return { targetTimestamp, targetAuthor };
   }
   async getConnectorUser(_runtime, params) {
     const lookup = params.userId ?? params.handle ?? params.username ?? params.query;
@@ -6726,6 +6763,9 @@ class SignalService extends Service {
 
 // src/setup-routes.ts
 import path3 from "node:path";
+function setupError(code, message) {
+  return { error: { code, message } };
+}
 var signalPairingSessions = new Map;
 var signalPairingSnapshots = new Map;
 var MAX_PAIRING_SESSIONS = 10;
@@ -6746,17 +6786,22 @@ function getSetupService(runtime) {
   const service = runtime.getService("connector-setup");
   return isConnectorSetupService(service) ? service : null;
 }
-function resolveSignalStatusResponse(accountId, session, previousSnapshot, authExists, serviceConnected) {
+function buildSignalStatusResponse(accountId, session, previousSnapshot, authExists, serviceConnected) {
   const snapshot = session?.getSnapshot() ?? previousSnapshot;
-  const status = snapshot?.status ?? (authExists || serviceConnected ? "connected" : "idle");
+  const pairingStatus = snapshot?.status ?? (authExists || serviceConnected ? "connected" : "idle");
+  const state = pairingStatus === "connected" ? "paired" : pairingStatus === "error" || pairingStatus === "timeout" ? "error" : pairingStatus === "idle" || pairingStatus === "disconnected" ? "idle" : "configuring";
   return {
-    accountId,
-    status,
-    authExists,
-    serviceConnected,
-    qrDataUrl: snapshot?.qrDataUrl ?? null,
-    phoneNumber: snapshot?.phoneNumber ?? null,
-    error: snapshot?.error ?? null
+    connector: "signal",
+    state,
+    detail: {
+      accountId,
+      pairingStatus,
+      authExists,
+      serviceConnected,
+      qrDataUrl: snapshot?.qrDataUrl ?? null,
+      phoneNumber: snapshot?.phoneNumber ?? null,
+      pairingError: snapshot?.error ?? null
+    }
   };
 }
 function reapTerminalSessions() {
@@ -6769,21 +6814,47 @@ function reapTerminalSessions() {
     }
   }
 }
-async function handlePair(req, res, runtime) {
+function resolveServiceConnected(runtime) {
+  const sigService = runtime.getService("signal");
+  if (!sigService)
+    return false;
+  return Boolean(sigService.connected) || Boolean(sigService.isConnected) || typeof sigService.isServiceConnected === "function" && Boolean(sigService.isServiceConnected());
+}
+function extractAccountId(value) {
+  return sanitizeAccountId(typeof value === "string" && value.trim() ? value.trim() : "default");
+}
+async function handleStatus(req, res, runtime) {
+  reapTerminalSessions();
+  const rawUrl = typeof req.url === "string" ? req.url : "/";
+  const url = new URL(rawUrl, "http://localhost");
+  let accountId;
+  try {
+    accountId = extractAccountId(url.searchParams.get("accountId"));
+  } catch (err) {
+    res.status(400).json(setupError("bad_request", err.message));
+    return;
+  }
+  const setupService = getSetupService(runtime);
+  const workspaceDir = setupService?.getWorkspaceDir() ?? "";
+  const session = signalPairingSessions.get(accountId);
+  const previousSnapshot = signalPairingSnapshots.get(accountId);
+  const authExists = signalAuthExists(workspaceDir, accountId);
+  const serviceConnected = resolveServiceConnected(runtime);
+  res.status(200).json(buildSignalStatusResponse(accountId, session, previousSnapshot, authExists, serviceConnected));
+}
+async function handleStart(req, res, runtime) {
   reapTerminalSessions();
   const body = req.body ?? {};
   let accountId;
   try {
-    accountId = sanitizeAccountId(typeof body.accountId === "string" && body.accountId.trim() ? body.accountId.trim() : "default");
+    accountId = extractAccountId(body.accountId);
   } catch (err) {
-    res.status(400).json({ error: err.message });
+    res.status(400).json(setupError("bad_request", err.message));
     return;
   }
   const isReplacing = signalPairingSessions.has(accountId);
   if (!isReplacing && signalPairingSessions.size >= MAX_PAIRING_SESSIONS) {
-    res.status(429).json({
-      error: `Too many concurrent pairing sessions (max ${MAX_PAIRING_SESSIONS})`
-    });
+    res.status(429).json(setupError("too_many_sessions", `Too many concurrent pairing sessions (max ${MAX_PAIRING_SESSIONS})`));
     return;
   }
   const setupService = getSetupService(runtime);
@@ -6852,60 +6923,15 @@ async function handlePair(req, res, runtime) {
     signalPairingSnapshots.set(accountId, session.getSnapshot());
     signalPairingSessions.delete(accountId);
   });
-  res.status(200).json({
-    ok: true,
-    ...resolveSignalStatusResponse(accountId, session, signalPairingSnapshots.get(accountId), false, false)
-  });
+  res.status(200).json(buildSignalStatusResponse(accountId, session, signalPairingSnapshots.get(accountId), false, false));
 }
-async function handleStatus(req, res, runtime) {
-  reapTerminalSessions();
-  const rawUrl = typeof req.url === "string" ? req.url : "/";
-  const url = new URL(rawUrl, "http://localhost");
-  let accountId;
-  try {
-    accountId = sanitizeAccountId(url.searchParams.get("accountId") || "default");
-  } catch (err) {
-    res.status(400).json({ error: err.message });
-    return;
-  }
-  const setupService = getSetupService(runtime);
-  const workspaceDir = setupService?.getWorkspaceDir() ?? "";
-  const session = signalPairingSessions.get(accountId);
-  const previousSnapshot = signalPairingSnapshots.get(accountId);
-  const authExists = signalAuthExists(workspaceDir, accountId);
-  let serviceConnected = false;
-  try {
-    const sigService = runtime.getService("signal");
-    if (sigService) {
-      serviceConnected = Boolean(sigService.connected) || Boolean(sigService.isConnected) || typeof sigService.isServiceConnected === "function" && Boolean(sigService.isServiceConnected());
-    }
-  } catch {}
-  res.status(200).json(resolveSignalStatusResponse(accountId, session, previousSnapshot, authExists, serviceConnected));
-}
-async function handlePairStop(req, res, _runtime) {
+async function handleCancel(req, res, runtime) {
   const body = req.body ?? {};
   let accountId;
   try {
-    accountId = sanitizeAccountId(typeof body.accountId === "string" && body.accountId.trim() ? body.accountId.trim() : "default");
+    accountId = extractAccountId(body.accountId);
   } catch (err) {
-    res.status(400).json({ error: err.message });
-    return;
-  }
-  const session = signalPairingSessions.get(accountId);
-  if (session) {
-    session.stop();
-    signalPairingSessions.delete(accountId);
-  }
-  signalPairingSnapshots.delete(accountId);
-  res.status(200).json({ ok: true, accountId, status: "idle" });
-}
-async function handleDisconnect(req, res, runtime) {
-  const body = req.body ?? {};
-  let accountId;
-  try {
-    accountId = sanitizeAccountId(typeof body.accountId === "string" && body.accountId.trim() ? body.accountId.trim() : "default");
-  } catch (err) {
-    res.status(400).json({ error: err.message });
+    res.status(400).json(setupError("bad_request", err.message));
     return;
   }
   const session = signalPairingSessions.get(accountId);
@@ -6919,9 +6945,7 @@ async function handleDisconnect(req, res, runtime) {
   try {
     signalLogout(workspaceDir, accountId);
   } catch (err) {
-    res.status(500).json({
-      error: `Failed to disconnect Signal: ${String(err)}`
-    });
+    res.status(500).json(setupError("internal_error", `Failed to disconnect Signal: ${err instanceof Error ? err.message : String(err)}`));
     return;
   }
   if (setupService) {
@@ -6943,37 +6967,33 @@ async function handleDisconnect(req, res, runtime) {
         };
       });
     } catch (error) {
-      res.status(500).json({
-        error: `Failed to persist Signal disconnect: ${String(error)}`
-      });
+      res.status(500).json(setupError("internal_error", `Failed to persist Signal disconnect: ${error instanceof Error ? error.message : String(error)}`));
       return;
     }
   }
-  res.status(200).json({ ok: true, accountId });
+  res.status(200).json({
+    connector: "signal",
+    state: "idle",
+    detail: { accountId }
+  });
 }
 var signalSetupRoutes = [
-  {
-    type: "POST",
-    path: "/api/signal/pair",
-    handler: handlePair,
-    rawPath: true
-  },
   {
     type: "GET",
-    path: "/api/signal/status",
+    path: "/api/setup/signal/status",
     handler: handleStatus,
     rawPath: true
   },
   {
     type: "POST",
-    path: "/api/signal/pair/stop",
-    handler: handlePairStop,
+    path: "/api/setup/signal/start",
+    handler: handleStart,
     rawPath: true
   },
   {
     type: "POST",
-    path: "/api/signal/disconnect",
-    handler: handleDisconnect,
+    path: "/api/setup/signal/cancel",
+    handler: handleCancel,
     rawPath: true
   }
 ];
@@ -7023,6 +7043,74 @@ class SignalWorkflowCredentialProvider extends Service2 {
     };
   }
 }
+// src/local-client.ts
+import { randomUUID } from "node:crypto";
+var DEFAULT_SIGNAL_HTTP_URL = "http://127.0.0.1:8080";
+var DEFAULT_RECEIVE_LIMIT = 25;
+var MAX_RECEIVE_LIMIT = 100;
+function isRecord2(value) {
+  return Boolean(value && typeof value === "object" && !Array.isArray(value));
+}
+function isSignalCliReceiveResponse(value) {
+  return isRecord2(value);
+}
+function readSignalLocalClientConfigFromEnv(env = process.env) {
+  const accountNumber = env.SIGNAL_ACCOUNT_NUMBER?.trim();
+  if (!accountNumber)
+    return null;
+  return {
+    httpUrl: env.SIGNAL_HTTP_URL?.trim() || DEFAULT_SIGNAL_HTTP_URL,
+    accountNumber
+  };
+}
+async function readSignalInboundMessages(config, limit = DEFAULT_RECEIVE_LIMIT) {
+  const parsedLimit = Number.isFinite(limit) ? Math.floor(limit) : DEFAULT_RECEIVE_LIMIT;
+  const receiveLimit = Math.min(Math.max(1, parsedLimit), MAX_RECEIVE_LIMIT);
+  const baseUrl = config.httpUrl.replace(/\/$/, "");
+  const account = encodeURIComponent(config.accountNumber);
+  const response = await fetch(`${baseUrl}/v1/receive/${account}`, {
+    headers: { Accept: "application/json" }
+  });
+  if (!response.ok) {
+    throw new Error(`Signal local receive failed with HTTP ${response.status}`);
+  }
+  const body = await response.json();
+  if (!Array.isArray(body)) {
+    throw new Error("Signal local receive returned an unexpected payload");
+  }
+  const messages = [];
+  for (const item of body.filter(isSignalCliReceiveResponse)) {
+    if (messages.length >= receiveLimit)
+      break;
+    const envelope = item.envelope;
+    const dataMessage = envelope?.dataMessage;
+    const text = dataMessage?.message?.trim();
+    if (!envelope || !dataMessage || !text)
+      continue;
+    const senderNumber = envelope.sourceNumber ?? envelope.source ?? null;
+    const senderUuid = envelope.sourceUuid ?? null;
+    const groupId = dataMessage.groupInfo?.groupId ?? null;
+    const isGroup = Boolean(groupId);
+    const channelId = groupId ?? senderNumber ?? senderUuid;
+    if (!channelId)
+      continue;
+    const speakerName = envelope.sourceName ?? senderNumber ?? senderUuid ?? "Signal";
+    const createdAt = dataMessage.timestamp ?? envelope.timestamp ?? Date.now();
+    const threadId = `signal:${channelId}`;
+    messages.push({
+      id: `${threadId}:${createdAt}:${randomUUID()}`,
+      roomId: threadId,
+      channelId,
+      roomName: isGroup ? `Signal group ${channelId}` : speakerName,
+      speakerName,
+      text,
+      createdAt,
+      isFromAgent: senderNumber === config.accountNumber,
+      isGroup
+    });
+  }
+  return messages;
+}
 
 // src/index.ts
 var signalPlugin = {
@@ -7048,7 +7136,7 @@ var signalPlugin = {
     const accountNumber = runtime.getSetting("SIGNAL_ACCOUNT_NUMBER");
     const httpUrl = runtime.getSetting("SIGNAL_HTTP_URL");
     const cliPath = runtime.getSetting("SIGNAL_CLI_PATH");
-    const effectiveCliPath = (cliPath ?? "").trim() || DEFAULT_SIGNAL_CLI_PATH;
+    const effectiveCliPath = cliPath.trim() || DEFAULT_SIGNAL_CLI_PATH;
     const ignoreGroups = runtime.getSetting("SIGNAL_SHOULD_IGNORE_GROUP_MESSAGES");
     const maskNumber = (number) => {
       if (!number || number.trim() === "")
@@ -7082,6 +7170,10 @@ var signalPlugin = {
       mode: httpUrl ? "http" : "local-cli",
       cliPath: effectiveCliPath
     }, "Signal plugin configuration validated successfully");
+  },
+  async dispose(runtime) {
+    const svc = runtime.getService(SignalService.serviceType);
+    await svc?.stop();
   }
 };
 var src_default = signalPlugin;
@@ -7103,6 +7195,8 @@ export {
   sanitizeAccountId as sanitizeSignalAccountId,
   resolveSignalAccount,
   resolveDefaultSignalAccountId,
+  readSignalLocalClientConfigFromEnv,
+  readSignalInboundMessages,
   parseSignalEventData,
   parseSignalCliAccountsOutput,
   normalizeE164,
@@ -7136,4 +7230,4 @@ export {
   DEFAULT_ACCOUNT_ID
 };
 
-//# debugId=593E95DA16C8A67B64756E2164756E21
+//# debugId=A2D8D2D244D7703264756E2164756E21