@okrlinkhub/agent-factory 3.0.2 → 3.1.0

package/src/client/index.ts

@@ -7,6 +7,7 @@ import {
 import type { Auth, HttpRouter } from "convex/server";
 import { v } from "convex/values";
 import type { ComponentApi } from "../component/_generated/component.js";
+import { parseTelegramWebhookSecretToken } from "../component/identity.js";
 import {
   providerConfigValidator,
   scalingPolicyValidator,
@@ -488,6 +489,7 @@ export function exposeApi(
           agentKey: "default",
           version: "1.0.0",
           secretsRef: ["telegram.botToken"],
+          botIdentity: "telegram-bot-default",
           enabled: true,
         });
       },
@@ -555,6 +557,22 @@ export function exposeApi(
         return await ctx.runAction((component.lib as any).deleteFlyVolume, args);
       },
     }),
+    runFlyCleanup: actionGeneric({
+      args: {
+        flyApiToken: v.optional(v.string()),
+        machineConcurrency: v.optional(v.number()),
+        volumeConcurrency: v.optional(v.number()),
+      },
+      handler: async (ctx, args) => {
+        await options.auth(ctx, { type: "read" });
+        return await ctx.runAction((component.lib as any).runFlyCleanup, {
+          flyApiToken: args.flyApiToken,
+          machineConcurrency: args.machineConcurrency,
+          volumeConcurrency: args.volumeConcurrency,
+          providerConfig: options.providerConfig,
+        });
+      },
+    }),
     recoverQueue: actionGeneric({
       args: {
         nowMs: v.optional(v.number()),
@@ -583,6 +601,7 @@ export function exposeApi(
       args: {
         consumerUserId: v.string(),
         agentKey: v.string(),
+        botIdentity: v.optional(v.string()),
         source: v.optional(
           v.union(v.literal("manual"), v.literal("telegram_pairing"), v.literal("api")),
         ),
@@ -665,6 +684,7 @@ export function exposeApi(
     }),
     resolveAgentForTelegram: queryGeneric({
       args: {
+        botIdentity: v.optional(v.string()),
         telegramUserId: v.optional(v.string()),
         telegramChatId: v.optional(v.string()),
       },
@@ -698,6 +718,7 @@ export function exposeApi(
     consumePairingCode: mutationGeneric({
       args: {
         code: v.string(),
+        botIdentity: v.optional(v.string()),
         telegramUserId: v.string(),
         telegramChatId: v.string(),
       },
@@ -725,7 +746,7 @@ export function exposeApi(
         return await ctx.runQuery((component.lib as any).getUserAgentPairingStatus, args);
       },
     }),
-    importTelegramTokenForAgent: mutationGeneric({
+    importTelegramTokenForAgent: actionGeneric({
       args: {
         consumerUserId: v.string(),
         agentKey: v.string(),
@@ -734,7 +755,17 @@ export function exposeApi(
       },
       handler: async (ctx, args) => {
         await options.auth(ctx, { type: "write", agentKey: args.agentKey });
-        return await ctx.runMutation((component.lib as any).importTelegramTokenForAgent, args);
+        return await ctx.runAction((component.lib as any).importTelegramTokenForAgent, args);
+      },
+    }),
+    reconcileTelegramBotIdentityForAgent: actionGeneric({
+      args: {
+        agentKey: v.string(),
+        secretRef: v.optional(v.string()),
+      },
+      handler: async (ctx, args) => {
+        await options.auth(ctx, { type: "write", agentKey: args.agentKey });
+        return await ctx.runAction((component.lib as any).reconcileTelegramBotIdentityForAgent, args);
       },
     }),
     getUserAgentOnboardingState: queryGeneric({
@@ -787,12 +818,27 @@ export function exposeApi(
       args: {
         convexSiteUrl: v.string(),
         secretRef: v.optional(v.string()),
+        agentKey: v.optional(v.string()),
       },
       handler: async (ctx, args) => {
         await options.auth(ctx, { type: "read" });
         return await ctx.runAction(component.lib.configureTelegramWebhook, args);
       },
     }),
+    softResetTelegramBindingsMissingBotIdentity: mutationGeneric({
+      args: {
+        nowMs: v.optional(v.number()),
+        revokeActiveBindings: v.optional(v.boolean()),
+        expirePendingPairings: v.optional(v.boolean()),
+      },
+      handler: async (ctx, args) => {
+        await options.auth(ctx, { type: "write" });
+        return await ctx.runMutation(
+          (component.lib as any).softResetTelegramBindingsMissingBotIdentity,
+          args,
+        );
+      },
+    }),
     getWebhookReadiness: actionGeneric({
       args: {
         agentKey: v.string(),
@@ -1227,6 +1273,18 @@ export function registerRoutes(
     path: `${pathPrefix}/telegram/webhook`,
     method: "POST",
     handler: httpActionGeneric(async (ctx, request) => {
+      const botIdentity = parseTelegramWebhookSecretToken(
+        request.headers.get("X-Telegram-Bot-Api-Secret-Token"),
+      );
+      if (!botIdentity) {
+        return new Response(
+          JSON.stringify({ ok: false, error: "missing or invalid telegram webhook secret token" }),
+          {
+            status: 403,
+            headers: { "Content-Type": "application/json" },
+          },
+        );
+      }
       const update = (await request.json()) as {
         update_id?: number;
         message?: {
@@ -1280,6 +1338,7 @@ export function registerRoutes(
         try {
           const pairing = await ctx.runMutation(component.lib.consumePairingCode, {
             code: startCommandCode,
+            botIdentity,
             telegramUserId,
             telegramChatId,
           });
@@ -1331,6 +1390,7 @@ export function registerRoutes(
 
       const mappedRaw = resolveAgentKeyFromBinding
         ? await ctx.runQuery(component.lib.resolveAgentForTelegram, {
+            botIdentity,
             telegramUserId,
             telegramChatId,
           })
@@ -1360,6 +1420,7 @@ export function registerRoutes(
         });
       }
       const metadata: Record<string, string> = {
+        telegramBotIdentity: botIdentity,
         telegramChatId,
         telegramUserId,
       };
@@ -1381,7 +1442,7 @@ export function registerRoutes(
             })
           : undefined;
       await ctx.runMutation(component.lib.enqueue, {
-        conversationId: mapped.conversationId ?? `telegram:${telegramChatId}`,
+        conversationId: mapped.conversationId ?? buildTelegramIngressConversationId(botIdentity, telegramChatId),
         agentKey,
         payload: {
           provider: "telegram",
@@ -1407,6 +1468,10 @@ function parseStartCommandCode(messageText: string): string | null {
   return match?.[1] ?? null;
 }
 
+function buildTelegramIngressConversationId(botIdentity: string, telegramChatId: string) {
+  return `telegram:${botIdentity}:${telegramChatId}`;
+}
+
 type TelegramWebhookMessage = {
   text?: string;
   caption?: string;

package/src/component/_generated/api.ts

@@ -9,6 +9,7 @@
  */
 
 import type * as config from "../config.js";
+import type * as flyCleanup from "../flyCleanup.js";
 import type * as identity from "../identity.js";
 import type * as lib from "../lib.js";
 import type * as messageTemplates from "../messageTemplates.js";
@@ -27,6 +28,7 @@ import { anyApi, componentsGeneric } from "convex/server";
 
 const fullApi: ApiFromModules<{
   config: typeof config;
+  flyCleanup: typeof flyCleanup;
   identity: typeof identity;
   lib: typeof lib;
   messageTemplates: typeof messageTemplates;

package/src/component/_generated/component.ts

@@ -23,12 +23,50 @@ import type { FunctionReference } from "convex/server";
  */
 export type ComponentApi<Name extends string | undefined = string | undefined> =
   {
+    flyCleanup: {
+      runFlyCleanup: FunctionReference<
+        "action",
+        "internal",
+        {
+          flyApiToken?: string;
+          machineConcurrency?: number;
+          providerConfig?: {
+            appName: string;
+            image: string;
+            kind: "fly" | "runpod" | "ecs";
+            organizationSlug: string;
+            region: string;
+            volumeName: string;
+            volumePath: string;
+            volumeSizeGb: number;
+          };
+          volumeConcurrency?: number;
+        },
+        {
+          appName: string;
+          errors: Array<string>;
+          machineIdsDeleted: Array<string>;
+          machineIdsRemaining: Array<string>;
+          machinesDeleted: number;
+          machinesFound: number;
+          machinesRemaining: number;
+          volumeIdsDeleted: Array<string>;
+          volumeIdsRemaining: Array<string>;
+          volumesDeleted: number;
+          volumesFound: number;
+          volumesRemaining: number;
+          warnings: Array<string>;
+        },
+        Name
+      >;
+    };
     identity: {
       bindUserAgent: FunctionReference<
         "mutation",
         "internal",
         {
           agentKey: string;
+          botIdentity?: string;
           consumerUserId: string;
           metadata?: Record<string, string>;
           nowMs?: number;
@@ -38,6 +76,7 @@ export type ComponentApi<Name extends string | undefined = string | undefined> =
         },
         {
           agentKey: string;
+          botIdentity: null | string;
           boundAt: number;
           consumerUserId: string;
           conversationId: string;
@@ -53,8 +92,9 @@ export type ComponentApi<Name extends string | undefined = string | undefined> =
       configureTelegramWebhook: FunctionReference<
         "action",
         "internal",
-        { convexSiteUrl: string; secretRef?: string },
+        { agentKey?: string; convexSiteUrl: string; secretRef?: string },
         {
+          botIdentity: null | string;
           currentUrl: null | string;
           description: string;
           isReady: boolean;
@@ -62,6 +102,7 @@ export type ComponentApi<Name extends string | undefined = string | undefined> =
           lastErrorMessage: null | string;
           ok: boolean;
           pendingUpdateCount: number;
+          secretTokenConfigured: boolean;
           webhookUrl: string;
         },
         Name
@@ -70,6 +111,7 @@ export type ComponentApi<Name extends string | undefined = string | undefined> =
         "mutation",
         "internal",
         {
+          botIdentity?: string;
           code: string;
           nowMs?: number;
           telegramChatId: string;
@@ -77,6 +119,7 @@ export type ComponentApi<Name extends string | undefined = string | undefined> =
         },
         {
           agentKey: string;
+          botIdentity: null | string;
           code: string;
           consumerUserId: string;
           createdAt: number;
@@ -99,6 +142,7 @@ export type ComponentApi<Name extends string | undefined = string | undefined> =
         },
         {
           agentKey: string;
+          botIdentity: null | string;
           code: string;
           consumerUserId: string;
           createdAt: number;
@@ -123,6 +167,7 @@ export type ComponentApi<Name extends string | undefined = string | undefined> =
           deepLink: null | string;
           pairing: {
             agentKey: string;
+            botIdentity: null | string;
             code: string;
             consumerUserId: string;
             createdAt: number;
@@ -176,6 +221,7 @@ export type ComponentApi<Name extends string | undefined = string | undefined> =
         { code: string; nowMs?: number },
         null | {
           agentKey: string;
+          botIdentity: null | string;
           code: string;
           consumerUserId: string;
           createdAt: number;
@@ -246,6 +292,7 @@ export type ComponentApi<Name extends string | undefined = string | undefined> =
         { consumerUserId: string },
         null | {
           agentKey: string;
+          botIdentity: null | string;
           boundAt: number;
           consumerUserId: string;
           conversationId: string;
@@ -264,6 +311,7 @@ export type ComponentApi<Name extends string | undefined = string | undefined> =
         { agentKey: string; consumerUserId: string; nowMs?: number },
         {
           agentKey: string;
+          botIdentity: null | string;
           nextAction:
             | "import_token"
             | "configure_webhook"
@@ -286,6 +334,7 @@ export type ComponentApi<Name extends string | undefined = string | undefined> =
         { agentKey: string; consumerUserId: string; nowMs?: number },
         null | {
           agentKey: string;
+          botIdentity: null | string;
           code: string;
           consumerUserId: string;
           createdAt: number;
@@ -338,7 +387,7 @@ export type ComponentApi<Name extends string | undefined = string | undefined> =
         Name
       >;
       importTelegramTokenForAgent: FunctionReference<
-        "mutation",
+        "action",
         "internal",
         {
           agentKey: string;
@@ -346,7 +395,13 @@ export type ComponentApi<Name extends string | undefined = string | undefined> =
           metadata?: Record<string, string>;
           plaintextValue: string;
         },
-        { secretId: string; secretRef: string; version: number },
+        {
+          botIdentity: string;
+          secretId: string;
+          secretRef: string;
+          telegramUsername: null | string;
+          version: number;
+        },
         Name
       >;
       listUserAgents: FunctionReference<
@@ -370,10 +425,26 @@ export type ComponentApi<Name extends string | undefined = string | undefined> =
         }>,
         Name
       >;
+      reconcileTelegramBotIdentityForAgent: FunctionReference<
+        "action",
+        "internal",
+        { agentKey: string; secretRef?: string },
+        {
+          agentKey: string;
+          botIdentity: string;
+          secretRef: null | string;
+          telegramUsername: null | string;
+        },
+        Name
+      >;
       resolveAgentForTelegram: FunctionReference<
         "query",
         "internal",
-        { telegramChatId?: string; telegramUserId?: string },
+        {
+          botIdentity?: string;
+          telegramChatId?: string;
+          telegramUserId?: string;
+        },
         {
           agentKey: null | string;
           consumerUserId: null | string;
@@ -395,6 +466,24 @@ export type ComponentApi<Name extends string | undefined = string | undefined> =
         { revoked: number },
         Name
       >;
+      softResetTelegramBindingsMissingBotIdentity: FunctionReference<
+        "mutation",
+        "internal",
+        {
+          expirePendingPairings?: boolean;
+          nowMs?: number;
+          revokeActiveBindings?: boolean;
+        },
+        {
+          annotatedBindings: number;
+          expiredPairings: number;
+          legacyBindingsMissingBotIdentity: number;
+          pendingPairingsMissingBotIdentity: number;
+          profilesMissingBotIdentity: number;
+          revokedBindings: number;
+        },
+        Name
+      >;
     };
     lib: {
       appendConversationMessages: FunctionReference<
@@ -425,6 +514,7 @@ export type ComponentApi<Name extends string | undefined = string | undefined> =
         "internal",
         {
           agentKey: string;
+          botIdentity?: string;
           consumerUserId: string;
           metadata?: Record<string, string>;
           nowMs?: number;
@@ -434,6 +524,7 @@ export type ComponentApi<Name extends string | undefined = string | undefined> =
         },
         {
           agentKey: string;
+          botIdentity: null | string;
           boundAt: number;
           consumerUserId: string;
           conversationId: string;
@@ -530,6 +621,7 @@ export type ComponentApi<Name extends string | undefined = string | undefined> =
         "internal",
         {
           agentKey: string;
+          botIdentity?: string;
           bridgeConfig?: {
             appBaseUrlMapJsonSecretRef?: string;
             appKey?: string;
@@ -548,8 +640,9 @@ export type ComponentApi<Name extends string | undefined = string | undefined> =
       configureTelegramWebhook: FunctionReference<
         "action",
         "internal",
-        { convexSiteUrl: string; secretRef?: string },
+        { agentKey?: string; convexSiteUrl: string; secretRef?: string },
         {
+          botIdentity: null | string;
           currentUrl: null | string;
           description: string;
           isReady: boolean;
@@ -557,6 +650,7 @@ export type ComponentApi<Name extends string | undefined = string | undefined> =
           lastErrorMessage: null | string;
           ok: boolean;
           pendingUpdateCount: number;
+          secretTokenConfigured: boolean;
           webhookUrl: string;
         },
         Name
@@ -565,6 +659,7 @@ export type ComponentApi<Name extends string | undefined = string | undefined> =
         "mutation",
         "internal",
         {
+          botIdentity?: string;
           code: string;
           nowMs?: number;
           telegramChatId: string;
@@ -572,6 +667,7 @@ export type ComponentApi<Name extends string | undefined = string | undefined> =
         },
         {
           agentKey: string;
+          botIdentity: null | string;
           code: string;
           consumerUserId: string;
           createdAt: number;
@@ -608,6 +704,7 @@ export type ComponentApi<Name extends string | undefined = string | undefined> =
         },
         {
           agentKey: string;
+          botIdentity: null | string;
           code: string;
           consumerUserId: string;
           createdAt: number;
@@ -735,6 +832,7 @@ export type ComponentApi<Name extends string | undefined = string | undefined> =
           deepLink: null | string;
           pairing: {
             agentKey: string;
+            botIdentity: null | string;
             code: string;
             consumerUserId: string;
             createdAt: number;
@@ -971,6 +1069,7 @@ export type ComponentApi<Name extends string | undefined = string | undefined> =
             appBaseUrlMapJson: null | string;
             appKey: null | string;
             baseUrl: null | string;
+            botIdentity: null | string;
             serviceId: null | string;
             serviceKey: null | string;
             serviceKeySecretRef: null | string;
@@ -1033,6 +1132,7 @@ export type ComponentApi<Name extends string | undefined = string | undefined> =
         { code: string; nowMs?: number },
         null | {
           agentKey: string;
+          botIdentity: null | string;
           code: string;
           consumerUserId: string;
           createdAt: number;
@@ -1110,6 +1210,7 @@ export type ComponentApi<Name extends string | undefined = string | undefined> =
         { consumerUserId: string },
         null | {
           agentKey: string;
+          botIdentity: null | string;
           boundAt: number;
           consumerUserId: string;
           conversationId: string;
@@ -1139,6 +1240,7 @@ export type ComponentApi<Name extends string | undefined = string | undefined> =
         { agentKey: string; consumerUserId: string; nowMs?: number },
         {
           agentKey: string;
+          botIdentity: null | string;
           nextAction:
             | "import_token"
             | "configure_webhook"
@@ -1161,6 +1263,7 @@ export type ComponentApi<Name extends string | undefined = string | undefined> =
         { agentKey: string; consumerUserId: string; nowMs?: number },
         null | {
           agentKey: string;
+          botIdentity: null | string;
           code: string;
           consumerUserId: string;
           createdAt: number;
@@ -1263,7 +1366,7 @@ export type ComponentApi<Name extends string | undefined = string | undefined> =
         Name
       >;
       importTelegramTokenForAgent: FunctionReference<
-        "mutation",
+        "action",
         "internal",
         {
           agentKey: string;
@@ -1271,7 +1374,13 @@ export type ComponentApi<Name extends string | undefined = string | undefined> =
           metadata?: Record<string, string>;
           plaintextValue: string;
         },
-        { secretId: string; secretRef: string; version: number },
+        {
+          botIdentity: string;
+          secretId: string;
+          secretRef: string;
+          telegramUsername: null | string;
+          version: number;
+        },
         Name
       >;
       listMessageTemplatesByCompany: FunctionReference<
@@ -1572,6 +1681,18 @@ export type ComponentApi<Name extends string | undefined = string | undefined> =
         { deadLetter: number; processing: number; queuedReady: number },
         Name
       >;
+      reconcileTelegramBotIdentityForAgent: FunctionReference<
+        "action",
+        "internal",
+        { agentKey: string; secretRef?: string },
+        {
+          agentKey: string;
+          botIdentity: string;
+          secretRef: null | string;
+          telegramUsername: null | string;
+        },
+        Name
+      >;
       reconcileWorkers: FunctionReference<
         "action",
         "internal",
@@ -1611,7 +1732,11 @@ export type ComponentApi<Name extends string | undefined = string | undefined> =
       resolveAgentForTelegram: FunctionReference<
         "query",
         "internal",
-        { telegramChatId?: string; telegramUserId?: string },
+        {
+          botIdentity?: string;
+          telegramChatId?: string;
+          telegramUserId?: string;
+        },
         {
           agentKey: null | string;
           consumerUserId: null | string;
@@ -1633,6 +1758,41 @@ export type ComponentApi<Name extends string | undefined = string | undefined> =
         { revoked: number },
         Name
       >;
+      runFlyCleanup: FunctionReference<
+        "action",
+        "internal",
+        {
+          flyApiToken?: string;
+          machineConcurrency?: number;
+          providerConfig?: {
+            appName: string;
+            image: string;
+            kind: "fly" | "runpod" | "ecs";
+            organizationSlug: string;
+            region: string;
+            volumeName: string;
+            volumePath: string;
+            volumeSizeGb: number;
+          };
+          volumeConcurrency?: number;
+        },
+        {
+          appName: string;
+          errors: Array<string>;
+          machineIdsDeleted: Array<string>;
+          machineIdsRemaining: Array<string>;
+          machinesDeleted: number;
+          machinesFound: number;
+          machinesRemaining: number;
+          volumeIdsDeleted: Array<string>;
+          volumeIdsRemaining: Array<string>;
+          volumesDeleted: number;
+          volumesFound: number;
+          volumesRemaining: number;
+          warnings: Array<string>;
+        },
+        Name
+      >;
       secretStatus: FunctionReference<
         "query",
         "internal",
@@ -1757,6 +1917,24 @@ export type ComponentApi<Name extends string | undefined = string | undefined> =
         boolean,
         Name
       >;
+      softResetTelegramBindingsMissingBotIdentity: FunctionReference<
+        "mutation",
+        "internal",
+        {
+          expirePendingPairings?: boolean;
+          nowMs?: number;
+          revokeActiveBindings?: boolean;
+        },
+        {
+          annotatedBindings: number;
+          expiredPairings: number;
+          legacyBindingsMissingBotIdentity: number;
+          pendingPairingsMissingBotIdentity: number;
+          profilesMissingBotIdentity: number;
+          revokedBindings: number;
+        },
+        Name
+      >;
       triggerPushJobNow: FunctionReference<
         "mutation",
         "internal",
@@ -2666,6 +2844,7 @@ export type ComponentApi<Name extends string | undefined = string | undefined> =
             appBaseUrlMapJson: null | string;
             appKey: null | string;
             baseUrl: null | string;
+            botIdentity: null | string;
             serviceId: null | string;
             serviceKey: null | string;
             serviceKeySecretRef: null | string;
@@ -3179,6 +3358,7 @@ export type ComponentApi<Name extends string | undefined = string | undefined> =
         "internal",
         {
           agentKey: string;
+          botIdentity?: string;
           bridgeConfig?: {
             appBaseUrlMapJsonSecretRef?: string;
             appKey?: string;