@hasna/conversations 0.1.25 → 0.1.27

package/bin/hook.js

@@ -114,9 +114,13 @@ function getDb() {
   `);
   db.exec(`
     CREATE TABLE IF NOT EXISTS agent_presence (
+      id TEXT NOT NULL,
       agent TEXT PRIMARY KEY,
+      session_id TEXT,
+      role TEXT NOT NULL DEFAULT 'agent',
       status TEXT NOT NULL DEFAULT 'online',
       last_seen_at TEXT NOT NULL DEFAULT (strftime('%Y-%m-%dT%H:%M:%f', 'now')),
+      created_at TEXT NOT NULL DEFAULT (strftime('%Y-%m-%dT%H:%M:%f', 'now')),
       metadata TEXT
     )
   `);
@@ -195,6 +199,25 @@ function getDb() {
     db.exec("ALTER TABLE messages ADD COLUMN reply_to INTEGER REFERENCES messages(id)");
     db.exec("CREATE INDEX IF NOT EXISTS idx_messages_reply_to ON messages(reply_to)");
   }
+  const presenceCols = db.prepare("PRAGMA table_info(agent_presence)").all();
+  const presenceColNames = presenceCols.map((c) => c.name);
+  if (!presenceColNames.includes("id")) {
+    db.exec("ALTER TABLE agent_presence ADD COLUMN id TEXT NOT NULL DEFAULT ''");
+    const rows = db.prepare("SELECT agent FROM agent_presence").all();
+    for (const row of rows) {
+      const id = crypto.randomUUID().slice(0, 8);
+      db.prepare("UPDATE agent_presence SET id = ? WHERE agent = ?").run(id, row.agent);
+    }
+  }
+  if (!presenceColNames.includes("session_id")) {
+    db.exec("ALTER TABLE agent_presence ADD COLUMN session_id TEXT");
+  }
+  if (!presenceColNames.includes("role")) {
+    db.exec("ALTER TABLE agent_presence ADD COLUMN role TEXT NOT NULL DEFAULT 'agent'");
+  }
+  if (!presenceColNames.includes("created_at")) {
+    db.exec("ALTER TABLE agent_presence ADD COLUMN created_at TEXT NOT NULL DEFAULT (strftime('%Y-%m-%dT%H:%M:%f', 'now'))");
+  }
   const ftsExists = db.prepare("SELECT name FROM sqlite_master WHERE type='table' AND name='messages_fts'").get();
   if (!ftsExists) {
     db.exec(`

package/bin/index.js

@@ -1968,9 +1968,13 @@ function getDb() {
   `);
   db.exec(`
     CREATE TABLE IF NOT EXISTS agent_presence (
+      id TEXT NOT NULL,
       agent TEXT PRIMARY KEY,
+      session_id TEXT,
+      role TEXT NOT NULL DEFAULT 'agent',
       status TEXT NOT NULL DEFAULT 'online',
       last_seen_at TEXT NOT NULL DEFAULT (strftime('%Y-%m-%dT%H:%M:%f', 'now')),
+      created_at TEXT NOT NULL DEFAULT (strftime('%Y-%m-%dT%H:%M:%f', 'now')),
       metadata TEXT
     )
   `);
@@ -2049,6 +2053,25 @@ function getDb() {
     db.exec("ALTER TABLE messages ADD COLUMN reply_to INTEGER REFERENCES messages(id)");
     db.exec("CREATE INDEX IF NOT EXISTS idx_messages_reply_to ON messages(reply_to)");
   }
+  const presenceCols = db.prepare("PRAGMA table_info(agent_presence)").all();
+  const presenceColNames = presenceCols.map((c) => c.name);
+  if (!presenceColNames.includes("id")) {
+    db.exec("ALTER TABLE agent_presence ADD COLUMN id TEXT NOT NULL DEFAULT ''");
+    const rows = db.prepare("SELECT agent FROM agent_presence").all();
+    for (const row of rows) {
+      const id = crypto.randomUUID().slice(0, 8);
+      db.prepare("UPDATE agent_presence SET id = ? WHERE agent = ?").run(id, row.agent);
+    }
+  }
+  if (!presenceColNames.includes("session_id")) {
+    db.exec("ALTER TABLE agent_presence ADD COLUMN session_id TEXT");
+  }
+  if (!presenceColNames.includes("role")) {
+    db.exec("ALTER TABLE agent_presence ADD COLUMN role TEXT NOT NULL DEFAULT 'agent'");
+  }
+  if (!presenceColNames.includes("created_at")) {
+    db.exec("ALTER TABLE agent_presence ADD COLUMN created_at TEXT NOT NULL DEFAULT (strftime('%Y-%m-%dT%H:%M:%f', 'now'))");
+  }
   const ftsExists = db.prepare("SELECT name FROM sqlite_master WHERE type='table' AND name='messages_fts'").get();
   if (!ftsExists) {
     db.exec(`
@@ -3311,26 +3334,76 @@ function parsePresence(row) {
   const nowMs = Date.now();
   const online = nowMs - lastSeenMs < ONLINE_THRESHOLD_SECONDS * 1000;
   return {
+    id: row.id || "",
     agent: row.agent,
+    session_id: row.session_id ?? null,
+    role: row.role || "agent",
     status: row.status,
     last_seen_at: lastSeenAt,
+    created_at: row.created_at || lastSeenAt,
     online,
     metadata
   };
 }
-function heartbeat(agent, status, metadata) {
+function isActiveSession(lastSeenAt) {
+  const lastSeenMs = new Date(lastSeenAt + "Z").getTime();
+  const nowMs = Date.now();
+  return nowMs - lastSeenMs < CONFLICT_THRESHOLD_SECONDS * 1000;
+}
+function registerAgent(name, sessionId, role) {
+  const db2 = getDb();
+  const normalizedName = name.trim().toLowerCase();
+  const existing = db2.prepare("SELECT * FROM agent_presence WHERE agent = ?").get(normalizedName);
+  if (existing) {
+    const lastSeenAt = existing.last_seen_at;
+    const existingSessionId = existing.session_id;
+    if (isActiveSession(lastSeenAt) && existingSessionId && existingSessionId !== sessionId) {
+      return {
+        conflict: true,
+        error: "agent_conflict",
+        message: `Agent "${normalizedName}" is already active (last seen: ${lastSeenAt}). Wait 30 minutes or use force takeover.`,
+        existing_id: existing.id,
+        existing_name: normalizedName,
+        existing_session_id: existingSessionId,
+        last_seen_at: lastSeenAt,
+        session_hint: existingSessionId ? existingSessionId.slice(0, 8) : null,
+        working_dir: null
+      };
+    }
+    const tookOver = existingSessionId !== sessionId;
+    db2.prepare(`
+      UPDATE agent_presence
+      SET session_id = ?, role = ?, last_seen_at = strftime('%Y-%m-%dT%H:%M:%f', 'now')
+      WHERE agent = ?
+    `).run(sessionId, role || existing.role || "agent", normalizedName);
+    const updated = db2.prepare("SELECT * FROM agent_presence WHERE agent = ?").get(normalizedName);
+    return { agent: parsePresence(updated), created: false, took_over: tookOver };
+  }
+  const id = crypto.randomUUID().slice(0, 8);
+  const resolvedRole = role || "agent";
+  db2.prepare(`
+    INSERT INTO agent_presence (id, agent, session_id, role, status, last_seen_at, created_at)
+    VALUES (?, ?, ?, ?, 'online', strftime('%Y-%m-%dT%H:%M:%f', 'now'), strftime('%Y-%m-%dT%H:%M:%f', 'now'))
+  `).run(id, normalizedName, sessionId, resolvedRole);
+  const created = db2.prepare("SELECT * FROM agent_presence WHERE agent = ?").get(normalizedName);
+  return { agent: parsePresence(created), created: true, took_over: false };
+}
+function heartbeat(agent, status, metadata, sessionId) {
   const db2 = getDb();
   const metadataJson = metadata ? JSON.stringify(metadata) : null;
   const resolvedStatus = status || "online";
   const normalizedAgent = agent.trim().toLowerCase();
+  const existing = db2.prepare("SELECT id FROM agent_presence WHERE agent = ?").get(agent);
+  const id = existing?.id || crypto.randomUUID().slice(0, 8);
   db2.prepare(`
-    INSERT INTO agent_presence (agent, status, last_seen_at, metadata)
-    VALUES (?, ?, strftime('%Y-%m-%dT%H:%M:%f', 'now'), ?)
+    INSERT INTO agent_presence (id, agent, session_id, role, status, last_seen_at, created_at, metadata)
+    VALUES (?, ?, ?, 'agent', ?, strftime('%Y-%m-%dT%H:%M:%f', 'now'), strftime('%Y-%m-%dT%H:%M:%f', 'now'), ?)
     ON CONFLICT(agent) DO UPDATE SET
       status = excluded.status,
       last_seen_at = excluded.last_seen_at,
+      session_id = COALESCE(excluded.session_id, agent_presence.session_id),
       metadata = excluded.metadata
-  `).run(normalizedAgent, resolvedStatus, metadataJson);
+  `).run(id, normalizedAgent, sessionId ?? null, resolvedStatus, metadataJson);
 }
 function getPresence(agent) {
   const db2 = getDb();
@@ -3341,12 +3414,11 @@ function getPresence(agent) {
 function listAgents(opts) {
   const db2 = getDb();
   let query = "SELECT * FROM agent_presence";
-  const params = [];
   if (opts?.online_only) {
     query += " WHERE last_seen_at > strftime('%Y-%m-%dT%H:%M:%f', 'now', '-60 seconds')";
   }
   query += " ORDER BY last_seen_at DESC";
-  const rows = db2.prepare(query).all(...params);
+  const rows = db2.prepare(query).all();
   return rows.map(parsePresence);
 }
 function removePresence(agent) {
@@ -3368,9 +3440,10 @@ function renameAgent(oldName, newName) {
   db2.prepare("UPDATE agent_presence SET agent = ? WHERE LOWER(agent) = ?").run(normalizedNew, normalizedOld);
   return true;
 }
-var ONLINE_THRESHOLD_SECONDS = 60;
+var ONLINE_THRESHOLD_SECONDS = 60, CONFLICT_THRESHOLD_SECONDS;
 var init_presence = __esm(() => {
   init_db();
+  CONFLICT_THRESHOLD_SECONDS = 30 * 60;
 });
 
 // src/lib/terminal-markdown.ts
@@ -3517,7 +3590,7 @@ var init_poll = __esm(() => {
 var require_package = __commonJS((exports, module) => {
   module.exports = {
     name: "@hasna/conversations",
-    version: "0.1.25",
+    version: "0.1.27",
     description: "Real-time CLI messaging for AI agents",
     type: "module",
     bin: {
@@ -30885,7 +30958,7 @@ var require_formats = __commonJS((exports) => {
   }
   var TIME = /^(\d\d):(\d\d):(\d\d(?:\.\d+)?)(z|([+-])(\d\d)(?::?(\d\d))?)?$/i;
   function getTime(strictTimeZone) {
-    return function time3(str) {
+    return function time(str) {
       const matches = TIME.exec(str);
       if (!matches)
         return false;
@@ -31149,62 +31222,6 @@ class ExperimentalServerTasks {
   requestStream(request, resultSchema, options) {
     return this._server.requestStream(request, resultSchema, options);
   }
-  createMessageStream(params, options) {
-    const clientCapabilities = this._server.getClientCapabilities();
-    if ((params.tools || params.toolChoice) && !clientCapabilities?.sampling?.tools) {
-      throw new Error("Client does not support sampling tools capability.");
-    }
-    if (params.messages.length > 0) {
-      const lastMessage = params.messages[params.messages.length - 1];
-      const lastContent = Array.isArray(lastMessage.content) ? lastMessage.content : [lastMessage.content];
-      const hasToolResults = lastContent.some((c) => c.type === "tool_result");
-      const previousMessage = params.messages.length > 1 ? params.messages[params.messages.length - 2] : undefined;
-      const previousContent = previousMessage ? Array.isArray(previousMessage.content) ? previousMessage.content : [previousMessage.content] : [];
-      const hasPreviousToolUse = previousContent.some((c) => c.type === "tool_use");
-      if (hasToolResults) {
-        if (lastContent.some((c) => c.type !== "tool_result")) {
-          throw new Error("The last message must contain only tool_result content if any is present");
-        }
-        if (!hasPreviousToolUse) {
-          throw new Error("tool_result blocks are not matching any tool_use from the previous message");
-        }
-      }
-      if (hasPreviousToolUse) {
-        const toolUseIds = new Set(previousContent.filter((c) => c.type === "tool_use").map((c) => c.id));
-        const toolResultIds = new Set(lastContent.filter((c) => c.type === "tool_result").map((c) => c.toolUseId));
-        if (toolUseIds.size !== toolResultIds.size || ![...toolUseIds].every((id) => toolResultIds.has(id))) {
-          throw new Error("ids of tool_result blocks and tool_use blocks from previous message do not match");
-        }
-      }
-    }
-    return this.requestStream({
-      method: "sampling/createMessage",
-      params
-    }, CreateMessageResultSchema, options);
-  }
-  elicitInputStream(params, options) {
-    const clientCapabilities = this._server.getClientCapabilities();
-    const mode = params.mode ?? "form";
-    switch (mode) {
-      case "url": {
-        if (!clientCapabilities?.elicitation?.url) {
-          throw new Error("Client does not support url elicitation.");
-        }
-        break;
-      }
-      case "form": {
-        if (!clientCapabilities?.elicitation?.form) {
-          throw new Error("Client does not support form elicitation.");
-        }
-        break;
-      }
-    }
-    const normalizedParams = mode === "form" && params.mode === undefined ? { ...params, mode: "form" } : params;
-    return this.requestStream({
-      method: "elicitation/create",
-      params: normalizedParams
-    }, ElicitResultSchema, options);
-  }
   async getTask(taskId, options) {
     return this._server.getTask({ taskId }, options);
   }
@@ -31218,9 +31235,6 @@ class ExperimentalServerTasks {
     return this._server.cancelTask({ taskId }, options);
   }
 }
-var init_server = __esm(() => {
-  init_types2();
-});
 
 // node_modules/@modelcontextprotocol/sdk/dist/esm/experimental/tasks/helpers.js
 function assertToolsCallTaskCapability(requests, method, entityName) {
@@ -31259,12 +31273,11 @@ function assertClientRequestTaskCapability(requests, method, entityName) {
 
 // node_modules/@modelcontextprotocol/sdk/dist/esm/server/index.js
 var Server;
-var init_server2 = __esm(() => {
+var init_server = __esm(() => {
   init_protocol();
   init_types2();
   init_ajv_provider();
   init_zod_compat();
-  init_server();
   Server = class Server extends Protocol {
     constructor(_serverInfo, options) {
       super(options);
@@ -32406,7 +32419,7 @@ function createCompletionResult(suggestions) {
 }
 var EMPTY_OBJECT_JSON_SCHEMA, EMPTY_COMPLETION_RESULT;
 var init_mcp = __esm(() => {
-  init_server2();
+  init_server();
   init_zod_compat();
   init_zod_json_schema_compat();
   init_types2();
@@ -33174,6 +33187,20 @@ var init_mcp2 = __esm(() => {
       content: [{ type: "text", text: JSON.stringify(messages) }]
     };
   });
+  server.registerTool("register_agent", {
+    description: "Register an agent with conflict detection. Returns AgentConflictError if another active session exists (active = heartbeat within last 30 min).",
+    inputSchema: {
+      name: exports_external.string(),
+      session_id: exports_external.string(),
+      role: exports_external.string().optional()
+    }
+  }, async (args) => {
+    const { name, session_id, role } = args;
+    const result = registerAgent(name, session_id, role);
+    return {
+      content: [{ type: "text", text: JSON.stringify(result) }]
+    };
+  });
   server.registerTool("heartbeat", {
     description: "Send presence heartbeat.",
     inputSchema: {
@@ -33305,6 +33332,7 @@ var init_mcp2 = __esm(() => {
       "pin_message",
       "unpin_message",
       "get_pinned_messages",
+      "register_agent",
       "heartbeat",
       "list_agents",
       "get_blockers",
@@ -33350,6 +33378,7 @@ var init_mcp2 = __esm(() => {
       pin_message: "Pin a message. Required: id",
       unpin_message: "Unpin a message. Required: id",
       get_pinned_messages: "Get pinned messages. Optional: space?, session_id?, limit?",
+      register_agent: "Register agent with conflict detection (30min active window). Required: name, session_id. Optional: role?. Returns AgentConflictError if another session is active.",
       heartbeat: "Register/refresh agent presence. Optional: from?, status?(online|busy|idle, default: online)",
       list_agents: "List agents with presence timestamps. Optional: online_only?(only agents seen in last 60s)",
       get_blockers: "Get unread blocking messages for agent. Optional: from?",

package/bin/mcp.js

@@ -6302,7 +6302,7 @@ var require_formats = __commonJS((exports) => {
   }
   var TIME = /^(\d\d):(\d\d):(\d\d(?:\.\d+)?)(z|([+-])(\d\d)(?::?(\d\d))?)?$/i;
   function getTime(strictTimeZone) {
-    return function time3(str) {
+    return function time(str) {
       const matches = TIME.exec(str);
       if (!matches)
         return false;
@@ -6600,9 +6600,13 @@ function getDb() {
   `);
   db.exec(`
     CREATE TABLE IF NOT EXISTS agent_presence (
+      id TEXT NOT NULL,
       agent TEXT PRIMARY KEY,
+      session_id TEXT,
+      role TEXT NOT NULL DEFAULT 'agent',
       status TEXT NOT NULL DEFAULT 'online',
       last_seen_at TEXT NOT NULL DEFAULT (strftime('%Y-%m-%dT%H:%M:%f', 'now')),
+      created_at TEXT NOT NULL DEFAULT (strftime('%Y-%m-%dT%H:%M:%f', 'now')),
       metadata TEXT
     )
   `);
@@ -6681,6 +6685,25 @@ function getDb() {
     db.exec("ALTER TABLE messages ADD COLUMN reply_to INTEGER REFERENCES messages(id)");
     db.exec("CREATE INDEX IF NOT EXISTS idx_messages_reply_to ON messages(reply_to)");
   }
+  const presenceCols = db.prepare("PRAGMA table_info(agent_presence)").all();
+  const presenceColNames = presenceCols.map((c) => c.name);
+  if (!presenceColNames.includes("id")) {
+    db.exec("ALTER TABLE agent_presence ADD COLUMN id TEXT NOT NULL DEFAULT ''");
+    const rows = db.prepare("SELECT agent FROM agent_presence").all();
+    for (const row of rows) {
+      const id = crypto.randomUUID().slice(0, 8);
+      db.prepare("UPDATE agent_presence SET id = ? WHERE agent = ?").run(id, row.agent);
+    }
+  }
+  if (!presenceColNames.includes("session_id")) {
+    db.exec("ALTER TABLE agent_presence ADD COLUMN session_id TEXT");
+  }
+  if (!presenceColNames.includes("role")) {
+    db.exec("ALTER TABLE agent_presence ADD COLUMN role TEXT NOT NULL DEFAULT 'agent'");
+  }
+  if (!presenceColNames.includes("created_at")) {
+    db.exec("ALTER TABLE agent_presence ADD COLUMN created_at TEXT NOT NULL DEFAULT (strftime('%Y-%m-%dT%H:%M:%f', 'now'))");
+  }
   const ftsExists = db.prepare("SELECT name FROM sqlite_master WHERE type='table' AND name='messages_fts'").get();
   if (!ftsExists) {
     db.exec(`
@@ -27263,62 +27286,6 @@ class ExperimentalServerTasks {
   requestStream(request, resultSchema, options) {
     return this._server.requestStream(request, resultSchema, options);
   }
-  createMessageStream(params, options) {
-    const clientCapabilities = this._server.getClientCapabilities();
-    if ((params.tools || params.toolChoice) && !clientCapabilities?.sampling?.tools) {
-      throw new Error("Client does not support sampling tools capability.");
-    }
-    if (params.messages.length > 0) {
-      const lastMessage = params.messages[params.messages.length - 1];
-      const lastContent = Array.isArray(lastMessage.content) ? lastMessage.content : [lastMessage.content];
-      const hasToolResults = lastContent.some((c) => c.type === "tool_result");
-      const previousMessage = params.messages.length > 1 ? params.messages[params.messages.length - 2] : undefined;
-      const previousContent = previousMessage ? Array.isArray(previousMessage.content) ? previousMessage.content : [previousMessage.content] : [];
-      const hasPreviousToolUse = previousContent.some((c) => c.type === "tool_use");
-      if (hasToolResults) {
-        if (lastContent.some((c) => c.type !== "tool_result")) {
-          throw new Error("The last message must contain only tool_result content if any is present");
-        }
-        if (!hasPreviousToolUse) {
-          throw new Error("tool_result blocks are not matching any tool_use from the previous message");
-        }
-      }
-      if (hasPreviousToolUse) {
-        const toolUseIds = new Set(previousContent.filter((c) => c.type === "tool_use").map((c) => c.id));
-        const toolResultIds = new Set(lastContent.filter((c) => c.type === "tool_result").map((c) => c.toolUseId));
-        if (toolUseIds.size !== toolResultIds.size || ![...toolUseIds].every((id) => toolResultIds.has(id))) {
-          throw new Error("ids of tool_result blocks and tool_use blocks from previous message do not match");
-        }
-      }
-    }
-    return this.requestStream({
-      method: "sampling/createMessage",
-      params
-    }, CreateMessageResultSchema, options);
-  }
-  elicitInputStream(params, options) {
-    const clientCapabilities = this._server.getClientCapabilities();
-    const mode = params.mode ?? "form";
-    switch (mode) {
-      case "url": {
-        if (!clientCapabilities?.elicitation?.url) {
-          throw new Error("Client does not support url elicitation.");
-        }
-        break;
-      }
-      case "form": {
-        if (!clientCapabilities?.elicitation?.form) {
-          throw new Error("Client does not support form elicitation.");
-        }
-        break;
-      }
-    }
-    const normalizedParams = mode === "form" && params.mode === undefined ? { ...params, mode: "form" } : params;
-    return this.requestStream({
-      method: "elicitation/create",
-      params: normalizedParams
-    }, ElicitResultSchema, options);
-  }
   async getTask(taskId, options) {
     return this._server.getTask({ taskId }, options);
   }
@@ -29778,6 +29745,7 @@ function updateCachedAutoName(newName) {
 // src/lib/presence.ts
 init_db();
 var ONLINE_THRESHOLD_SECONDS = 60;
+var CONFLICT_THRESHOLD_SECONDS = 30 * 60;
 function parsePresence(row) {
   let metadata = null;
   if (row.metadata) {
@@ -29792,36 +29760,85 @@ function parsePresence(row) {
   const nowMs = Date.now();
   const online = nowMs - lastSeenMs < ONLINE_THRESHOLD_SECONDS * 1000;
   return {
+    id: row.id || "",
     agent: row.agent,
+    session_id: row.session_id ?? null,
+    role: row.role || "agent",
     status: row.status,
     last_seen_at: lastSeenAt,
+    created_at: row.created_at || lastSeenAt,
     online,
     metadata
   };
 }
-function heartbeat(agent, status, metadata) {
+function isActiveSession(lastSeenAt) {
+  const lastSeenMs = new Date(lastSeenAt + "Z").getTime();
+  const nowMs = Date.now();
+  return nowMs - lastSeenMs < CONFLICT_THRESHOLD_SECONDS * 1000;
+}
+function registerAgent(name, sessionId, role) {
+  const db2 = getDb();
+  const normalizedName = name.trim().toLowerCase();
+  const existing = db2.prepare("SELECT * FROM agent_presence WHERE agent = ?").get(normalizedName);
+  if (existing) {
+    const lastSeenAt = existing.last_seen_at;
+    const existingSessionId = existing.session_id;
+    if (isActiveSession(lastSeenAt) && existingSessionId && existingSessionId !== sessionId) {
+      return {
+        conflict: true,
+        error: "agent_conflict",
+        message: `Agent "${normalizedName}" is already active (last seen: ${lastSeenAt}). Wait 30 minutes or use force takeover.`,
+        existing_id: existing.id,
+        existing_name: normalizedName,
+        existing_session_id: existingSessionId,
+        last_seen_at: lastSeenAt,
+        session_hint: existingSessionId ? existingSessionId.slice(0, 8) : null,
+        working_dir: null
+      };
+    }
+    const tookOver = existingSessionId !== sessionId;
+    db2.prepare(`
+      UPDATE agent_presence
+      SET session_id = ?, role = ?, last_seen_at = strftime('%Y-%m-%dT%H:%M:%f', 'now')
+      WHERE agent = ?
+    `).run(sessionId, role || existing.role || "agent", normalizedName);
+    const updated = db2.prepare("SELECT * FROM agent_presence WHERE agent = ?").get(normalizedName);
+    return { agent: parsePresence(updated), created: false, took_over: tookOver };
+  }
+  const id = crypto.randomUUID().slice(0, 8);
+  const resolvedRole = role || "agent";
+  db2.prepare(`
+    INSERT INTO agent_presence (id, agent, session_id, role, status, last_seen_at, created_at)
+    VALUES (?, ?, ?, ?, 'online', strftime('%Y-%m-%dT%H:%M:%f', 'now'), strftime('%Y-%m-%dT%H:%M:%f', 'now'))
+  `).run(id, normalizedName, sessionId, resolvedRole);
+  const created = db2.prepare("SELECT * FROM agent_presence WHERE agent = ?").get(normalizedName);
+  return { agent: parsePresence(created), created: true, took_over: false };
+}
+function heartbeat(agent, status, metadata, sessionId) {
   const db2 = getDb();
   const metadataJson = metadata ? JSON.stringify(metadata) : null;
   const resolvedStatus = status || "online";
   const normalizedAgent = agent.trim().toLowerCase();
+  const existing = db2.prepare("SELECT id FROM agent_presence WHERE agent = ?").get(agent);
+  const id = existing?.id || crypto.randomUUID().slice(0, 8);
   db2.prepare(`
-    INSERT INTO agent_presence (agent, status, last_seen_at, metadata)
-    VALUES (?, ?, strftime('%Y-%m-%dT%H:%M:%f', 'now'), ?)
+    INSERT INTO agent_presence (id, agent, session_id, role, status, last_seen_at, created_at, metadata)
+    VALUES (?, ?, ?, 'agent', ?, strftime('%Y-%m-%dT%H:%M:%f', 'now'), strftime('%Y-%m-%dT%H:%M:%f', 'now'), ?)
     ON CONFLICT(agent) DO UPDATE SET
       status = excluded.status,
       last_seen_at = excluded.last_seen_at,
+      session_id = COALESCE(excluded.session_id, agent_presence.session_id),
       metadata = excluded.metadata
-  `).run(normalizedAgent, resolvedStatus, metadataJson);
+  `).run(id, normalizedAgent, sessionId ?? null, resolvedStatus, metadataJson);
 }
 function listAgents(opts) {
   const db2 = getDb();
   let query = "SELECT * FROM agent_presence";
-  const params = [];
   if (opts?.online_only) {
     query += " WHERE last_seen_at > strftime('%Y-%m-%dT%H:%M:%f', 'now', '-60 seconds')";
   }
   query += " ORDER BY last_seen_at DESC";
-  const rows = db2.prepare(query).all(...params);
+  const rows = db2.prepare(query).all();
   return rows.map(parsePresence);
 }
 function removePresence(agent) {
@@ -29846,7 +29863,7 @@ function renameAgent(oldName, newName) {
 // package.json
 var package_default = {
   name: "@hasna/conversations",
-  version: "0.1.25",
+  version: "0.1.27",
   description: "Real-time CLI messaging for AI agents",
   type: "module",
   bin: {
@@ -30555,6 +30572,20 @@ server.registerTool("get_pinned_messages", {
     content: [{ type: "text", text: JSON.stringify(messages) }]
   };
 });
+server.registerTool("register_agent", {
+  description: "Register an agent with conflict detection. Returns AgentConflictError if another active session exists (active = heartbeat within last 30 min).",
+  inputSchema: {
+    name: exports_external.string(),
+    session_id: exports_external.string(),
+    role: exports_external.string().optional()
+  }
+}, async (args) => {
+  const { name, session_id, role } = args;
+  const result = registerAgent(name, session_id, role);
+  return {
+    content: [{ type: "text", text: JSON.stringify(result) }]
+  };
+});
 server.registerTool("heartbeat", {
   description: "Send presence heartbeat.",
   inputSchema: {
@@ -30686,6 +30717,7 @@ server.registerTool("search_tools", {
     "pin_message",
     "unpin_message",
     "get_pinned_messages",
+    "register_agent",
     "heartbeat",
     "list_agents",
     "get_blockers",
@@ -30731,6 +30763,7 @@ server.registerTool("describe_tools", {
     pin_message: "Pin a message. Required: id",
     unpin_message: "Unpin a message. Required: id",
     get_pinned_messages: "Get pinned messages. Optional: space?, session_id?, limit?",
+    register_agent: "Register agent with conflict detection (30min active window). Required: name, session_id. Optional: role?. Returns AgentConflictError if another session is active.",
     heartbeat: "Register/refresh agent presence. Optional: from?, status?(online|busy|idle, default: online)",
     list_agents: "List agents with presence timestamps. Optional: online_only?(only agents seen in last 60s)",
     get_blockers: "Get unread blocking messages for agent. Optional: from?",