@yrpri/api 9.0.80 → 9.0.82

package/active-citizen/email_templates/notifications/general_user_notification/style.css

@@ -11,7 +11,7 @@ body {
 
 h1, h2, h3, h4, h5, h6 {
   font-weight: 600;
-  line-height: 1.1em;
+  line-height: 2em;
   margin: 0; }
 
 h1 {

package/active-citizen/engine/notifications/emails_utils.cjs

@@ -104,6 +104,9 @@ const renderTemplateWithLocals = (templatePath, locals, done) => {
     });
 };
 const translateSubject = function (subjectHash) {
+    if (typeof subjectHash === 'string') {
+        return i18n.t(subjectHash);
+    }
     var subject = i18n.t(subjectHash.translateToken);
     if (subjectHash.contentName) {
         subject += ": " + subjectHash.contentName;

package/agents/assistants/modes/tools/agentTools.js

@@ -315,7 +315,7 @@ export class AgentTools extends BaseAssistantTools {
     get showConfigurationWidget() {
         return {
             name: "show_configuration_widget_if_needed_or_user_asks_to_show_it",
-            description: "Show the configuration widget for the current agent, this is needed before running the agent workflow",
+            description: "Show the configuration widget for the current agent. The user needs to fill out the configuration before running the agent workflow to make sure to offer it to the user.",
             type: "function",
             parameters: {
                 type: "object",
@@ -386,7 +386,7 @@ export class AgentTools extends BaseAssistantTools {
                 success: true,
                 clientEvents: [clientEvent],
                 data: {
-                    message: "Submitted configuration for the current agent successfully",
+                    message: "Submitted configuration for the current agent successfully now offer the user to start the agent workflow run",
                 },
             };
         }

package/agents/assistants/modes/tools/models/subscriptions.js

@@ -45,6 +45,7 @@ export class SubscriptionModels {
             return {
                 availablePlans: availablePlans.map((plan) => ({
                     subscriptionPlanId: plan.id,
+                    type: plan.configuration?.type || "coming_soon",
                     name: plan.AgentProduct?.configuration?.displayName || "No name available",
                     description: plan.AgentProduct?.description || "No description available",
                     imageUrl: plan.configuration?.imageUrl || "",

package/agents/assistants/modes/tools/subscriptionTools.js

@@ -30,6 +30,7 @@ export class SubscriptionTools extends BaseAssistantTools {
             for (const subscription of status.availableSubscriptions) {
                 agentChips += `<div class="agent-chips"><yp-agent-chip-for-purchase
           isSubscribed="${true}"
+          type="${subscription.Plan?.configuration.type}"
           agentProductId="${subscription.Plan?.AgentProduct?.id}"
           subscriptionPlanId="${subscription.Plan?.id}"
           agentName="${subscription.Plan?.AgentProduct?.name}"
@@ -87,10 +88,37 @@ export class SubscriptionTools extends BaseAssistantTools {
                 console.log(`list_all_agents_available_for_purchase: ${JSON.stringify(status, null, 2)}`);
             }
             let agentChips = "";
-            const sortedPlans = [...status.availablePlans].sort((a, b) => b.price - a.price);
+            function planTypePriority(type) {
+                switch (type) {
+                    case "coming_soon":
+                        return 0;
+                    case "paid":
+                        return 1;
+                    case "free_trial":
+                        return 2;
+                    default:
+                        return 999;
+                }
+            }
+            // 2) Custom sort function
+            const sortedPlans = [...status.availablePlans].sort((a, b) => {
+                // Compare by type priority first
+                const typeComparison = planTypePriority(a.type) - planTypePriority(b.type);
+                if (typeComparison !== 0) {
+                    // If types differ, that decides the order
+                    return typeComparison;
+                }
+                // If both are the same type and it's "paid", sort by price descending
+                if (a.type === "paid" && b.type === "paid") {
+                    return b.price - a.price;
+                }
+                // Otherwise keep them in the same order if they're not "paid"
+                return 0;
+            });
             for (const agent of sortedPlans) {
                 agentChips += `<yp-agent-chip-for-purchase
           subscriptionPlanId="${agent.subscriptionPlanId}"
+          type="${agent.type}"
           agentName="${agent.name}"
           agentDescription="${agent.description}"
           agentImageUrl="${agent.imageUrl}"
@@ -122,7 +150,7 @@ export class SubscriptionTools extends BaseAssistantTools {
     get subscribeToCurrentAgentPlan() {
         return {
             name: "subscribe_to_current_agent_plan",
-            description: "Subscribe to the current agent plan. User must confirm subscription with the agent name before proceeding. The user needs to subscribe to the agent before it can be used.",
+            description: "Subscribe to the current agent plan. User must confirm subscription with the agent name before proceeding. The user needs to subscribe to the agent before it can be used so make sure to offer it to the user.",
             type: "function",
             parameters: {
                 type: "object",
@@ -182,12 +210,12 @@ export class SubscriptionTools extends BaseAssistantTools {
           maxRunsPerCycle="${result.plan.configuration.max_runs_per_cycle}"
         ></yp-agent-chip-for-purchase></div>`;
             }
-            this.assistant.emit("update-ai-model-session", "Successfully subscribed to agent plan, now offer to start and show the configuration tool/widget");
+            this.assistant.emit("update-ai-model-session", "Successfully subscribed to agent plan, now offer to show the configuration input tool/widget to configure the agent");
             return {
                 success: true,
                 html,
                 data: {
-                    message: "Successfully subscribed to agent plan, now the user can configure the agent",
+                    message: "Successfully subscribed to agent plan, now offer to show the configuration input tool/widget to configure the agent",
                     subscription: result.subscription,
                     subscriptionPlan: result.plan,
                 },

package/agents/managers/notificationAgentQueueManager.js

@@ -40,7 +40,7 @@ export class NotificationAgentQueueManager extends AgentQueueManager {
         }
         const currentWorkflowStep = updatedWorkflow?.steps[updatedWorkflow?.currentStepIndex];
         // Send email notification
-        const subject = `${agentRun.Subscription?.Plan?.AgentProduct?.name} - ${currentWorkflowStep?.name} ready`;
+        const subject = `${agentRun.Subscription?.Plan?.AgentProduct?.name} - ${currentWorkflowStep?.shortName} ready`;
         const content = `Next workflow step is ready: ${currentWorkflowStep?.description}`;
         const bundleId = agentRun.Subscription?.Plan?.AgentProduct?.AgentBundles?.[0]?.id || 1;
         await this.sendNotificationEmail(agent, subject, content, bundleId);
@@ -66,10 +66,10 @@ export class NotificationAgentQueueManager extends AgentQueueManager {
         <div>
           <h1>${subject}</h1>
           <p>${content}</p>
-          ${link ? `<p><a href="${link}">${link}</a></p>` : ""}
         </div>
       `;
-            for (let u = 0; u < Math.min(admins.length, 50); u++) {
+            const MAX_ADMIN_EMAILS = 25;
+            for (let u = 0; u < Math.min(admins.length, MAX_ADMIN_EMAILS); u++) {
                 queue.add("send-one-email", {
                     subject: subject,
                     template: "general_user_notification",
@@ -267,7 +267,7 @@ export class NotificationAgentQueueManager extends AgentQueueManager {
                                 console.error(`NotificationAgentQueueManager: Agent run ID ${agentRunId} not found.`);
                             }
                             if (agent) {
-                                // Send websocket notification
+                                // Send notification
                                 await this.sendNotification(agent, agentRun, type, wsClientId, agentRun.status, returnvalue, agentRunId, updatedWorkflow);
                             }
                             else {

package/agents/models/testData/updateAgentWorkflowConfiguration.js

@@ -1,63 +1,63 @@
 import { YpAgentProduct } from "../agentProduct.js";
 import { YpSubscriptionPlan } from "../subscriptionPlan.js";
 async function setupAgentProductsConfiguration() {
+    const competitionAgentWorkflow = {
+        currentStepIndex: 0,
+        steps: [
+            {
+                name: "Competitor Analysis Wide Search",
+                shortName: "Wide search",
+                description: "Wide search for competitor strategies and market positions.",
+                shortDescription: "Wide search for competitor strategies and market positions.",
+                agentClassUuid: "a1b2c3d4-e5f6-c7c8-a9c0-c1225354f516",
+                type: "agentOps",
+                stepBackgroundColor: "#ffdc2f",
+                stepTextColor: "#211e1c",
+            },
+            {
+                name: "Competitor Analysis People Review",
+                shortName: "Vetting competitors",
+                description: "People Review to vet key competitors",
+                shortDescription: "People Review to vet key competitors",
+                agentClassUuid: "a1b2c3d4-e5f6-c7c8-a9c0-c1225354f516",
+                type: "engagmentFromOutputConnector",
+                stepBackgroundColor: "#e74c3c",
+                stepTextColor: "#ffffff",
+            },
+            {
+                name: "Competitor Analysis Detailed Search",
+                shortName: "Detailed search",
+                description: "Detailed search for competitor strategies and market positions.",
+                shortDescription: "Detailed search for competitor strategies and market positions.",
+                agentClassUuid: "c6e99ac4-e5f6-c7c1-a1c0-c1ab53c4ff16",
+                type: "agentOps",
+                stepBackgroundColor: "#1e90ff",
+                stepTextColor: "#ffffff",
+            },
+            {
+                name: "Competitor Analysis Detailed Search People Review",
+                shortName: "Key competitors",
+                description: "People review of key competitors",
+                shortDescription: "People review of key competitors",
+                agentClassUuid: "c6e99ac4-e5f6-c7c1-a1c0-c1ab53c4ff16",
+                type: "engagmentFromOutputConnector",
+                stepBackgroundColor: "#2ecc71",
+                stepTextColor: "#ffffff",
+            },
+            {
+                name: "Competitors Report",
+                shortName: "Competitor report",
+                description: "Report on the state of the market based on the competitors analysis.",
+                shortDescription: "Report on the state of the market based on the competitors analysis.",
+                agentClassUuid: "1cf3af64-a5f6-a7c1-91c1-51fb13c72f1a",
+                type: "agentOps",
+                stepBackgroundColor: "#d486da",
+                stepTextColor: "#ffffff",
+            },
+        ],
+    };
     const competitorAgentFreeTrial = await YpAgentProduct.findByPk(1);
     if (competitorAgentFreeTrial) {
-        const competitionAgentWorkflow = {
-            currentStepIndex: 0,
-            steps: [
-                {
-                    name: "Competitor Analysis Wide Search",
-                    shortName: "Wide search",
-                    description: "Wide search for competitor strategies and market positions.",
-                    shortDescription: "Wide search for competitor strategies and market positions.",
-                    agentClassUuid: "a1b2c3d4-e5f6-c7c8-a9c0-c1225354f516",
-                    type: "agentOps",
-                    stepBackgroundColor: "#ffdc2f",
-                    stepTextColor: "#211e1c",
-                },
-                {
-                    name: "Competitor Analysis People Review",
-                    shortName: "Vetting competitors",
-                    description: "People Review to vet key competitors",
-                    shortDescription: "People Review to vet key competitors",
-                    agentClassUuid: "a1b2c3d4-e5f6-c7c8-a9c0-c1225354f516",
-                    type: "engagmentFromOutputConnector",
-                    stepBackgroundColor: "#e74c3c",
-                    stepTextColor: "#ffffff",
-                },
-                {
-                    name: "Competitor Analysis Detailed Search",
-                    shortName: "Detailed search",
-                    description: "Detailed search for competitor strategies and market positions.",
-                    shortDescription: "Detailed search for competitor strategies and market positions.",
-                    agentClassUuid: "c6e99ac4-e5f6-c7c1-a1c0-c1ab53c4ff16",
-                    type: "agentOps",
-                    stepBackgroundColor: "#1e90ff",
-                    stepTextColor: "#ffffff",
-                },
-                {
-                    name: "Competitor Analysis Detailed Search People Review",
-                    shortName: "Key competitors",
-                    description: "People review of key competitors",
-                    shortDescription: "People review of key competitors",
-                    agentClassUuid: "c6e99ac4-e5f6-c7c1-a1c0-c1ab53c4ff16",
-                    type: "engagmentFromOutputConnector",
-                    stepBackgroundColor: "#2ecc71",
-                    stepTextColor: "#ffffff",
-                },
-                {
-                    name: "Competitors Report",
-                    shortName: "Competitor report",
-                    description: "Report on the state of the market based on the competitors analysis.",
-                    shortDescription: "Report on the state of the market based on the competitors analysis.",
-                    agentClassUuid: "1cf3af64-a5f6-a7c1-91c1-51fb13c72f1a",
-                    type: "agentOps",
-                    stepBackgroundColor: "#d486da",
-                    stepTextColor: "#ffffff",
-                },
-            ],
-        };
         competitorAgentFreeTrial.set("configuration.workflow", competitionAgentWorkflow);
         competitorAgentFreeTrial.changed("configuration", true);
         await competitorAgentFreeTrial.save();
@@ -65,6 +65,12 @@ async function setupAgentProductsConfiguration() {
     else {
         console.log("CompetitorAgentFreeTrial not found");
     }
+    const competitorAgentPaid = await YpAgentProduct.findByPk(2);
+    if (competitorAgentPaid) {
+        competitorAgentPaid.set("configuration.workflow", competitionAgentWorkflow);
+        competitorAgentPaid.changed("configuration", true);
+        await competitorAgentPaid.save();
+    }
     const fundingAgent = await YpAgentProduct.findByPk(6);
     if (fundingAgent) {
         const fundingAgentWorkflow = {
@@ -141,6 +147,28 @@ async function setupAgentProductsConfiguration() {
                 charCounter: true,
                 text: "Business Description",
             },
+            {
+                uniqueId: "investorGeographicFocus",
+                type: "textFieldLong",
+                description: "Geographic focus of the investors",
+                value: "",
+                maxLength: 250,
+                required: false,
+                rows: 1,
+                charCounter: true,
+                text: "Investor Geographic Focus",
+            },
+            {
+                uniqueId: "investorIndustryFocus",
+                type: "textFieldLong",
+                description: "Industry focus of the investors",
+                value: "",
+                maxLength: 250,
+                required: false,
+                rows: 1,
+                charCounter: true,
+                text: "Investor Industry Focus",
+            }
         ]);
         fundingSubscriptionPlan.changed("configuration", true);
         await fundingSubscriptionPlan.save();
@@ -148,5 +176,20 @@ async function setupAgentProductsConfiguration() {
     else {
         console.log("FundingSubscriptionPlan not found");
     }
+    // Update subscription plans 2-5 to coming_soon
+    for (let planId = 2; planId <= 5; planId++) {
+        const subscriptionPlan = await YpSubscriptionPlan.findByPk(planId);
+        if (subscriptionPlan) {
+            subscriptionPlan.set("configuration.type", "coming_soon");
+            if (planId == 2) {
+                subscriptionPlan.set("configuration.type", "paid");
+            }
+            subscriptionPlan.changed("configuration", true);
+            await subscriptionPlan.save();
+        }
+        else {
+            console.log(`SubscriptionPlan ${planId} not found`);
+        }
+    }
 }
 setupAgentProductsConfiguration();

package/app.js

@@ -298,7 +298,7 @@ export class YourPrioritiesApi {
     }
     addInviteAsAnonMiddleWare() {
         this.app.use(async (req, res, next) => {
-            if (!req.user && req.query.anonInvite && req.query.token) {
+            if (req.query.anonInvite && req.query.token) {
                 const token = req.query.token;
                 try {
                     //TODO: Fix this "as any" in all places
@@ -317,9 +317,15 @@ export class YourPrioritiesApi {
                     });
                     if (invite) {
                         const anonEmail = req.sessionID + "_v3anonymous@citizens.is";
-                        let user = await models.User.findOne({
-                            where: { email: anonEmail },
-                        });
+                        let user;
+                        if (req.user) {
+                            user = req.user;
+                        }
+                        else {
+                            user = await models.User.findOne({
+                                where: { email: anonEmail },
+                            });
+                        }
                         if (!user) {
                             user = await models.User.create({
                                 email: anonEmail,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yrpri/api",
-  "version": "9.0.80",
+  "version": "9.0.82",
   "license": "MIT",
   "author": "Robert Bjarnason & Citizens Foundation",
   "repository": {