shepherd-onboard 0.1.18 → 0.1.20

package/bin/shepherd-onboard.js

@@ -19,6 +19,7 @@ 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_ADMIN_URL = "https://admin.google.com/ac/owl/domainwidedelegation";
 const GOOGLE_WORKSPACE_DELEGATION_APP_NAME = "Shepherd";
 const GOOGLE_WORKSPACE_DELEGATION_SERVICE_ACCOUNT_EMAIL =
   "gigabrain-delegation@shepherd-gigabrain.iam.gserviceaccount.com";
@@ -148,6 +149,7 @@ async function runOnboarding() {
   if (sources.google) {
     console.log("\nGoogle Workspace domain-wide delegation");
     printGoogleWorkspaceDelegationSetup(session.googleWorkspaceDelegation);
+    await openGoogleWorkspaceDelegationAdmin({ noOpen });
     await waitForEnter("After the Google Workspace super admin authorizes Shepherd in Admin Console, press Enter.");
   }
 
@@ -297,6 +299,16 @@ async function runAgentOnboarding() {
   });
 
   const opened = [];
+  let googleAdminConsole = null;
+  if (sources.google) {
+    googleAdminConsole = { url: GOOGLE_WORKSPACE_DELEGATION_ADMIN_URL };
+    if (!noOpen) {
+      await openGoogleWorkspaceDelegationAdmin({ noOpen: false });
+      googleAdminConsole.opened = true;
+    } else {
+      googleAdminConsole.opened = false;
+    }
+  }
   for (const [provider, url] of Object.entries(session.authUrls ?? {})) {
     if (typeof url !== "string") continue;
     if (provider === "google") continue;
@@ -315,6 +327,7 @@ async function runAgentOnboarding() {
       account: publicAgentAccount(session.account),
       opened,
       googleWorkspaceDelegation: sources.google ? googleWorkspaceDelegationSetup(session.googleWorkspaceDelegation) : undefined,
+      googleAdminConsole,
       granolaApiKeyPage,
       statePath,
       messagesChatsCommand: sources.messages ? `${agentCommand()} messages-chats` : undefined,
@@ -334,10 +347,14 @@ async function runAgentOnboarding() {
     console.log(`Opened browser authorization: ${opened.join(", ")}`);
   }
   if (sources.google) {
+    if (googleAdminConsole?.opened) {
+      console.log(`Opened Google Admin Console: ${googleAdminConsole.url}`);
+    }
     console.log("\nGoogle Workspace domain-wide delegation setup:");
     printGoogleWorkspaceDelegationSetup(session.googleWorkspaceDelegation);
   }
   if (noOpen) {
+    if (sources.google) console.log(`Google Admin Console domain-wide delegation URL: ${GOOGLE_WORKSPACE_DELEGATION_ADMIN_URL}`);
     for (const [provider, url] of Object.entries(session.authUrls ?? {})) {
       if (provider === "google") continue;
       console.log(`${provider} auth URL: ${url}`);
@@ -813,9 +830,9 @@ Add skip flags for sources the user did not select:
 - --no-granola
 - --no-messages
 
-That command creates/reuses the customer user and org, prints Google Workspace domain-wide delegation setup values, opens Slack browser auth if selected, and saves local state.
+That command creates/reuses the customer user and org, opens the Google Admin Console domain-wide delegation page if Google Workspace is selected, prints Google Workspace setup values, opens Slack browser auth if selected, and saves local state.
 
-If Google Workspace is selected, show this Admin Console setup to the user and have their Google Workspace super admin authorize it:
+If Google Workspace is selected, the setup command opens the Admin Console domain-wide delegation page. Show this setup to the user and have their Google Workspace super admin authorize it:
 
 App name: ${payload.googleWorkspaceDelegation.appName}
 Service account email: ${payload.googleWorkspaceDelegation.serviceAccountEmail}
@@ -1072,6 +1089,15 @@ async function openOrPrint(url, opts) {
   });
 }
 
+async function openGoogleWorkspaceDelegationAdmin(opts = {}) {
+  if (opts.noOpen) {
+    console.log(`Google Admin Console domain-wide delegation URL: ${GOOGLE_WORKSPACE_DELEGATION_ADMIN_URL}`);
+    return { opened: false, url: GOOGLE_WORKSPACE_DELEGATION_ADMIN_URL };
+  }
+  await openOrPrint(GOOGLE_WORKSPACE_DELEGATION_ADMIN_URL, { noOpen: false });
+  return { opened: true, url: GOOGLE_WORKSPACE_DELEGATION_ADMIN_URL };
+}
+
 async function openGranolaApiKeys(opts = {}) {
   const deepLink = granolaApiKeysDeepLink();
   if (opts.noOpen) {
@@ -1259,12 +1285,20 @@ async function selectChatsInBrowser(chats, opts = {}) {
   const token = Math.random().toString(36).slice(2) + Math.random().toString(36).slice(2);
   let settled = false;
   let server;
+  const sockets = new Set();
 
   return new Promise((resolve, reject) => {
+    const closeSelectorServer = () => {
+      server?.close();
+      server?.closeIdleConnections?.();
+      for (const socket of sockets) socket.destroy();
+      sockets.clear();
+    };
+
     const timeout = setTimeout(() => {
       if (settled) return;
       settled = true;
-      server?.close();
+      closeSelectorServer();
       reject(new Error("Messages chat selection timed out."));
     }, 20 * 60 * 1000);
 
@@ -1292,11 +1326,11 @@ async function selectChatsInBrowser(chats, opts = {}) {
             return;
           }
 
+          if (!settled) res.once("finish", closeSelectorServer);
           sendHtml(res, renderMessagesDonePage(`${selected.length} chat${selected.length === 1 ? "" : "s"} selected.`));
           if (!settled) {
             settled = true;
             clearTimeout(timeout);
-            setTimeout(() => server.close(), 100);
             resolve(selected);
           }
           return;
@@ -1307,16 +1341,22 @@ async function selectChatsInBrowser(chats, opts = {}) {
         if (!settled) {
           settled = true;
           clearTimeout(timeout);
-          server?.close();
+          closeSelectorServer();
           reject(err);
         }
       }
     });
 
+    server.on("connection", (socket) => {
+      sockets.add(socket);
+      socket.once("close", () => sockets.delete(socket));
+    });
+
     server.on("error", (err) => {
       if (settled) return;
       settled = true;
       clearTimeout(timeout);
+      closeSelectorServer();
       reject(err);
     });
 
@@ -1326,7 +1366,7 @@ async function selectChatsInBrowser(chats, opts = {}) {
       if (!port) {
         settled = true;
         clearTimeout(timeout);
-        server.close();
+        closeSelectorServer();
         reject(new Error("Could not start local Messages selector."));
         return;
       }
@@ -1642,6 +1682,7 @@ function renderMessagesSelectorPage(chats, token, error = "") {
     const search = document.getElementById("search");
     const empty = document.getElementById("empty");
     const selected = document.getElementById("selection-count");
+    const form = document.querySelector("form");
     const checks = Array.from(document.querySelectorAll('input[name="chatId"]'));
 
     function updateRows() {
@@ -1663,6 +1704,11 @@ function renderMessagesSelectorPage(chats, token, error = "") {
     }
 
     search.addEventListener("input", updateRows);
+    document.addEventListener("keydown", (event) => {
+      if (event.key !== "Enter") return;
+      event.preventDefault();
+      form.requestSubmit();
+    });
     for (const check of checks) check.addEventListener("change", updateSelected);
     updateRows();
     updateSelected();
@@ -1672,6 +1718,7 @@ function renderMessagesSelectorPage(chats, token, error = "") {
 }
 
 function renderMessagesDonePage(message, isError = false) {
+  const closeScript = isError ? "" : "<script>setTimeout(() => window.close(), 150);</script>";
   return `<!doctype html>
 <html lang="en">
 <head>
@@ -1692,8 +1739,9 @@ function renderMessagesDonePage(message, isError = false) {
   <main>
     <div class="mark">${isError ? "!" : "OK"}</div>
     <h1>${html(message)}</h1>
-    <p>${isError ? "Return to the terminal and retry." : "You can close this tab and return to the terminal."}</p>
+    <p>${isError ? "Return to the terminal and retry." : "Returning to the terminal."}</p>
   </main>
+  ${closeScript}
 </body>
 </html>`;
 }
@@ -1760,6 +1808,7 @@ function sendHtml(res, body, status = 200) {
   res.writeHead(status, {
     "Content-Type": "text/html; charset=utf-8",
     "Cache-Control": "no-store",
+    "Connection": "close",
   });
   res.end(body);
 }

package/package.json

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