@nordsym/apiclaw 1.3.7 → 1.3.8

package/convex/logs.ts

@@ -17,6 +17,7 @@ export const createLog = mutation({
     status: v.union(v.literal("success"), v.literal("error")),
     latencyMs: v.number(),
     errorMessage: v.optional(v.string()),
+    subagentId: v.optional(v.string()), // from X-APIClaw-Subagent header
   },
   handler: async (ctx, args) => {
     // Verify session and get workspace
@@ -33,6 +34,7 @@ export const createLog = mutation({
     return await ctx.db.insert("apiLogs", {
       workspaceId: session.workspaceId,
       sessionToken: args.token,
+      subagentId: args.subagentId,
       provider: args.provider,
       action: args.action,
       status: args.status,
@@ -56,11 +58,13 @@ export const createLogInternal = mutation({
     status: v.union(v.literal("success"), v.literal("error")),
     latencyMs: v.number(),
     errorMessage: v.optional(v.string()),
+    subagentId: v.optional(v.string()), // from X-APIClaw-Subagent header
   },
   handler: async (ctx, args) => {
     return await ctx.db.insert("apiLogs", {
       workspaceId: args.workspaceId,
       sessionToken: args.sessionToken,
+      subagentId: args.subagentId,
       provider: args.provider,
       action: args.action,
       status: args.status,
@@ -85,11 +89,13 @@ export const getLogs = query({
     cursor: v.optional(v.number()), // createdAt timestamp for pagination
     status: v.optional(v.union(v.literal("success"), v.literal("error"), v.literal("all"))),
     provider: v.optional(v.string()),
+    subagentId: v.optional(v.string()), // filter by subagent
   },
   handler: async (ctx, args) => {
     const limit = args.limit ?? 50;
     const status = args.status ?? "all";
     const provider = args.provider;
+    const subagentId = args.subagentId;
     const cursor = args.cursor;
 
     // Verify session
@@ -127,6 +133,16 @@ export const getLogs = query({
       filteredLogs = filteredLogs.filter((log) => log.provider === provider);
     }
 
+    // Filter by subagent
+    if (subagentId) {
+      if (subagentId === "main") {
+        // Main agent calls (no subagentId)
+        filteredLogs = filteredLogs.filter((log) => !log.subagentId);
+      } else {
+        filteredLogs = filteredLogs.filter((log) => log.subagentId === subagentId);
+      }
+    }
+
     const hasMore = filteredLogs.length > limit;
     const logs = filteredLogs.slice(0, limit);
 
@@ -138,6 +154,7 @@ export const getLogs = query({
         status: log.status,
         latencyMs: log.latencyMs,
         errorMessage: log.errorMessage,
+        subagentId: log.subagentId || null,
         createdAt: log.createdAt,
       })),
       hasMore,

package/convex/providerKeys.ts

@@ -64,6 +64,8 @@ export const addKey = mutation({
     const encryptedKey = encryptKey(args.apiKey);
     const keyHint = getKeyHint(args.apiKey);
 
+    let isFirstKey = false;
+
     if (existingKey) {
       // Update existing key
       await ctx.db.patch(existingKey._id, {
@@ -71,7 +73,6 @@ export const addKey = mutation({
         keyHint,
         updatedAt: now,
       });
-      return { success: true, action: "updated" };
     } else {
       // Create new key
       await ctx.db.insert("providerKeys", {
@@ -83,11 +84,90 @@ export const addKey = mutation({
         createdAt: now,
         updatedAt: now,
       });
-      return { success: true, action: "created" };
+
+      // Check if this is the first BYOK key for earn progress
+      const allKeys = await ctx.db
+        .query("providerKeys")
+        .withIndex("by_workspaceId", (q) => q.eq("workspaceId", workspaceId))
+        .collect();
+
+      // If this is the only key (the one we just created), mark BYOK setup
+      if (allKeys.length === 1) {
+        isFirstKey = true;
+        // Import and call markByokSetup
+        const earnProgress = await ctx.db
+          .query("earnProgress")
+          .withIndex("by_workspaceId", (q) => q.eq("workspaceId", workspaceId))
+          .first();
+
+        if (earnProgress && !earnProgress.byokSetup) {
+          const newTotal = calculateEarnTotal({ ...earnProgress, byokSetup: true });
+          await ctx.db.patch(earnProgress._id, {
+            byokSetup: true,
+            byokSetupAt: now,
+            totalEarned: newTotal,
+            updatedAt: now,
+          });
+          // Add 5 calls to workspace limit
+          const workspace = await ctx.db.get(workspaceId);
+          if (workspace) {
+            await ctx.db.patch(workspaceId, {
+              usageLimit: workspace.usageLimit + 5,
+              updatedAt: now,
+            });
+          }
+        } else if (!earnProgress) {
+          // Create earn progress with byokSetup
+          await ctx.db.insert("earnProgress", {
+            workspaceId,
+            firstDirectCall: false,
+            apisUsed: [],
+            apisUsedComplete: false,
+            agentListed: false,
+            apiListed: false,
+            byokSetup: true,
+            byokSetupAt: now,
+            githubStarred: false,
+            twitterFollowed: false,
+            referralCount: 0,
+            totalEarned: 5, // BYOK reward
+            createdAt: now,
+            updatedAt: now,
+          });
+          // Add 5 calls to workspace limit
+          const workspace = await ctx.db.get(workspaceId);
+          if (workspace) {
+            await ctx.db.patch(workspaceId, {
+              usageLimit: workspace.usageLimit + 5,
+              updatedAt: now,
+            });
+          }
+        }
+      }
     }
+
+    return { 
+      success: true, 
+      action: existingKey ? "updated" : "created",
+      earnedByok: isFirstKey,
+    };
   },
 });
 
+// Helper to calculate earn total (duplicated to avoid circular import)
+function calculateEarnTotal(progress: any): number {
+  let total = 0;
+  if (progress.firstDirectCall) total += 15;
+  if (progress.apisUsedComplete) total += 10;
+  if (progress.agentListed) total += 10;
+  if (progress.apiListed) total += 10;
+  if (progress.byokSetup) total += 5;
+  if (progress.githubStarred) total += 10;
+  if (progress.twitterFollowed) total += 5;
+  total += (progress.referralCount || 0) * 10;
+  return total;
+}
+
 // ============================================
 // REMOVE KEY
 // ============================================

package/convex/schema.ts

@@ -49,19 +49,32 @@ export default defineSchema({
     tier: v.string(), // "free" | "pro" | "enterprise"
     usageCount: v.number(), // total API calls made
     usageLimit: v.number(), // max API calls for tier
+    // Main agent identification
+    mainAgentId: v.optional(v.string()), // UUID, auto-generated on first call
+    mainAgentName: v.optional(v.string()), // Auto-generated name (e.g., "Crimson Phoenix")
     // Stripe billing fields
     stripeCustomerId: v.optional(v.string()),
     stripeSubscriptionId: v.optional(v.string()),
     billingPlan: v.optional(v.string()), // "free" | "usage_based" | "starter" | "pro" | "scale"
     creditBalance: v.optional(v.number()), // prepaid credits in cents
     lastBillingDate: v.optional(v.number()),
+    // Payment method fields
+    hasPaymentMethod: v.optional(v.boolean()),
+    paymentMethodType: v.optional(v.string()),
+    cardBrand: v.optional(v.string()),
+    cardLast4: v.optional(v.string()),
+    // Referral fields
+    referralCode: v.optional(v.string()), // CLAW-XXXXXX format
+    referredBy: v.optional(v.id("workspaces")), // who referred this user
     createdAt: v.number(),
     updatedAt: v.number(),
   })
     .index("by_email", ["email"])
     .index("by_stripeCustomerId", ["stripeCustomerId"])
     .index("by_stripeSubscriptionId", ["stripeSubscriptionId"])
-    .index("by_status", ["status"]),
+    .index("by_status", ["status"])
+    .index("by_referralCode", ["referralCode"])
+    .index("by_mainAgentId", ["mainAgentId"]),
 
   // Invoices (Stripe invoice records)
   invoices: defineTable({
@@ -106,6 +119,19 @@ export default defineSchema({
     .index("by_sessionToken", ["sessionToken"])
     .index("by_workspaceId", ["workspaceId"]),
 
+  // Subagent tracking (tasks spawned by main agent)
+  subagents: defineTable({
+    workspaceId: v.id("workspaces"),
+    subagentId: v.string(), // from X-APIClaw-Subagent header
+    name: v.optional(v.string()), // optional display name
+    callCount: v.number(),
+    firstSeenAt: v.number(),
+    lastActiveAt: v.number(),
+  })
+    .index("by_workspaceId", ["workspaceId"])
+    .index("by_workspaceId_subagentId", ["workspaceId", "subagentId"])
+    .index("by_lastActiveAt", ["lastActiveAt"]),
+
   // Magic links for workspace email verification
   workspaceMagicLinks: defineTable({
     email: v.string(),
@@ -383,6 +409,7 @@ export default defineSchema({
   apiLogs: defineTable({
     workspaceId: v.id("workspaces"),
     sessionToken: v.string(),
+    subagentId: v.optional(v.string()), // from X-APIClaw-Subagent header
     provider: v.string(),
     action: v.string(),
     status: v.union(v.literal("success"), v.literal("error")),
@@ -392,7 +419,8 @@ export default defineSchema({
   })
     .index("by_workspaceId", ["workspaceId"])
     .index("by_createdAt", ["createdAt"])
-    .index("by_workspaceId_createdAt", ["workspaceId", "createdAt"]),
+    .index("by_workspaceId_createdAt", ["workspaceId", "createdAt"])
+    .index("by_subagentId", ["subagentId"]),
 
   // ============================================
   // WAITLIST (for Direct Call provider leads)
@@ -509,6 +537,47 @@ export default defineSchema({
     .index("by_workspaceId", ["workspaceId"])
     .index("by_provider", ["workspaceId", "provider"]),
 
+  // ============================================
+  // EARN PROGRESS TRACKING
+  // ============================================
+
+  earnProgress: defineTable({
+    workspaceId: v.id("workspaces"),
+
+    // Usage tasks
+    firstDirectCall: v.boolean(),
+    firstDirectCallAt: v.optional(v.number()),
+
+    apisUsed: v.array(v.string()), // Track unique provider/action combos
+    apisUsedComplete: v.boolean(),
+
+    agentListed: v.boolean(),
+    agentListedAt: v.optional(v.number()),
+
+    apiListed: v.boolean(),
+    apiListedAt: v.optional(v.number()),
+
+    byokSetup: v.boolean(),
+    byokSetupAt: v.optional(v.number()),
+
+    // Growth tasks
+    githubStarred: v.boolean(),
+    githubStarredAt: v.optional(v.number()),
+
+    twitterFollowed: v.boolean(),
+    twitterFollowedAt: v.optional(v.number()),
+
+    // Referrals (tracked separately but stored here for convenience)
+    referralCount: v.number(),
+
+    // Calculated total
+    totalEarned: v.number(),
+
+    createdAt: v.number(),
+    updatedAt: v.number(),
+  })
+    .index("by_workspaceId", ["workspaceId"]),
+
   // ============================================
   // FEEDBACK SYSTEM
   // ============================================

package/convex/workspaces.ts

@@ -27,13 +27,24 @@ export const createMagicLink = mutation({
   },
 });
 
+// Generate a unique referral code (CLAW-XXXXXX format)
+function generateReferralCode(): string {
+  const chars = "ABCDEFGHJKLMNPQRSTUVWXYZ23456789";
+  let code = "";
+  for (let i = 0; i < 6; i++) {
+    code += chars.charAt(Math.floor(Math.random() * chars.length));
+  }
+  return `CLAW-${code}`;
+}
+
 // Verify magic link and create workspace + session
 export const verifyMagicLink = mutation({
   args: { 
     token: v.string(),
     fingerprint: v.optional(v.string()),
+    referralCode: v.optional(v.string()), // Referral code from signup URL
   },
-  handler: async (ctx, { token, fingerprint }) => {
+  handler: async (ctx, { token, fingerprint, referralCode }) => {
     const magicLink = await ctx.db
       .query("workspaceMagicLinks")
       .withIndex("by_token", (q) => q.eq("token", token))
@@ -60,20 +71,90 @@ export const verifyMagicLink = mutation({
       .withIndex("by_email", (q) => q.eq("email", magicLink.email))
       .first();
 
+    let isNewUser = false;
     if (!workspace) {
-      // Create new workspace with free tier
+      isNewUser = true;
+
+      // Generate unique referral code for new user
+      let newReferralCode: string;
+      let attempts = 0;
+      do {
+        newReferralCode = generateReferralCode();
+        const existing = await ctx.db
+          .query("workspaces")
+          .withIndex("by_referralCode", (q) => q.eq("referralCode", newReferralCode))
+          .first();
+        if (!existing) break;
+        attempts++;
+      } while (attempts < 10);
+
+      // Create new workspace with free tier + referral code
       const workspaceId = await ctx.db.insert("workspaces", {
         email: magicLink.email,
         status: "active",
         tier: "free",
         usageCount: 0,
         usageLimit: 50, // 50 free API calls
+        referralCode: newReferralCode!,
         createdAt: Date.now(),
         updatedAt: Date.now(),
       });
       workspace = await ctx.db.get(workspaceId);
     }
 
+    // Process referral for new users
+    if (isNewUser && referralCode) {
+      // Find referrer by code
+      const referrer = await ctx.db
+        .query("workspaces")
+        .withIndex("by_referralCode", (q) => q.eq("referralCode", referralCode))
+        .first();
+
+      if (referrer && referrer._id !== workspace!._id) {
+        // Update new user's referredBy
+        await ctx.db.patch(workspace!._id, {
+          referredBy: referrer._id,
+          updatedAt: Date.now(),
+        });
+
+        // Get or create referrer's earn progress
+        let referrerProgress = await ctx.db
+          .query("earnProgress")
+          .withIndex("by_workspaceId", (q) => q.eq("workspaceId", referrer._id))
+          .first();
+
+        if (!referrerProgress) {
+          await ctx.db.insert("earnProgress", {
+            workspaceId: referrer._id,
+            firstDirectCall: false,
+            apisUsed: [],
+            apisUsedComplete: false,
+            agentListed: false,
+            apiListed: false,
+            byokSetup: false,
+            githubStarred: false,
+            twitterFollowed: false,
+            referralCount: 1,
+            totalEarned: 10,
+            createdAt: Date.now(),
+            updatedAt: Date.now(),
+          });
+        } else {
+          await ctx.db.patch(referrerProgress._id, {
+            referralCount: referrerProgress.referralCount + 1,
+            totalEarned: referrerProgress.totalEarned + 10,
+            updatedAt: Date.now(),
+          });
+        }
+
+        // Credit referrer with +10 API calls
+        await ctx.db.patch(referrer._id, {
+          usageLimit: referrer.usageLimit + 10,
+          updatedAt: Date.now(),
+        });
+      }
+    }
+
     // Create agent session
     const sessionToken = generateToken();
 
@@ -92,6 +173,7 @@ export const verifyMagicLink = mutation({
         id: workspace!._id,
         email: workspace!.email,
         tier: workspace!.tier,
+        referralCode: workspace!.referralCode,
       },
     };
   },

package/dist/adapters/base.d.ts

@@ -0,0 +1,112 @@
+/**
+ * MCP Client Adapter - Base Interface & Abstract Class
+ * Defines the contract for all MCP client adapters
+ */
+import { MCPClient } from '../utils/paths.js';
+import { Platform } from '../utils/os.js';
+import { MCPConfig, ContinueConfig } from '../utils/config.js';
+export interface ConfigResult {
+    success: boolean;
+    message: string;
+    configPath: string;
+    backupPath?: string | null;
+    isNew?: boolean;
+    alreadyConfigured?: boolean;
+    error?: string;
+}
+export interface VerifyResult {
+    success: boolean;
+    hasConfig: boolean;
+    configValid: boolean;
+    message: string;
+}
+export interface InstallInfo {
+    installed: boolean;
+    appPath?: string;
+    configExists: boolean;
+    configPath: string;
+}
+export interface ConfigureOptions {
+    workspaceId?: string;
+    serverName?: string;
+    force?: boolean;
+}
+/**
+ * MCP Client Adapter Interface
+ */
+export interface MCPClientAdapter {
+    /** Internal client name */
+    name: MCPClient | 'custom';
+    /** Human-readable display name */
+    displayName: string;
+    /** Check if the client is installed on the system */
+    isInstalled(): Promise<boolean>;
+    /** Get the config file path for this client */
+    getConfigPath(): string;
+    /** Configure APIClaw MCP server for this client */
+    configure(options?: ConfigureOptions): Promise<ConfigResult>;
+    /** Verify the current configuration */
+    verify(): Promise<VerifyResult>;
+    /** Get detailed installation info */
+    getInstallInfo(): Promise<InstallInfo>;
+    /** Remove APIClaw configuration */
+    unconfigure(serverName?: string): Promise<ConfigResult>;
+}
+/**
+ * Abstract base class for MCP client adapters
+ * Provides common functionality for all adapters
+ */
+export declare abstract class BaseAdapter implements MCPClientAdapter {
+    abstract name: MCPClient | 'custom';
+    abstract displayName: string;
+    protected os: Platform;
+    constructor();
+    /**
+     * Get the config file path
+     */
+    getConfigPath(): string;
+    /**
+     * Check if config file exists
+     */
+    protected configExists(): boolean;
+    /**
+     * Get application paths to check for installation
+     * Override in subclasses for specific clients
+     */
+    protected abstract getAppPaths(): string[];
+    /**
+     * Check if the client application is installed
+     */
+    isInstalled(): Promise<boolean>;
+    /**
+     * Get detailed installation information
+     */
+    getInstallInfo(): Promise<InstallInfo>;
+    /**
+     * Configure APIClaw MCP server
+     */
+    configure(options?: ConfigureOptions): Promise<ConfigResult>;
+    /**
+     * Merge APIClaw config into existing config
+     * Override in subclasses for special formats (e.g., Continue)
+     */
+    protected mergeConfig(config: MCPConfig | ContinueConfig, options: {
+        workspace?: string;
+        serverName?: string;
+        force?: boolean;
+    }): MCPConfig | ContinueConfig;
+    /**
+     * Verify the current configuration
+     */
+    verify(): Promise<VerifyResult>;
+    /**
+     * Remove APIClaw configuration
+     */
+    unconfigure(serverName?: string): Promise<ConfigResult>;
+    /**
+     * Remove APIClaw from config
+     * Override in subclasses for special formats
+     */
+    protected removeFromConfig(config: MCPConfig | ContinueConfig, serverName: string): MCPConfig | ContinueConfig;
+}
+//# sourceMappingURL=base.d.ts.map

package/dist/adapters/base.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"base.d.ts","sourceRoot":"","sources":["../../src/adapters/base.ts"],"names":[],"mappings":"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"}