@okrlinkhub/agent-factory 0.2.3 → 0.2.5

package/src/component/queue.ts

@@ -53,10 +53,12 @@ const bridgeProfileConfigValidator = v.object({
   serviceId: v.optional(v.string()),
   appKey: v.optional(v.string()),
   serviceKeySecretRef: v.optional(v.string()),
+  appBaseUrlMapJsonSecretRef: v.optional(v.string()),
 });
 
 const bridgeRuntimeConfigValidator = v.object({
   baseUrl: v.union(v.null(), v.string()),
+  appBaseUrlMapJson: v.union(v.null(), v.string()),
   serviceId: v.union(v.null(), v.string()),
   appKey: v.union(v.null(), v.string()),
   serviceKey: v.union(v.null(), v.string()),
@@ -66,6 +68,7 @@ const bridgeRuntimeConfigValidator = v.object({
 const BRIDGE_SECRET_REFS = {
   serviceKey: "agent-bridge.serviceKey",
   baseUrl: "agent-bridge.baseUrl",
+  baseUrlMapJson: "agent-bridge.baseUrlMapJson",
   serviceId: "agent-bridge.serviceId",
   appKey: "agent-bridge.appKey",
 } as const;
@@ -91,6 +94,31 @@ export const enqueueMessage = mutation({
     if (!profile || !profile.enabled) {
       throw new Error(`Agent profile '${args.agentKey}' not found or disabled`);
     }
+    const resolvedProviderUserId =
+      profile.providerUserId && profile.providerUserId.trim().length > 0
+        ? profile.providerUserId.trim()
+        : args.payload.providerUserId;
+
+    const providerUserIdStr =
+      typeof resolvedProviderUserId === "string" &&
+      resolvedProviderUserId.trim().length > 0
+        ? resolvedProviderUserId.trim()
+        : null;
+
+    if (providerUserIdStr === null) {
+      throw new Error(
+        `providerUserId is required but missing: profile.providerUserId=${JSON.stringify(profile.providerUserId)}, payload.providerUserId=${JSON.stringify(args.payload.providerUserId)}`,
+      );
+    }
+
+    const payload = {
+      ...args.payload,
+      providerUserId: providerUserIdStr,
+      metadata: {
+        ...(args.payload.metadata ?? {}),
+        providerUserId: providerUserIdStr,
+      },
+    };
 
     const existingConversation = await ctx.db
       .query("conversations")
@@ -116,7 +144,7 @@ export const enqueueMessage = mutation({
     const messageId = await ctx.db.insert("messageQueue", {
       conversationId: args.conversationId,
       agentKey: args.agentKey,
-      payload: args.payload,
+      payload,
       status: "queued",
       priority,
       scheduledFor: args.scheduledFor ?? nowMs,
@@ -209,6 +237,7 @@ export const appendConversationMessages = mutation({
 export const upsertAgentProfile = mutation({
   args: {
     agentKey: v.string(),
+    providerUserId: v.optional(v.string()),
     version: v.string(),
     soulMd: v.string(),
     clientMd: v.optional(v.string()),
@@ -1413,10 +1442,12 @@ async function resolveBridgeRuntimeConfig(
       serviceId?: string;
       appKey?: string;
       serviceKeySecretRef?: string;
+      appBaseUrlMapJsonSecretRef?: string;
     };
   },
 ): Promise<{
   baseUrl: string | null;
+  appBaseUrlMapJson: string | null;
   serviceId: string | null;
   appKey: string | null;
   serviceKey: string | null;
@@ -1427,6 +1458,7 @@ async function resolveBridgeRuntimeConfig(
   }
 
   const configuredServiceKeySecretRef = profile.bridgeConfig.serviceKeySecretRef ?? null;
+  const configuredBaseUrlMapSecretRef = profile.bridgeConfig.appBaseUrlMapJsonSecretRef ?? null;
   const [serviceKeySecretRef, serviceKey] = await resolveFirstActiveSecretValue(
     ctx,
     getScopedSecretRefCandidates(
@@ -1440,6 +1472,14 @@ async function resolveBridgeRuntimeConfig(
     ctx,
     getScopedSecretRefCandidates(profile.agentKey, BRIDGE_SECRET_REFS.baseUrl),
   );
+  const [, appBaseUrlMapJsonFromSecret] = await resolveFirstActiveSecretValue(
+    ctx,
+    getScopedSecretRefCandidates(
+      profile.agentKey,
+      BRIDGE_SECRET_REFS.baseUrlMapJson,
+      configuredBaseUrlMapSecretRef,
+    ),
+  );
   const [, serviceIdFromSecret] = await resolveFirstActiveSecretValue(
     ctx,
     getScopedSecretRefCandidates(profile.agentKey, BRIDGE_SECRET_REFS.serviceId),
@@ -1451,6 +1491,7 @@ async function resolveBridgeRuntimeConfig(
 
   return {
     baseUrl: profile.bridgeConfig.baseUrl ?? baseUrlFromSecret,
+    appBaseUrlMapJson: appBaseUrlMapJsonFromSecret,
     serviceId: profile.bridgeConfig.serviceId ?? serviceIdFromSecret,
     appKey: profile.bridgeConfig.appKey ?? appKeyFromSecret,
     serviceKey,
@@ -1464,6 +1505,7 @@ function getBridgeSecretRefsForProfile(
     | {
         enabled: boolean;
         serviceKeySecretRef?: string;
+        appBaseUrlMapJsonSecretRef?: string;
       }
     | undefined,
 ): Array<string> {
@@ -1472,6 +1514,8 @@ function getBridgeSecretRefsForProfile(
   }
   const refs: Array<string> = [
     bridgeConfig.serviceKeySecretRef ?? `${BRIDGE_SECRET_REFS.serviceKey}.${agentKey}`,
+    bridgeConfig.appBaseUrlMapJsonSecretRef ??
+      `${BRIDGE_SECRET_REFS.baseUrlMapJson}.${agentKey}`,
   ];
   return refs;
 }

package/src/component/schema.ts

@@ -4,6 +4,7 @@ import { v } from "convex/values";
 export default defineSchema({
   agentProfiles: defineTable({
     agentKey: v.string(),
+    providerUserId: v.optional(v.string()),
     version: v.string(),
     soulMd: v.string(),
     clientMd: v.optional(v.string()),
@@ -16,6 +17,7 @@ export default defineSchema({
         serviceId: v.optional(v.string()),
         appKey: v.optional(v.string()),
         serviceKeySecretRef: v.optional(v.string()),
+        appBaseUrlMapJsonSecretRef: v.optional(v.string()),
       }),
     ),
     enabled: v.boolean(),
@@ -227,4 +229,140 @@ export default defineSchema({
   })
     .index("by_conversationId", ["conversationId"])
     .index("by_agentKey_and_lastHydratedAt", ["agentKey", "lastHydratedAt"]),
+
+  messagePushTemplates: defineTable({
+    companyId: v.string(),
+    templateKey: v.string(),
+    title: v.string(),
+    text: v.string(),
+    periodicity: v.union(
+      v.literal("manual"),
+      v.literal("daily"),
+      v.literal("weekly"),
+      v.literal("monthly"),
+    ),
+    suggestedTimes: v.array(
+      v.union(
+        v.object({
+          kind: v.literal("daily"),
+          time: v.string(),
+        }),
+        v.object({
+          kind: v.literal("weekly"),
+          weekday: v.number(),
+          time: v.string(),
+        }),
+        v.object({
+          kind: v.literal("monthly"),
+          dayOfMonth: v.union(v.number(), v.literal("last")),
+          time: v.string(),
+        }),
+      ),
+    ),
+    enabled: v.boolean(),
+    createdBy: v.string(),
+    updatedBy: v.string(),
+    createdAt: v.number(),
+    updatedAt: v.number(),
+  })
+    .index("by_companyId", ["companyId"])
+    .index("by_companyId_and_templateKey", ["companyId", "templateKey"])
+    .index("by_companyId_and_enabled", ["companyId", "enabled"]),
+
+  messagePushJobs: defineTable({
+    companyId: v.string(),
+    consumerUserId: v.string(),
+    agentKey: v.optional(v.string()),
+    sourceTemplateId: v.optional(v.id("messagePushTemplates")),
+    title: v.string(),
+    text: v.string(),
+    periodicity: v.union(
+      v.literal("manual"),
+      v.literal("daily"),
+      v.literal("weekly"),
+      v.literal("monthly"),
+    ),
+    timezone: v.string(),
+    schedule: v.union(
+      v.object({
+        kind: v.literal("manual"),
+      }),
+      v.object({
+        kind: v.literal("daily"),
+        time: v.string(),
+      }),
+      v.object({
+        kind: v.literal("weekly"),
+        weekday: v.number(),
+        time: v.string(),
+      }),
+      v.object({
+        kind: v.literal("monthly"),
+        dayOfMonth: v.union(v.number(), v.literal("last")),
+        time: v.string(),
+      }),
+    ),
+    enabled: v.boolean(),
+    nextRunAt: v.optional(v.number()),
+    lastRunAt: v.optional(v.number()),
+    lastRunKey: v.optional(v.string()),
+    createdAt: v.number(),
+    updatedAt: v.number(),
+  })
+    .index("by_enabled_and_nextRunAt", ["enabled", "nextRunAt"])
+    .index("by_consumerUserId", ["consumerUserId"])
+    .index("by_consumerUserId_and_enabled", ["consumerUserId", "enabled"])
+    .index("by_companyId", ["companyId"])
+    .index("by_companyId_and_enabled", ["companyId", "enabled"])
+    .index("by_sourceTemplateId", ["sourceTemplateId"]),
+
+  messagePushDispatches: defineTable({
+    jobId: v.id("messagePushJobs"),
+    consumerUserId: v.string(),
+    runKey: v.string(),
+    scheduledFor: v.number(),
+    enqueuedMessageId: v.optional(v.id("messageQueue")),
+    status: v.union(
+      v.literal("enqueued"),
+      v.literal("skipped"),
+      v.literal("failed"),
+    ),
+    error: v.optional(v.string()),
+    createdAt: v.number(),
+  })
+    .index("by_jobId_and_runKey", ["jobId", "runKey"])
+    .index("by_consumerUserId_and_createdAt", ["consumerUserId", "createdAt"]),
+
+  messagePushBroadcasts: defineTable({
+    companyId: v.string(),
+    title: v.string(),
+    text: v.string(),
+    target: v.literal("all_active_agents"),
+    requestedBy: v.string(),
+    requestedAt: v.number(),
+    status: v.union(v.literal("running"), v.literal("done"), v.literal("failed")),
+    totalTargets: v.number(),
+    enqueuedCount: v.number(),
+    failedCount: v.number(),
+    completedAt: v.optional(v.number()),
+  })
+    .index("by_companyId_and_requestedAt", ["companyId", "requestedAt"])
+    .index("by_status", ["status"]),
+
+  messagePushBroadcastDispatches: defineTable({
+    broadcastId: v.id("messagePushBroadcasts"),
+    consumerUserId: v.string(),
+    agentKey: v.string(),
+    runKey: v.string(),
+    enqueuedMessageId: v.optional(v.id("messageQueue")),
+    status: v.union(
+      v.literal("enqueued"),
+      v.literal("skipped"),
+      v.literal("failed"),
+    ),
+    error: v.optional(v.string()),
+    createdAt: v.number(),
+  })
+    .index("by_broadcastId_and_consumerUserId", ["broadcastId", "consumerUserId"])
+    .index("by_broadcastId_and_createdAt", ["broadcastId", "createdAt"]),
 });