fix(kiloclaw): scope subscription selection to personal instances for billing mutations (#2189)

Author: jeanduplessis

apps/web/src/lib/kiloclaw/access-gate.ts

@@ -17,7 +17,8 @@ export async function requireKiloClawAccess(userId: string): Promise<void> {
   const now = new Date();
 
   // 1. Active subscription
-  const { accessReason } = await getEffectiveKiloClawSubscriptionForUser(userId, now);
+  const { subscription, accessReason, subscriptionCount } =
+    await getEffectiveKiloClawSubscriptionForUser(userId, now);
   if (accessReason) {
     return;
   }
@@ -33,6 +34,25 @@ export async function requireKiloClawAccess(userId: string): Promise<void> {
     return;
   }
 
+  console.warn(
+    JSON.stringify({
+      event: 'kiloclaw_access_denied',
+      userId,
+      subscriptionCount,
+      effectiveSubscription: subscription
+        ? {
+            id: subscription.id,
+            status: subscription.status,
+            plan: subscription.plan,
+            suspended_at: subscription.suspended_at,
+            instance_id: subscription.instance_id,
+          }
+        : 'none',
+      accessReason,
+      earlybirdFound: !!earlybird,
+    })
+  );
+
   throw new TRPCError({
     code: 'FORBIDDEN',
     message: 'KiloClaw access requires an active subscription, trial, or earlybird purchase.',

apps/web/src/lib/kiloclaw/access-state.ts

@@ -71,6 +71,7 @@ export async function getEffectiveKiloClawSubscriptionForUser(
 ): Promise<{
   subscription: KiloClawSubscription | null;
   accessReason: KiloClawAccessReason | null;
+  subscriptionCount: number;
 }> {
   const subscriptions = await db
     .select()
@@ -81,5 +82,6 @@ export async function getEffectiveKiloClawSubscriptionForUser(
   return {
     subscription,
     accessReason: getKiloClawSubscriptionAccessReason(subscription, now),
+    subscriptionCount: subscriptions.length,
   };
 }

apps/web/src/lib/kiloclaw/stripe-handlers.ts

@@ -442,12 +442,20 @@ export async function handleKiloClawSubscriptionCreated(params: {
   let convertedFromTrial = false;
 
   await db.transaction(async tx => {
-    // Look up the user's active instance to link the subscription.
+    // Look up the user's active personal instance to link the subscription.
+    // Scoped to personal instances (organization_id IS NULL) so a checkout
+    // from the /claw page never attaches to an org-owned instance.  If no
+    // personal instance exists the subscription is inserted with
+    // instance_id = NULL and adoptOrphanedSubscription handles it later.
     const [activeInstance] = await tx
       .select({ id: kiloclaw_instances.id })
       .from(kiloclaw_instances)
       .where(
-        and(eq(kiloclaw_instances.user_id, kiloUserId), isNull(kiloclaw_instances.destroyed_at))
+        and(
+          eq(kiloclaw_instances.user_id, kiloUserId),
+          isNull(kiloclaw_instances.destroyed_at),
+          isNull(kiloclaw_instances.organization_id)
+        )
       )
       .limit(1);