@hasna/bridge 0.2.0 → 0.2.1

package/README.md

@@ -143,8 +143,18 @@ bridge agents add aicopilot-main --kind aicopilot --profile aicopilot-main
 
 - `bridge_status`
 - `bridge_config`
+- `bridge_session_list`
+- `bridge_session_status`
+- `bridge_session_create`
+- `bridge_session_attach`
+- `bridge_session_send`
+- `bridge_session_route_message`
 - `bridge_route_message`
 
+Use `bridge_session_route_message` for normal inbound channel behavior through
+session bindings. `bridge_route_message` remains for compatibility with explicit
+stateless routes.
+
 ## State
 
 Default config path:
@@ -234,6 +244,10 @@ If your Mac has more than one Messages account, add the account selector:
 bridge channels add-imessage imessage-main --allowed-handles +15555550100 --account you@example.com
 ```
 
+For receive mode, configured accounts are also used as a filter when Messages
+stores account metadata in `chat.db`. If an account is configured but an inbound
+row has no matching account metadata, the row is skipped rather than routed.
+
 Enable local receive polling only when you are comfortable granting the daemon
 host access to Messages data:
 

package/dist/cli/index.js

@@ -7137,17 +7137,57 @@ function imessageDateToIso(value) {
 function getIMessageDbPath(channel) {
   return channel.chatDbPath || defaultMessagesDbPath();
 }
+function tableColumns(db, table) {
+  const rows = db.query(`pragma table_info(${table})`).all();
+  return new Set(rows.map((row) => row.name).filter((name) => Boolean(name)));
+}
+function selectColumn(columns, table, column, alias) {
+  return columns.has(column) ? `${table}.${column} as ${alias}` : `null as ${alias}`;
+}
+function normalizeIdentifier(value) {
+  return value.trim().toLowerCase();
+}
+function valueMatchesConfigured(value, expected) {
+  if (!value || !expected)
+    return false;
+  const normalizedValue = normalizeIdentifier(value);
+  const normalizedExpected = normalizeIdentifier(expected);
+  return normalizedValue === normalizedExpected || normalizedValue.endsWith(`:${normalizedExpected}`) || normalizedValue.endsWith(`;${normalizedExpected}`);
+}
+function rowMatchesAccount(channel, row) {
+  if (!channel.account)
+    return true;
+  const rowCandidates = [row.account, row.accountGuid].filter(Boolean);
+  const candidates = rowCandidates.length ? rowCandidates : [row.chatAccount].filter(Boolean);
+  return candidates.some((value) => valueMatchesConfigured(value, channel.account));
+}
+function rowMatchesService(channel, row) {
+  const expected = channel.serviceName || "iMessage";
+  const candidates = row.service ? [row.service] : row.handleService ? [row.handleService] : row.chatService ? [row.chatService] : [];
+  if (!candidates.length)
+    return true;
+  return candidates.some((value) => valueMatchesConfigured(value, expected));
+}
 function getIMessageMessages(channel, options = {}) {
   if ((channel.receiveMode || "disabled") !== "chat-db")
     return [];
   const db = new Database(getIMessageDbPath(channel), { readonly: true });
   try {
+    const messageColumns = tableColumns(db, "message");
+    const handleColumns = tableColumns(db, "handle");
+    const chatColumns = tableColumns(db, "chat");
     const limit = options.limit || channel.pollLimit || 50;
     const scanLimit = Math.max(limit * 10, limit);
     const rows = db.query(`
       select
         message.ROWID as rowId,
         handle.id as handle,
+        ${selectColumn(messageColumns, "message", "account", "account")},
+        ${selectColumn(messageColumns, "message", "account_guid", "accountGuid")},
+        ${selectColumn(messageColumns, "message", "service", "service")},
+        ${selectColumn(handleColumns, "handle", "service", "handleService")},
+        ${selectColumn(chatColumns, "chat", "account_login", "chatAccount")},
+        ${selectColumn(chatColumns, "chat", "service_name", "chatService")},
         chat.guid as chatGuid,
         chat.display_name as displayName,
         message.text as text,
@@ -7162,8 +7202,14 @@ function getIMessageMessages(channel, options = {}) {
       order by message.ROWID asc
       limit ?
     `).all(options.afterRowId || 0, scanLimit);
-    return rows.filter((row) => row.handle && row.text && imessageHandleAllowed(channel, row.handle)).slice(0, limit).map((row) => {
+    return rows.filter((row) => row.handle && row.text && imessageHandleAllowed(channel, row.handle) && rowMatchesAccount(channel, row) && rowMatchesService(channel, row)).slice(0, limit).map((row) => {
       const item = { rowId: row.rowId, handle: row.handle, text: row.text, date: row.date };
+      if (row.account)
+        item.account = row.account;
+      if (row.accountGuid)
+        item.accountGuid = row.accountGuid;
+      if (row.service || row.handleService || row.chatService)
+        item.service = row.service || row.handleService || row.chatService;
       if (row.chatGuid)
         item.chatGuid = row.chatGuid;
       if (row.displayName)

package/dist/index.js

@@ -5106,17 +5106,57 @@ function imessageDateToIso(value) {
 function getIMessageDbPath(channel) {
   return channel.chatDbPath || defaultMessagesDbPath();
 }
+function tableColumns(db, table) {
+  const rows = db.query(`pragma table_info(${table})`).all();
+  return new Set(rows.map((row) => row.name).filter((name) => Boolean(name)));
+}
+function selectColumn(columns, table, column, alias) {
+  return columns.has(column) ? `${table}.${column} as ${alias}` : `null as ${alias}`;
+}
+function normalizeIdentifier(value) {
+  return value.trim().toLowerCase();
+}
+function valueMatchesConfigured(value, expected) {
+  if (!value || !expected)
+    return false;
+  const normalizedValue = normalizeIdentifier(value);
+  const normalizedExpected = normalizeIdentifier(expected);
+  return normalizedValue === normalizedExpected || normalizedValue.endsWith(`:${normalizedExpected}`) || normalizedValue.endsWith(`;${normalizedExpected}`);
+}
+function rowMatchesAccount(channel, row) {
+  if (!channel.account)
+    return true;
+  const rowCandidates = [row.account, row.accountGuid].filter(Boolean);
+  const candidates = rowCandidates.length ? rowCandidates : [row.chatAccount].filter(Boolean);
+  return candidates.some((value) => valueMatchesConfigured(value, channel.account));
+}
+function rowMatchesService(channel, row) {
+  const expected = channel.serviceName || "iMessage";
+  const candidates = row.service ? [row.service] : row.handleService ? [row.handleService] : row.chatService ? [row.chatService] : [];
+  if (!candidates.length)
+    return true;
+  return candidates.some((value) => valueMatchesConfigured(value, expected));
+}
 function getIMessageMessages(channel, options = {}) {
   if ((channel.receiveMode || "disabled") !== "chat-db")
     return [];
   const db = new Database(getIMessageDbPath(channel), { readonly: true });
   try {
+    const messageColumns = tableColumns(db, "message");
+    const handleColumns = tableColumns(db, "handle");
+    const chatColumns = tableColumns(db, "chat");
     const limit = options.limit || channel.pollLimit || 50;
     const scanLimit = Math.max(limit * 10, limit);
     const rows = db.query(`
       select
         message.ROWID as rowId,
         handle.id as handle,
+        ${selectColumn(messageColumns, "message", "account", "account")},
+        ${selectColumn(messageColumns, "message", "account_guid", "accountGuid")},
+        ${selectColumn(messageColumns, "message", "service", "service")},
+        ${selectColumn(handleColumns, "handle", "service", "handleService")},
+        ${selectColumn(chatColumns, "chat", "account_login", "chatAccount")},
+        ${selectColumn(chatColumns, "chat", "service_name", "chatService")},
         chat.guid as chatGuid,
         chat.display_name as displayName,
         message.text as text,
@@ -5131,8 +5171,14 @@ function getIMessageMessages(channel, options = {}) {
       order by message.ROWID asc
       limit ?
     `).all(options.afterRowId || 0, scanLimit);
-    return rows.filter((row) => row.handle && row.text && imessageHandleAllowed(channel, row.handle)).slice(0, limit).map((row) => {
+    return rows.filter((row) => row.handle && row.text && imessageHandleAllowed(channel, row.handle) && rowMatchesAccount(channel, row) && rowMatchesService(channel, row)).slice(0, limit).map((row) => {
       const item = { rowId: row.rowId, handle: row.handle, text: row.text, date: row.date };
+      if (row.account)
+        item.account = row.account;
+      if (row.accountGuid)
+        item.accountGuid = row.accountGuid;
+      if (row.service || row.handleService || row.chatService)
+        item.service = row.service || row.handleService || row.chatService;
       if (row.chatGuid)
         item.chatGuid = row.chatGuid;
       if (row.displayName)

package/dist/lib/imessage.d.ts

@@ -9,6 +9,9 @@ export interface IMessageRow {
     handle: string;
     chatGuid?: string;
     displayName?: string;
+    account?: string;
+    accountGuid?: string;
+    service?: string;
     text: string;
     date?: number;
 }

package/dist/lib/imessage.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"imessage.d.ts","sourceRoot":"","sources":["../../src/lib/imessage.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,aAAa,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;AAGxE,MAAM,WAAW,kBAAkB;IACjC,IAAI,EAAE,MAAM,CAAC;IACb,EAAE,EAAE,OAAO,CAAC;IACZ,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,WAAW;IAC1B,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,mBAAmB;IAClC,GAAG,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,OAAO,CAAC;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAC3F,eAAe,CAAC,EAAE,OAAO,CAAC;CAC3B;AAED,wBAAgB,qBAAqB,IAAI,MAAM,CAE9C;AAED,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,qBAAqB,EAAE,MAAM,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,CAIzG;AAMD,wBAAgB,wBAAwB,CAAC,OAAO,EAAE,qBAAqB,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,CAoB7G;AAYD,wBAAsB,YAAY,CAChC,OAAO,EAAE,qBAAqB,EAC9B,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,MAAM,EACZ,OAAO,GAAE,mBAAwB,GAChC,OAAO,CAAC;IAAE,EAAE,EAAE,IAAI,CAAA;CAAE,CAAC,CAUvB;AAUD,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,qBAAqB,GAAG,MAAM,CAExE;AAED,wBAAgB,mBAAmB,CACjC,OAAO,EAAE,qBAAqB,EAC9B,OAAO,GAAE;IAAE,UAAU,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAO,GACpD,WAAW,EAAE,CA2Cf;AAED,wBAAgB,oBAAoB,CAAC,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,WAAW,GAAG,aAAa,CAWvF;AAUD,wBAAsB,gBAAgB,CAAC,OAAO,EAAE,qBAAqB,GAAG,OAAO,CAAC,kBAAkB,EAAE,CAAC,CAmCpG"}
+{"version":3,"file":"imessage.d.ts","sourceRoot":"","sources":["../../src/lib/imessage.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,aAAa,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;AAGxE,MAAM,WAAW,kBAAkB;IACjC,IAAI,EAAE,MAAM,CAAC;IACb,EAAE,EAAE,OAAO,CAAC;IACZ,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,WAAW;IAC1B,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,mBAAmB;IAClC,GAAG,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,OAAO,CAAC;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAC3F,eAAe,CAAC,EAAE,OAAO,CAAC;CAC3B;AAED,wBAAgB,qBAAqB,IAAI,MAAM,CAE9C;AAED,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,qBAAqB,EAAE,MAAM,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,CAIzG;AAMD,wBAAgB,wBAAwB,CAAC,OAAO,EAAE,qBAAqB,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,CAoB7G;AAYD,wBAAsB,YAAY,CAChC,OAAO,EAAE,qBAAqB,EAC9B,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,MAAM,EACZ,OAAO,GAAE,mBAAwB,GAChC,OAAO,CAAC;IAAE,EAAE,EAAE,IAAI,CAAA;CAAE,CAAC,CAUvB;AAUD,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,qBAAqB,GAAG,MAAM,CAExE;AAoDD,wBAAgB,mBAAmB,CACjC,OAAO,EAAE,qBAAqB,EAC9B,OAAO,GAAE;IAAE,UAAU,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAO,GACpD,WAAW,EAAE,CAmEf;AAED,wBAAgB,oBAAoB,CAAC,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,WAAW,GAAG,aAAa,CAWvF;AAUD,wBAAsB,gBAAgB,CAAC,OAAO,EAAE,qBAAqB,GAAG,OAAO,CAAC,kBAAkB,EAAE,CAAC,CAmCpG"}

package/dist/mcp/index.js

@@ -5122,7 +5122,7 @@ function text(value) {
   return { content: [{ type: "text", text: typeof value === "string" ? value : JSON.stringify(value, null, 2) }] };
 }
 function buildServer() {
-  const server = new McpServer({ name: "bridge", version: "0.2.0" });
+  const server = new McpServer({ name: "bridge", version: "0.2.1" });
   server.tool("bridge_status", {}, async () => text(await doctor()));
   server.tool("bridge_config", {}, async () => text(redactConfig(await loadConfig())));
   server.tool("bridge_session_list", {}, async () => text(listBridgeSessions(await loadState())));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hasna/bridge",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "description": "Agent messaging bridge for Telegram and other channels",
   "type": "module",
   "main": "dist/index.js",