shepherd-onboard 0.1.12 → 0.1.14

package/README.md

@@ -11,7 +11,7 @@ npx -y shepherd-onboard@latest agent
 ```
 
 The command prints the exact prompt the agent should follow, then the exact follow-up commands to open Shepherd WorkOS login/signup, guide Google Workspace Admin Console delegation, open source auth for non-Google sources, open Granola's API key page, finalize, start cloud raw polling/backfills, and install local Messages sync.
-The agent prompt tells coding agents to ask short selection questions first: existing/new org, sources to connect, and Messages skip/provide-handle. If Messages is selected, the agent runs `messages-chats`, opens a minimal local webpage with the 20 most recent local Messages chats, and has the user select which contacts/groups to sync. Account creation/relinking always starts with Shepherd WorkOS auth.
+The agent prompt tells coding agents to ask short selection questions first: existing/new org, sources to connect, and Messages skip/provide-handle. If Messages is selected, the agent runs `messages-chats`, opens a minimal searchable local webpage, and has the user select which contacts/groups to sync. Account creation/relinking always starts with Shepherd WorkOS auth.
 Existing-organization joins are verified from Shepherd login and company email domain; the typed org name is not trusted by itself.
 
 ## Human Terminal One-liner
@@ -31,7 +31,7 @@ The command:
 - opens Slack authorization
 - opens the Granola desktop app to Settings -> Connectors -> API keys
 - collects the Granola API key after opening the Granola screen when Granola is enabled
-- opens a minimal local webpage showing the 20 most recent local Messages chats with contact/group names and only syncs the chats selected by the user
+- opens a minimal searchable local webpage with contact/group names and only syncs the chats selected by the user
 - sets up local macOS Messages raw sync with a background LaunchAgent scoped to the selected chats
 - starts raw polling/backfill for connected sources
 - does not start wiki generation, memory compilation, or doc summaries
@@ -82,6 +82,8 @@ npx -y shepherd-onboard@latest messages-chats
 
 Use `--json` for machine-readable chat metadata, or `--text` for a terminal list.
 
+The browser selector displays the first page of recent chats and lets the user search contacts or groups loaded from local Messages.
+
 Pass the selected chat IDs when finishing onboarding:
 
 ```sh

package/bin/shepherd-onboard.js

@@ -6,14 +6,18 @@ import { createServer } from "node:http";
 import { homedir, platform } from "node:os";
 import { dirname, join } from "node:path";
 import readline from "node:readline";
+import { fileURLToPath } from "node:url";
 
 const DEFAULT_API_URL = "https://brain-api-customer-facing.up.railway.app";
 const PACKAGE_NAME = "shepherd-onboard";
 const PACKAGE_SPEC = `${PACKAGE_NAME}@latest`;
+const PACKAGE_DIR = dirname(dirname(fileURLToPath(import.meta.url)));
 const DEFAULT_AGENT_STATE_PATH = join(homedir(), ".shepherd", "raw-onboarding-agent.json");
 const MAX_BATCH_SIZE = 50;
 const MAX_QUEUE_MESSAGES = 10_000;
-const DEFAULT_RECENT_MESSAGE_CHATS = 20;
+const DEFAULT_MESSAGE_CHAT_SEARCH_LIMIT = 200;
+const INITIAL_MESSAGE_CHAT_ROWS = 20;
+const SHEPHERD_LOGO_PATH = join(PACKAGE_DIR, "assets", "shepherd_G_vector_136033.png");
 const GRANOLA_API_KEYS_PATH = "/settings/integrations/api-keys";
 const GOOGLE_WORKSPACE_DELEGATION_APP_NAME = "Shepherd";
 const GOOGLE_WORKSPACE_DELEGATION_SERVICE_ACCOUNT_EMAIL =
@@ -515,7 +519,7 @@ async function printAgentStatus() {
 
 async function runMessagesChatsCommand() {
   const chats = await listRecentMessageChats({
-    limit: clampInt(Number(args.limit ?? DEFAULT_RECENT_MESSAGE_CHATS), 1, 100),
+    limit: clampInt(Number(args.limit ?? DEFAULT_MESSAGE_CHAT_SEARCH_LIMIT), 1, 500),
   });
 
   if (args.json) {
@@ -647,7 +651,7 @@ Usage:
   npx -y ${PACKAGE_NAME}@latest messages-chats --json
 
 Options:
-  --limit <n>                Number of recent chats to show. Defaults to ${DEFAULT_RECENT_MESSAGE_CHATS}.
+  --limit <n>                Number of recent chats to load for search. Defaults to ${DEFAULT_MESSAGE_CHAT_SEARCH_LIMIT}.
   --text                     Print a terminal list instead of opening the selector page.
   --no-open                  Print the local selector URL instead of opening it.
   --json                     Print machine-readable chat IDs and labels.
@@ -702,7 +706,7 @@ function printAgentContract() {
       "If Google Workspace is selected, guide the customer's Google Workspace super admin to authorize Shepherd's Client ID and scopes in Google Admin Console.",
       "Ask Messages as a selectable choice: Skip Messages, or Provide handle.",
       "If the user chooses Provide handle, ask for the phone number or Apple ID email.",
-      "If Messages is selected, run the recent-chat command and ask which of the 20 most recent chats to sync. Never sync all Messages chats by default.",
+      "If Messages is selected, run the recent-chat command. It opens a browser selector with recent chats and search. Never sync all Messages chats by default.",
     ],
     selectionQuestions: [
       {
@@ -726,7 +730,7 @@ function printAgentContract() {
       "Full name",
       "Organization name",
       "Messages phone number or Apple ID email, if they want local Messages connected",
-      "Selected local Messages chats from the 20 most recent chats, if they want local Messages connected",
+      "Selected local Messages chats from the browser selector, if they want local Messages connected",
     ],
     afterStartCommand: [
       "For Google Workspace, have a super admin authorize the Shepherd Client ID and scopes in Google Admin Console.",
@@ -798,7 +802,7 @@ If they are joining an existing org, ask for the org name they believe they belo
 If Messages is selected, run:
   ${payload.messagesChatsCommand}
 
-This opens a minimal local webpage with the 20 recent local Messages chats. Have the user select which contacts/groups Shepherd should sync. Do not select all chats by default. When the command returns, keep the printed comma-separated chat IDs.
+This opens a minimal local webpage with recent local Messages chats and search. Have the user select which contacts/groups Shepherd should sync. Do not select all chats by default. When the command returns, keep the printed comma-separated chat IDs.
 
 Then run:
   ${payload.startCommand}
@@ -1207,7 +1211,7 @@ async function selectRecentMessageChats() {
     throw new Error(`Messages sync requires selected chat IDs. Run ${agentCommand()} messages-chats and pass --messages-chat-ids "<id1>,<id2>".`);
   }
 
-  const chats = await listRecentMessageChats({ limit: DEFAULT_RECENT_MESSAGE_CHATS });
+  const chats = await listRecentMessageChats({ limit: clampInt(Number(args.limit ?? DEFAULT_MESSAGE_CHAT_SEARCH_LIMIT), 1, 500) });
   if (chats.length === 0) {
     throw new Error("No recent local Messages chats were found on this Mac.");
   }
@@ -1314,19 +1318,36 @@ async function selectChatsInBrowser(chats, opts = {}) {
 }
 
 function renderMessagesSelectorPage(chats, token, error = "") {
-  const rows = chats.map((chat) => `
-      <label class="chat-row">
+  const logo = shepherdLogoDataUri();
+  const rows = chats.map((chat, index) => {
+    const people = chatPeopleLine(chat);
+    const when = formatMessageChatMeta(chat);
+    const searchText = [
+      chat.label,
+      chat.kind,
+      people,
+      when,
+      ...(chat.participants ?? []).flatMap((participant) => [participant.name, participant.handle]),
+    ]
+      .filter(Boolean)
+      .join(" ")
+      .toLowerCase();
+
+    const kindKey = chat.kind === "group" ? "group" : chat.kind === "dm" ? "dm" : "other";
+    const kindLabel = kindKey === "group" ? "Group" : kindKey === "dm" ? "Contact" : "Chat";
+    return `
+      <label class="chat-row" data-index="${index}" data-search="${htmlAttr(searchText)}">
         <input type="checkbox" name="chatId" value="${htmlAttr(chat.chatId)}">
         <span class="box" aria-hidden="true"></span>
-        <span class="chat-main">
-          <span class="chat-top">
-            <span class="chat-name">${html(chat.label)}</span>
-            <span class="chat-kind">${html(chat.kind === "group" ? "Group" : chat.kind === "dm" ? "Contact" : "Chat")}</span>
-          </span>
-          ${renderChatPeople(chat)}
-          <span class="chat-meta">${html(formatMessageChatMeta(chat))}</span>
+        <span class="avatar" aria-hidden="true">${html(chatInitials(chat.label))}</span>
+        <span class="chat-name-block">
+          <span class="chat-name">${html(chat.label)}</span>
+          ${people ? `<span class="chat-people">${html(people)}</span>` : ""}
         </span>
-      </label>`).join("");
+        <span class="chat-kind chat-kind--${kindKey}">${html(kindLabel)}</span>
+        <span class="chat-meta">${when ? html(when) : "—"}</span>
+      </label>`;
+  }).join("");
 
   return `<!doctype html>
 <html lang="en">
@@ -1336,87 +1357,131 @@ function renderMessagesSelectorPage(chats, token, error = "") {
   <title>Select Messages Chats</title>
   <style>
     :root {
-      color-scheme: light dark;
-      --bg: #FCFCFC;
-      --fg: #111111;
-      --muted: #6D726D;
-      --line: #E8ECE8;
+      --hero-top: #136033;
+      --hero-bottom: #0c3f22;
       --panel: #FFFFFF;
-      --button: #136033;
-      --button-text: #FFFFFF;
-      --link: #136033;
-      --radius: 10px;
-    }
-    @media (prefers-color-scheme: dark) {
-      :root {
-        --bg: #000000;
-        --fg: #F8F8F8;
-        --muted: #A2A8A2;
-        --line: #202520;
-        --panel: #070907;
-        --button: #FFFFFF;
-        --button-text: #000000;
-        --link: #136033;
-      }
+      --fg: #15201a;
+      --muted: #6B736D;
+      --faint: #8A938C;
+      --line: #EEF1EE;
+      --green: #136033;
+      --green-soft: #E7F3EC;
+      --green-text: #1F7A43;
+      --neutral-soft: #F0F1EF;
+      --button: #1F6E3C;
+      --button-hover: #237b44;
+      --radius: 12px;
+      --grid: 20px 36px minmax(0, 1fr) 92px 124px;
     }
     * { box-sizing: border-box; }
     body {
       margin: 0;
-      background: var(--bg);
+      min-height: 100vh;
+      background: linear-gradient(180deg, var(--hero-top) 0%, var(--hero-top) 150px, var(--hero-bottom) 520px, var(--hero-bottom) 100%);
       color: var(--fg);
       font-family: Geist, "Geist Sans", ui-sans-serif, system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", sans-serif;
       letter-spacing: 0;
+      -webkit-font-smoothing: antialiased;
     }
     main {
       width: min(760px, calc(100vw - 32px));
-      margin: 40px auto;
+      margin: 0 auto;
+      padding: 48px 0 40px;
     }
-    header {
+    .hero {
       display: flex;
-      justify-content: space-between;
-      gap: 16px;
-      align-items: end;
-      padding-bottom: 18px;
-      border-bottom: 1px solid var(--line);
+      gap: 22px;
+      align-items: center;
+      padding: 0 6px 34px;
+      color: #FFFFFF;
+    }
+    .hero .logo {
+      width: 96px;
+      height: 96px;
+      object-fit: contain;
+      flex: none;
+    }
+    .hero .logo-fallback {
+      width: 88px;
+      height: 88px;
+      border-radius: 20px;
+      display: grid;
+      place-items: center;
+      color: #FFFFFF;
+      border: 2px solid rgba(255, 255, 255, 0.35);
+      font-size: 34px;
+      font-weight: 700;
+      flex: none;
     }
     h1 {
       margin: 0;
-      font-size: 24px;
-      line-height: 1.1;
-      font-weight: 650;
+      font-size: clamp(30px, 4.6vw, 44px);
+      line-height: 1.05;
+      font-weight: 700;
+      letter-spacing: -0.02em;
     }
-    .count {
-      color: var(--muted);
-      font-size: 13px;
-      white-space: nowrap;
+    .subtitle {
+      margin: 12px 0 0;
+      font-size: 16px;
+      line-height: 1.45;
+      color: rgba(231, 243, 235, 0.72);
+    }
+    .panel {
+      background: var(--panel);
+      border-radius: 22px;
+      box-shadow: 0 18px 50px rgba(0, 0, 0, 0.22);
+      padding: 8px 0 0;
+      overflow: hidden;
+    }
+    .panel-head {
+      padding: 18px 24px 14px;
+    }
+    .search {
+      width: 100%;
+      border: 1px solid #E6EAE6;
+      border-radius: 10px;
+      background: #F6F8F6;
+      color: var(--fg);
+      padding: 11px 13px;
+      font: inherit;
+      font-size: 14px;
+      outline: none;
     }
-    form {
-      margin-top: 18px;
+    .search:focus {
+      border-color: var(--green);
+      background: #FFFFFF;
+      box-shadow: 0 0 0 3px color-mix(in srgb, var(--green) 16%, transparent);
     }
+    .search::placeholder { color: var(--faint); }
     .error {
-      margin: 0 0 12px;
+      margin: 12px 24px 0;
       color: #9B1C1C;
       font-size: 14px;
     }
-    .chat-list {
+    .list-head {
       display: grid;
-      gap: 8px;
-      margin: 0 0 18px;
+      grid-template-columns: var(--grid);
+      gap: 14px;
+      align-items: center;
+      padding: 6px 24px 12px;
+      border-bottom: 1px solid var(--line);
+      color: var(--faint);
+      font-size: 13px;
+      font-weight: 500;
     }
+    .list-head .right { text-align: left; }
+    .chat-list { display: block; }
     .chat-row {
       display: grid;
-      grid-template-columns: 24px 1fr;
-      gap: 12px;
-      align-items: start;
-      padding: 13px 14px;
-      background: var(--panel);
-      border: 1px solid var(--line);
-      border-radius: var(--radius);
+      grid-template-columns: var(--grid);
+      gap: 14px;
+      align-items: center;
+      padding: 13px 24px;
+      border-bottom: 1px solid var(--line);
       cursor: pointer;
+      transition: background 120ms ease;
     }
-    .chat-row:hover {
-      border-color: color-mix(in srgb, var(--link) 45%, var(--line));
-    }
+    .chat-row:hover { background: #F7FAF8; }
     input[type="checkbox"] {
       position: absolute;
       opacity: 0;
@@ -1425,34 +1490,41 @@ function renderMessagesSelectorPage(chats, token, error = "") {
     .box {
       width: 18px;
       height: 18px;
-      margin-top: 2px;
-      border: 1.5px solid var(--muted);
+      border: 1.5px solid #C7CDC8;
       border-radius: 5px;
       display: inline-grid;
       place-items: center;
+      transition: background 120ms ease, border-color 120ms ease;
     }
+    .chat-row:hover .box { border-color: var(--green); }
     input[type="checkbox"]:checked + .box {
-      background: var(--button);
-      border-color: var(--button);
+      background: var(--green);
+      border-color: var(--green);
     }
     input[type="checkbox"]:checked + .box::after {
       content: "";
       width: 7px;
       height: 4px;
-      border-left: 2px solid var(--button-text);
-      border-bottom: 2px solid var(--button-text);
+      border-left: 2px solid #FFFFFF;
+      border-bottom: 2px solid #FFFFFF;
       transform: rotate(-45deg) translateY(-1px);
     }
-    .chat-main {
-      min-width: 0;
+    .avatar {
+      width: 36px;
+      height: 36px;
+      border-radius: 50%;
+      background: var(--green);
+      color: #FFFFFF;
       display: grid;
-      gap: 4px;
+      place-items: center;
+      font-size: 13px;
+      font-weight: 650;
+      letter-spacing: 0.02em;
     }
-    .chat-top {
-      display: flex;
-      gap: 10px;
-      align-items: center;
+    .chat-name-block {
       min-width: 0;
+      display: grid;
+      gap: 2px;
     }
     .chat-name {
       overflow: hidden;
@@ -1461,55 +1533,145 @@ function renderMessagesSelectorPage(chats, token, error = "") {
       font-size: 15px;
       font-weight: 600;
     }
+    .chat-people {
+      color: var(--muted);
+      font-size: 13px;
+      line-height: 1.3;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+    }
     .chat-kind {
-      color: var(--link);
-      font-size: 12px;
-      flex: none;
+      justify-self: start;
+      padding: 3px 11px;
+      border-radius: 999px;
+      font-size: 12.5px;
+      font-weight: 500;
     }
-    .chat-people,
+    .chat-kind--group { background: var(--green-soft); color: var(--green-text); }
+    .chat-kind--dm,
+    .chat-kind--other { background: var(--neutral-soft); color: var(--muted); }
     .chat-meta {
       color: var(--muted);
-      font-size: 13px;
-      line-height: 1.35;
+      font-size: 13.5px;
       overflow-wrap: anywhere;
     }
+    [hidden] { display: none !important; }
+    .empty {
+      margin: 0;
+      padding: 28px 24px 32px;
+      color: var(--muted);
+      font-size: 14px;
+      text-align: center;
+    }
     .actions {
       display: flex;
-      justify-content: flex-end;
+      justify-content: space-between;
+      align-items: center;
+      gap: 12px;
       position: sticky;
       bottom: 0;
-      padding: 14px 0 0;
-      background: linear-gradient(to top, var(--bg) 70%, transparent);
+      margin-top: 22px;
+      padding: 16px 6px 4px;
+    }
+    .selection-count {
+      color: rgba(231, 243, 235, 0.82);
+      font-size: 14.5px;
+      font-weight: 500;
     }
     button {
       appearance: none;
       border: 0;
-      border-radius: var(--radius);
+      border-radius: 14px;
       background: var(--button);
-      color: var(--button-text);
-      padding: 10px 14px;
+      color: #FFFFFF;
+      padding: 14px 24px;
       font: inherit;
-      font-weight: 620;
+      font-size: 15px;
+      font-weight: 600;
       cursor: pointer;
+      display: inline-flex;
+      align-items: center;
+      gap: 10px;
+      box-shadow: 0 10px 24px rgba(0, 0, 0, 0.28);
+      transition: background 120ms ease, transform 120ms ease;
+    }
+    button:hover { background: var(--button-hover); }
+    button:active { transform: scale(0.985); }
+    button svg { width: 18px; height: 18px; }
+    @media (max-width: 560px) {
+      :root { --grid: 18px 32px minmax(0, 1fr) auto; }
+      .list-head span:last-child,
+      .chat-meta { display: none; }
     }
-    a { color: var(--link); }
   </style>
 </head>
 <body>
   <main>
-    <header>
-      <h1>Select Messages chats</h1>
-      <div class="count">${chats.length} recent chats</div>
+    <header class="hero">
+      ${logo ? `<img class="logo" src="${htmlAttr(logo)}" alt="">` : `<span class="logo-fallback" aria-hidden="true">S</span>`}
+      <div>
+        <h1>Select Your Recent Chats</h1>
+        <p class="subtitle">Choose the chats Shepherd should sync. Search if you do not see one.</p>
+      </div>
     </header>
     <form method="post" action="/select">
       <input type="hidden" name="token" value="${htmlAttr(token)}">
-      ${error ? `<p class="error">${html(error)}</p>` : ""}
-      <div class="chat-list">${rows}</div>
+      <div class="panel">
+        <div class="panel-head">
+          <input class="search" id="search" type="search" placeholder="Search contacts or groups" autocomplete="off">
+        </div>
+        ${error ? `<p class="error">${html(error)}</p>` : ""}
+        <div class="list-head">
+          <span></span>
+          <span></span>
+          <span>Name</span>
+          <span>Type</span>
+          <span class="right">Last message</span>
+        </div>
+        <div class="chat-list">${rows}</div>
+        <p class="empty" id="empty" hidden>No chats found.</p>
+      </div>
       <div class="actions">
-        <button type="submit">Use selected chats</button>
+        <span class="selection-count" id="selection-count">0 selected</span>
+        <button type="submit">
+          <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><path d="M19 12H5"/><path d="m12 19-7-7 7-7"/></svg>
+          Return
+        </button>
       </div>
     </form>
   </main>
+  <script>
+    const initialRows = ${INITIAL_MESSAGE_CHAT_ROWS};
+    const rows = Array.from(document.querySelectorAll(".chat-row"));
+    const search = document.getElementById("search");
+    const empty = document.getElementById("empty");
+    const selected = document.getElementById("selection-count");
+    const checks = Array.from(document.querySelectorAll('input[name="chatId"]'));
+
+    function updateRows() {
+      const query = search.value.trim().toLowerCase();
+      let visible = 0;
+      for (const row of rows) {
+        const matches = query
+          ? row.dataset.search.includes(query)
+          : Number(row.dataset.index) < initialRows;
+        row.hidden = !matches;
+        if (matches) visible += 1;
+      }
+      empty.hidden = visible !== 0;
+    }
+
+    function updateSelected() {
+      const count = checks.filter((check) => check.checked).length;
+      selected.textContent = count + " selected";
+    }
+
+    search.addEventListener("input", updateRows);
+    for (const check of checks) check.addEventListener("change", updateSelected);
+    updateRows();
+    updateSelected();
+  </script>
 </body>
 </html>`;
 }
@@ -1542,16 +1704,66 @@ function renderMessagesDonePage(message, isError = false) {
 }
 
 function renderChatPeople(chat) {
+  const people = chatPeopleLine(chat);
+  if (!people) return "";
+  return `<span class="chat-people">${html(people)}</span>`;
+}
+
+function chatInitials(label) {
+  const words = String(label ?? "").trim().split(/\s+/).filter(Boolean);
+  if (words.length === 0) return "?";
+  if (words.length === 1) return words[0].slice(0, 2).toUpperCase();
+  return (words[0][0] + words[words.length - 1][0]).toUpperCase();
+}
+
+function chatPeopleLine(chat) {
+  if (chat.kind !== "group") return "";
   const names = chat.participants?.map((participant) => participant.name ?? participant.handle).filter(Boolean) ?? [];
-  if (!names.length) return "";
-  return `<span class="chat-people">${html(names.slice(0, 6).join(", "))}</span>`;
+  const line = names.slice(0, 6).join(", ");
+  if (!line || normalizeDisplayText(line) === normalizeDisplayText(chat.label)) return "";
+  return line;
 }
 
 function formatMessageChatMeta(chat) {
-  const parts = [];
-  if (chat.service) parts.push(chat.service);
-  if (chat.lastMessageAt) parts.push(new Date(chat.lastMessageAt).toLocaleString());
-  return parts.join(" · ");
+  return formatShortChatTime(chat.lastMessageAt);
+}
+
+function formatShortChatTime(value) {
+  if (!value) return "";
+  const date = new Date(value);
+  if (Number.isNaN(date.getTime())) return "";
+
+  const now = new Date();
+  const today = new Date(now.getFullYear(), now.getMonth(), now.getDate());
+  const day = new Date(date.getFullYear(), date.getMonth(), date.getDate());
+  const diffDays = Math.round((today.getTime() - day.getTime()) / (24 * 60 * 60 * 1000));
+  const time = new Intl.DateTimeFormat(undefined, { hour: "numeric", minute: "2-digit" })
+    .format(date)
+    .replace(":00", "")
+    .replace(/\s/g, "")
+    .toLowerCase();
+
+  if (diffDays === 0) return `Today ${time}`;
+  if (diffDays === 1) return `Yesterday ${time}`;
+  if (diffDays >= 0 && diffDays < 7) {
+    const weekday = new Intl.DateTimeFormat(undefined, { weekday: "long" }).format(date);
+    return `${weekday} ${time}`;
+  }
+  const monthDay = new Intl.DateTimeFormat(undefined, { month: "short", day: "numeric" }).format(date);
+  return `${monthDay} ${time}`;
+}
+
+function normalizeDisplayText(value) {
+  return String(value ?? "").trim().replace(/\s+/g, " ").toLowerCase();
+}
+
+function shepherdLogoDataUri() {
+  try {
+    const bytes = readFileSync(SHEPHERD_LOGO_PATH);
+    return `data:image/png;base64,${bytes.toString("base64")}`;
+  } catch {
+    return null;
+  }
 }
 
 function sendHtml(res, body, status = 200) {
@@ -1589,7 +1801,7 @@ async function listRecentMessageChats({ limit }) {
   try {
     const chats = await sdk.listChats({
       sortBy: "recent",
-      limit: Math.max(limit, DEFAULT_RECENT_MESSAGE_CHATS),
+      limit: Math.max(limit, INITIAL_MESSAGE_CHAT_ROWS),
     });
     const visible = chats
       .filter((chat) => typeof chat.chatId === "string" && chat.chatId.trim())
@@ -1614,10 +1826,12 @@ async function enrichMessageChat(sdk, chat, contactLookup) {
     : null;
   const dmName = dmHandle ? contactLookup.resolveName(dmHandle) : null;
   const groupNames = participants.map((participant) => participant.name ?? participant.handle).filter(Boolean);
-  const label = cleanChatName(chat.name)
-    ?? (chat.kind === "dm" ? dmName ?? dmHandle : null)
-    ?? (chat.kind === "group" && groupNames.length ? groupNames.slice(0, 4).join(", ") : null)
-    ?? (chat.kind === "group" ? "Group chat" : "Direct message");
+  const chatName = cleanChatName(chat.name);
+  const label = chat.kind === "dm"
+    ? dmName ?? nonHandleChatName(chatName) ?? dmHandle ?? "Contact"
+    : nonHandleChatName(chatName)
+      ?? (groupNames.length ? groupNames.slice(0, 4).join(", ") : null)
+      ?? "Group";
 
   return {
     chatId: chat.chatId,
@@ -1647,11 +1861,10 @@ function uniqueParticipants(messages, contactLookup) {
 }
 
 function formatMessageChatOption(chat) {
-  const kind = chat.kind === "group" ? "group" : chat.kind === "dm" ? "dm" : "chat";
-  const names = chat.participants?.map((participant) => participant.name ?? participant.handle).filter(Boolean) ?? [];
-  const people = names.length ? ` · ${names.slice(0, 4).join(", ")}` : "";
-  const when = chat.lastMessageAt ? ` · ${new Date(chat.lastMessageAt).toLocaleString()}` : "";
-  return `${chat.label} (${kind})${people}${when}`;
+  const kind = chat.kind === "group" ? "Group" : chat.kind === "dm" ? "Contact" : "Chat";
+  const people = chatPeopleLine(chat);
+  const when = formatMessageChatMeta(chat);
+  return [chat.label, kind, people, when].filter(Boolean).join(" · ");
 }
 
 function publicMessageChat(chat) {
@@ -2008,6 +2221,27 @@ function cleanChatName(name) {
   return trimmed || null;
 }
 
+function nonHandleChatName(name) {
+  if (!name) return null;
+  return looksLikeHandleList(name) ? null : name;
+}
+
+function looksLikeHandleList(value) {
+  const text = String(value ?? "").trim();
+  if (!text) return false;
+  const tokens = text
+    .split(/[,;/&\s]+/)
+    .map((token) => token.trim())
+    .filter(Boolean);
+  if (!tokens.length) return false;
+  return tokens.every((token) => {
+    if (token.includes("@")) return true;
+    const digits = token.replace(/\D/g, "");
+    if (digits.length >= 4 && /^[+()\-\d.\s]+$/.test(token)) return true;
+    return /^\d{4,}$/.test(token);
+  });
+}
+
 function parseDmHandleFromChatId(chatId) {
   const parts = String(chatId ?? "").split(";");
   if (parts.length >= 3 && parts[1] === "-") return parts.slice(2).join(";") || null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "shepherd-onboard",
-  "version": "0.1.12",
+  "version": "0.1.14",
   "description": "Customer-facing Shepherd raw sync onboarding CLI",
   "type": "module",
   "bin": {
@@ -10,6 +10,7 @@
     "@photon-ai/imessage-kit": "^3.0.0"
   },
   "files": [
+    "assets",
     "bin",
     "README.md"
   ],