shepherd-onboard 0.1.12 → 0.1.13

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,8 +1318,23 @@ 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();
+
+    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">
@@ -1323,10 +1342,11 @@ function renderMessagesSelectorPage(chats, token, error = "") {
             <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>
+          ${people ? `<span class="chat-people">${html(people)}</span>` : ""}
+          ${when ? `<span class="chat-meta">${html(when)}</span>` : ""}
         </span>
-      </label>`).join("");
+      </label>`;
+  }).join("");
 
   return `<!doctype html>
 <html lang="en">
@@ -1368,31 +1388,69 @@ function renderMessagesSelectorPage(chats, token, error = "") {
       letter-spacing: 0;
     }
     main {
-      width: min(760px, calc(100vw - 32px));
-      margin: 40px auto;
+      width: min(700px, calc(100vw - 32px));
+      margin: 36px auto;
     }
     header {
       display: flex;
       justify-content: space-between;
       gap: 16px;
-      align-items: end;
+      align-items: center;
       padding-bottom: 18px;
       border-bottom: 1px solid var(--line);
     }
+    .brand {
+      display: flex;
+      gap: 10px;
+      align-items: center;
+      min-width: 0;
+    }
+    .logo {
+      width: 30px;
+      height: 30px;
+      border-radius: 8px;
+      object-fit: contain;
+      flex: none;
+    }
+    .logo-fallback {
+      width: 30px;
+      height: 30px;
+      border-radius: 8px;
+      display: grid;
+      place-items: center;
+      color: #FFFFFF;
+      background: #136033;
+      font-weight: 700;
+      flex: none;
+    }
     h1 {
       margin: 0;
-      font-size: 24px;
+      font-size: 22px;
       line-height: 1.1;
       font-weight: 650;
     }
-    .count {
-      color: var(--muted);
-      font-size: 13px;
-      white-space: nowrap;
-    }
     form {
       margin-top: 18px;
     }
+    .search {
+      width: 100%;
+      margin: 0 0 12px;
+      border: 1px solid var(--line);
+      border-radius: var(--radius);
+      background: var(--panel);
+      color: var(--fg);
+      padding: 11px 12px;
+      font: inherit;
+      font-size: 14px;
+      outline: none;
+    }
+    .search:focus {
+      border-color: #136033;
+      box-shadow: 0 0 0 3px color-mix(in srgb, #136033 16%, transparent);
+    }
+    .search::placeholder {
+      color: var(--muted);
+    }
     .error {
       margin: 0 0 12px;
       color: #9B1C1C;
@@ -1473,14 +1531,29 @@ function renderMessagesSelectorPage(chats, token, error = "") {
       line-height: 1.35;
       overflow-wrap: anywhere;
     }
+    [hidden] {
+      display: none !important;
+    }
+    .empty {
+      margin: 18px 0 28px;
+      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);
     }
+    .selection-count {
+      color: var(--muted);
+      font-size: 13px;
+    }
     button {
       appearance: none;
       border: 0;
@@ -1498,18 +1571,54 @@ function renderMessagesSelectorPage(chats, token, error = "") {
 <body>
   <main>
     <header>
-      <h1>Select Messages chats</h1>
-      <div class="count">${chats.length} recent chats</div>
+      <div class="brand">
+        ${logo ? `<img class="logo" src="${htmlAttr(logo)}" alt="">` : `<span class="logo-fallback" aria-hidden="true">G</span>`}
+        <h1>Select chats</h1>
+      </div>
     </header>
     <form method="post" action="/select">
       <input type="hidden" name="token" value="${htmlAttr(token)}">
+      <input class="search" id="search" type="search" placeholder="Search contacts or groups" autocomplete="off">
       ${error ? `<p class="error">${html(error)}</p>` : ""}
       <div class="chat-list">${rows}</div>
+      <p class="empty" id="empty" hidden>No chats found.</p>
       <div class="actions">
-        <button type="submit">Use selected chats</button>
+        <span class="selection-count" id="selection-count">Select one or more</span>
+        <button type="submit">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 ? count + " selected" : "Select one or more";
+    }
+
+    search.addEventListener("input", updateRows);
+    for (const check of checks) check.addEventListener("change", updateSelected);
+    updateRows();
+    updateSelected();
+  </script>
 </body>
 </html>`;
 }
@@ -1542,16 +1651,59 @@ function renderMessagesDonePage(message, isError = false) {
 }
 
 function renderChatPeople(chat) {
+  const people = chatPeopleLine(chat);
+  if (!people) return "";
+  return `<span class="chat-people">${html(people)}</span>`;
+}
+
+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 +1741,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 +1766,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 +1801,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 +2161,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.13",
   "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"
   ],