@hasna/bridge 0.1.2 → 0.2.0

package/dist/cli/index.js

@@ -2064,7 +2064,7 @@ var require_commander = __commonJS((exports) => {
 
 // src/cli/index.ts
 import { readFileSync } from "fs";
-import { dirname as dirname4, join as join4 } from "path";
+import { dirname as dirname4, join as join5 } from "path";
 import { fileURLToPath } from "url";
 
 // node_modules/commander/esm.mjs
@@ -2103,6 +2103,11 @@ function mergeEnv(profile, agent) {
     env["HOME"] = profile.home;
   return Object.keys(env).length ? env : undefined;
 }
+function compatibilityDetail(kind) {
+  if (kind === "shell")
+    return "shell command session; local bridge state is durable";
+  return "compatibility mode: this adapter invokes the current CLI one message at a time until a stable create/send/resume API is wired";
+}
 function resolveAgent(config, agentId) {
   const agent = config.agents[agentId];
   if (!agent)
@@ -2121,7 +2126,7 @@ function buildAgentCommand(config, agentId, input) {
   const kind = agent.kind;
   const command = agent.command || profile?.command;
   const args = agent.args || profile?.args;
-  const cwd = agent.cwd || profile?.cwd;
+  const cwd = input.session?.cwd || agent.cwd || profile?.cwd;
   const env = mergeEnv(profile, agent);
   if (command) {
     return { command: [command, ...renderCustomArgs(args, prompt)], cwd, env };
@@ -2143,6 +2148,32 @@ function buildAgentCommand(config, agentId, input) {
   }
   return { command: ["sh", "-lc", prompt], cwd, env };
 }
+function createAgentSessionRef(config, agentId) {
+  const { agent } = resolveAgent(config, agentId);
+  const timestamp = new Date().toISOString();
+  return {
+    kind: agent.kind,
+    mode: "compatibility",
+    createdAt: timestamp,
+    updatedAt: timestamp,
+    detail: compatibilityDetail(agent.kind)
+  };
+}
+function closeAgentSession(session) {
+  return {
+    supported: session.agentSession?.mode === "durable",
+    ref: session.agentSession,
+    detail: session.agentSession?.mode === "durable" ? "durable close is adapter-owned" : "compatibility close only updates bridge session state"
+  };
+}
+async function sendAgentSessionMessage(config, session, message, options = {}) {
+  const run = options.run || runAgent;
+  return run(config, session.agentId, {
+    message,
+    route: { id: `session:${session.id}`, fromChannel: message.channelId, toAgent: session.agentId },
+    session
+  });
+}
 async function runAgent(config, agentId, input) {
   const { agent } = resolveAgent(config, agentId);
   const built = buildAgentCommand(config, agentId, input);
@@ -6200,7 +6231,14 @@ var channelSchema = exports_external.discriminatedUnion("kind", [
     kind: exports_external.literal("imessage"),
     label: exports_external.string().optional(),
     enabled: exports_external.boolean().optional(),
-    account: exports_external.string().optional()
+    account: exports_external.string().optional(),
+    serviceName: exports_external.string().optional(),
+    defaultHandle: exports_external.string().optional(),
+    allowedHandles: exports_external.array(exports_external.string()).optional(),
+    allowAllHandles: exports_external.boolean().optional(),
+    receiveMode: exports_external.enum(["disabled", "chat-db"]).optional(),
+    chatDbPath: exports_external.string().optional(),
+    pollLimit: exports_external.number().int().positive().max(500).optional()
   })
 ]);
 var envSchema = exports_external.record(exports_external.string(), exports_external.string());
@@ -6313,19 +6351,35 @@ import { dirname as dirname3, join as join3, resolve } from "path";
 // src/lib/state.ts
 import { chmod as chmod2, mkdir as mkdir2, readFile as readFile2, writeFile as writeFile2 } from "fs/promises";
 import { dirname as dirname2, join as join2 } from "path";
+var STATE_SCHEMA_VERSION = 2;
 function defaultStatePath() {
   return process.env["BRIDGE_STATE"] || join2(bridgeHome(), "state.json");
 }
 function emptyState() {
-  return { telegramOffsets: {} };
+  return {
+    schemaVersion: STATE_SCHEMA_VERSION,
+    telegramOffsets: {},
+    sessions: {},
+    bindings: {},
+    messageLedger: {},
+    cursors: {}
+  };
+}
+function normalizeState(value) {
+  return {
+    schemaVersion: STATE_SCHEMA_VERSION,
+    telegramOffsets: value.telegramOffsets && typeof value.telegramOffsets === "object" ? value.telegramOffsets : {},
+    sessions: value.sessions && typeof value.sessions === "object" ? value.sessions : {},
+    bindings: value.bindings && typeof value.bindings === "object" ? value.bindings : {},
+    messageLedger: value.messageLedger && typeof value.messageLedger === "object" ? value.messageLedger : {},
+    cursors: value.cursors && typeof value.cursors === "object" ? value.cursors : {}
+  };
 }
 async function loadState(statePath = defaultStatePath()) {
   try {
     const raw = await readFile2(statePath, "utf-8");
     const parsed = JSON.parse(raw);
-    return {
-      telegramOffsets: parsed.telegramOffsets && typeof parsed.telegramOffsets === "object" ? parsed.telegramOffsets : {}
-    };
+    return normalizeState(parsed);
   } catch (err) {
     if (err && typeof err === "object" && "code" in err && err.code === "ENOENT") {
       return emptyState();
@@ -6334,8 +6388,9 @@ async function loadState(statePath = defaultStatePath()) {
   }
 }
 async function saveState(state, statePath = defaultStatePath()) {
+  const normalized = normalizeState(state);
   await mkdir2(dirname2(statePath), { recursive: true, mode: 448 });
-  await writeFile2(statePath, `${JSON.stringify(state, null, 2)}
+  await writeFile2(statePath, `${JSON.stringify(normalized, null, 2)}
 `, { encoding: "utf-8", mode: 384 });
   await chmod2(statePath, 384);
 }
@@ -6422,6 +6477,7 @@ function telegramUpdateToMessage(channelId, update) {
     channelId,
     text,
     chatId: String(chatId),
+    threadId: update.message?.message_thread_id !== undefined ? String(update.message.message_thread_id) : undefined,
     from: update.message?.from?.username || (update.message?.from?.id !== undefined ? String(update.message.from.id) : undefined),
     receivedAt: update.message?.date ? new Date(update.message.date * 1000).toISOString() : new Date().toISOString(),
     raw: update
@@ -6600,14 +6656,17 @@ function startCommand(options) {
 function telegramChannels(config) {
   return Object.values(config.channels).filter((channel) => channel.kind === "telegram" && channel.enabled !== false);
 }
+function imessagePollChannels(config) {
+  return Object.values(config.channels).filter((channel) => channel.kind === "imessage" && channel.enabled !== false && channel.receiveMode === "chat-db");
+}
 function requiredTelegramEnvVars(config) {
   return [...new Set(telegramChannels(config).map((channel) => channel.botTokenEnv || "TELEGRAM_BOT_TOKEN"))];
 }
 async function validateStartConfig(configPath) {
   const config = await loadConfig(configPath);
-  const channels = telegramChannels(config);
+  const channels = [...telegramChannels(config), ...imessagePollChannels(config)];
   if (!channels.length)
-    throw new Error("No enabled Telegram channels configured; add one before starting the daemon");
+    throw new Error("No enabled pollable channels configured; add Telegram or iMessage receive before starting the daemon");
   for (const envName of requiredTelegramEnvVars(config)) {
     if (!process.env[envName])
       throw new Error(`Missing Telegram bot token env var for daemon start: ${envName}`);
@@ -7009,6 +7068,167 @@ async function daemonLogs(options = {}) {
 }
 // src/lib/doctor.ts
 import { stat as stat2 } from "fs/promises";
+
+// src/lib/imessage.ts
+import { access } from "fs/promises";
+import { join as join4 } from "path";
+import { Database } from "bun:sqlite";
+function defaultMessagesDbPath() {
+  return join4(homeDir(), "Library", "Messages", "chat.db");
+}
+function imessageHandleAllowed(channel, handle) {
+  if (channel.allowAllHandles)
+    return true;
+  if (!channel.allowedHandles?.length)
+    return false;
+  return Boolean(handle && channel.allowedHandles.includes(handle));
+}
+function appleScriptString(value) {
+  return `"${value.replaceAll("\\", "\\\\").replaceAll('"', "\\\"")}"`;
+}
+function renderSendIMessageScript(channel, handle, text) {
+  const service = channel.serviceName || "iMessage";
+  const serviceSelector = channel.account ? `1st service whose name = ${appleScriptString(service)} and account = ${appleScriptString(channel.account)}` : `1st service whose name = ${appleScriptString(service)}`;
+  const targetLines = handle.startsWith("chat:") ? [
+    `set targetChat to 1st chat whose id = ${appleScriptString(handle.slice("chat:".length))}`,
+    `send ${appleScriptString(text)} to targetChat`
+  ] : [
+    `set targetBuddy to buddy ${appleScriptString(handle)} of targetService`,
+    `send ${appleScriptString(text)} to targetBuddy`
+  ];
+  return [
+    'tell application "Messages"',
+    `set targetService to ${serviceSelector}`,
+    ...targetLines,
+    "end tell"
+  ].join(`
+`);
+}
+async function defaultRun(command) {
+  const proc = Bun.spawn(command, { stdout: "pipe", stderr: "pipe" });
+  const [exitCode, stdout, stderr] = await Promise.all([
+    proc.exited,
+    new Response(proc.stdout).text(),
+    new Response(proc.stderr).text()
+  ]);
+  return { exitCode, stdout, stderr };
+}
+async function sendIMessage(channel, handle, text, options = {}) {
+  if (!(options.allowChatTarget && handle.startsWith("chat:")) && !imessageHandleAllowed(channel, handle)) {
+    throw new Error(`iMessage handle is not allowed for channel ${channel.id}: ${handle}`);
+  }
+  const script = renderSendIMessageScript(channel, handle, text);
+  const result = await (options.run || defaultRun)(["osascript", "-e", script]);
+  if (result.exitCode !== 0) {
+    throw new Error(`iMessage send failed: ${result.stderr || result.stdout || `exit ${result.exitCode}`}`);
+  }
+  return { ok: true };
+}
+function imessageDateToIso(value) {
+  if (typeof value !== "number" || !Number.isFinite(value) || value <= 0)
+    return new Date().toISOString();
+  const appleEpochMs = Date.UTC(2001, 0, 1);
+  if (value > 1000000000000000)
+    return new Date(appleEpochMs + Math.floor(value / 1e6)).toISOString();
+  if (value > 1e9)
+    return new Date(appleEpochMs + value * 1000).toISOString();
+  return new Date(appleEpochMs + value).toISOString();
+}
+function getIMessageDbPath(channel) {
+  return channel.chatDbPath || defaultMessagesDbPath();
+}
+function getIMessageMessages(channel, options = {}) {
+  if ((channel.receiveMode || "disabled") !== "chat-db")
+    return [];
+  const db = new Database(getIMessageDbPath(channel), { readonly: true });
+  try {
+    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,
+        chat.guid as chatGuid,
+        chat.display_name as displayName,
+        message.text as text,
+        message.date as date
+      from message
+      left join handle on message.handle_id = handle.ROWID
+      left join chat_message_join on chat_message_join.message_id = message.ROWID
+      left join chat on chat.ROWID = chat_message_join.chat_id
+      where message.ROWID > ?
+        and message.is_from_me = 0
+        and message.text is not null
+      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) => {
+      const item = { rowId: row.rowId, handle: row.handle, text: row.text, date: row.date };
+      if (row.chatGuid)
+        item.chatGuid = row.chatGuid;
+      if (row.displayName)
+        item.displayName = row.displayName;
+      return item;
+    });
+  } finally {
+    db.close();
+  }
+}
+function imessageRowToMessage(channelId, row) {
+  return {
+    id: `imessage:${row.rowId}`,
+    channelId,
+    chatId: row.chatGuid ? `chat:${row.chatGuid}` : row.handle,
+    responseTargetId: row.chatGuid ? `chat:${row.chatGuid}` : row.handle,
+    from: row.handle,
+    text: row.text,
+    receivedAt: imessageDateToIso(row.date),
+    raw: row
+  };
+}
+async function commandExists(command) {
+  const proc = Bun.spawn(["sh", "-lc", `command -v ${command} >/dev/null 2>&1`], {
+    stdout: "ignore",
+    stderr: "ignore"
+  });
+  return await proc.exited === 0;
+}
+async function diagnoseIMessage(channel) {
+  const checks = [];
+  checks.push({
+    name: `imessage-platform:${channel.id}`,
+    ok: process.platform === "darwin",
+    detail: process.platform === "darwin" ? "macOS" : `unsupported platform: ${process.platform}`
+  });
+  checks.push({
+    name: `imessage-osascript:${channel.id}`,
+    ok: await commandExists("osascript"),
+    detail: "required for Messages send automation"
+  });
+  checks.push({
+    name: `imessage-allowlist:${channel.id}`,
+    ok: Boolean(channel.allowAllHandles || channel.allowedHandles?.length),
+    detail: channel.allowAllHandles ? "allowAllHandles=true" : `${channel.allowedHandles?.length || 0} handle(s)`
+  });
+  if ((channel.receiveMode || "disabled") === "chat-db") {
+    const path = getIMessageDbPath(channel);
+    try {
+      await access(path);
+      checks.push({ name: `imessage-chat-db:${channel.id}`, ok: true, detail: path });
+    } catch (err) {
+      checks.push({
+        name: `imessage-chat-db:${channel.id}`,
+        ok: false,
+        detail: `${path}: ${err instanceof Error ? err.message : String(err)}. Grant Full Disk Access to the terminal/daemon host or disable receive mode.`
+      });
+    }
+  } else {
+    checks.push({ name: `imessage-receive:${channel.id}`, ok: true, detail: "receiveMode=disabled" });
+  }
+  return checks;
+}
+
+// src/lib/doctor.ts
 function isNotFound2(err) {
   return Boolean(err && typeof err === "object" && "code" in err && err.code === "ENOENT");
 }
@@ -7036,7 +7256,7 @@ async function privateDirCheck(name, path) {
     return { name, ok: false, detail: `${path}: ${err instanceof Error ? err.message : String(err)}` };
   }
 }
-async function commandExists(command) {
+async function commandExists2(command) {
   const proc = Bun.spawn(["sh", "-lc", `command -v ${command} >/dev/null 2>&1`], {
     stdout: "ignore",
     stderr: "ignore"
@@ -7074,7 +7294,7 @@ async function doctor(configPath = defaultConfigPath(), statePath = defaultState
   for (const command of ["bridge", "codewith", "claude", "aicopilot"]) {
     checks.push({
       name: `command:${command}`,
-      ok: command === "bridge" ? true : await commandExists(command),
+      ok: command === "bridge" ? true : await commandExists2(command),
       detail: command === "bridge" ? "current package" : undefined
     });
   }
@@ -7099,6 +7319,10 @@ async function doctor(configPath = defaultConfigPath(), statePath = defaultState
       detail: `${route.fromChannel} -> ${route.toAgent}`
     });
   }
+  const imessageChannels = Object.values(config.channels).filter((channel) => channel.kind === "imessage");
+  for (const channel of imessageChannels) {
+    checks.push(...await diagnoseIMessage(channel));
+  }
   return { ok: checks.every((check) => check.ok), configPath, checks };
 }
 // src/lib/router.ts
@@ -7109,6 +7333,9 @@ function matchingRoutes(config, message) {
   if (channel?.kind === "telegram" && !telegramChatAllowed(channel, message.chatId)) {
     return [];
   }
+  if (channel?.kind === "imessage" && !imessageHandleAllowed(channel, message.from || (message.chatId?.startsWith("chat:") ? undefined : message.chatId))) {
+    return [];
+  }
   return config.routes.filter((route) => {
     if (route.enabled === false)
       return false;
@@ -7148,15 +7375,359 @@ async function routeMessage(config, message, options = {}) {
       if (options.writeConsole !== false)
         (options.writeConsole || console.log)(responseText);
       deliveredResponse = true;
+    } else if (responseText && channel?.kind === "imessage") {
+      const handle = message.responseTargetId || message.chatId || message.from;
+      const allowedIdentity = message.from || (handle?.startsWith("chat:") ? undefined : handle);
+      if (handle && imessageHandleAllowed(channel, allowedIdentity)) {
+        await sendIMessage(channel, handle, responseText, { allowChatTarget: handle.startsWith("chat:") });
+        deliveredResponse = true;
+      }
     }
     results.push({ route, agent, deliveredResponse });
   }
   return results;
 }
+// src/lib/sessions.ts
+import { randomUUID } from "crypto";
+function nowIso() {
+  return new Date().toISOString();
+}
+function newSessionId() {
+  return `ses_${randomUUID()}`;
+}
+function normalizeConversationId(channel, conversation) {
+  if (conversation.includes(":") && conversation.startsWith(`${channel.kind}:`))
+    return conversation;
+  if (channel.kind === "telegram")
+    return `telegram:${channel.id}:${conversation}`;
+  if (channel.kind === "imessage")
+    return `imessage:${channel.id}:${conversation}`;
+  return `${channel.kind}:${channel.id}:${conversation || "default"}`;
+}
+function messageConversationId(config, message) {
+  const channel = config.channels[message.channelId];
+  if (!channel)
+    return;
+  if (channel.kind === "telegram") {
+    if (!message.chatId)
+      return;
+    return normalizeConversationId(channel, message.threadId ? `${message.chatId}:${message.threadId}` : message.chatId);
+  }
+  if (channel.kind === "imessage") {
+    const conversation = message.chatId || message.from;
+    return conversation ? normalizeConversationId(channel, conversation) : undefined;
+  }
+  return normalizeConversationId(channel, message.chatId || message.from || "default");
+}
+function bindingId(channelId, conversationId) {
+  return `${channelId}::${conversationId}`;
+}
+function ledgerId(message) {
+  return `${message.channelId}::${message.id}`;
+}
+function createBridgeSession(config, state, input) {
+  const { agent, profile } = resolveAgent(config, input.agentId);
+  const timestamp = nowIso();
+  const session = {
+    id: input.id || newSessionId(),
+    agentId: agent.id,
+    profileId: agent.profileId,
+    cwd: input.cwd || agent.cwd || profile?.cwd,
+    title: input.title,
+    status: "active",
+    createdAt: timestamp,
+    updatedAt: timestamp,
+    agentSession: createAgentSessionRef(config, agent.id)
+  };
+  state.sessions[session.id] = session;
+  return session;
+}
+function getBridgeSession(state, sessionId) {
+  const session = state.sessions[sessionId];
+  if (!session)
+    throw new Error(`Session not found: ${sessionId}`);
+  return session;
+}
+function listBridgeSessions(state) {
+  return Object.values(state.sessions).sort((a, b) => a.createdAt.localeCompare(b.createdAt));
+}
+function updateBridgeSessionStatus(state, sessionId, status) {
+  const session = getBridgeSession(state, sessionId);
+  if (status === "closed")
+    closeAgentSession(session);
+  session.status = status;
+  session.updatedAt = nowIso();
+  return session;
+}
+function attachBridgeSession(config, state, input) {
+  const channel = config.channels[input.channelId];
+  if (!channel)
+    throw new Error(`Channel not found: ${input.channelId}`);
+  const session = getBridgeSession(state, input.sessionId);
+  if (session.status === "closed")
+    throw new Error(`Cannot attach closed session: ${session.id}`);
+  const conversationId = normalizeConversationId(channel, input.conversation);
+  const id = bindingId(channel.id, conversationId);
+  const existing = state.bindings[id];
+  const timestamp = nowIso();
+  const binding = {
+    id,
+    channelId: channel.id,
+    conversationId,
+    activeSessionId: session.id,
+    defaultSessionId: input.makeDefault ? session.id : existing?.defaultSessionId,
+    createdAt: existing?.createdAt || timestamp,
+    updatedAt: timestamp,
+    authorization: input.authorization || existing?.authorization || (channel.kind === "telegram" ? { chatId: input.conversation.split(":")[0] } : undefined)
+  };
+  state.bindings[id] = binding;
+  return binding;
+}
+function detachBridgeBinding(config, state, channelId, conversation) {
+  const channel = config.channels[channelId];
+  if (!channel)
+    throw new Error(`Channel not found: ${channelId}`);
+  const conversationId = normalizeConversationId(channel, conversation);
+  const id = bindingId(channel.id, conversationId);
+  const existing = state.bindings[id];
+  delete state.bindings[id];
+  return existing;
+}
+function noSessionText(channelId, conversationId) {
+  return [
+    "No bridge session is attached to this conversation.",
+    "Create and attach one locally:",
+    "bridge sessions create --agent <agent-id>",
+    `bridge sessions attach <session-id> --channel ${channelId}${conversationId ? ` --conversation ${conversationId}` : " --conversation <conversation-id>"}`
+  ].join(`
+`);
+}
+async function deliverResponse(config, message, text, options) {
+  const channel = config.channels[message.channelId];
+  if (!text || !channel || channel.enabled === false)
+    return false;
+  if (channel.kind === "telegram" && message.chatId) {
+    if (!telegramChatAllowed(channel, message.chatId))
+      return false;
+    await (options.sendTelegram || sendTelegramMessage)(telegramToken(channel), message.chatId, text);
+    return true;
+  }
+  if (channel.kind === "console") {
+    if (options.writeConsole !== false)
+      (options.writeConsole || console.log)(text);
+    return true;
+  }
+  if (channel.kind === "imessage" && message.chatId) {
+    const allowedIdentity = message.from || (message.chatId.startsWith("chat:") ? undefined : message.chatId);
+    if (!imessageHandleAllowed(channel, allowedIdentity))
+      return false;
+    await sendIMessage(channel, message.responseTargetId || message.chatId, text, { allowChatTarget: Boolean(message.responseTargetId?.startsWith("chat:") || message.chatId.startsWith("chat:")) });
+    return true;
+  }
+  return false;
+}
+async function deliverStoredResponse(config, state, binding, message, entry, options) {
+  const session = getBridgeSession(state, binding.activeSessionId);
+  const responseText = entry.responseText || "";
+  const deliveredResponse = responseText ? await deliverResponse(config, message, responseText, options) : false;
+  completeLedger(entry, "delivered", session.id);
+  entry.deliveredResponse = deliveredResponse;
+  return {
+    kind: "session",
+    session,
+    binding,
+    conversationId: binding.conversationId,
+    deliveredResponse,
+    status: responseText ? "delivered" : "no_output"
+  };
+}
+function channelAuthorized(config, message) {
+  const channel = config.channels[message.channelId];
+  if (!channel || channel.enabled === false)
+    return false;
+  if (channel.kind === "telegram")
+    return telegramChatAllowed(channel, message.chatId);
+  if (channel.kind === "imessage")
+    return imessageHandleAllowed(channel, message.from || (message.chatId?.startsWith("chat:") ? undefined : message.chatId));
+  return true;
+}
+function bindingAuthorized(binding, message) {
+  if (binding.authorization?.chatId && binding.authorization.chatId !== message.chatId)
+    return false;
+  if (binding.authorization?.from && binding.authorization.from !== message.from)
+    return false;
+  return true;
+}
+async function sendBridgeSessionMessage(config, state, sessionId, message, options = {}) {
+  const session = getBridgeSession(state, sessionId);
+  if (session.status === "paused")
+    return { kind: "session", session, status: "paused", message: "Session is paused" };
+  if (session.status === "closed")
+    return { kind: "session", session, status: "closed", message: "Session is closed" };
+  const agent = await sendAgentSessionMessage(config, session, message, { run: options.run });
+  const timestamp = nowIso();
+  session.lastMessageAt = timestamp;
+  session.updatedAt = timestamp;
+  if (session.agentSession)
+    session.agentSession.updatedAt = timestamp;
+  if (agent.timedOut || agent.exitCode !== null && agent.exitCode !== 0) {
+    return {
+      kind: "session",
+      session,
+      agent,
+      deliveredResponse: false,
+      status: "failed",
+      message: agent.stderr.trim() || agent.stdout.trim() || (agent.timedOut ? "Agent timed out" : `Agent exited ${agent.exitCode}`)
+    };
+  }
+  const responseText = agent.stdout.trim();
+  await options.beforeDeliver?.(agent, responseText);
+  const deliveredResponse = responseText ? await deliverResponse(config, message, responseText, options) : false;
+  return {
+    kind: "session",
+    session,
+    agent,
+    deliveredResponse,
+    status: responseText ? "delivered" : "no_output"
+  };
+}
+async function routeSessionMessage(config, state, message, options = {}) {
+  const channel = config.channels[message.channelId];
+  if (!channel || channel.enabled === false) {
+    return { kind: "session", status: "unauthorized", message: `Channel not enabled: ${message.channelId}` };
+  }
+  if (!channelAuthorized(config, message)) {
+    return { kind: "session", status: "unauthorized", message: "Message is not authorized for this channel" };
+  }
+  const conversationId = messageConversationId(config, message);
+  const binding = conversationId ? state.bindings[bindingId(message.channelId, conversationId)] : undefined;
+  if (!binding) {
+    const text = noSessionText(message.channelId, conversationId);
+    if (options.respondOnNoSession !== false)
+      await deliverResponse(config, message, text, options);
+    return { kind: "session", conversationId, status: "no_session", message: text };
+  }
+  if (!bindingAuthorized(binding, message)) {
+    return { kind: "session", binding, conversationId, status: "unauthorized", message: "Message does not match binding authorization" };
+  }
+  const result = await sendBridgeSessionMessage(config, state, binding.activeSessionId, message, options);
+  return { ...result, binding, conversationId };
+}
+function beginLedger(state, message, conversationId) {
+  const id = ledgerId(message);
+  const existing = state.messageLedger[id];
+  if (existing && ["delivered", "skipped", "unauthorized"].includes(existing.status)) {
+    return { entry: existing, shouldProcess: false };
+  }
+  const timestamp = nowIso();
+  const entry = existing || {
+    id,
+    channelId: message.channelId,
+    messageId: message.id,
+    conversationId,
+    status: "processing",
+    attempts: 0,
+    firstSeenAt: timestamp,
+    updatedAt: timestamp
+  };
+  if (entry.status !== "agent_completed")
+    entry.status = "processing";
+  entry.attempts += 1;
+  entry.conversationId = conversationId || entry.conversationId;
+  entry.updatedAt = timestamp;
+  delete entry.error;
+  state.messageLedger[id] = entry;
+  return { entry, shouldProcess: true };
+}
+function completeLedger(entry, status, sessionId, error) {
+  const timestamp = nowIso();
+  entry.status = status;
+  entry.sessionId = sessionId || entry.sessionId;
+  entry.updatedAt = timestamp;
+  if (["delivered", "skipped", "unauthorized"].includes(status))
+    entry.terminalAt = timestamp;
+  if (error)
+    entry.error = error;
+  return entry;
+}
+function recordAgentCompleted(entry, sessionId, agent, responseText) {
+  const timestamp = nowIso();
+  entry.status = "agent_completed";
+  entry.sessionId = sessionId || entry.sessionId;
+  entry.responseText = responseText;
+  entry.agentExitCode = agent.exitCode;
+  entry.agentTimedOut = agent.timedOut;
+  entry.updatedAt = timestamp;
+  delete entry.error;
+  return entry;
+}
+async function dispatchMessageWithSessions(config, state, message, options = {}) {
+  const conversationId = messageConversationId(config, message);
+  const { entry, shouldProcess } = beginLedger(state, message, conversationId);
+  if (!shouldProcess)
+    return { message, ledger: entry };
+  await options.persistState?.(state);
+  try {
+    const binding = conversationId ? state.bindings[bindingId(message.channelId, conversationId)] : undefined;
+    if (binding) {
+      if (!bindingAuthorized(binding, message)) {
+        const session3 = {
+          kind: "session",
+          binding,
+          conversationId,
+          status: "unauthorized",
+          message: "Message does not match binding authorization"
+        };
+        completeLedger(entry, "unauthorized");
+        return { message, session: session3, ledger: entry };
+      }
+      if (entry.status === "agent_completed") {
+        const session3 = await deliverStoredResponse(config, state, binding, message, entry, options);
+        return { message, session: session3, ledger: entry };
+      }
+      const session2 = await routeSessionMessage(config, state, message, {
+        ...options,
+        beforeDeliver: async (agent, responseText) => {
+          recordAgentCompleted(entry, binding.activeSessionId, agent, responseText);
+          await options.persistState?.(state);
+          await options.beforeDeliver?.(agent, responseText);
+        }
+      });
+      if (session2.status === "failed") {
+        completeLedger(entry, "failed", session2.session?.id, session2.message);
+        throw new Error(session2.message || "Agent session failed");
+      }
+      const terminal = session2.status === "unauthorized" ? "unauthorized" : session2.status === "delivered" || session2.status === "no_output" ? "delivered" : "skipped";
+      completeLedger(entry, terminal, session2.session?.id);
+      entry.deliveredResponse = session2.deliveredResponse;
+      return { message, session: session2, ledger: entry };
+    }
+    if (options.fallbackToRoutes) {
+      const routes = await routeMessage(config, message, options);
+      if (routes.length) {
+        completeLedger(entry, "delivered");
+        return { message, routes, ledger: entry };
+      }
+    }
+    const session = await routeSessionMessage(config, state, message, options);
+    const status = session.status === "unauthorized" ? "unauthorized" : "skipped";
+    completeLedger(entry, status, session.session?.id);
+    return { message, session, ledger: entry };
+  } catch (err) {
+    const messageText = err instanceof Error ? err.message : String(err);
+    if (entry.status === "agent_completed") {
+      entry.error = messageText;
+      entry.updatedAt = nowIso();
+    } else {
+      completeLedger(entry, "failed", undefined, messageText);
+    }
+    throw err;
+  }
+}
 // src/cli/index.ts
 function version() {
   try {
-    const pkgPath = join4(dirname4(fileURLToPath(import.meta.url)), "..", "..", "package.json");
+    const pkgPath = join5(dirname4(fileURLToPath(import.meta.url)), "..", "..", "package.json");
     return JSON.parse(readFileSync(pkgPath, "utf-8")).version || "0.0.0";
   } catch {
     return "0.0.0";
@@ -7198,11 +7769,11 @@ function printList(items) {
 async function runServe(options) {
   const config2 = await loadConfig(options.config);
   const telegramChannels2 = Object.values(config2.channels).filter((channel) => channel.kind === "telegram" && channel.enabled !== false);
+  const imessageChannels = Object.values(config2.channels).filter((channel) => channel.kind === "imessage" && channel.enabled !== false && channel.receiveMode === "chat-db");
   const intervalMs = parseNonNegativeInt(options.interval || "1000", "--interval");
-  if (!telegramChannels2.length)
-    throw new Error("No enabled Telegram channels configured");
+  if (!telegramChannels2.length && !imessageChannels.length)
+    throw new Error("No enabled pollable channels configured");
   const statePath = options.state || defaultStatePath();
-  const state2 = await loadState(statePath);
   const errorCounts = new Map;
   let stopping = false;
   const stop = () => {
@@ -7213,20 +7784,79 @@ async function runServe(options) {
   while (!stopping) {
     for (const channel of telegramChannels2) {
       try {
+        const pollState = await loadState(statePath);
         const updates = await getTelegramUpdates(telegramToken(channel), {
-          offset: state2.telegramOffsets[channel.id],
+          offset: pollState.telegramOffsets[channel.id],
           timeoutSeconds: channel.pollTimeoutSeconds || 20
         });
         errorCounts.delete(channel.id);
         for (const update of updates) {
-          state2.telegramOffsets[channel.id] = update.update_id + 1;
-          await saveState(state2, statePath);
+          const state2 = await loadState(statePath);
           const message = telegramUpdateToMessage(channel.id, update);
-          if (!message)
-            continue;
-          const results = await routeMessage(config2, message, { writeConsole: options.json ? false : undefined });
-          if (options.json)
-            asJson({ message, results });
+          if (message) {
+            try {
+              const results = await dispatchMessageWithSessions(config2, state2, message, {
+                writeConsole: options.json ? false : undefined,
+                fallbackToRoutes: true,
+                persistState: async (nextState) => saveState(nextState, statePath)
+              });
+              if (results.ledger?.status === "failed" || results.ledger?.status === "processing" || results.ledger?.status === "agent_completed") {
+                await saveState(state2, statePath);
+                throw new Error(results.ledger.error || `Message ${message.id} did not reach a terminal state`);
+              }
+              state2.telegramOffsets[channel.id] = update.update_id + 1;
+              await saveState(state2, statePath);
+              if (options.json)
+                asJson(results);
+            } catch (err) {
+              await saveState(state2, statePath);
+              throw err;
+            }
+          } else {
+            state2.telegramOffsets[channel.id] = update.update_id + 1;
+            await saveState(state2, statePath);
+          }
+        }
+      } catch (err) {
+        if (options.once)
+          throw err;
+        const count = (errorCounts.get(channel.id) || 0) + 1;
+        errorCounts.set(channel.id, count);
+        const message = err instanceof Error ? err.message : String(err);
+        console.error(`[bridge] ${channel.id} poll failed (${count}): ${message}`);
+        await Bun.sleep(Math.min(30000, Math.max(1000, intervalMs * Math.min(count, 30))));
+      }
+    }
+    for (const channel of imessageChannels) {
+      try {
+        const pollState = await loadState(statePath);
+        const cursorKey = `imessage:${channel.id}`;
+        const rows = getIMessageMessages(channel, {
+          afterRowId: Number(pollState.cursors[cursorKey] || 0),
+          limit: channel.pollLimit || 50
+        });
+        errorCounts.delete(channel.id);
+        for (const row of rows) {
+          const state2 = await loadState(statePath);
+          const message = imessageRowToMessage(channel.id, row);
+          try {
+            const results = await dispatchMessageWithSessions(config2, state2, message, {
+              writeConsole: options.json ? false : undefined,
+              fallbackToRoutes: true,
+              persistState: async (nextState) => saveState(nextState, statePath)
+            });
+            if (results.ledger?.status === "failed" || results.ledger?.status === "processing" || results.ledger?.status === "agent_completed") {
+              await saveState(state2, statePath);
+              throw new Error(results.ledger.error || `Message ${message.id} did not reach a terminal state`);
+            }
+            state2.cursors[cursorKey] = row.rowId;
+            await saveState(state2, statePath);
+            if (options.json)
+              asJson(results);
+          } catch (err) {
+            await saveState(state2, statePath);
+            throw err;
+          }
         }
       } catch (err) {
         if (options.once)
@@ -7294,6 +7924,27 @@ channels.command("add-console").argument("<id>").description("Add a console chan
   const config2 = await upsertChannel({ id, kind: "console", enabled: true }, options.config);
   options.json ? asJson(config2.channels[id]) : console.log(`Added console channel ${id}`);
 });
+channels.command("add-imessage").argument("<id>").description("Add a local macOS iMessage channel").option("--default-handle <handle>", "default iMessage handle for bridge send").option("--allowed-handles <handles>", "comma-separated allowed handles").option("--allow-all-handles", "explicitly allow every local iMessage handle").option("--account <account>", "Messages account selector for multi-account Macs").option("--service-name <name>", "Messages service name", "iMessage").option("--receive", "enable local Messages chat.db polling").option("--chat-db-path <path>", "override Messages chat.db path").option("--poll-limit <n>", "maximum rows per poll").option("-c, --config <path>", "config path", defaultConfigPath()).option("--json", "output JSON").action(async (id, options) => {
+  const allowedHandles = splitCsv(options.allowedHandles);
+  if (!allowedHandles?.length && !options.allowAllHandles) {
+    throw new Error("iMessage channels require --allowed-handles or explicit --allow-all-handles");
+  }
+  const pollLimit = options.pollLimit ? Number.parseInt(options.pollLimit, 10) : undefined;
+  const config2 = await upsertChannel({
+    id,
+    kind: "imessage",
+    enabled: true,
+    defaultHandle: options.defaultHandle,
+    allowedHandles,
+    allowAllHandles: Boolean(options.allowAllHandles),
+    account: options.account,
+    serviceName: options.serviceName,
+    receiveMode: options.receive ? "chat-db" : "disabled",
+    chatDbPath: options.chatDbPath,
+    pollLimit
+  }, options.config);
+  options.json ? asJson(config2.channels[id]) : console.log(`Added imessage channel ${id}`);
+});
 var profiles = program2.command("profiles").description("Manage reusable agent profiles");
 profiles.command("list").option("-c, --config <path>", "config path", defaultConfigPath()).option("--json", "output JSON").action(async (options) => {
   const config2 = await loadConfig(options.config);
@@ -7350,14 +8001,103 @@ routes.command("add").argument("<id>").requiredOption("--from <channel>", "sourc
   }, options.config);
   options.json ? asJson(config2.routes.find((route) => route.id === id)) : console.log(`Added route ${id}`);
 });
+var sessions2 = program2.command("sessions").description("Manage durable bridge sessions and channel bindings");
+sessions2.command("list").description("List bridge sessions").option("--state <path>", "state path", defaultStatePath()).option("--json", "output JSON").action(async (options) => {
+  const state2 = await loadState(options.state);
+  const items = listBridgeSessions(state2);
+  options.json ? asJson(items) : printList(items);
+});
+sessions2.command("show").argument("<id>").description("Show one bridge session").option("--state <path>", "state path", defaultStatePath()).option("--json", "output JSON").action(async (id, options) => {
+  const state2 = await loadState(options.state);
+  const session = getBridgeSession(state2, id);
+  options.json ? asJson(session) : console.log(JSON.stringify(session, null, 2));
+});
+sessions2.command("create").description("Create a bridge-owned session for an agent").requiredOption("--agent <id>", "agent id").option("--id <id>", "explicit session id").option("--title <text>", "session title").option("--cwd <path>", "session working directory override").option("-c, --config <path>", "config path", defaultConfigPath()).option("--state <path>", "state path", defaultStatePath()).option("--json", "output JSON").action(async (options) => {
+  const config2 = await loadConfig(options.config);
+  const state2 = await loadState(options.state);
+  const session = createBridgeSession(config2, state2, {
+    id: options.id,
+    agentId: options.agent,
+    title: options.title,
+    cwd: options.cwd
+  });
+  await saveState(state2, options.state);
+  options.json ? asJson(session) : console.log(session.id);
+});
+async function attachSessionAction(sessionId, options) {
+  const config2 = await loadConfig(options.config);
+  const state2 = await loadState(options.state);
+  const binding = attachBridgeSession(config2, state2, {
+    sessionId,
+    channelId: options.channel,
+    conversation: options.conversation,
+    makeDefault: Boolean(options.default)
+  });
+  await saveState(state2, options.state);
+  options.json ? asJson(binding) : console.log(binding.id);
+}
+sessions2.command("attach").argument("<id>").description("Attach a session to a channel conversation").requiredOption("--channel <id>", "channel id").requiredOption("--conversation <id>", "external conversation id, such as a Telegram chat id").option("--default", "also make this the default session for the conversation").option("-c, --config <path>", "config path", defaultConfigPath()).option("--state <path>", "state path", defaultStatePath()).option("--json", "output JSON").action(attachSessionAction);
+sessions2.command("use").argument("<id>").description("Set the active session for a channel conversation").requiredOption("--channel <id>", "channel id").requiredOption("--conversation <id>", "external conversation id, such as a Telegram chat id").option("-c, --config <path>", "config path", defaultConfigPath()).option("--state <path>", "state path", defaultStatePath()).option("--json", "output JSON").action(async (id, options) => attachSessionAction(id, { ...options, default: true }));
+sessions2.command("detach").description("Detach the active session from a channel conversation").requiredOption("--channel <id>", "channel id").requiredOption("--conversation <id>", "external conversation id, such as a Telegram chat id").option("-c, --config <path>", "config path", defaultConfigPath()).option("--state <path>", "state path", defaultStatePath()).option("--json", "output JSON").action(async (options) => {
+  const config2 = await loadConfig(options.config);
+  const state2 = await loadState(options.state);
+  const binding = detachBridgeBinding(config2, state2, options.channel, options.conversation);
+  await saveState(state2, options.state);
+  options.json ? asJson(binding || null) : console.log(binding ? `detached ${binding.id}` : "No binding.");
+});
+for (const status of ["pause", "resume", "close"]) {
+  const nextStatus = status === "pause" ? "paused" : status === "resume" ? "active" : "closed";
+  sessions2.command(status).argument("<id>").description(`${status} a bridge session`).option("--state <path>", "state path", defaultStatePath()).option("--json", "output JSON").action(async (id, options) => {
+    const state2 = await loadState(options.state);
+    const session = updateBridgeSessionStatus(state2, id, nextStatus);
+    await saveState(state2, options.state);
+    options.json ? asJson(session) : console.log(`${session.id} ${session.status}`);
+  });
+}
+sessions2.command("send").argument("<id>").argument("<text...>").description("Send one message directly to a bridge session").option("-c, --config <path>", "config path", defaultConfigPath()).option("--state <path>", "state path", defaultStatePath()).option("--json", "output JSON").action(async (id, textParts, options) => {
+  const config2 = await loadConfig(options.config);
+  const state2 = await loadState(options.state);
+  const message = {
+    id: `cli:${Date.now()}`,
+    channelId: "cli",
+    text: textParts.join(" "),
+    receivedAt: new Date().toISOString()
+  };
+  const result = await sendBridgeSessionMessage(config2, state2, id, message, { writeConsole: false });
+  await saveState(state2, options.state);
+  if (options.json)
+    asJson(result);
+  else
+    process.stdout.write(result.agent?.stdout || result.agent?.stderr || result.message || "");
+  process.exitCode = result.agent?.exitCode ?? 0;
+});
+sessions2.command("route-message").description("Route one synthetic message through session bindings").requiredOption("--channel <id>", "source channel id").requiredOption("--text <text>", "message text").option("--chat-id <id>", "chat id").option("--from <from>", "sender").option("--fallback-routes", "fall back to compatibility routes when no session is bound").option("-c, --config <path>", "config path", defaultConfigPath()).option("--state <path>", "state path", defaultStatePath()).option("--json", "output JSON").action(async (options) => {
+  const config2 = await loadConfig(options.config);
+  const state2 = await loadState(options.state);
+  const result = await dispatchMessageWithSessions(config2, state2, {
+    id: `cli:${Date.now()}`,
+    channelId: options.channel,
+    text: options.text,
+    chatId: options.chatId,
+    from: options.from,
+    receivedAt: new Date().toISOString()
+  }, {
+    writeConsole: options.json ? false : undefined,
+    fallbackToRoutes: Boolean(options.fallbackRoutes),
+    persistState: async (nextState) => saveState(nextState, options.state)
+  });
+  await saveState(state2, options.state);
+  options.json ? asJson(result) : printList(result.session ? [result.session] : result.routes || []);
+});
 program2.command("send").argument("<channel>").argument("[chatId]").argument("[text...]").description("Send a message through a channel").option("-c, --config <path>", "config path", defaultConfigPath()).option("--json", "output JSON").action(async (channelId, chatId, textParts, options) => {
   const config2 = await loadConfig(options.config);
   const channel = config2.channels[channelId];
   if (!channel)
     throw new Error(`Channel not found: ${channelId}`);
   let targetChat = chatId;
-  let text = textParts.join(" ");
-  if (channel.kind !== "telegram" && !text && targetChat) {
+  const textArgParts = textParts;
+  let text = textArgParts.join(" ");
+  if (channel.kind === "console" && !text && targetChat) {
     text = targetChat;
     targetChat = undefined;
   }
@@ -7379,6 +8119,26 @@ program2.command("send").argument("<channel>").argument("[chatId]").argument("[t
       console.log(text);
     return;
   }
+  if (channel.kind === "imessage") {
+    if (!text && targetChat) {
+      const looksLikeHandle = targetChat.startsWith("+") || targetChat.includes("@") || imessageHandleAllowed(channel, targetChat);
+      if (looksLikeHandle)
+        throw new Error("message text is required when an iMessage handle is provided");
+      text = targetChat;
+      targetChat = undefined;
+    }
+    targetChat = targetChat || channel.defaultHandle;
+    if (!targetChat)
+      throw new Error("chatId/handle argument or channel.defaultHandle is required");
+    if (!text)
+      throw new Error("message text is required");
+    if (!imessageHandleAllowed(channel, targetChat)) {
+      throw new Error(`iMessage handle ${targetChat} is not allowed for channel ${channel.id}`);
+    }
+    const result = await sendIMessage(channel, targetChat, text);
+    options.json ? asJson(result) : console.log("sent");
+    return;
+  }
   throw new Error(`Sending through ${channel.kind} is not implemented yet`);
 });
 program2.command("ask").argument("<agent>").argument("<text...>").description("Run one agent directly").option("-c, --config <path>", "config path", defaultConfigPath()).option("--json", "output JSON").action(async (agentId, textParts, options) => {