@hasna/conversations 0.2.33 → 0.2.35

package/bin/index.js

@@ -6,60 +6,39 @@ var __defProp = Object.defineProperty;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
-function __accessProp(key) {
-  return this[key];
-}
-var __toESMCache_node;
-var __toESMCache_esm;
 var __toESM = (mod, isNodeMode, target) => {
-  var canCache = mod != null && typeof mod === "object";
-  if (canCache) {
-    var cache = isNodeMode ? __toESMCache_node ??= new WeakMap : __toESMCache_esm ??= new WeakMap;
-    var cached = cache.get(mod);
-    if (cached)
-      return cached;
-  }
   target = mod != null ? __create(__getProtoOf(mod)) : {};
   const to = isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target;
   for (let key of __getOwnPropNames(mod))
     if (!__hasOwnProp.call(to, key))
       __defProp(to, key, {
-        get: __accessProp.bind(mod, key),
+        get: () => mod[key],
         enumerable: true
       });
-  if (canCache)
-    cache.set(mod, to);
   return to;
 };
+var __moduleCache = /* @__PURE__ */ new WeakMap;
 var __toCommonJS = (from) => {
-  var entry = (__moduleCache ??= new WeakMap).get(from), desc;
+  var entry = __moduleCache.get(from), desc;
   if (entry)
     return entry;
   entry = __defProp({}, "__esModule", { value: true });
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (var key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(entry, key))
-        __defProp(entry, key, {
-          get: __accessProp.bind(from, key),
-          enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
-        });
-  }
+  if (from && typeof from === "object" || typeof from === "function")
+    __getOwnPropNames(from).map((key) => !__hasOwnProp.call(entry, key) && __defProp(entry, key, {
+      get: () => from[key],
+      enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
+    }));
   __moduleCache.set(from, entry);
   return entry;
 };
-var __moduleCache;
 var __commonJS = (cb, mod) => () => (mod || cb((mod = { exports: {} }).exports, mod), mod.exports);
-var __returnValue = (v) => v;
-function __exportSetter(name, newValue) {
-  this[name] = __returnValue.bind(null, newValue);
-}
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, {
       get: all[name],
       enumerable: true,
       configurable: true,
-      set: __exportSetter.bind(all, name)
+      set: (newValue) => all[name] = () => newValue
     });
 };
 var __esm = (fn, res) => () => (fn && (res = fn(fn = 0)), res);
@@ -2256,7 +2235,7 @@ var init_names = __esm(() => {
   ];
 });
 
-// node_modules/@hasna/cloud/dist/index.js
+// ../../../../node_modules/@hasna/cloud/dist/index.js
 var exports_dist = {};
 __export(exports_dist, {
   translateSql: () => translateSql,
@@ -2351,11 +2330,11 @@ import { join as join5 } from "path";
 import { join as join6, dirname } from "path";
 import { existsSync as existsSync6, writeFileSync as writeFileSync2, unlinkSync, mkdirSync as mkdirSync3 } from "fs";
 import { homedir as homedir5, platform } from "os";
-function __accessProp2(key) {
+function __accessProp(key) {
   return this[key];
 }
-function __exportSetter2(name, newValue) {
-  this[name] = __returnValue2.bind(null, newValue);
+function __exportSetter(name, newValue) {
+  this[name] = __returnValue.bind(null, newValue);
 }
 function translateSql(sql, dialect) {
   if (dialect === "sqlite")
@@ -3668,9 +3647,9 @@ async function syncTransfer(source, target, options, _direction) {
           const batch = rows.slice(offset, offset + batchSize);
           try {
             if (isAsyncAdapter(target)) {
-              await batchUpsertPg(target, table, columns, updateCols, pkColumns, batch);
+              await batchUpsertPg(target, table, columns, updateCols, pkColumns, batch, columns.includes(conflictColumn) ? conflictColumn : undefined);
             } else {
-              batchUpsertSqlite(target, table, columns, updateCols, pkColumns, batch);
+              batchUpsertSqlite(target, table, columns, updateCols, pkColumns, batch, columns.includes(conflictColumn) ? conflictColumn : undefined);
             }
             result.rowsWritten += batch.length;
           } catch (err) {
@@ -3717,7 +3696,7 @@ async function syncTransfer(source, target, options, _direction) {
   }
   return results;
 }
-async function batchUpsertPg(target, table, columns, updateCols, primaryKeys, batch) {
+async function batchUpsertPg(target, table, columns, updateCols, primaryKeys, batch, conflictColumn) {
   if (batch.length === 0)
     return;
   const colList = columns.map((c) => `"${c}"`).join(", ");
@@ -3727,20 +3706,22 @@ async function batchUpsertPg(target, table, columns, updateCols, primaryKeys, ba
   }).join(", ");
   const pkList = primaryKeys.map((c) => `"${c}"`).join(", ");
   const setClause = updateCols.length > 0 ? updateCols.map((c) => `"${c}" = EXCLUDED."${c}"`).join(", ") : `"${primaryKeys[0]}" = EXCLUDED."${primaryKeys[0]}"`;
+  const whereClause = conflictColumn && updateCols.includes(conflictColumn) ? ` WHERE "${table}"."${conflictColumn}" IS NULL OR EXCLUDED."${conflictColumn}" >= "${table}"."${conflictColumn}"` : "";
   const sql = `INSERT INTO "${table}" (${colList}) VALUES ${valuePlaceholders}
-    ON CONFLICT (${pkList}) DO UPDATE SET ${setClause}`;
+    ON CONFLICT (${pkList}) DO UPDATE SET ${setClause}${whereClause}`;
   const params = batch.flatMap((row) => columns.map((c) => row[c] ?? null));
   await target.run(sql, ...params);
 }
-function batchUpsertSqlite(target, table, columns, updateCols, primaryKeys, batch) {
+function batchUpsertSqlite(target, table, columns, updateCols, primaryKeys, batch, conflictColumn) {
   if (batch.length === 0)
     return;
   const colList = columns.map((c) => `"${c}"`).join(", ");
   const valuePlaceholders = batch.map(() => `(${columns.map(() => "?").join(", ")})`).join(", ");
   const pkList = primaryKeys.map((c) => `"${c}"`).join(", ");
   const setClause = updateCols.length > 0 ? updateCols.map((c) => `"${c}" = EXCLUDED."${c}"`).join(", ") : `"${primaryKeys[0]}" = EXCLUDED."${primaryKeys[0]}"`;
+  const whereClause = conflictColumn && updateCols.includes(conflictColumn) ? ` WHERE "${table}"."${conflictColumn}" IS NULL OR EXCLUDED."${conflictColumn}" >= "${table}"."${conflictColumn}"` : "";
   const sql = `INSERT INTO "${table}" (${colList}) VALUES ${valuePlaceholders}
-    ON CONFLICT (${pkList}) DO UPDATE SET ${setClause}`;
+    ON CONFLICT (${pkList}) DO UPDATE SET ${setClause}${whereClause}`;
   const params = batch.flatMap((row) => columns.map((c) => coerceForSqlite(row[c])));
   target.run(sql, ...params);
 }
@@ -4810,7 +4791,7 @@ async function ensureAllPgDatabases() {
   }
   return results;
 }
-function registerCloudTools(server, serviceName) {
+function registerCloudTools(server, serviceName, opts = {}) {
   server.tool(`${serviceName}_cloud_status`, "Show cloud configuration and connection health", {}, async () => {
     const config = getCloudConfig();
     const lines = [
@@ -4843,8 +4824,13 @@ function registerCloudTools(server, serviceName) {
         isError: true
       };
     }
-    const local = new SqliteAdapter(getDbPath(serviceName));
+    const local = new SqliteAdapter(opts.dbPath ?? getDbPath(serviceName));
     const cloud = new PgAdapterAsync(getConnectionString(serviceName));
+    if (opts.migrations?.length) {
+      for (const sql of opts.migrations) {
+        await cloud.run(sql);
+      }
+    }
     const tableList = tablesStr ? tablesStr.split(",").map((t) => t.trim()) : listSqliteTables(local);
     const results = await syncPush(local, cloud, { tables: tableList });
     local.close();
@@ -4866,7 +4852,7 @@ function registerCloudTools(server, serviceName) {
         isError: true
       };
     }
-    const local = new SqliteAdapter(getDbPath(serviceName));
+    const local = new SqliteAdapter(opts.dbPath ?? getDbPath(serviceName));
     const cloud = new PgAdapterAsync(getConnectionString(serviceName));
     let tableList;
     if (tablesStr) {
@@ -4989,10 +4975,10 @@ function registerCloudCommands(program2, serviceName) {
     }
   });
 }
-var __create2, __getProtoOf2, __defProp2, __getOwnPropNames2, __hasOwnProp2, __toESMCache_node2, __toESMCache_esm2, __toESM2 = (mod, isNodeMode, target) => {
+var __create2, __getProtoOf2, __defProp2, __getOwnPropNames2, __hasOwnProp2, __toESMCache_node, __toESMCache_esm, __toESM2 = (mod, isNodeMode, target) => {
   var canCache = mod != null && typeof mod === "object";
   if (canCache) {
-    var cache = isNodeMode ? __toESMCache_node2 ??= new WeakMap : __toESMCache_esm2 ??= new WeakMap;
+    var cache = isNodeMode ? __toESMCache_node ??= new WeakMap : __toESMCache_esm ??= new WeakMap;
     var cached = cache.get(mod);
     if (cached)
       return cached;
@@ -5002,19 +4988,19 @@ var __create2, __getProtoOf2, __defProp2, __getOwnPropNames2, __hasOwnProp2, __t
   for (let key of __getOwnPropNames2(mod))
     if (!__hasOwnProp2.call(to, key))
       __defProp2(to, key, {
-        get: __accessProp2.bind(mod, key),
+        get: __accessProp.bind(mod, key),
         enumerable: true
       });
   if (canCache)
     cache.set(mod, to);
   return to;
-}, __commonJS2 = (cb, mod) => () => (mod || cb((mod = { exports: {} }).exports, mod), mod.exports), __returnValue2 = (v) => v, __export2 = (target, all) => {
+}, __commonJS2 = (cb, mod) => () => (mod || cb((mod = { exports: {} }).exports, mod), mod.exports), __returnValue = (v) => v, __export2 = (target, all) => {
   for (var name in all)
     __defProp2(target, name, {
       get: all[name],
       enumerable: true,
       configurable: true,
-      set: __exportSetter2.bind(all, name)
+      set: __exportSetter.bind(all, name)
     });
 }, __esm2 = (fn, res) => () => (fn && (res = fn(fn = 0)), res), __require2, require_postgres_array, require_arrayParser, require_postgres_date, require_mutable, require_postgres_interval, require_postgres_bytea, require_textParsers, require_pg_int8, require_binaryParsers, require_builtins, require_pg_types, require_defaults, require_utils, require_utils_legacy, require_utils_webcrypto, require_utils2, require_cert_signatures, require_sasl, require_type_overrides, require_pg_connection_string, require_connection_parameters, require_result, require_query, require_messages, require_buffer_writer, require_serializer, require_buffer_reader, require_parser, require_dist, require_empty, require_stream, require_connection, require_split2, require_helper, require_lib, require_client, require_pg_pool, require_query2, require_client2, require_lib2, import_lib, Client, Pool, Connection, types, Query, DatabaseError, escapeIdentifier, escapeLiteral, Result, TypeOverrides, defaults, esm_default, init_esm, init_adapter, util, objectUtil, ZodParsedType, getParsedType = (data) => {
   const t = typeof data;
@@ -14928,7 +14914,7 @@ var init_presence = __esm(() => {
 var require_package = __commonJS((exports, module) => {
   module.exports = {
     name: "@hasna/conversations",
-    version: "0.2.33",
+    version: "0.2.35",
     description: "Real-time CLI messaging for AI agents",
     type: "module",
     bin: {
@@ -15769,7 +15755,7 @@ async function tmuxSend(target, message, opts = {}) {
 }
 function registerTmuxCommands(program2) {
   const tmux = program2.command("tmux").description("Dispatch messages to tmux windows (Claude Code sessions)");
-  tmux.command("send").description("Send a message to a tmux window with paste+wait+Enter+verify").requiredOption("--target <target>", "Tmux target: session:window or session:window.pane").requiredOption("--message <text>", "Message text to send").option("--delay <ms>", "Wait time (ms) after paste before hitting Enter (default: adaptive 25-1500ms)", parseInt).option("--retries <n>", "Max retry attempts (default: 3)", parseInt).option("--no-verify", "Skip verification after sending").option("--json", "Output result as JSON").action(async (opts) => {
+  tmux.command("send").description("Send a message to a tmux window with paste+wait+Enter+verify").requiredOption("--target <target>", "Tmux target: session:window or session:window.pane").requiredOption("--message <text>", "Message text to send").option("--delay <ms>", "Wait time (ms) after paste before hitting Enter (default: adaptive 25-1500ms)", parseInt).option("--retries <n>", "Max retry attempts (default: 3)", parseInt).option("--no-verify", "Skip verification after sending").option("-j, --json", "Output result as JSON").action(async (opts) => {
     const target = opts.target.trim();
     const message = opts.message;
     if (!target) {
@@ -15804,7 +15790,7 @@ function registerTmuxCommands(program2) {
       process.exit(1);
     }
   });
-  tmux.command("broadcast").description("Send the same message to multiple tmux windows").requiredOption("--targets <list>", "Comma-separated list of tmux targets").requiredOption("--message <text>", "Message text to send").option("--delay <ms>", "Wait time (ms) after paste before Enter (default: adaptive 25-1500ms)", parseInt).option("--stagger <ms>", "Delay (ms) between each target (default: 500)", parseInt).option("--retries <n>", "Max retry attempts per target (default: 3)", parseInt).option("--no-verify", "Skip verification after sending").option("--json", "Output results as JSON").action(async (opts) => {
+  tmux.command("broadcast").description("Send the same message to multiple tmux windows").requiredOption("--targets <list>", "Comma-separated list of tmux targets").requiredOption("--message <text>", "Message text to send").option("--delay <ms>", "Wait time (ms) after paste before Enter (default: adaptive 25-1500ms)", parseInt).option("--stagger <ms>", "Delay (ms) between each target (default: 500)", parseInt).option("--retries <n>", "Max retry attempts per target (default: 3)", parseInt).option("--no-verify", "Skip verification after sending").option("-j, --json", "Output results as JSON").action(async (opts) => {
     const targets = opts.targets.split(",").map((t) => t.trim()).filter(Boolean);
     const message = opts.message;
     const stagger = Number.isFinite(opts.stagger) && opts.stagger >= 0 ? opts.stagger : 500;
@@ -43146,7 +43132,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;
@@ -44725,25 +44711,49 @@ var init_stdio2 = __esm(() => {
 // src/mcp/tools/messaging.ts
 function registerMessagingTools(server, resolveProjectId) {
   server.registerTool("send_message", {
-    description: "Send a DM to an agent.",
+    description: "Send a DM to an agent by name, or to a specific agent-claude session by ID. When target_session_id is provided, the message is routed to that exact session and auto-injected into its conversation.",
     inputSchema: {
-      to: exports_external2.string(),
+      to: exports_external2.string().describe("Agent name to send to, OR use target_session_id instead for session targeting"),
       content: exports_external2.string(),
       from: exports_external2.string().optional(),
       priority: exports_external2.string().optional(),
       blocking: exports_external2.coerce.boolean().optional(),
-      project_id: exports_external2.string().optional()
+      project_id: exports_external2.string().optional(),
+      target_session_id: exports_external2.string().optional().describe("If provided, sends to a specific agent-claude session ID (UUID). The message auto-injects into that session's conversation.")
     }
   }, async (args) => {
-    const { from: fromParam, to, content, priority, blocking, project_id } = args;
+    const { from: fromParam, to, content, priority, blocking, project_id, target_session_id } = args;
     const from = resolveIdentity(fromParam);
     const msg = sendMessage({
       from,
-      to,
+      to: target_session_id ? `session:${target_session_id}` : to,
       content,
       priority,
       blocking,
-      project_id
+      project_id,
+      metadata: target_session_id ? { target_session_id } : undefined
+    });
+    return {
+      content: [{ type: "text", text: JSON.stringify(msg) }]
+    };
+  });
+  server.registerTool("send_to_session", {
+    description: "Send a message to a specific agent-claude session by its session ID. The message will be auto-injected into that session's conversation via the channel bridge.",
+    inputSchema: {
+      target_session_id: exports_external2.string().describe("The agent-claude session ID (UUID) to send the message to"),
+      content: exports_external2.string().describe("Message content to inject into the target session"),
+      from: exports_external2.string().optional().describe("Sender agent name (defaults to CONVERSATIONS_AGENT_ID)"),
+      priority: exports_external2.string().optional()
+    }
+  }, async (args) => {
+    const { target_session_id, content, from: fromParam, priority } = args;
+    const from = resolveIdentity(fromParam);
+    const msg = sendMessage({
+      from,
+      to: `session:${target_session_id}`,
+      content,
+      priority,
+      metadata: { target_session_id }
     });
     return {
       content: [{ type: "text", text: JSON.stringify(msg) }]
@@ -46918,55 +46928,73 @@ var init_cloud = __esm(() => {
 });
 
 // src/mcp/channel.ts
-function registerChannelBridge(server, getAgentId) {
+function registerChannelBridge(server, getAgentId, getSessionId) {
   server.server.registerCapabilities({
     experimental: {
       "claude/channel": {}
     }
   });
   let lastSeenId = 0;
+  let lastSeenSessionId = 0;
   let pollTimer = null;
-  function seedLastSeen(agentId) {
-    const latest = readMessages({
-      to: agentId,
-      order: "desc",
-      limit: 1
+  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) {
+    server.server.notification({
+      method: "notifications/claude/channel",
+      params: {
+        content: msg.content,
+        meta: {
+          from: msg.from_agent,
+          session_id: msg.session_id,
+          ...msg.space ? { space: msg.space } : {},
+          ...msg.priority && msg.priority !== "normal" ? { priority: msg.priority } : {}
+        }
+      }
     });
-    if (latest.length > 0) {
-      lastSeenId = latest[0].id;
-    }
   }
   function startPolling2() {
     if (pollTimer)
       return;
     const agentId = getAgentId();
-    if (!agentId)
+    const sessionId = getSessionId();
+    if (!agentId && !sessionId)
       return;
-    seedLastSeen(agentId);
+    if (agentId)
+      seedLastSeen(agentId, sessionId);
     pollTimer = setInterval(() => {
-      const currentAgent = getAgentId();
-      if (!currentAgent)
-        return;
       try {
-        const newMessages = readMessages({
-          to: currentAgent,
-          order: "asc",
-          limit: 20
-        }).filter((m) => m.id > lastSeenId);
-        for (const msg of newMessages) {
-          lastSeenId = msg.id;
-          server.server.notification({
-            method: "notifications/claude/channel",
-            params: {
-              content: msg.content,
-              meta: {
-                from: msg.from_agent,
-                session_id: msg.session_id,
-                ...msg.space ? { space: msg.space } : {},
-                ...msg.priority !== "normal" ? { priority: msg.priority } : {}
-              }
-            }
-          });
+        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);
@@ -47131,7 +47159,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);
+  registerChannelBridge(server, () => process.env.CONVERSATIONS_AGENT_ID ?? null, () => process.env.CONVERSATIONS_SESSION_ID ?? null);
   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) => {
@@ -48835,7 +48863,7 @@ init_presence();
 init_db();
 import chalk4 from "chalk";
 function registerMessagingCommands(program2) {
-  program2.command("send").description("Send a message to an agent").argument("<message>", "Message content").option("--to <agent>", "Recipient agent ID (required unless --space is used)").option("--from <agent>", "Sender agent ID").option("--session <id>", "Session ID (auto-generated if omitted)").option("--priority <level>", "Priority: low, normal, high, urgent", "normal").option("--working-dir <path>", "Working directory context").option("--repository <repo>", "Repository context").option("--branch <branch>", "Branch context").option("--metadata <json>", "JSON metadata string").option("--space <name>", "Send to a space instead of a specific agent").option("--blocking", "Send as a blocking message (recipient must acknowledge)").option("--json", "Output as JSON").action((message, opts) => {
+  program2.command("send").description("Send a message to an agent").argument("<message>", "Message content").option("--to <agent>", "Recipient agent ID (required unless --space is used)").option("--from <agent>", "Sender agent ID").option("--session <id>", "Session ID (auto-generated if omitted)").option("--priority <level>", "Priority: low, normal, high, urgent", "normal").option("--working-dir <path>", "Working directory context").option("--repository <repo>", "Repository context").option("--branch <branch>", "Branch context").option("--metadata <json>", "JSON metadata string").option("--space <name>", "Send to a space instead of a specific agent").option("--blocking", "Send as a blocking message (recipient must acknowledge)").option("-j, --json", "Output as JSON").action((message, opts) => {
     const from = resolveIdentity(opts.from).trim();
     const to = typeof opts.to === "string" ? opts.to.trim() : "";
     const space = typeof opts.space === "string" ? opts.space.trim() : "";
@@ -48884,7 +48912,7 @@ function registerMessagingCommands(program2) {
     }
     closeDb();
   });
-  program2.command("read").description("Read messages").option("--session <id>", "Filter by session ID").option("--from <agent>", "Filter by sender").option("--to <agent>", "Filter by recipient").option("--space <name>", "Filter by space").option("--since <timestamp>", "Messages after this ISO timestamp").option("--limit <n>", "Max messages to return", parseInt).option("--unread", "Only unread messages").option("--mark-read", "Mark returned messages as read").option("--json", "Output as JSON").action((opts) => {
+  program2.command("read").description("Read messages").option("--session <id>", "Filter by session ID").option("--from <agent>", "Filter by sender").option("--to <agent>", "Filter by recipient").option("--space <name>", "Filter by space").option("--since <timestamp>", "Messages after this ISO timestamp").option("--limit <n>", "Max messages to return", parseInt).option("--unread", "Only unread messages").option("--mark-read", "Mark returned messages as read").option("-j, --json", "Output as JSON").action((opts) => {
     const messages = readMessages({
       session_id: opts.session,
       from: opts.from,
@@ -48929,7 +48957,7 @@ function registerMessagingCommands(program2) {
     }
     closeDb();
   });
-  program2.command("digest").description("Show unread message digest (preview only, auto-marks read)").argument("[space]", "Space name to digest (omit for DMs)").option("--since <timestamp>", "Messages after this ISO timestamp").option("--limit <n>", "Max messages to show", parseInt).option("--to <agent>", "Filter by recipient (for DMs)").option("--json", "Output as JSON").action((spaceArg, opts) => {
+  program2.command("digest").description("Show unread message digest (preview only, auto-marks read)").argument("[space]", "Space name to digest (omit for DMs)").option("--since <timestamp>", "Messages after this ISO timestamp").option("--limit <n>", "Max messages to show", parseInt).option("--to <agent>", "Filter by recipient (for DMs)").option("-j, --json", "Output as JSON").action((spaceArg, opts) => {
     const result = readDigest({
       space: spaceArg || undefined,
       since: opts.since,
@@ -48956,7 +48984,7 @@ function registerMessagingCommands(program2) {
     }
     closeDb();
   });
-  program2.command("search").description("Search messages by content").argument("<query>", "Search query string").option("--space <name>", "Filter by space").option("--from <agent>", "Filter by sender").option("--to <agent>", "Filter by recipient").option("--limit <n>", "Max results to return", parseInt).option("--json", "Output as JSON").action((query, opts) => {
+  program2.command("search").description("Search messages by content").argument("<query>", "Search query string").option("--space <name>", "Filter by space").option("--from <agent>", "Filter by sender").option("--to <agent>", "Filter by recipient").option("--limit <n>", "Max results to return", parseInt).option("-j, --json", "Output as JSON").action((query, opts) => {
     const q = typeof query === "string" ? query.trim() : "";
     if (!q) {
       console.error(chalk4.red("Search query cannot be empty."));
@@ -48989,7 +49017,7 @@ function registerMessagingCommands(program2) {
     }
     closeDb();
   });
-  program2.command("since").description("Show all activity (DMs + spaces) since a duration ago").argument("<duration>", "Duration: e.g. 30m, 2h, 1d").option("--json", "Output as JSON").action((duration, opts) => {
+  program2.command("since").description("Show all activity (DMs + spaces) since a duration ago").argument("<duration>", "Duration: e.g. 30m, 2h, 1d").option("-j, --json", "Output as JSON").action((duration, opts) => {
     const match = duration.match(/^(\d+)([mhd])$/);
     if (!match) {
       console.error(chalk4.red(`Invalid duration "${duration}". Use format: 30m, 2h, 1d`));
@@ -49023,7 +49051,7 @@ function registerMessagingCommands(program2) {
     }
     closeDb();
   });
-  program2.command("reply").description("Reply to a message (uses same session)").argument("<message>", "Reply content").requiredOption("--to <message-id>", "Message ID to reply to", parseInt).option("--from <agent>", "Sender agent ID").option("--priority <level>", "Priority: low, normal, high, urgent", "normal").option("--json", "Output as JSON").action((message, opts) => {
+  program2.command("reply").description("Reply to a message (uses same session)").argument("<message>", "Reply content").requiredOption("--to <message-id>", "Message ID to reply to", parseInt).option("--from <agent>", "Sender agent ID").option("--priority <level>", "Priority: low, normal, high, urgent", "normal").option("-j, --json", "Output as JSON").action((message, opts) => {
     const original = getMessageById(opts.to);
     if (!original) {
       console.error(chalk4.red(`Message #${opts.to} not found.`));
@@ -49056,7 +49084,7 @@ function registerMessagingCommands(program2) {
     }
     closeDb();
   });
-  program2.command("mark-read").description("Mark messages as read").argument("[ids...]", "Message IDs to mark as read").option("--all", "Mark all messages as read").option("--session <id>", "Mark all messages in session as read").option("--space <name>", "Mark all messages in space as read").option("--agent <id>", "Agent marking messages as read").option("--json", "Output as JSON").action((ids, opts) => {
+  program2.command("mark-read").description("Mark messages as read").argument("[ids...]", "Message IDs to mark as read").option("--all", "Mark all messages as read").option("--session <id>", "Mark all messages in session as read").option("--space <name>", "Mark all messages in space as read").option("--agent <id>", "Agent marking messages as read").option("-j, --json", "Output as JSON").action((ids, opts) => {
     const agent = resolveIdentity(opts.agent);
     let count = 0;
     if (opts.all) {
@@ -49091,7 +49119,7 @@ function registerMessagingCommands(program2) {
     console.log(result);
     closeDb();
   });
-  program2.command("edit").description("Edit a message (only sender can edit)").argument("<id>", "Message ID", parseInt).argument("<new-content>", "New message content").option("--from <agent>", "Sender agent ID").option("--json", "Output as JSON").action((id, newContent, opts) => {
+  program2.command("edit").description("Edit a message (only sender can edit)").argument("<id>", "Message ID", parseInt).argument("<new-content>", "New message content").option("--from <agent>", "Sender agent ID").option("-j, --json", "Output as JSON").action((id, newContent, opts) => {
     const agent = resolveIdentity(opts.from).trim();
     const content = typeof newContent === "string" ? newContent : "";
     if (!agent) {
@@ -49115,7 +49143,7 @@ function registerMessagingCommands(program2) {
     }
     closeDb();
   });
-  program2.command("delete").description("Delete a message (only sender can delete)").argument("<id>", "Message ID", parseInt).option("--from <agent>", "Sender agent ID").option("--json", "Output as JSON").action((id, opts) => {
+  program2.command("delete").description("Delete a message (only sender can delete)").argument("<id>", "Message ID", parseInt).option("--from <agent>", "Sender agent ID").option("-j, --json", "Output as JSON").action((id, opts) => {
     const agent = resolveIdentity(opts.from).trim();
     if (!agent) {
       console.error(chalk4.red("Agent identity is required."));
@@ -49134,7 +49162,7 @@ function registerMessagingCommands(program2) {
     }
     closeDb();
   });
-  program2.command("pin").description("Pin a message").argument("<id>", "Message ID", parseInt).option("--json", "Output as JSON").action((id, opts) => {
+  program2.command("pin").description("Pin a message").argument("<id>", "Message ID", parseInt).option("-j, --json", "Output as JSON").action((id, opts) => {
     const msg = pinMessage(id);
     if (opts.json) {
       console.log(JSON.stringify(msg, null, 2));
@@ -49148,7 +49176,7 @@ function registerMessagingCommands(program2) {
     }
     closeDb();
   });
-  program2.command("unpin").description("Unpin a message").argument("<id>", "Message ID", parseInt).option("--json", "Output as JSON").action((id, opts) => {
+  program2.command("unpin").description("Unpin a message").argument("<id>", "Message ID", parseInt).option("-j, --json", "Output as JSON").action((id, opts) => {
     const msg = unpinMessage(id);
     if (opts.json) {
       console.log(JSON.stringify(msg, null, 2));
@@ -49162,7 +49190,7 @@ function registerMessagingCommands(program2) {
     }
     closeDb();
   });
-  program2.command("pinned").description("List pinned messages").option("--space <name>", "Filter by space").option("--session <id>", "Filter by session ID").option("--limit <n>", "Max results", parseInt).option("--json", "Output as JSON").action((opts) => {
+  program2.command("pinned").description("List pinned messages").option("--space <name>", "Filter by space").option("--session <id>", "Filter by session ID").option("--limit <n>", "Max results", parseInt).option("-j, --json", "Output as JSON").action((opts) => {
     const messages = getPinnedMessages({ space: opts.space, session_id: opts.session, limit: opts.limit });
     if (opts.json) {
       console.log(JSON.stringify(messages, null, 2));
@@ -49182,7 +49210,7 @@ function registerMessagingCommands(program2) {
     }
     closeDb();
   });
-  program2.command("blockers").description("Check for unread blocking messages").option("--from <agent>", "Agent to check blockers for").option("--json", "Output as JSON").action((opts) => {
+  program2.command("blockers").description("Check for unread blocking messages").option("--from <agent>", "Agent to check blockers for").option("-j, --json", "Output as JSON").action((opts) => {
     const agent = resolveIdentity(opts.from);
     const blockers = getUnreadBlockers(agent);
     if (opts.json) {
@@ -49311,7 +49339,7 @@ Acknowledge with: conversations mark-read ${blockers.map((b) => b.id).join(" ")}
       process.exit(0);
     });
   });
-  program2.command("update").description("Check for and install updates").option("--check", "Only check for updates, don't install").option("--json", "Output as JSON").action(async (opts) => {
+  program2.command("update").description("Check for and install updates").option("--check", "Only check for updates, don't install").option("-j, --json", "Output as JSON").action(async (opts) => {
     const pkg = await Promise.resolve().then(() => __toESM(require_package(), 1));
     const current = pkg.version;
     let latest;
@@ -49376,7 +49404,7 @@ init_terminal_markdown();
 import chalk5 from "chalk";
 function registerSpaceCommands(program2) {
   const space = program2.command("space").description("Manage spaces");
-  space.command("create").description("Create a new space").argument("<name>", "Space name").option("--description <text>", "Space description").option("--parent <name>", "Parent space name (for nesting)").option("--project <id>", "Project ID to associate with").option("--from <agent>", "Creator agent ID").option("--json", "Output as JSON").action((name, opts) => {
+  space.command("create").description("Create a new space").argument("<name>", "Space name").option("--description <text>", "Space description").option("--parent <name>", "Parent space name (for nesting)").option("--project <id>", "Project ID to associate with").option("--from <agent>", "Creator agent ID").option("-j, --json", "Output as JSON").action((name, opts) => {
     const agent = resolveIdentity(opts.from).trim();
     const spaceName = typeof name === "string" ? name.trim() : "";
     if (!agent) {
@@ -49409,7 +49437,7 @@ function registerSpaceCommands(program2) {
     }
     closeDb();
   });
-  space.command("list").description("List all spaces").option("--project <id>", "Filter by project ID").option("--parent <name>", "Filter by parent space name").option("--top-level", "Show only top-level spaces").option("--archived", "Include archived spaces").option("--json", "Output as JSON").action((opts) => {
+  space.command("list").description("List all spaces").option("--project <id>", "Filter by project ID").option("--parent <name>", "Filter by parent space name").option("--top-level", "Show only top-level spaces").option("--archived", "Include archived spaces").option("-j, --json", "Output as JSON").action((opts) => {
     const listOpts = {};
     if (opts.project)
       listOpts.project_id = opts.project;
@@ -49437,7 +49465,7 @@ function registerSpaceCommands(program2) {
     }
     closeDb();
   });
-  space.command("update").description("Update a space").argument("<name>", "Space name").option("--description <text>", "New description").option("--parent <name>", "New parent space name").option("--project <id>", "New project ID").option("--json", "Output as JSON").action((name, opts) => {
+  space.command("update").description("Update a space").argument("<name>", "Space name").option("--description <text>", "New description").option("--parent <name>", "New parent space name").option("--project <id>", "New project ID").option("-j, --json", "Output as JSON").action((name, opts) => {
     const spaceName = typeof name === "string" ? name.trim() : "";
     if (!spaceName) {
       console.error(chalk5.red("Space name cannot be empty."));
@@ -49463,7 +49491,7 @@ function registerSpaceCommands(program2) {
     }
     closeDb();
   });
-  space.command("archive").description("Archive a space").argument("<name>", "Space name").option("--json", "Output as JSON").action((name, opts) => {
+  space.command("archive").description("Archive a space").argument("<name>", "Space name").option("-j, --json", "Output as JSON").action((name, opts) => {
     const spaceName = typeof name === "string" ? name.trim() : "";
     if (!spaceName) {
       console.error(chalk5.red("Space name cannot be empty."));
@@ -49482,7 +49510,7 @@ function registerSpaceCommands(program2) {
     }
     closeDb();
   });
-  space.command("unarchive").description("Unarchive a space").argument("<name>", "Space name").option("--json", "Output as JSON").action((name, opts) => {
+  space.command("unarchive").description("Unarchive a space").argument("<name>", "Space name").option("-j, --json", "Output as JSON").action((name, opts) => {
     const spaceName = typeof name === "string" ? name.trim() : "";
     if (!spaceName) {
       console.error(chalk5.red("Space name cannot be empty."));
@@ -49501,7 +49529,7 @@ function registerSpaceCommands(program2) {
     }
     closeDb();
   });
-  space.command("send").description("Send a message to a space").argument("<space>", "Space name").argument("<message>", "Message content").option("--from <agent>", "Sender agent ID").option("--priority <level>", "Priority: low, normal, high, urgent", "normal").option("--json", "Output as JSON").action((spaceName, message, opts) => {
+  space.command("send").description("Send a message to a space").argument("<space>", "Space name").argument("<message>", "Message content").option("--from <agent>", "Sender agent ID").option("--priority <level>", "Priority: low, normal, high, urgent", "normal").option("-j, --json", "Output as JSON").action((spaceName, message, opts) => {
     const from = resolveIdentity(opts.from).trim();
     const spaceArg = typeof spaceName === "string" ? spaceName.trim() : "";
     const content = typeof message === "string" ? message : "";
@@ -49537,7 +49565,7 @@ function registerSpaceCommands(program2) {
     }
     closeDb();
   });
-  space.command("read").description("Read messages from a space").argument("<space>", "Space name").option("--since <timestamp>", "Messages after this ISO timestamp").option("--limit <n>", "Max messages to return", parseInt).option("--json", "Output as JSON").action((spaceName, opts) => {
+  space.command("read").description("Read messages from a space").argument("<space>", "Space name").option("--since <timestamp>", "Messages after this ISO timestamp").option("--limit <n>", "Max messages to return", parseInt).option("-j, --json", "Output as JSON").action((spaceName, opts) => {
     const spaceArg = typeof spaceName === "string" ? spaceName.trim() : "";
     if (!spaceArg) {
       console.error(chalk5.red("Space name cannot be empty."));
@@ -49569,7 +49597,7 @@ function registerSpaceCommands(program2) {
     }
     closeDb();
   });
-  space.command("join").description("Join a space").argument("<space>", "Space name").option("--from <agent>", "Agent ID").option("--json", "Output as JSON").action((spaceName, opts) => {
+  space.command("join").description("Join a space").argument("<space>", "Space name").option("--from <agent>", "Agent ID").option("-j, --json", "Output as JSON").action((spaceName, opts) => {
     const agent = resolveIdentity(opts.from).trim();
     const spaceArg = typeof spaceName === "string" ? spaceName.trim() : "";
     if (!agent) {
@@ -49592,7 +49620,7 @@ function registerSpaceCommands(program2) {
     }
     closeDb();
   });
-  space.command("leave").description("Leave a space").argument("<space>", "Space name").option("--from <agent>", "Agent ID").option("--json", "Output as JSON").action((spaceName, opts) => {
+  space.command("leave").description("Leave a space").argument("<space>", "Space name").option("--from <agent>", "Agent ID").option("-j, --json", "Output as JSON").action((spaceName, opts) => {
     const agent = resolveIdentity(opts.from).trim();
     const spaceArg = typeof spaceName === "string" ? spaceName.trim() : "";
     if (!agent) {
@@ -49615,7 +49643,7 @@ function registerSpaceCommands(program2) {
     }
     closeDb();
   });
-  space.command("members").description("List space members").argument("<space>", "Space name").option("--json", "Output as JSON").action((spaceName, opts) => {
+  space.command("members").description("List space members").argument("<space>", "Space name").option("-j, --json", "Output as JSON").action((spaceName, opts) => {
     const spaceArg = typeof spaceName === "string" ? spaceName.trim() : "";
     if (!spaceArg) {
       console.error(chalk5.red("Space name cannot be empty."));
@@ -49648,9 +49676,20 @@ function requireDeleteConfirmation(confirmed) {
     throw new Error("Project deletion requires --yes confirmation");
   }
 }
+function parseProjectListPagination(limitInput, offsetInput) {
+  if (limitInput !== undefined && (!Number.isFinite(limitInput) || Number(limitInput) <= 0)) {
+    throw new Error("--limit must be a positive integer.");
+  }
+  if (offsetInput !== undefined && (!Number.isFinite(offsetInput) || Number(offsetInput) < 0)) {
+    throw new Error("--offset must be a non-negative integer.");
+  }
+  const limit = Number.isFinite(limitInput) ? Math.floor(Number(limitInput)) : undefined;
+  const offset = Number.isFinite(offsetInput) ? Math.floor(Number(offsetInput)) : undefined;
+  return { limit, offset };
+}
 function registerProjectCommands(program2) {
   const project = program2.command("project").description("Manage projects");
-  project.command("create").description("Create a new project").argument("<name>", "Project name").option("--description <text>", "Project description").option("--path <path>", "Project path on disk").option("--repository <url>", "Repository URL").option("--tags <json>", "JSON array of tags").option("--from <agent>", "Creator agent ID").option("--json", "Output as JSON").action((name, opts) => {
+  project.command("create").description("Create a new project").argument("<name>", "Project name").option("--description <text>", "Project description").option("--path <path>", "Project path on disk").option("--repository <url>", "Repository URL").option("--tags <json>", "JSON array of tags").option("--from <agent>", "Creator agent ID").option("-j, --json", "Output as JSON").action((name, opts) => {
     const agent = resolveIdentity(opts.from).trim();
     const projectName = typeof name === "string" ? name.trim() : "";
     if (!agent) {
@@ -49694,10 +49733,16 @@ function registerProjectCommands(program2) {
     }
     closeDb();
   });
-  project.command("list").description("List all projects").option("--status <status>", "Filter by status (active/archived)").option("--limit <n>", "Limit results", parseInt).option("--offset <n>", "Skip first N results", parseInt).option("--json", "Output as JSON").action((opts) => {
+  project.command("list").description("List all projects").option("--status <status>", "Filter by status (active/archived)").option("--limit <n>", "Limit results", parseInt).option("--offset <n>", "Skip first N results", parseInt).option("-j, --json", "Output as JSON").action((opts) => {
     const status = opts.status === "active" || opts.status === "archived" ? opts.status : undefined;
-    const limit = Number.isFinite(opts.limit) && opts.limit > 0 ? opts.limit : undefined;
-    const offset = Number.isFinite(opts.offset) && opts.offset >= 0 ? opts.offset : undefined;
+    let limit;
+    let offset;
+    try {
+      ({ limit, offset } = parseProjectListPagination(opts.limit, opts.offset));
+    } catch (e) {
+      console.error(chalk6.red(e.message));
+      process.exit(1);
+    }
     const projects = listProjects({
       ...status ? { status } : {},
       ...limit !== undefined ? { limit } : {},
@@ -49718,7 +49763,7 @@ function registerProjectCommands(program2) {
     }
     closeDb();
   });
-  project.command("get").description("Get project details").argument("<id-or-name>", "Project ID or name").option("--json", "Output as JSON").action((idOrName, opts) => {
+  project.command("get").description("Get project details").argument("<id-or-name>", "Project ID or name").option("-j, --json", "Output as JSON").action((idOrName, opts) => {
     let p = getProject(idOrName);
     if (!p)
       p = getProjectByName(idOrName);
@@ -49744,7 +49789,7 @@ function registerProjectCommands(program2) {
     }
     closeDb();
   });
-  project.command("update").description("Update a project").argument("<id-or-name>", "Project ID or name").option("--name <name>", "New name").option("--description <text>", "New description").option("--path <path>", "New path").option("--status <status>", "New status (active/archived)").option("--repository <url>", "New repository URL").option("--tags <json>", "New tags (JSON array)").option("--json", "Output as JSON").action((id, opts) => {
+  project.command("update").description("Update a project").argument("<id-or-name>", "Project ID or name").option("--name <name>", "New name").option("--description <text>", "New description").option("--path <path>", "New path").option("--status <status>", "New status (active/archived)").option("--repository <url>", "New repository URL").option("--tags <json>", "New tags (JSON array)").option("-j, --json", "Output as JSON").action((id, opts) => {
     const updates = {};
     if (opts.name)
       updates.name = opts.name;
@@ -49779,7 +49824,7 @@ function registerProjectCommands(program2) {
     }
     closeDb();
   });
-  project.command("delete").description("Delete a project").argument("<id-or-name>", "Project ID or name").option("--yes", "Confirm project deletion").option("--json", "Output as JSON").action((id, opts) => {
+  project.command("delete").description("Delete a project").argument("<id-or-name>", "Project ID or name").option("--yes", "Confirm project deletion").option("-j, --json", "Output as JSON").action((id, opts) => {
     try {
       requireDeleteConfirmation(opts.yes);
       const isUuid = /^[0-9a-f-]{36}$/i.test(id);
@@ -49834,7 +49879,7 @@ function buildWhoamiPayload(agent, source, presence, nowMs = Date.now()) {
 }
 function registerAgentCommands(program2) {
   const agents = program2.command("agents").description("Manage agents");
-  agents.command("list").description("List all agents with their presence status").option("--online", "Only show online agents").option("--json", "Output as JSON").action((opts) => {
+  agents.command("list").description("List all agents with their presence status").option("--online", "Only show online agents").option("-j, --json", "Output as JSON").action((opts) => {
     const agent = resolveIdentity();
     heartbeat(agent);
     const agentsList = listAgents({ online_only: opts.online });
@@ -49854,7 +49899,7 @@ function registerAgentCommands(program2) {
     }
     closeDb();
   });
-  agents.command("remove").description("Remove an agent from the presence list").argument("<name>", "Agent name to remove").option("--json", "Output as JSON").action((name, opts) => {
+  agents.command("remove").description("Remove an agent from the presence list").argument("<name>", "Agent name to remove").option("-j, --json", "Output as JSON").action((name, opts) => {
     const agentName = typeof name === "string" ? name.trim() : "";
     if (!agentName) {
       console.error(chalk7.red("Agent name cannot be empty."));
@@ -49873,7 +49918,7 @@ function registerAgentCommands(program2) {
     }
     closeDb();
   });
-  agents.command("rename").description("Rename an agent in the presence list").argument("<old-name>", "Current agent name").argument("<new-name>", "New agent name").option("--json", "Output as JSON").action((oldName, newName, opts) => {
+  agents.command("rename").description("Rename an agent in the presence list").argument("<old-name>", "Current agent name").argument("<new-name>", "New agent name").option("-j, --json", "Output as JSON").action((oldName, newName, opts) => {
     const old = typeof oldName === "string" ? oldName.trim() : "";
     const renamed = typeof newName === "string" ? newName.trim() : "";
     if (!old || !renamed) {
@@ -49897,7 +49942,7 @@ function registerAgentCommands(program2) {
     }
     closeDb();
   });
-  agents.command("register").description("Register an agent with conflict detection (30 min active window)").argument("<name>", "Agent name to register").option("--session <id>", "Session ID (default: random UUID)").option("--role <role>", "Agent role (default: agent)").option("--project <id>", "Project ID to lock agent to").option("--force", "Force takeover even if another session is active").option("--json", "Output as JSON").action((name, opts) => {
+  agents.command("register").description("Register an agent with conflict detection (30 min active window)").argument("<name>", "Agent name to register").option("--session <id>", "Session ID (default: random UUID)").option("--role <role>", "Agent role (default: agent)").option("--project <id>", "Project ID to lock agent to").option("--force", "Force takeover even if another session is active").option("-j, --json", "Output as JSON").action((name, opts) => {
     const agentName = (typeof name === "string" ? name : "").trim();
     if (!agentName) {
       console.error(chalk7.red("Agent name is required."));
@@ -49922,7 +49967,7 @@ function registerAgentCommands(program2) {
     }
     closeDb();
   });
-  agents.command("heartbeat").description("Send a presence heartbeat to mark yourself as active").option("--from <agent>", "Agent identity (default: CONVERSATIONS_AGENT_ID or auto)").option("--status <status>", "Status: online, busy, idle (default: online)").option("--json", "Output as JSON").action((opts) => {
+  agents.command("heartbeat").description("Send a presence heartbeat to mark yourself as active").option("--from <agent>", "Agent identity (default: CONVERSATIONS_AGENT_ID or auto)").option("--status <status>", "Status: online, busy, idle (default: online)").option("-j, --json", "Output as JSON").action((opts) => {
     const agent = resolveIdentity(opts.from);
     const status = opts.status || "online";
     heartbeat(agent, status);
@@ -49934,7 +49979,7 @@ function registerAgentCommands(program2) {
     closeDb();
   });
   const focus = program2.command("focus").description("Manage agent project focus");
-  focus.command("set").description("Set your project focus \u2014 scopes read operations to this project").argument("<project>", "Project ID or name").option("--from <agent>", "Agent identity").option("--json", "Output as JSON").action((projectArg, opts) => {
+  focus.command("set").description("Set your project focus \u2014 scopes read operations to this project").argument("<project>", "Project ID or name").option("--from <agent>", "Agent identity").option("-j, --json", "Output as JSON").action((projectArg, opts) => {
     const agent = resolveIdentity(opts.from);
     const project = getProject(projectArg) || getProjectByName(projectArg);
     if (!project) {
@@ -49949,7 +49994,7 @@ function registerAgentCommands(program2) {
     }
     closeDb();
   });
-  focus.command("clear").description("Clear your project focus").option("--from <agent>", "Agent identity").option("--json", "Output as JSON").action((opts) => {
+  focus.command("clear").description("Clear your project focus").option("--from <agent>", "Agent identity").option("-j, --json", "Output as JSON").action((opts) => {
     const agent = resolveIdentity(opts.from);
     getDb().prepare("UPDATE agent_presence SET project_id = NULL WHERE agent = ?").run(agent);
     if (opts.json) {
@@ -49959,7 +50004,7 @@ function registerAgentCommands(program2) {
     }
     closeDb();
   });
-  focus.command("get").description("Show current project focus").option("--from <agent>", "Agent identity").option("--json", "Output as JSON").action((opts) => {
+  focus.command("get").description("Show current project focus").option("--from <agent>", "Agent identity").option("-j, --json", "Output as JSON").action((opts) => {
     const agent = resolveIdentity(opts.from);
     const presence = getPresence(agent);
     const projectId = presence?.project_id ?? null;
@@ -49976,7 +50021,7 @@ function registerAgentCommands(program2) {
     }
     closeDb();
   });
-  program2.command("whoami").description("Show current agent identity and online status").option("--from <agent>", "Explicit agent identity").option("--json", "Output as JSON").action((opts) => {
+  program2.command("whoami").description("Show current agent identity and online status").option("--from <agent>", "Explicit agent identity").option("-j, --json", "Output as JSON").action((opts) => {
     const envValue = process.env.CONVERSATIONS_AGENT_ID?.trim();
     const agent = resolveIdentity(opts.from);
     let source;
@@ -50030,7 +50075,7 @@ var import__package = __toESM(require_package(), 1);
 import chalk8 from "chalk";
 function registerAnalyticsCommands(program2) {
   const graph = program2.command("graph").description("Knowledge graph operations");
-  graph.command("build").description("Build/rebuild knowledge graph from messages, spaces, projects").option("--json", "Output as JSON").action((opts) => {
+  graph.command("build").description("Build/rebuild knowledge graph from messages, spaces, projects").option("-j, --json", "Output as JSON").action((opts) => {
     const result = buildGraph();
     if (opts.json) {
       console.log(JSON.stringify(result, null, 2));
@@ -50039,7 +50084,7 @@ function registerAnalyticsCommands(program2) {
     }
     closeDb();
   });
-  graph.command("stats").description("Show knowledge graph statistics").option("--json", "Output as JSON").action((opts) => {
+  graph.command("stats").description("Show knowledge graph statistics").option("-j, --json", "Output as JSON").action((opts) => {
     const stats = getGraphStats();
     if (opts.json) {
       console.log(JSON.stringify(stats, null, 2));
@@ -50052,7 +50097,7 @@ function registerAnalyticsCommands(program2) {
     }
     closeDb();
   });
-  graph.command("agent").description("Show an agent's communication network").argument("<name>", "Agent name").option("--json", "Output as JSON").action((name, opts) => {
+  graph.command("agent").description("Show an agent's communication network").argument("<name>", "Agent name").option("-j, --json", "Output as JSON").action((name, opts) => {
     const network = getAgentNetwork(name);
     if (opts.json) {
       console.log(JSON.stringify(network, null, 2));
@@ -50077,7 +50122,7 @@ function registerAnalyticsCommands(program2) {
     }
     closeDb();
   });
-  program2.command("summary").description("Get a structured summary of a conversation").argument("<target>", "Session ID or space name").option("--json", "Output as JSON").action((target, opts) => {
+  program2.command("summary").description("Get a structured summary of a conversation").argument("<target>", "Session ID or space name").option("-j, --json", "Output as JSON").action((target, opts) => {
     const summary = getConversationSummary(target);
     if (!summary) {
       console.error(chalk8.red(`No messages found for "${target}"`));
@@ -50113,7 +50158,7 @@ function registerAnalyticsCommands(program2) {
     }
     closeDb();
   });
-  program2.command("topics").description("Extract topics from a space, session, or trending globally").option("--space <name>", "Topics for a specific space").option("--session <id>", "Topics for a specific session").option("--hours <n>", "Trending topics in last N hours", parseInt).option("--json", "Output as JSON").action((opts) => {
+  program2.command("topics").description("Extract topics from a space, session, or trending globally").option("--space <name>", "Topics for a specific space").option("--session <id>", "Topics for a specific session").option("--hours <n>", "Trending topics in last N hours", parseInt).option("-j, --json", "Output as JSON").action((opts) => {
     let topics;
     if (opts.space) {
       topics = getSpaceTopics(opts.space);
@@ -50139,7 +50184,7 @@ function registerAnalyticsCommands(program2) {
     }
     closeDb();
   });
-  program2.command("hot").description("Show hot conversations ranked by activity").option("--limit <n>", "Max results", parseInt).option("--min-score <n>", "Minimum hotness score", parseInt).option("--space <name>", "Filter by space").option("--json", "Output as JSON").action((opts) => {
+  program2.command("hot").description("Show hot conversations ranked by activity").option("--limit <n>", "Max results", parseInt).option("--min-score <n>", "Minimum hotness score", parseInt).option("--space <name>", "Filter by space").option("-j, --json", "Output as JSON").action((opts) => {
     const sessions = listHotSessions({
       limit: opts.limit ?? 10,
       min_score: opts.minScore,
@@ -50165,7 +50210,7 @@ function registerAnalyticsCommands(program2) {
     }
     closeDb();
   });
-  program2.command("context").description("One-shot session boot context for agents: online agents, unread DMs, spaces, recent activity").option("--json", "Output as JSON").action((opts) => {
+  program2.command("context").description("One-shot session boot context for agents: online agents, unread DMs, spaces, recent activity").option("-j, --json", "Output as JSON").action((opts) => {
     const agent = resolveIdentity();
     heartbeat(agent);
     const db2 = getDb();
@@ -50212,7 +50257,7 @@ function registerAnalyticsCommands(program2) {
     }
     closeDb();
   });
-  program2.command("sessions").description("List conversation sessions").option("--agent <id>", "Filter sessions involving this agent").option("--json", "Output as JSON").action((opts) => {
+  program2.command("sessions").description("List conversation sessions").option("--agent <id>", "Filter sessions involving this agent").option("-j, --json", "Output as JSON").action((opts) => {
     const sessions = listSessions(opts.agent);
     if (opts.json) {
       console.log(JSON.stringify(sessions, null, 2));
@@ -50229,7 +50274,7 @@ function registerAnalyticsCommands(program2) {
     }
     closeDb();
   });
-  program2.command("status").description("Show database stats").option("--json", "Output as JSON").action((opts) => {
+  program2.command("status").description("Show database stats").option("-j, --json", "Output as JSON").action((opts) => {
     const db2 = getDb();
     const dbPath = getDbPath2();
     const totalMessages = db2.prepare("SELECT COUNT(*) as count FROM messages").get().count;
@@ -50258,7 +50303,7 @@ function registerAnalyticsCommands(program2) {
     }
     closeDb();
   });
-  program2.command("doctor").description("Check conversations setup and health").option("--json", "Output as JSON").action(async (opts) => {
+  program2.command("doctor").description("Check conversations setup and health").option("-j, --json", "Output as JSON").action(async (opts) => {
     const checks = [];
     try {
       const db2 = getDb();
@@ -50332,7 +50377,7 @@ function registerAnalyticsCommands(program2) {
       }
     }
   });
-  program2.command("react").description("Add an emoji reaction to a message").argument("<id>", "Message ID", parseInt).argument("<emoji>", "Emoji to react with").option("--from <agent>", "Agent identity override").option("--json", "Output as JSON").action((id, emoji, opts) => {
+  program2.command("react").description("Add an emoji reaction to a message").argument("<id>", "Message ID", parseInt).argument("<emoji>", "Emoji to react with").option("--from <agent>", "Agent identity override").option("-j, --json", "Output as JSON").action((id, emoji, opts) => {
     const agent = resolveIdentity(opts.from);
     const reaction = addReaction(id, agent, emoji);
     if (opts.json) {
@@ -50342,7 +50387,7 @@ function registerAnalyticsCommands(program2) {
     }
     closeDb();
   });
-  program2.command("unreact").description("Remove an emoji reaction from a message").argument("<id>", "Message ID", parseInt).argument("<emoji>", "Emoji to remove").option("--from <agent>", "Agent identity override").option("--json", "Output as JSON").action((id, emoji, opts) => {
+  program2.command("unreact").description("Remove an emoji reaction from a message").argument("<id>", "Message ID", parseInt).argument("<emoji>", "Emoji to remove").option("--from <agent>", "Agent identity override").option("-j, --json", "Output as JSON").action((id, emoji, opts) => {
     const agent = resolveIdentity(opts.from);
     const removed = removeReaction(id, agent, emoji);
     if (opts.json) {
@@ -50356,7 +50401,7 @@ function registerAnalyticsCommands(program2) {
     }
     closeDb();
   });
-  program2.command("reactions").description("Show emoji reactions on a message").argument("<id>", "Message ID", parseInt).option("--json", "Output as JSON").action((id, opts) => {
+  program2.command("reactions").description("Show emoji reactions on a message").argument("<id>", "Message ID", parseInt).option("-j, --json", "Output as JSON").action((id, opts) => {
     const summary = getReactionSummary(id);
     if (opts.json) {
       console.log(JSON.stringify(summary, null, 2));