@hasna/conversations 0.2.37 → 0.2.38

package/bin/index.js

@@ -14914,7 +14914,7 @@ var init_presence = __esm(() => {
 var require_package = __commonJS((exports, module) => {
   module.exports = {
     name: "@hasna/conversations",
-    version: "0.2.37",
+    version: "0.2.38",
     description: "Real-time CLI messaging for AI agents",
     type: "module",
     bin: {
@@ -45594,6 +45594,99 @@ var init_projects2 = __esm(() => {
   init_identity();
 });
 
+// src/mcp/channel.ts
+function setSessionAgent(agentId) {
+  sessionAgentId = agentId;
+}
+function getSessionAgent() {
+  return sessionAgentId || process.env.CONVERSATIONS_AGENT_ID || null;
+}
+function registerChannelBridge(server) {
+  server.server.registerCapabilities({
+    experimental: { "claude/channel": {} }
+  });
+  let lastAgentMsgId = 0;
+  let lastSessionMsgId = 0;
+  let pollTimer = null;
+  function getSessionId() {
+    return process.env.CONVERSATIONS_SESSION_ID || null;
+  }
+  function seedLastSeen() {
+    const agent = getSessionAgent();
+    const sid = getSessionId();
+    if (agent) {
+      const latest = readMessages({ to: agent, order: "desc", limit: 1 });
+      if (latest.length > 0)
+        lastAgentMsgId = latest[0].id;
+    }
+    if (sid) {
+      const latest = readMessages({ to: `session:${sid}`, order: "desc", limit: 1 });
+      if (latest.length > 0)
+        lastSessionMsgId = latest[0].id;
+    }
+  }
+  function pushNotification(msg, isDirect) {
+    if (isDirect) {
+      try {
+        markReadByIds([msg.id]);
+      } catch {}
+    }
+    const context = [
+      `From: ${msg.from_agent}`,
+      `Mode: ${isDirect ? "direct (auto-injected, auto-read)" : "dm (passive, check inbox)"}`,
+      `Message ID: ${msg.id}`,
+      msg.space ? `Space: ${msg.space}` : null,
+      msg.priority && msg.priority !== "normal" ? `Priority: ${msg.priority}` : null
+    ].filter(Boolean).join(" | ");
+    const enrichedContent = `[${context}]
+${msg.content}`;
+    server.server.notification({
+      method: "notifications/claude/channel",
+      params: {
+        content: enrichedContent,
+        meta: {
+          from: msg.from_agent,
+          message_id: String(msg.id),
+          session_id: msg.session_id,
+          mode: isDirect ? "direct" : "dm",
+          ...msg.space ? { space: msg.space } : {},
+          ...msg.priority && msg.priority !== "normal" ? { priority: msg.priority } : {}
+        }
+      }
+    }).catch(() => {});
+  }
+  function startPolling2() {
+    if (pollTimer)
+      return;
+    seedLastSeen();
+    pollTimer = setInterval(() => {
+      try {
+        const agent = getSessionAgent();
+        const sid = getSessionId();
+        if (agent) {
+          const msgs = readMessages({ to: agent, order: "asc", limit: 20 }).filter((m) => m.id > lastAgentMsgId);
+          for (const msg of msgs) {
+            lastAgentMsgId = msg.id;
+            pushNotification(msg, false);
+          }
+        }
+        if (sid) {
+          const msgs = readMessages({ to: `session:${sid}`, order: "asc", limit: 20 }).filter((m) => m.id > lastSessionMsgId);
+          for (const msg of msgs) {
+            lastSessionMsgId = msg.id;
+            pushNotification(msg, true);
+          }
+        }
+      } catch {}
+    }, POLL_INTERVAL_MS);
+  }
+  setTimeout(() => startPolling2(), 2000);
+}
+var POLL_INTERVAL_MS = 1000, sessionAgentId = null;
+var init_channel = __esm(() => {
+  init_messages();
+});
+
 // src/mcp/tools/agents.ts
 function registerAgentTools(server, agentFocus, getAgentFocus) {
   server.registerTool("register_agent", {
@@ -45608,6 +45701,7 @@ function registerAgentTools(server, agentFocus, getAgentFocus) {
     const { name, session_id, role, project_id } = args;
     try {
       const result = registerAgent(name, session_id, role, project_id);
+      setSessionAgent(name);
       return {
         content: [{ type: "text", text: JSON.stringify(result) }]
       };
@@ -45631,6 +45725,7 @@ function registerAgentTools(server, agentFocus, getAgentFocus) {
     const { from: fromParam, status } = args;
     const agent = resolveIdentity(fromParam);
     heartbeat(agent, status);
+    setSessionAgent(agent);
     return {
       content: [{ type: "text", text: JSON.stringify({ agent, status: status || "online", heartbeat: true }) }]
     };
@@ -45787,6 +45882,7 @@ var init_agents = __esm(() => {
   init_zod2();
   init_identity();
   init_presence();
+  init_channel();
   init_sessions();
   init_messages();
 });
@@ -46930,95 +47026,6 @@ var init_cloud = __esm(() => {
   CONFLICT_TABLES = new Set(["spaces", "projects", "agent_presence"]);
 });
 
-// src/mcp/channel.ts
-function registerChannelBridge(server, getAgentId, getSessionId) {
-  server.server.registerCapabilities({
-    experimental: {
-      "claude/channel": {}
-    }
-  });
-  let lastSeenId = 0;
-  let lastSeenSessionId = 0;
-  let pollTimer = null;
-  function seedLastSeen(agentId, sessionId) {
-    const latestAgent = readMessages({ to: agentId, order: "desc", limit: 1 });
-    if (latestAgent.length > 0)
-      lastSeenId = latestAgent[0].id;
-    if (sessionId) {
-      const latestSession = readMessages({ to: `session:${sessionId}`, order: "desc", limit: 1 });
-      if (latestSession.length > 0)
-        lastSeenSessionId = latestSession[0].id;
-    }
-  }
-  function pushNotification(msg) {
-    console.error(`[channel-bridge] pushing notification: from=${msg.from_agent}, id=${msg.id}, content=${msg.content.slice(0, 50)}`);
-    server.server.notification({
-      method: "notifications/claude/channel",
-      params: {
-        content: msg.content,
-        meta: {
-          from: msg.from_agent,
-          message_id: String(msg.id),
-          session_id: msg.session_id,
-          ...msg.space ? { space: msg.space } : {},
-          ...msg.priority && msg.priority !== "normal" ? { priority: msg.priority } : {}
-        }
-      }
-    }).catch((err) => {
-      console.error(`[channel-bridge] notification error: ${err}`);
-    });
-  }
-  function startPolling2() {
-    if (pollTimer)
-      return;
-    const agentId = getAgentId();
-    const sessionId = getSessionId();
-    console.error(`[channel-bridge] startPolling: agentId=${agentId}, sessionId=${sessionId}`);
-    if (!agentId && !sessionId) {
-      console.error("[channel-bridge] no agentId or sessionId \u2014 not polling");
-      return;
-    }
-    if (agentId)
-      seedLastSeen(agentId, sessionId);
-    pollTimer = setInterval(() => {
-      try {
-        const currentAgent = getAgentId();
-        const currentSession = getSessionId();
-        if (currentAgent) {
-          const newAgentMsgs = readMessages({
-            to: currentAgent,
-            order: "asc",
-            limit: 20
-          }).filter((m) => m.id > lastSeenId);
-          for (const msg of newAgentMsgs) {
-            lastSeenId = msg.id;
-            pushNotification(msg);
-          }
-        }
-        if (currentSession) {
-          const newSessionMsgs = readMessages({
-            to: `session:${currentSession}`,
-            order: "asc",
-            limit: 20
-          }).filter((m) => m.id > lastSeenSessionId);
-          for (const msg of newSessionMsgs) {
-            lastSeenSessionId = msg.id;
-            pushNotification(msg);
-          }
-        }
-      } catch {}
-    }, POLL_INTERVAL_MS);
-  }
-  setTimeout(() => {
-    console.error("[channel-bridge] attempting to start polling...");
-    startPolling2();
-  }, 2000);
-}
-var POLL_INTERVAL_MS = 1000;
-var init_channel = __esm(() => {
-  init_messages();
-});
-
 // src/mcp/tools/tmux.ts
 function sleep2(ms) {
   return new Promise((resolve) => setTimeout(resolve, ms));
@@ -47172,7 +47179,7 @@ var init_mcp2 = __esm(() => {
   registerAgentTools(server, agentFocus, getAgentFocus);
   registerAdvancedTools(server, import__package2.default.version);
   registerTmuxTools(server);
-  registerChannelBridge(server, () => process.env.CONVERSATIONS_AGENT_ID ?? null, () => process.env.CONVERSATIONS_SESSION_ID ?? null);
+  registerChannelBridge(server);
   isDirectRun = import.meta.url === `file://${process.argv[1]}` || process.argv[1]?.endsWith("mcp.js") || process.argv[1]?.endsWith("mcp.ts");
   if (isDirectRun) {
     startMcpServer().catch((error48) => {

package/bin/mcp.js

@@ -42426,6 +42426,97 @@ function registerProjectTools(server) {
   });
 }
 
+// src/mcp/channel.ts
+var POLL_INTERVAL_MS = 1000;
+var sessionAgentId = null;
+function setSessionAgent(agentId) {
+  sessionAgentId = agentId;
+}
+function getSessionAgent() {
+  return sessionAgentId || process.env.CONVERSATIONS_AGENT_ID || null;
+}
+function registerChannelBridge(server) {
+  server.server.registerCapabilities({
+    experimental: { "claude/channel": {} }
+  });
+  let lastAgentMsgId = 0;
+  let lastSessionMsgId = 0;
+  let pollTimer = null;
+  function getSessionId() {
+    return process.env.CONVERSATIONS_SESSION_ID || null;
+  }
+  function seedLastSeen() {
+    const agent = getSessionAgent();
+    const sid = getSessionId();
+    if (agent) {
+      const latest = readMessages({ to: agent, order: "desc", limit: 1 });
+      if (latest.length > 0)
+        lastAgentMsgId = latest[0].id;
+    }
+    if (sid) {
+      const latest = readMessages({ to: `session:${sid}`, order: "desc", limit: 1 });
+      if (latest.length > 0)
+        lastSessionMsgId = latest[0].id;
+    }
+  }
+  function pushNotification(msg, isDirect) {
+    if (isDirect) {
+      try {
+        markReadByIds([msg.id]);
+      } catch {}
+    }
+    const context = [
+      `From: ${msg.from_agent}`,
+      `Mode: ${isDirect ? "direct (auto-injected, auto-read)" : "dm (passive, check inbox)"}`,
+      `Message ID: ${msg.id}`,
+      msg.space ? `Space: ${msg.space}` : null,
+      msg.priority && msg.priority !== "normal" ? `Priority: ${msg.priority}` : null
+    ].filter(Boolean).join(" | ");
+    const enrichedContent = `[${context}]
+${msg.content}`;
+    server.server.notification({
+      method: "notifications/claude/channel",
+      params: {
+        content: enrichedContent,
+        meta: {
+          from: msg.from_agent,
+          message_id: String(msg.id),
+          session_id: msg.session_id,
+          mode: isDirect ? "direct" : "dm",
+          ...msg.space ? { space: msg.space } : {},
+          ...msg.priority && msg.priority !== "normal" ? { priority: msg.priority } : {}
+        }
+      }
+    }).catch(() => {});
+  }
+  function startPolling() {
+    if (pollTimer)
+      return;
+    seedLastSeen();
+    pollTimer = setInterval(() => {
+      try {
+        const agent = getSessionAgent();
+        const sid = getSessionId();
+        if (agent) {
+          const msgs = readMessages({ to: agent, order: "asc", limit: 20 }).filter((m) => m.id > lastAgentMsgId);
+          for (const msg of msgs) {
+            lastAgentMsgId = msg.id;
+            pushNotification(msg, false);
+          }
+        }
+        if (sid) {
+          const msgs = readMessages({ to: `session:${sid}`, order: "asc", limit: 20 }).filter((m) => m.id > lastSessionMsgId);
+          for (const msg of msgs) {
+            lastSessionMsgId = msg.id;
+            pushNotification(msg, true);
+          }
+        }
+      } catch {}
+    }, POLL_INTERVAL_MS);
+  }
+  setTimeout(() => startPolling(), 2000);
+}
+
 // src/mcp/tools/agents.ts
 function registerAgentTools(server, agentFocus, getAgentFocus) {
   server.registerTool("register_agent", {
@@ -42440,6 +42531,7 @@ function registerAgentTools(server, agentFocus, getAgentFocus) {
     const { name, session_id, role, project_id } = args;
     try {
       const result = registerAgent(name, session_id, role, project_id);
+      setSessionAgent(name);
       return {
         content: [{ type: "text", text: JSON.stringify(result) }]
       };
@@ -42463,6 +42555,7 @@ function registerAgentTools(server, agentFocus, getAgentFocus) {
     const { from: fromParam, status } = args;
     const agent = resolveIdentity(fromParam);
     heartbeat(agent, status);
+    setSessionAgent(agent);
     return {
       content: [{ type: "text", text: JSON.stringify({ agent, status: status || "online", heartbeat: true }) }]
     };
@@ -44076,92 +44169,6 @@ function formatError2(e) {
   return String(e);
 }
 
-// src/mcp/channel.ts
-var POLL_INTERVAL_MS = 1000;
-function registerChannelBridge(server, getAgentId, getSessionId) {
-  server.server.registerCapabilities({
-    experimental: {
-      "claude/channel": {}
-    }
-  });
-  let lastSeenId = 0;
-  let lastSeenSessionId = 0;
-  let pollTimer = null;
-  function seedLastSeen(agentId, sessionId) {
-    const latestAgent = readMessages({ to: agentId, order: "desc", limit: 1 });
-    if (latestAgent.length > 0)
-      lastSeenId = latestAgent[0].id;
-    if (sessionId) {
-      const latestSession = readMessages({ to: `session:${sessionId}`, order: "desc", limit: 1 });
-      if (latestSession.length > 0)
-        lastSeenSessionId = latestSession[0].id;
-    }
-  }
-  function pushNotification(msg) {
-    console.error(`[channel-bridge] pushing notification: from=${msg.from_agent}, id=${msg.id}, content=${msg.content.slice(0, 50)}`);
-    server.server.notification({
-      method: "notifications/claude/channel",
-      params: {
-        content: msg.content,
-        meta: {
-          from: msg.from_agent,
-          message_id: String(msg.id),
-          session_id: msg.session_id,
-          ...msg.space ? { space: msg.space } : {},
-          ...msg.priority && msg.priority !== "normal" ? { priority: msg.priority } : {}
-        }
-      }
-    }).catch((err) => {
-      console.error(`[channel-bridge] notification error: ${err}`);
-    });
-  }
-  function startPolling() {
-    if (pollTimer)
-      return;
-    const agentId = getAgentId();
-    const sessionId = getSessionId();
-    console.error(`[channel-bridge] startPolling: agentId=${agentId}, sessionId=${sessionId}`);
-    if (!agentId && !sessionId) {
-      console.error("[channel-bridge] no agentId or sessionId \u2014 not polling");
-      return;
-    }
-    if (agentId)
-      seedLastSeen(agentId, sessionId);
-    pollTimer = setInterval(() => {
-      try {
-        const currentAgent = getAgentId();
-        const currentSession = getSessionId();
-        if (currentAgent) {
-          const newAgentMsgs = readMessages({
-            to: currentAgent,
-            order: "asc",
-            limit: 20
-          }).filter((m) => m.id > lastSeenId);
-          for (const msg of newAgentMsgs) {
-            lastSeenId = msg.id;
-            pushNotification(msg);
-          }
-        }
-        if (currentSession) {
-          const newSessionMsgs = readMessages({
-            to: `session:${currentSession}`,
-            order: "asc",
-            limit: 20
-          }).filter((m) => m.id > lastSeenSessionId);
-          for (const msg of newSessionMsgs) {
-            lastSeenSessionId = msg.id;
-            pushNotification(msg);
-          }
-        }
-      } catch {}
-    }, POLL_INTERVAL_MS);
-  }
-  setTimeout(() => {
-    console.error("[channel-bridge] attempting to start polling...");
-    startPolling();
-  }, 2000);
-}
-
 // src/cli/commands/tmux.ts
 import { execSync } from "child_process";
 function sleep(ms) {
@@ -44310,7 +44317,7 @@ function registerTmuxTools(server) {
 // package.json
 var package_default = {
   name: "@hasna/conversations",
-  version: "0.2.37",
+  version: "0.2.38",
   description: "Real-time CLI messaging for AI agents",
   type: "module",
   bin: {
@@ -44413,7 +44420,7 @@ registerProjectTools(server);
 registerAgentTools(server, agentFocus, getAgentFocus);
 registerAdvancedTools(server, package_default.version);
 registerTmuxTools(server);
-registerChannelBridge(server, () => process.env.CONVERSATIONS_AGENT_ID ?? null, () => process.env.CONVERSATIONS_SESSION_ID ?? null);
+registerChannelBridge(server);
 async function startMcpServer() {
   const transport = new StdioServerTransport;
   registerCloudSyncTools(server);

package/dist/mcp/channel.d.ts

@@ -1,14 +1,21 @@
 /**
  * Claude Code channel bridge for conversations MCP server.
  *
- * Declares `experimental['claude/channel']` capability so agent-claude
- * can use this server as a channel for inter-session messaging.
+ * Two messaging modes:
+ *   1. Direct inject (send_to_session) — targets session ID, auto-injected
+ *      via channel notification, auto-marked as read
+ *   2. DM (send_message) — targets agent name, sits in inbox unread
+ *      until the agent checks, also injected if agent is online
  *
- * Polls for new messages addressed to:
- *   1. The agent name (CONVERSATIONS_AGENT_ID) — standard DMs
- *   2. The session ID (session:<uuid>) — targeted session injection via send_to_session
+ * The bridge figures out who it is from:
+ *   - The agent that registered/heartbeated in this MCP session
+ *   - The CONVERSATIONS_SESSION_ID env var (set by agent-claude)
+ *   - Falls back to CONVERSATIONS_AGENT_ID if set
  *
- * Messages are pushed as `notifications/claude/channel` events.
+ * No manual config needed — just connect and go.
  */
 import type { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
-export declare function registerChannelBridge(server: McpServer, getAgentId: () => string | null, getSessionId: () => string | null): void;
+/** Called by agent tools when register_agent or heartbeat fires */
+export declare function setSessionAgent(agentId: string): void;
+export declare function getSessionAgent(): string | null;
+export declare function registerChannelBridge(server: McpServer): void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hasna/conversations",
-  "version": "0.2.37",
+  "version": "0.2.38",
   "description": "Real-time CLI messaging for AI agents",
   "type": "module",
   "bin": {