@okrlinkhub/agent-factory 0.2.4 → 0.2.6

package/src/component/queue.ts

@@ -94,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")
@@ -119,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,
@@ -212,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()),
@@ -745,6 +771,7 @@ export const releaseExpiredLeases = internalMutation({
     let requeued = 0;
     let unlocked = 0;
     for (const message of stuck) {
+      const claimedWorkerId = message.claimedBy;
       await ctx.db.patch(message._id, {
         status: "queued",
         scheduledFor: nowMs,
@@ -768,6 +795,24 @@ export const releaseExpiredLeases = internalMutation({
         await ctx.db.patch(conversation._id, { processingLock: undefined });
         unlocked += 1;
       }
+
+      if (claimedWorkerId) {
+        const worker = await ctx.db
+          .query("workers")
+          .withIndex("by_workerId", (q) => q.eq("workerId", claimedWorkerId))
+          .unique();
+        if (worker && worker.status === "active") {
+          const nextLoad = Math.max(0, worker.load - 1);
+          const nextScheduledShutdownAt =
+            nextLoad === 0 ? nowMs + DEFAULT_CONFIG.scaling.idleTimeoutMs : undefined;
+          await ctx.db.patch(worker._id, {
+            load: nextLoad,
+            heartbeatAt: nowMs,
+            scheduledShutdownAt: nextScheduledShutdownAt,
+            stoppedAt: undefined,
+          });
+        }
+      }
     }
 
     return { requeued, unlocked };
@@ -797,6 +842,7 @@ export const releaseStuckJobs = mutation({
     let requeued = 0;
     let unlocked = 0;
     for (const message of stuck) {
+      const claimedWorkerId = message.claimedBy;
       await ctx.db.patch(message._id, {
         status: "queued",
         scheduledFor: nowMs,
@@ -820,6 +866,24 @@ export const releaseStuckJobs = mutation({
         await ctx.db.patch(conversation._id, { processingLock: undefined });
         unlocked += 1;
       }
+
+      if (claimedWorkerId) {
+        const worker = await ctx.db
+          .query("workers")
+          .withIndex("by_workerId", (q) => q.eq("workerId", claimedWorkerId))
+          .unique();
+        if (worker && worker.status === "active") {
+          const nextLoad = Math.max(0, worker.load - 1);
+          const nextScheduledShutdownAt =
+            nextLoad === 0 ? nowMs + DEFAULT_CONFIG.scaling.idleTimeoutMs : undefined;
+          await ctx.db.patch(worker._id, {
+            load: nextLoad,
+            heartbeatAt: nowMs,
+            scheduledShutdownAt: nextScheduledShutdownAt,
+            stoppedAt: undefined,
+          });
+        }
+      }
     }
 
     return { requeued, unlocked };

package/src/component/scheduler.ts

@@ -123,6 +123,21 @@ async function runReconcileWorkerPool(
   const workspaceId = args.workspaceId ?? "default";
   const provider = resolveProvider(providerConfig.kind, flyApiToken);
 
+  // Always recover expired leases before scaling decisions.
+  // This prevents stale "processing" jobs from blocking queue drain forever.
+  try {
+    await ctx.runMutation((internal.queue as any).releaseExpiredLeases, {
+      nowMs,
+      limit: 500,
+    });
+  } catch (error) {
+    console.warn(
+      `[scheduler] releaseExpiredLeases failed: ${
+        error instanceof Error ? error.message : String(error)
+      }`,
+    );
+  }
+
   const activeConversationCount: number = await ctx.runQuery(
     (internal.queue as any).getActiveConversationCountForScheduler,
     { nowMs, limit: 1000 },
@@ -204,8 +219,9 @@ async function runReconcileWorkerPool(
       `[scheduler] dedicated volume mode enabled for ${providerConfig.volumeName}; clamping desired workers to 1`,
     );
   }
+  const staleHeartbeatCutoff = nowMs - DEFAULT_CONFIG.lease.staleAfterMs;
   const activeWorkers = workerRows.filter(
-    (worker) => worker.status === "active",
+    (worker) => worker.status === "active" && worker.heartbeatAt > staleHeartbeatCutoff,
   ).length;
 
   if (targetActiveWorkers > activeWorkers) {

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()),
@@ -228,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"]),
 });