@myvillage/cli 1.48.6 → 1.49.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@myvillage/cli",
-  "version": "1.48.6",
+  "version": "1.49.0",
   "description": "MyVillageOS CLI for community developers",
   "type": "module",
   "bin": {

package/src/commands/post.js

@@ -10,6 +10,7 @@ import {
   editPost as apiEditPost,
   deletePost as apiDeletePost,
   listCommunities,
+  listMyCommunities,
   listMyAgents,
 } from '../utils/api.js';
 import {
@@ -64,14 +65,30 @@ export async function postCreateCommand(options = {}) {
   }
 
   try {
-    // Fetch communities for selection
+    // Fetch the communities the user has actually joined. This includes the
+    // default community for each of their villages (auto-joined on signup),
+    // plus any topical communities they chose. Falls back to the global list
+    // if /communities/my fails (older backend, transient error, etc).
     const commSpinner = villageSpinner('Loading your communities...').start();
     let communities = [];
+    let usedFallback = false;
     try {
-      const result = await listCommunities({ pageSize: 50 });
+      const result = await listMyCommunities({ pageSize: 50 });
       communities = result.data || result;
+      if (!Array.isArray(communities) || communities.length === 0) {
+        // No memberships — try the global list so the prompt isn't empty.
+        const fallback = await listCommunities({ pageSize: 50 });
+        communities = fallback.data || fallback;
+        usedFallback = true;
+      }
     } catch {
-      // Fall back to manual entry if fetch fails
+      try {
+        const fallback = await listCommunities({ pageSize: 50 });
+        communities = fallback.data || fallback;
+        usedFallback = true;
+      } catch {
+        // Fall back to manual entry if both fetches fail
+      }
     }
     commSpinner.stop();
 
@@ -122,10 +139,28 @@ export async function postCreateCommand(options = {}) {
       }
     }
 
+    // Label each community as "{Village} → {Community Name}" so multi-village
+    // users can tell which village they're posting into. Communities without a
+    // village (open to all) are labelled as "(open) → {Name}". Sort so default
+    // communities appear first within each village.
     const communityChoices = Array.isArray(communities) && communities.length > 0
-      ? communities.map(c => ({ name: `r/${c.slug} - ${c.name}`, value: c.slug }))
+      ? communities
+        .slice()
+        .sort((a, b) => {
+          if (a.isDefault !== b.isDefault) return a.isDefault ? -1 : 1;
+          return (a.village?.name || 'zzz').localeCompare(b.village?.name || 'zzz');
+        })
+        .map(c => {
+          const villageLabel = c.village?.name || '(open)';
+          const defaultTag = c.isDefault ? ' [default]' : '';
+          return { name: `${villageLabel} → ${c.name}${defaultTag}`, value: c.slug };
+        })
       : null;
 
+    if (usedFallback) {
+      console.log(brand.teal('  Note: showing all communities — you may need to join one before posting.\n'));
+    }
+
     const answers = await inquirer.prompt([
       communityChoices
         ? {
@@ -191,10 +226,11 @@ export async function postCreateCommand(options = {}) {
     spinner.succeed('Post created!');
 
     const post = result.data || result;
+    const targetSlug = post.community?.slug || answers.communitySlug;
     if (agentProfileId) {
-      console.log(brand.green(`  ✓ Post published in r/${answers.communitySlug} as agent`));
+      console.log(brand.green(`  ✓ Post published in r/${targetSlug} as agent`));
     } else {
-      console.log(brand.green(`  ✓ Post published in r/${answers.communitySlug}`));
+      console.log(brand.green(`  ✓ Post published in r/${targetSlug}`));
     }
     console.log(brand.teal(`  ID: ${post.id}\n`));
   } catch (err) {
@@ -202,7 +238,21 @@ export async function postCreateCommand(options = {}) {
       console.log(chalk.red('  ✗ Prompts cannot be rendered in this environment.\n'));
       return;
     }
-    const message = err.response?.data?.error || err.response?.data?.message || err.message;
+    // Backend returns 400 { error: "multiple_villages", villages: [...] }
+    // when the caller is in multiple villages and gave no communitySlug.
+    // The interactive prompt always sends a slug, so this is unusual, but
+    // surface it cleanly if it does happen.
+    const data = err.response?.data;
+    if (err.response?.status === 400 && data?.error === 'multiple_villages' && Array.isArray(data.villages)) {
+      console.log(chalk.yellow('\n  You belong to multiple villages. Pick a community in one of:'));
+      for (const v of data.villages) {
+        const slug = v.defaultCommunitySlug || '<no default community>';
+        console.log(`    - ${v.name}  (default community: r/${slug})`);
+      }
+      console.log('');
+      return;
+    }
+    const message = data?.error || data?.message || err.message;
     console.log(chalk.red(`  ✗ Failed to create post: ${message}\n`));
   }
 }

package/src/utils/api.js

@@ -215,6 +215,15 @@ export async function listCommunities(params = {}) {
   return response.data;
 }
 
+// Communities the authenticated villager has actually joined — preferred over
+// listCommunities() for "where can I post?" pickers since it never shows
+// communities you'd hit a 403 on.
+export async function listMyCommunities(params = {}) {
+  const client = getNetworkClient();
+  const response = await client.get('/communities/my', { params });
+  return response.data;
+}
+
 export async function getCommunity(slug) {
   const client = getNetworkClient();
   const response = await client.get(`/communities/${slug}`);