shepherd-onboard 0.1.15 → 0.1.17

package/bin/shepherd-onboard.js

@@ -1356,16 +1356,15 @@ function renderMessagesSelectorPage(chats, token, error = "") {
   <title>Select Messages Chats</title>
   <style>
     :root {
-      --bg: #fbfbfa;
-      --panel: #ffffff;
+      --bg: #ffffff;
       --fg: #141614;
-      --muted: #767d78;
-      --faint: #9aa09b;
-      --line: #dedfdd;
+      --muted: #615d59;
+      --faint: #a39e98;
+      --line: #e6e6e6;
       --green: #1f5c2e;
       --green-hover: #246836;
       --radius: 8px;
-      --grid: 20px minmax(0, 1fr) 84px 112px;
+      --grid: 20px minmax(0, 1fr) 76px 108px;
     }
     * { box-sizing: border-box; }
     body {
@@ -1378,32 +1377,30 @@ function renderMessagesSelectorPage(chats, token, error = "") {
       -webkit-font-smoothing: antialiased;
     }
     main {
-      width: min(720px, calc(100vw - 32px));
+      width: min(640px, calc(100vw - 32px));
       margin: 0 auto;
-      padding: 30px 0 28px;
+      padding: 56px 0 28px;
     }
     .header {
-      display: flex;
-      justify-content: space-between;
-      align-items: center;
-      gap: 16px;
-      padding: 0 0 18px;
+      display: grid;
+      justify-items: center;
+      text-align: center;
+      padding: 0 0 28px;
     }
     .brand {
-      display: flex;
-      align-items: center;
-      gap: 10px;
+      display: grid;
+      justify-items: center;
+      gap: 16px;
       min-width: 0;
     }
     .logo {
-      width: 28px;
-      height: 28px;
+      width: 30px;
+      height: 30px;
       object-fit: contain;
-      flex: none;
     }
     .logo-fallback {
-      width: 28px;
-      height: 28px;
+      width: 30px;
+      height: 30px;
       border-radius: 6px;
       display: grid;
       place-items: center;
@@ -1415,36 +1412,32 @@ function renderMessagesSelectorPage(chats, token, error = "") {
     }
     h1 {
       margin: 0;
-      font-size: 19px;
+      font-size: 30px;
       line-height: 1.1;
       font-weight: 700;
       letter-spacing: 0;
     }
     .subtitle {
-      margin: 4px 0 0;
-      font-size: 13px;
+      margin: 8px 0 0;
+      font-size: 14px;
       line-height: 1.4;
       color: var(--muted);
     }
     .panel {
-      background: var(--panel);
-      border: 1px solid var(--line);
-      border-radius: var(--radius);
-      overflow: hidden;
+      background: transparent;
     }
     .panel-head {
-      padding: 12px;
-      border-bottom: 1px solid var(--line);
+      padding: 0 0 18px;
     }
     .search {
       width: 100%;
-      border: 1px solid #d7d9d6;
-      border-radius: 6px;
+      border: 1px solid var(--line);
+      border-radius: 8px;
       background: #ffffff;
       color: var(--fg);
-      padding: 9px 10px;
+      padding: 12px 13px;
       font: inherit;
-      font-size: 13px;
+      font-size: 15px;
       outline: none;
     }
     .search:focus {
@@ -1454,7 +1447,7 @@ function renderMessagesSelectorPage(chats, token, error = "") {
     }
     .search::placeholder { color: var(--faint); }
     .error {
-      margin: 10px 12px 0;
+      margin: 0 0 12px;
       color: #9B1C1C;
       font-size: 13px;
     }
@@ -1463,12 +1456,14 @@ function renderMessagesSelectorPage(chats, token, error = "") {
       grid-template-columns: var(--grid);
       gap: 12px;
       align-items: center;
-      padding: 9px 12px;
+      padding: 9px 0;
+      border-top: 1px solid var(--line);
       border-bottom: 1px solid var(--line);
       color: var(--faint);
       font-size: 11px;
       font-weight: 600;
       text-transform: uppercase;
+      letter-spacing: 0.02em;
     }
     .list-head .right { text-align: left; }
     .chat-list { display: block; }
@@ -1477,13 +1472,12 @@ function renderMessagesSelectorPage(chats, token, error = "") {
       grid-template-columns: var(--grid);
       gap: 12px;
       align-items: center;
-      padding: 11px 12px;
+      padding: 11px 0;
       border-bottom: 1px solid var(--line);
       cursor: pointer;
       transition: background 120ms ease;
     }
-    .chat-row:last-child { border-bottom: 0; }
-    .chat-row:hover { background: #f6f7f5; }
+    .chat-row:hover { background: #f6f5f4; }
     input[type="checkbox"] {
       position: absolute;
       opacity: 0;
@@ -1521,7 +1515,7 @@ function renderMessagesSelectorPage(chats, token, error = "") {
       text-overflow: ellipsis;
       white-space: nowrap;
       font-size: 15px;
-      font-weight: 550;
+      font-weight: 500;
     }
     .chat-people {
       color: var(--muted);
@@ -1535,9 +1529,9 @@ function renderMessagesSelectorPage(chats, token, error = "") {
       justify-self: start;
       color: var(--muted);
       font-size: 12.5px;
-      font-weight: 500;
+      font-weight: 400;
     }
-    .chat-kind--group { color: var(--green); }
+    .chat-kind--group { color: var(--fg); }
     .chat-meta {
       color: var(--muted);
       font-size: 12.5px;
@@ -1558,8 +1552,8 @@ function renderMessagesSelectorPage(chats, token, error = "") {
       gap: 12px;
       position: sticky;
       bottom: 0;
-      margin-top: 12px;
-      padding: 10px 0 0;
+      margin-top: 16px;
+      padding: 12px 0 0;
       background: var(--bg);
     }
     .selection-count {
@@ -1570,7 +1564,7 @@ function renderMessagesSelectorPage(chats, token, error = "") {
     button {
       appearance: none;
       border: 0;
-      border-radius: 6px;
+      border-radius: 8px;
       background: var(--green);
       color: #FFFFFF;
       padding: 9px 13px;
@@ -1595,7 +1589,7 @@ function renderMessagesSelectorPage(chats, token, error = "") {
         ${logo ? `<img class="logo" src="${htmlAttr(logo)}" alt="">` : `<span class="logo-fallback" aria-hidden="true">S</span>`}
         <div>
           <h1>Select chats</h1>
-          <p class="subtitle">Choose the local Messages chats Shepherd should sync.</p>
+          <p class="subtitle">Choose which local Messages chats Shepherd should sync.</p>
         </div>
       </div>
     </header>
@@ -1607,7 +1601,6 @@ function renderMessagesSelectorPage(chats, token, error = "") {
         </div>
         ${error ? `<p class="error">${html(error)}</p>` : ""}
         <div class="list-head">
-          <span></span>
           <span></span>
           <span>Name</span>
           <span>Type</span>
@@ -1692,7 +1685,9 @@ function renderChatPeople(chat) {
 
 function chatPeopleLine(chat) {
   if (chat.kind !== "group") return "";
-  const names = chat.participants?.map((participant) => participant.name ?? participant.handle).filter(Boolean) ?? [];
+  const names = chat.participants
+    ?.map((participant) => participant.name)
+    .filter((name) => name && !looksLikeHandleList(name)) ?? [];
   const line = names.slice(0, 6).join(", ");
   if (!line || normalizeDisplayText(line) === normalizeDisplayText(chat.label)) return "";
   return line;
@@ -2029,8 +2024,8 @@ function createMessageSerializer(kit, contactLookup = emptyContactLookup()) {
   };
 }
 
-function buildContactLookup() {
-  const contacts = loadContacts();
+function buildContactLookup(opts = {}) {
+  const contacts = opts.loadAll === false ? [] : loadContacts();
   const myCard = loadMyCard();
   const handleToName = new Map();
   const selfHandles = new Set();
@@ -2077,6 +2072,9 @@ function emptyContactLookup() {
 
 function loadContacts() {
   if (platform() !== "darwin") return [];
+  const sqliteContacts = loadContactsFromAddressBookDb();
+  if (sqliteContacts.length > 0) return sqliteContacts;
+
   const script = `
 set output to ""
 tell application "Contacts"
@@ -2100,14 +2098,71 @@ return output`;
   try {
     const raw = execFileSync("osascript", ["-e", script], {
       encoding: "utf8",
-      timeout: 30_000,
+      timeout: 120_000,
     });
     return parseContacts(raw);
-  } catch {
+  } catch (err) {
+    if (args.debug === true) console.error("Could not load Contacts:", safeError(err));
     return [];
   }
 }
 
+function loadContactsFromAddressBookDb() {
+  const contacts = new Map();
+  for (const dbPath of addressBookDatabasePaths()) {
+    const query = `
+select r.Z_PK,
+       coalesce(nullif(r.ZNAME, ''), nullif(trim(coalesce(r.ZFIRSTNAME, '') || ' ' || coalesce(r.ZLASTNAME, '')), ''), nullif(r.ZORGANIZATION, ''), '') as display_name,
+       coalesce(p.ZFULLNUMBER, '') as phone,
+       '' as email
+from ZABCDRECORD r
+join ZABCDPHONENUMBER p on p.ZOWNER = r.Z_PK
+where p.ZFULLNUMBER is not null and p.ZFULLNUMBER != ''
+union all
+select r.Z_PK,
+       coalesce(nullif(r.ZNAME, ''), nullif(trim(coalesce(r.ZFIRSTNAME, '') || ' ' || coalesce(r.ZLASTNAME, '')), ''), nullif(r.ZORGANIZATION, ''), '') as display_name,
+       '' as phone,
+       coalesce(e.ZADDRESS, '') as email
+from ZABCDRECORD r
+join ZABCDEMAILADDRESS e on e.ZOWNER = r.Z_PK
+where e.ZADDRESS is not null and e.ZADDRESS != '';`;
+
+    try {
+      const raw = execFileSync("sqlite3", ["-separator", "\t", dbPath, query], {
+        encoding: "utf8",
+        timeout: 10_000,
+      });
+      for (const line of raw.split("\n").filter(Boolean)) {
+        const [id, rawName, phone, email] = line.split("\t");
+        const name = rawName?.trim();
+        if (!id || !name) continue;
+        const key = `${dbPath}:${id}`;
+        const current = contacts.get(key) ?? { name, phones: [], emails: [] };
+        if (phone) current.phones.push(phone.trim());
+        if (email) current.emails.push(email.trim());
+        contacts.set(key, current);
+      }
+    } catch (err) {
+      if (args.debug === true) console.error(`Could not read Contacts DB ${dbPath}:`, safeError(err));
+    }
+  }
+
+  return [...contacts.values()].filter((contact) => contact.name);
+}
+
+function addressBookDatabasePaths() {
+  const addressBookDir = join(homedir(), "Library", "Application Support", "AddressBook");
+  try {
+    const raw = execFileSync("find", [addressBookDir, "-maxdepth", "4", "-name", "AddressBook-v22.abcddb"], {
+      encoding: "utf8",
+      timeout: 5_000,
+    });
+    return [...new Set(raw.split("\n").map((path) => path.trim()).filter(Boolean))];
+  } catch {
+    return [join(addressBookDir, "AddressBook-v22.abcddb")];
+  }
+}
+
 function loadMyCard() {
   if (platform() !== "darwin") return null;
   const script = `

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "shepherd-onboard",
-  "version": "0.1.15",
+  "version": "0.1.17",
   "description": "Customer-facing Shepherd raw sync onboarding CLI",
   "type": "module",
   "bin": {