diff --git a/packages/cli/src/setup-databases.test.ts b/packages/cli/src/setup-databases.test.ts
index 0acf91f6..69aea44c 100644
--- a/packages/cli/src/setup-databases.test.ts
+++ b/packages/cli/src/setup-databases.test.ts
@@ -532,8 +532,8 @@ describe('setup databases step', () => {
     expect(prompts.select).toHaveBeenCalledWith({
       message: 'Primary sources already configured: warehouse\nWhat would you like to do?',
       options: [
-        { value: 'add', label: 'Add another primary source' },
         { value: 'continue', label: 'Continue to knowledge sources' },
+        { value: 'add', label: 'Add another primary source' },
         { value: 'back', label: 'Back' },
       ],
     });
@@ -583,8 +583,8 @@ describe('setup databases step', () => {
     expect(prompts.select).toHaveBeenCalledWith({
       message: 'Primary sources already configured: warehouse\nWhat would you like to do?',
       options: [
-        { value: 'add', label: 'Add another primary source' },
         { value: 'continue', label: 'Continue to knowledge sources' },
+        { value: 'add', label: 'Add another primary source' },
         { value: 'back', label: 'Back' },
       ],
     });
@@ -618,8 +618,8 @@ describe('setup databases step', () => {
     expect(prompts.select).toHaveBeenCalledWith({
       message: 'Primary sources already configured: postgres-warehouse\nWhat would you like to do?',
       options: [
-        { value: 'add', label: 'Add another primary source' },
         { value: 'continue', label: 'Continue to knowledge sources' },
+        { value: 'add', label: 'Add another primary source' },
         { value: 'back', label: 'Back' },
       ],
     });
@@ -653,8 +653,8 @@ describe('setup databases step', () => {
     expect(prompts.select).toHaveBeenNthCalledWith(2, {
       message: 'Primary sources already configured: postgres-warehouse\nWhat would you like to do?',
       options: [
-        { value: 'add', label: 'Add another primary source' },
         { value: 'continue', label: 'Continue to knowledge sources' },
+        { value: 'add', label: 'Add another primary source' },
         { value: 'back', label: 'Back' },
       ],
     });
@@ -696,8 +696,8 @@ describe('setup databases step', () => {
     expect(prompts.select).toHaveBeenNthCalledWith(2, {
       message: 'Primary sources already configured: warehouse\nWhat would you like to do?',
       options: [
-        { value: 'add', label: 'Add another primary source' },
         { value: 'continue', label: 'Continue to knowledge sources' },
+        { value: 'add', label: 'Add another primary source' },
         { value: 'back', label: 'Back' },
       ],
     });
diff --git a/packages/cli/src/setup-databases.ts b/packages/cli/src/setup-databases.ts
index d13e4d4a..75d3fd51 100644
--- a/packages/cli/src/setup-databases.ts
+++ b/packages/cli/src/setup-databases.ts
@@ -394,8 +394,8 @@ function configuredPrimarySourcesPrompt(connectionIds: string[]): {
   return {
     message: `Primary sources already configured: ${connectionIds.join(', ')}\nWhat would you like to do?`,
     options: [
-      { value: 'add', label: 'Add another primary source' },
       { value: 'continue', label: 'Continue to knowledge sources' },
+      { value: 'add', label: 'Add another primary source' },
       { value: 'back', label: 'Back' },
     ],
   };
diff --git a/packages/cli/src/setup-sources.ts b/packages/cli/src/setup-sources.ts
index cf55c2c4..11d53ba7 100644
--- a/packages/cli/src/setup-sources.ts
+++ b/packages/cli/src/setup-sources.ts
@@ -1187,10 +1187,10 @@ async function promptForInteractiveSource(
     },
     async (currentState) => {
       const crawlMode = await prompts.select({
-        message: 'Notion crawl mode',
+        message: 'Which Notion pages should KTX ingest?',
         options: [
-          { value: 'selected_roots', label: 'Selected roots' },
-          { value: 'all_accessible', label: 'All accessible pages' },
+          { value: 'all_accessible', label: 'All pages the integration can access' },
+          { value: 'selected_roots', label: 'Specific pages and their subpages (you\'ll paste page IDs)' },
           { value: 'back', label: 'Back' },
         ],
       });
@@ -1205,8 +1205,8 @@ async function promptForInteractiveSource(
       ? [
           async (currentState: SourcePromptState) => {
             const roots = await promptText(prompts, {
-              message: 'Notion root page ids',
-              placeholder: 'comma-separated ids',
+              message: 'Notion page IDs to ingest (each page includes all its subpages)',
+              placeholder: 'page-id-1, page-id-2',
             });
             if (roots === undefined) return 'back';
             currentState.notionRootPageIds = roots