012 visual builder update

.github/workflows/setup-github-projects_Version3.yml

@@ -32,17 +32,12 @@ jobs:
             exit 1
           fi
 
-      - name: Authenticate GH CLI
-        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: gh auth login --with-token <<< "${GH_TOKEN}"
-
       - name: Create Project with description
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
-          PROJECT_NAME="Auto Project"
-          PROJECT_DESC="Automated project for task management with weekly iterations"
+          PROJECT_NAME="Agent Builder Application"
+          PROJECT_DESC="Agent Builder Application - AI agent creation, testing, and deployment platform"
 
           # Check if project exists
           proj_list=$(gh project list --owner ${{ github.repository_owner }} --format json 2>&1)

convex/agentBuilderWorkflow.ts

@@ -220,14 +220,22 @@ export const executeWorkflowStage = action( {
       userPrompt: fullPrompt,
     } );
 
-    // Meter: token-based billing for this workflow stage
+    // Meter: token-based billing for this workflow stage (non-fatal)
     if ( result.inputTokens > 0 || result.outputTokens > 0 ) {
-      await ctx.runMutation( internal.stripeMutations.incrementUsageAndReportOverage, {
-        userId: gateResult.userId as any,
-        modelId: WORKFLOW_MODEL_ID,
-        inputTokens: result.inputTokens,
-        outputTokens: result.outputTokens,
-      } );
+      try {
+        await ctx.runMutation( internal.stripeMutations.incrementUsageAndReportOverage, {
+          userId: gateResult.userId,
+          modelId: WORKFLOW_MODEL_ID,
+          inputTokens: result.inputTokens,
+          outputTokens: result.outputTokens,
+        } );
+      } catch ( billingErr ) {
+        console.error( "agentBuilderWorkflow: billing failed (non-fatal)", {
+          userId: gateResult.userId, modelId: WORKFLOW_MODEL_ID,
+          inputTokens: result.inputTokens, outputTokens: result.outputTokens,
+          error: billingErr instanceof Error ? billingErr.message : billingErr,
+        } );
+      }
     }
 
     return {

convex/automatedAgentBuilder.ts

@@ -154,14 +154,23 @@ export const processResponse = action( {
     const systemPrompt = buildSystemPrompt( session.agentRequirements );
     const response = await analyzeAndAskNext( systemPrompt, updatedHistory );
 
-    // Meter token usage for billing
+    // Meter token usage for billing (non-fatal: don't kill agent generation)
     if ( response.tokenUsage && gateResult.allowed ) {
-      await ctx.runMutation( internal.stripeMutations.incrementUsageAndReportOverage, {
-        userId: gateResult.userId as any,
-        modelId,
-        inputTokens: response.tokenUsage.inputTokens,
-        outputTokens: response.tokenUsage.outputTokens,
-      } );
+      try {
+        await ctx.runMutation( internal.stripeMutations.incrementUsageAndReportOverage, {
+          userId: gateResult.userId,
+          modelId,
+          inputTokens: response.tokenUsage.inputTokens,
+          outputTokens: response.tokenUsage.outputTokens,
+        } );
+      } catch ( billingErr ) {
+        console.error( "automatedAgentBuilder: billing failed (non-fatal)", {
+          userId: gateResult.userId, modelId,
+          inputTokens: response.tokenUsage.inputTokens,
+          outputTokens: response.tokenUsage.outputTokens,
+          error: billingErr instanceof Error ? billingErr.message : billingErr,
+        } );
+      }
     }
 
     // Parse response to extract:

convex/awsDeployment.ts

@@ -7,6 +7,7 @@
 import { action, internalAction, mutation, query, internalMutation, internalQuery } from "./_generated/server";
 import { v } from "convex/values";
 import { internal, api } from "./_generated/api";
+import type { Id } from "./_generated/dataModel";
 
 // Stripe mutations live in stripeMutations.ts. Cast bridges codegen gap.
 
@@ -703,7 +704,7 @@ async function deployToAgentCore( artifacts: any, config: any ) {
 export const createDeploymentInternal = internalMutation( {
   args: {
     agentId: v.id( "agents" ),
-    userId: v.union( v.id( "users" ), v.string() ),
+    userId: v.id( "users" ),
     tier: v.optional( v.string() ),
     deploymentConfig: v.object( {
       region: v.string(),
@@ -714,14 +715,9 @@ export const createDeploymentInternal = internalMutation( {
     } ),
   },
   handler: async ( ctx, args ) => {
-    // Ensure userId is a proper Id<"users">
-    const userId = typeof args.userId === 'string' && args.userId.startsWith( 'j' )
-      ? args.userId as any
-      : args.userId;
-
     return await ctx.db.insert( "deployments", {
       agentId: args.agentId,
-      userId: userId,
+      userId: args.userId,
       tier: args.tier || "freemium",
       agentName: args.deploymentConfig.agentName,
       description: args.deploymentConfig.description,
@@ -953,7 +949,7 @@ export const executeDeploymentInternal = internalAction( {
 /**
  * Tier 1: Deploy to YOUR Fargate (Freemium)
  */
-async function deployTier1( ctx: any, args: any, userId: string ): Promise<any> {
+async function deployTier1( ctx: any, args: any, userId: Id<"users"> ): Promise<any> {
   // Create deployment record
   const deploymentId: any = await ctx.runMutation( internal.awsDeployment.createDeploymentInternal, {
     agentId: args.agentId,
@@ -962,8 +958,15 @@ async function deployTier1( ctx: any, args: any, userId: string ): Promise<any>
     deploymentConfig: args.deploymentConfig,
   } );
 
-  // Increment usage counter (centralized in stripeMutations.ts)
-  await ctx.runMutation( internalStripeMutations.incrementUsageAndReportOverage, { userId } );
+  // Increment usage counter (non-fatal: don't block deployment)
+  try {
+    await ctx.runMutation( internalStripeMutations.incrementUsageAndReportOverage, { userId } );
+  } catch ( billingErr ) {
+    console.error( "awsDeployment.deployTier1: billing failed (non-fatal)", {
+      userId,
+      error: billingErr instanceof Error ? billingErr.message : billingErr,
+    } );
+  }
 
   // Start deployment
   await ctx.scheduler.runAfter( 0, internal.awsDeployment.executeDeploymentInternal, {

convex/awsDiagramGenerator.ts

@@ -365,7 +365,7 @@ export const storeDiagram = mutation({
       // Create new diagram
       return await ctx.db.insert("diagrams", {
         deploymentId: args.deploymentId,
-        userId: userId as any,
+        userId: userId,
         format: args.format,
         content: args.content,
         generatedAt: Date.now(),

convex/deploymentRouter.ts

@@ -8,6 +8,7 @@ import { mutation, query } from "./_generated/server";
 import { action } from "./_generated/server";
 import { getAuthUserId } from "@convex-dev/auth/server";
 import { api, internal } from "./_generated/api";
+import type { Id } from "./_generated/dataModel";
 
 // Stripe mutations live in stripeMutations.ts. Cast bridges codegen gap.
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -64,7 +65,7 @@ export const getUserTier = query({
 });
 
 // Tier 1: Deploy to AgentCore (Freemium)
-async function deployTier1(ctx: any, args: any, userId: any): Promise<any> {
+async function deployTier1(ctx: any, args: any, userId: Id<"users">): Promise<any> {
   // Check usage limits
   const user = await ctx.runQuery(api.deploymentRouter.getUserTier);
 
@@ -129,11 +130,18 @@ async function deployTier1(ctx: any, args: any, userId: any): Promise<any> {
       throw new Error(result.error || "AgentCore deployment failed");
     }
 
-    // Increment usage counter (centralized in stripeMutations.ts)
-    await ctx.runMutation( internalStripeMutations.incrementUsageAndReportOverage, {
-      userId,
-      modelId: agent.model,
-    } );
+    // Increment usage counter (non-fatal: don't block deployment)
+    try {
+      await ctx.runMutation( internalStripeMutations.incrementUsageAndReportOverage, {
+        userId,
+        modelId: agent.model,
+      } );
+    } catch ( billingErr ) {
+      console.error( "deploymentRouter.deployTier1: billing failed (non-fatal)", {
+        userId, modelId: agent.model,
+        error: billingErr instanceof Error ? billingErr.message : billingErr,
+      } );
+    }
 
     return {
       success: true,
@@ -251,7 +259,7 @@ export const getDeploymentHistory = query({
 
     let query = ctx.db
       .query("deployments")
-      .withIndex("by_user", (q) => q.eq("userId", userId as any));
+      .withIndex("by_user", (q) => q.eq("userId", userId));
 
     if (args.agentId) {
       query = ctx.db

convex/deployments.ts

@@ -22,7 +22,7 @@ export const create = mutation({
 
     const deploymentId = await ctx.db.insert("deployments", {
       agentId: args.agentId,
-      userId: userId as any,
+      userId: userId,
       tier: args.tier,
       awsAccountId: args.awsAccountId,
       region: args.region,
@@ -74,7 +74,7 @@ export const list = query({
 
     return await ctx.db
       .query("deployments")
-      .withIndex("by_user", (q) => q.eq("userId", userId as any))
+      .withIndex("by_user", (q) => q.eq("userId", userId))
       .order("desc")
       .take(args.limit || 20);
   },

convex/http.ts

@@ -517,19 +517,44 @@ http.route({
         }
 
         case "charge.dispute.created": {
-          // Stripe Dispute: customer is on the linked charge, not top-level.
-          // Use the raw event data which includes customer as a string.
+          // Stripe Dispute: customer may be top-level, on expanded charge, or
+          // require a charge lookup when charge is a string ID (not expanded).
           const disputeData = event.data.object as any;
-          const disputeCustomer: string | undefined =
-            typeof disputeData.customer === "string"
-              ? disputeData.customer
-              : typeof disputeData.charge === "string"
-                ? undefined // charge ID only — need to look up; skip for now
-                : disputeData.charge?.customer;
+          let disputeCustomer: string | undefined;
+
+          if ( typeof disputeData.customer === "string" ) {
+            // Customer is directly on the dispute object
+            disputeCustomer = disputeData.customer;
+          } else if ( typeof disputeData.charge === "string" ) {
+            // Charge is an unexpanded string ID — fetch it to get customer
+            try {
+              const chargeObj = await stripe.charges.retrieve( disputeData.charge );
+              disputeCustomer = typeof chargeObj.customer === "string"
+                ? chargeObj.customer
+                : typeof chargeObj.customer === "object" && chargeObj.customer !== null
+                  ? chargeObj.customer.id
+                  : undefined;
+            } catch ( chargeErr ) {
+              console.error( "Failed to retrieve charge for dispute", {
+                chargeId: disputeData.charge,
+                error: chargeErr instanceof Error ? chargeErr.message : chargeErr,
+              } );
+            }
+          } else if ( disputeData.charge?.customer ) {
+            // Charge is an expanded object with customer
+            disputeCustomer = typeof disputeData.charge.customer === "string"
+              ? disputeData.charge.customer
+              : disputeData.charge.customer?.id;
+          }
+
           if ( disputeCustomer ) {
             await ctx.runMutation(internal.stripeMutations.restrictAccountForDispute, {
               stripeCustomerId: disputeCustomer,
             });
+          } else {
+            console.error( "charge.dispute.created: could not resolve customer", {
+              disputeId: disputeData.id,
+            } );
           }
           break;
         }

convex/interleavedReasoning.ts

@@ -145,14 +145,23 @@ export const sendMessage: any = action( {
         args.message
       );
 
-      // Meter token usage for billing
+      // Meter token usage for billing (non-fatal: don't kill message delivery)
       if ( response.tokenUsage && gateResult.allowed ) {
-        await ctx.runMutation( internal.stripeMutations.incrementUsageAndReportOverage, {
-          userId: gateResult.userId as any,
-          modelId,
-          inputTokens: response.tokenUsage.inputTokens,
-          outputTokens: response.tokenUsage.outputTokens,
-        } );
+        try {
+          await ctx.runMutation( internal.stripeMutations.incrementUsageAndReportOverage, {
+            userId: gateResult.userId,
+            modelId,
+            inputTokens: response.tokenUsage.inputTokens,
+            outputTokens: response.tokenUsage.outputTokens,
+          } );
+        } catch ( billingErr ) {
+          console.error( "interleavedReasoning: billing failed (non-fatal)", {
+            userId: gateResult.userId, modelId,
+            inputTokens: response.tokenUsage.inputTokens,
+            outputTokens: response.tokenUsage.outputTokens,
+            error: billingErr instanceof Error ? billingErr.message : billingErr,
+          } );
+        }
       }
     }
 

convex/lib/bedrockGate.ts

@@ -13,6 +13,7 @@
  */
 
 import { getAuthUserId } from "@convex-dev/auth/server";
+import type { Id } from "../_generated/dataModel";
 import {
   isProviderAllowedForTier,
   isBedrockModelAllowedForTier,
@@ -26,7 +27,7 @@ import {
 
 export interface BedrockAccessGranted {
   allowed: true;
-  userId: string;
+  userId: Id<"users">;
   tier: TierName;
 }
 
@@ -82,7 +83,7 @@ export async function requireBedrockAccess(
   const result = await requireBedrockAccessForUser( user, modelId );
   if ( result.allowed ) {
     // Override userId with the real authenticated user ID
-    return { ...result, userId: String( userId ) };
+    return { ...result, userId };
   }
   return result;
 }
@@ -210,9 +211,18 @@ export async function requireBedrockAccessForUser(
     };
   }
 
+  if ( !userDoc._id ) {
+    console.error( "bedrockGate: userDoc is missing _id", { tier, isAnonymous: userDoc.isAnonymous } );
+    return {
+      allowed: false,
+      reason: "User record is incomplete (missing ID). Please sign in again.",
+      upgradeMessage: "Sign in to continue.",
+    };
+  }
+
   return {
     allowed: true,
-    userId: String( userDoc._id || "internal" ),
+    userId: userDoc._id as Id<"users">,
     tier,
   };
 }