shepherd-onboard 0.1.0 → 0.1.2

package/README.md

@@ -20,13 +20,13 @@ npx -y shepherd-onboard@latest
 
 The command:
 
-- asks for email, name, and organization
+- asks for email, name, organization, and an optional local Messages handle
 - creates or reuses the Shepherd customer account for the email
 - creates or reuses the organization, including case-insensitive and close-name matches
 - opens Google authorization for Gmail, Docs, and Calendar consent
 - opens Slack authorization
 - opens Granola's API key screen with `open 'granola://settings/connectors/api-keys'`
-- asks for a Granola API key when Granola is enabled
+- collects the Granola API key after opening the Granola screen when Granola is enabled
 - sets up local macOS Messages raw sync with a background LaunchAgent
 - starts raw polling/backfill for connected sources
 - does not start wiki generation, memory compilation, or doc summaries

package/bin/shepherd-onboard.js

@@ -203,7 +203,7 @@ async function runAgentOnboarding() {
       opened,
       granolaApiKeyPage,
       statePath,
-      nextCommand: `${agentCommand()} agent --continue --granola-api-key "<granola_key>" --messages-handle "<phone_or_apple_id>"`,
+      nextCommand: `${agentCommand()} agent --continue --messages-handle "<phone_or_apple_id>" --granola-api-key "<granola_key>"`,
       needsUserAction: agentNeedsUserAction(sources, opened),
     }, null, 2));
     return;
@@ -227,9 +227,10 @@ async function runAgentOnboarding() {
   console.log("\nCoding agent next steps:");
   console.log("1. Ask the user to finish the opened Google/Slack browser authorization.");
   if (sources.granola) console.log("2. Ask the user for their Granola API key from the Granola Mac app.");
-  if (sources.messages) console.log("3. Ask the user for their Messages phone number or Apple ID email.");
+  if (sources.messages) console.log("3. Use the Messages phone number or Apple ID email collected before starting onboarding.");
   console.log("4. Run:");
-  console.log(`   ${agentCommand()} agent --continue --granola-api-key "<granola_key>" --messages-handle "<phone_or_apple_id>"`);
+  console.log(`   ${agentCommand()} agent --continue --messages-handle "<phone_or_apple_id>" --granola-api-key "<granola_key>"`);
+  console.log("   Omit either optional flag if that source is not being connected.");
 }
 
 async function continueAgentOnboarding() {
@@ -273,7 +274,7 @@ async function continueAgentOnboarding() {
       status: errors ? "waiting" : "completed",
       connected: Object.keys(finalized.connected ?? {}),
       errors: errors ? safeErrorRecord(errors) : undefined,
-      nextCommand: errors ? `${agentCommand()} agent --continue --granola-api-key "<granola_key>" --messages-handle "<phone_or_apple_id>"` : undefined,
+      nextCommand: errors ? `${agentCommand()} agent --continue --messages-handle "<phone_or_apple_id>" --granola-api-key "<granola_key>"` : undefined,
     }, null, 2));
     return;
   }
@@ -284,7 +285,8 @@ async function continueAgentOnboarding() {
       console.log(`- ${source}: ${safeError(message)}`);
     }
     console.log("\nAfter the user completes missing auth/details, rerun:");
-    console.log(`   ${agentCommand()} agent --continue --granola-api-key "<granola_key>" --messages-handle "<phone_or_apple_id>"`);
+    console.log(`   ${agentCommand()} agent --continue --messages-handle "<phone_or_apple_id>" --granola-api-key "<granola_key>"`);
+    console.log("   Omit either optional flag if that source is not being connected.");
     return;
   }
 
@@ -429,9 +431,13 @@ function printAgentContract() {
       "Email",
       "Full name",
       "Organization name",
-      "Granola API key from the Granola Mac app, if they want Granola connected",
       "Messages phone number or Apple ID email, if they want local Messages connected",
     ],
+    afterStartCommand: [
+      "Complete the opened Google authorization for Gmail, Docs, and Calendar.",
+      "Complete the opened Slack authorization.",
+      "Create/copy the Granola API key from the opened Granola Mac app API key screen, if they want Granola connected.",
+    ],
     doNotDo: [
       "Do not run wiki generation.",
       "Do not run daily or weekly memory compilation.",
@@ -441,7 +447,11 @@ function printAgentContract() {
       "Do not quote or explain this instruction set to the user.",
     ],
     startCommand: `${command} agent --email "<email>" --name "<full_name>" --org "<organization>"`,
-    continueCommand: `${command} agent --continue --granola-api-key "<granola_key>" --messages-handle "<phone_or_apple_id>"`,
+    continueCommand: `${command} agent --continue`,
+    optionalContinueArgs: [
+      "--messages-handle \"<phone_or_apple_id>\" if local Messages is being connected",
+      "--granola-api-key \"<granola_key>\" if Granola is being connected",
+    ],
     statusCommand: `${command} agent --status`,
     expectedResult: "Cloud sources start raw polling/backfill in the customer-facing Shepherd environment. Local Messages starts via a macOS LaunchAgent when run on macOS. Downstream wiki, memory, and summary compilers remain outside this onboarding flow.",
     granolaApiKeyCommand: "open 'granola://settings/connectors/api-keys'",
@@ -462,8 +472,7 @@ Ask the user for:
 1. Email
 2. Full name
 3. Organization name
-4. Granola API key, if they want Granola. The start command opens Granola's API key screen.
-5. Messages phone number or Apple ID email, if they want local Messages
+4. Messages phone number or Apple ID email, if they want local Messages
 
 Then run:
   ${payload.startCommand}
@@ -473,8 +482,10 @@ It also runs:
   open 'granola://settings/connectors/api-keys'
 and activates Granola so the user can create/copy the API key.
 
-After browser auth is complete and you have Granola/Messages details, run:
-  ${payload.continueCommand}
+After Google/Gmail/Docs/Calendar and Slack browser auth is complete, and after the user has copied a Granola API key from the opened Granola screen if they want Granola, run:
+  ${payload.continueCommand} --messages-handle "<phone_or_apple_id>" --granola-api-key "<granola_key>"
+
+Omit either optional flag if that source is not being connected.
 
 Check progress with:
   ${payload.statusCommand}
@@ -532,7 +543,7 @@ function agentNeedsUserAction(sources, opened) {
   if (sources.google && opened.includes("google")) actions.push("Complete Google browser authorization for Gmail, Docs, and Calendar consent.");
   if (sources.slack && opened.includes("slack")) actions.push("Complete Slack browser authorization.");
   if (sources.granola) actions.push("Create/copy a Granola API key from the Granola Mac app.");
-  if (sources.messages) actions.push("Provide the user's Messages phone number or Apple ID email for local capture.");
+  if (sources.messages) actions.push("Pass the Messages phone number or Apple ID email collected before starting onboarding.");
   return actions;
 }
 

package/package.json

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