calabasas 0.20.1 → 0.21.0

package/dist/index.js

@@ -2587,42 +2587,72 @@ async function generate(options) {
     fs4.writeFileSync(testingPath, files["testing.ts"]);
     generated.push("convex/calabasas/_generated/testing.ts");
   }
+  if (files["oauth.ts"]) {
+    const oauthPath = path4.join(generatedDir, "oauth.ts");
+    fs4.writeFileSync(oauthPath, files["oauth.ts"]);
+    generated.push("convex/calabasas/_generated/oauth.ts");
+  }
   s.stop(`Generated ${generated.length} file${generated.length > 1 ? "s" : ""}`);
   p5.note(generated.join(`
 `), "Generated files");
-  const hasSyncEnabled = !!files["schema.ts"];
-  if (hasSyncEnabled) {
-    const syncExports = [];
-    const text = configText.toLowerCase();
-    if (text.includes("guilds") && text.includes("true")) {
-      syncExports.push("syncGuild");
-      syncExports.push("syncGuildAdmins");
-    }
-    if (text.includes("channels") && text.includes("true"))
-      syncExports.push("syncChannel", "syncChannelBatch");
-    if (text.includes("roles") && text.includes("true"))
-      syncExports.push("syncRole", "syncRoleBatch");
-    if (text.includes("members") && text.includes("true"))
-      syncExports.push("syncMember", "syncMemberBatch");
-    if (text.includes("presence") && text.includes("true"))
-      syncExports.push("syncPresence", "syncPresenceBatch");
-    if (syncExports.length === 0) {
-      syncExports.push("syncGuild", "syncChannel", "syncChannelBatch", "syncRole", "syncRoleBatch", "syncMember", "syncMemberBatch", "syncPresence", "syncPresenceBatch");
-    }
-    syncExports.push("updateSyncState");
-    p5.note(`1. Add tables to your convex/schema.ts:
+  const hasSyncEnabled = !!files["sync.ts"];
+  const hasOAuthEnabled = !!files["oauth.ts"];
+  if (hasSyncEnabled || hasOAuthEnabled) {
+    const steps = [];
+    let stepNum = 1;
+    if (hasSyncEnabled || hasOAuthEnabled) {
+      steps.push(`${stepNum}. Add tables to your convex/schema.ts:
    import { calabasasTables } from "./calabasas/_generated/schema";
 
    export default defineSchema({
      ...calabasasTables,
-   });
-
-2. Re-export sync mutations in convex/discord.ts:
-   export { ${syncExports.join(", ")} } from "./calabasas/_generated/sync";
+   });`);
+      stepNum++;
+    }
+    if (hasSyncEnabled) {
+      const syncExports = [];
+      const text = configText.toLowerCase();
+      if (text.includes("guilds") && text.includes("true")) {
+        syncExports.push("syncGuild");
+        syncExports.push("syncGuildAdmins");
+      }
+      if (text.includes("channels") && text.includes("true"))
+        syncExports.push("syncChannel", "syncChannelBatch");
+      if (text.includes("roles") && text.includes("true"))
+        syncExports.push("syncRole", "syncRoleBatch");
+      if (text.includes("members") && text.includes("true"))
+        syncExports.push("syncMember", "syncMemberBatch");
+      if (text.includes("presence") && text.includes("true"))
+        syncExports.push("syncPresence", "syncPresenceBatch");
+      if (syncExports.length === 0) {
+        syncExports.push("syncGuild", "syncChannel", "syncChannelBatch", "syncRole", "syncRoleBatch", "syncMember", "syncMemberBatch", "syncPresence", "syncPresenceBatch");
+      }
+      syncExports.push("updateSyncState");
+      steps.push(`${stepNum}. Re-export sync mutations in convex/discord.ts:
+   export { ${syncExports.join(", ")} } from "./calabasas/_generated/sync";`);
+      stepNum++;
+    }
+    if (hasOAuthEnabled) {
+      steps.push(`${stepNum}. Re-export OAuth mutations in convex/discord.ts:
+   export { syncOAuthToken } from "./calabasas/_generated/oauth";`);
+      stepNum++;
+      steps.push(`${stepNum}. Create your verification handler in convex/calabasas/discord.ts:
+
+   import { handleOAuthVerification } from "./_generated/oauth";
+
+   export const verify = handleOAuthVerification({
+     onVerify: async (ctx, { user, guildId, tokens }, bot) => {
+       console.log("User verified:", user.username);
+     },
+   });`);
+      stepNum++;
+    }
+    steps.push(`${stepNum}. Add CALABASAS_SECRET to your Convex environment variables`);
+    stepNum++;
+    steps.push(`${stepNum}. Run \`calabasas push\` to sync config with Calabasas`);
+    p5.note(steps.join(`
 
-3. Add CALABASAS_SECRET to your Convex environment variables
-4. Create your event handler in convex/calabasas/discord.ts
-5. Run \`calabasas push\` to sync config with Calabasas`, "Next steps");
+`), "Next steps");
   } else {
     p5.note(`1. Add CALABASAS_SECRET to your Convex environment variables
 2. Create your handler in convex/calabasas/discord.ts:
@@ -4686,6 +4716,7 @@ type EmojiData = {
 
 type EmojiPickerProps = {
   guildDiscordId?: string;
+  discordAppId?: string;
   source?: "all" | "guild" | "application" | "default";
   mode?: "single" | "multi";
   maxCount?: number;
@@ -5247,6 +5278,7 @@ function LazyEmoji({
 
 export function EmojiPicker({
   guildDiscordId,
+  discordAppId,
   source = "all",
   mode = "single",
   maxCount,
@@ -5280,7 +5312,7 @@ export function EmojiPicker({
   );
   const appEmojis = useQuery(
     api.calabasas.queries.listAppEmojis,
-    needsApp ? {} : "skip"
+    needsApp && discordAppId ? { discordAppId } : "skip"
   );
 
   // Build sections
@@ -5644,7 +5676,7 @@ export function EmojiPicker({
 });
 
 export const listAppEmojis = query({
-  args: {},
+  args: { discordAppId: v.string() },
   returns: v.array(
     v.object({
       discordId: v.string(),
@@ -5653,9 +5685,10 @@ export const listAppEmojis = query({
       available: v.boolean(),
     })
   ),
-  handler: async (ctx) => {
+  handler: async (ctx, { discordAppId }) => {
     const emojis = await ctx.db
       .query("calabasasAppEmojis")
+      .withIndex("by_application", (q) => q.eq("discordAppId", discordAppId))
       .collect();
     return emojis
       .filter((e) => e.available)
@@ -6852,6 +6885,10 @@ async function botAdd(options) {
     }
     intents = selectedIntents.reduce((sum, i) => sum + INTENT_ENTRIES[i].value, 0);
   }
+  let clientSecret;
+  if (options.clientSecret) {
+    clientSecret = options.clientSecret;
+  }
   const s = p10.spinner();
   s.start("Creating bot...");
   let ok;
@@ -6862,6 +6899,7 @@ async function botAdd(options) {
       name: name.trim(),
       discordAppId: discordAppId.trim(),
       token,
+      clientSecret,
       intents
     }));
   } else {
@@ -6881,6 +6919,7 @@ async function botAdd(options) {
       name: name.trim(),
       discordAppId: discordAppId.trim(),
       token,
+      clientSecret,
       intents
     }));
   }
@@ -7054,6 +7093,44 @@ async function botEdit(botId, options) {
   p10.note("The Gateway will automatically reconnect with the new settings.", "Note");
   p10.outro("Bot updated successfully!");
 }
+async function botSetClientSecret(botId, options) {
+  const auth = resolveAuth();
+  if (!auth) {
+    console.log("Not logged in. Run `calabasas login` first.");
+    return;
+  }
+  p10.intro("calabasas bot set-client-secret");
+  await showPlatformContext(auth.key);
+  let secret;
+  if (options.secret) {
+    secret = options.secret;
+  } else {
+    secret = await p10.password({
+      message: "Discord OAuth2 client secret",
+      validate: (v) => v.trim() ? undefined : "Client secret is required"
+    });
+    if (p10.isCancel(secret)) {
+      p10.cancel("Cancelled.");
+      return;
+    }
+  }
+  const s = p10.spinner();
+  s.start("Setting client secret...");
+  const { ok, data, status } = auth.isPlatformKey ? await platformApiRequest("PATCH", "/api/cli/bots", auth.key, {
+    botId,
+    clientSecret: secret
+  }) : await apiRequest("PATCH", "/api/cli/bots", {
+    botId,
+    clientSecret: secret
+  });
+  if (!ok) {
+    s.stop("Failed to set client secret");
+    p10.cancel(`${data.error || `HTTP ${status}`}`);
+    return;
+  }
+  s.stop("Done");
+  p10.outro("Client secret set successfully!");
+}
 
 // src/commands/platform.ts
 import * as p11 from "@clack/prompts";
@@ -7469,6 +7546,22 @@ ${commandLines.join(`
       });
       sections.push(`  contextMenus: {
 ${menuLines.join(`
+`)}
+  },`);
+    }
+  }
+  if (config.oauth) {
+    const oauthLines = [];
+    if (config.oauth.scopes && config.oauth.scopes.length > 0) {
+      const items = config.oauth.scopes.map((s) => JSON.stringify(s)).join(", ");
+      oauthLines.push(`    scopes: [${items}],`);
+    }
+    if (config.oauth.redirectUrl) {
+      oauthLines.push(`    redirectUrl: ${JSON.stringify(config.oauth.redirectUrl)},`);
+    }
+    if (oauthLines.length > 0) {
+      sections.push(`  oauth: {
+${oauthLines.join(`
 `)}
   },`);
     }
@@ -7764,10 +7857,11 @@ program2.command("config").description("View and modify your Calabasas config").
 program2.command("status").alias("dashboard").description("Real-time dashboard showing bot status, events, and stats").action(dashboard);
 program2.command("logs").description("Event log viewer (live by default, or one-shot with --once)").option("-b, --bot <id>", "Bot ID (omit for all bots in platform)").option("-n, --limit <number>", "Number of log entries to show", "50").option("--once", "One-shot output instead of real-time view").option("--errors", "Show only failed events").option("--success", "Show only successful events").action(logs);
 var bot = program2.command("bot").description("Manage Discord bots");
-bot.command("add").description("Add a new Discord bot").option("-n, --name <name>", "Bot name").option("-a, --app-id <id>", "Discord Application ID").option("-t, --token <token>", "Bot token").option("-i, --intents <intents>", "Intents value (number)").action(botAdd);
+bot.command("add").description("Add a new Discord bot").option("-n, --name <name>", "Bot name").option("-a, --app-id <id>", "Discord Application ID").option("-t, --token <token>", "Bot token").option("-i, --intents <intents>", "Intents value (number)").option("--client-secret <secret>", "Discord OAuth2 client secret (optional)").action(botAdd);
 bot.command("list").alias("ls").description("List your Discord bots (real-time by default)").option("--once", "One-shot output instead of real-time view").action(botList);
 bot.command("remove <botId>").alias("rm").description("Remove a Discord bot").option("-y, --yes", "Skip confirmation prompt").action(botRemove);
 bot.command("edit <botId>").description("Edit a Discord bot").option("-n, --name <name>", "New bot name").option("-t, --token <token>", "New bot token").option("-i, --intents <intents>", "New intents value").action(botEdit);
+bot.command("set-client-secret <botId>").description("Set or update a bot's Discord OAuth2 client secret").option("-s, --secret <secret>", "Client secret value").action(botSetClientSecret);
 var platformCmd = program2.command("platform").description("Manage your Calabasas platform");
 platformCmd.command("create").description("Create a new platform with Convex project configuration").option("-n, --name <name>", "Platform name").option("-p, --project <project>", "Convex project name (e.g. diligent-swordfish-752)").action(platformCreate);
 platformCmd.command("connect").description("Connect this project to an existing platform (saves API key to .env.local)").action(platformConnect);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "calabasas",
-  "version": "0.20.1",
+  "version": "0.21.0",
   "description": "CLI for Calabasas - Discord Gateway as a Service for Convex",
   "type": "module",
   "bin": {