@saltcorn/copilot 0.8.1 → 0.8.3

package/app-constructor/feedback-action.js

@@ -1,9 +1,9 @@
-const { eval_expression } = require("@saltcorn/data/models/expression");
 const MetaData = require("@saltcorn/data/models/metadata");
 const { interpolate } = require("@saltcorn/data/utils");
 const { getState } = require("@saltcorn/data/db/state");
 const { requirements_tool, task_tool } = require("./tools");
 const { tool_choice } = require("./common");
+const { PromptGenerator } = require("./prompt-generator");
 
 module.exports = {
   description: "Provide user feedback to the AppConstructor",
@@ -71,6 +71,7 @@ module.exports = {
       title_field,
       description_field,
       url_field,
+      research_context,
     },
   }) => {
     const use_title =
@@ -81,85 +82,72 @@ module.exports = {
         : row[description_field];
     const use_url =
       mode === "workflow" ? interpolate(url, row, user) : row[url_field];
-    await MetaData.create({
-      type: "CopilotConstructMgr",
-      name: "feedback",
-      body: { title: use_title, description: use_description, url: use_url },
-      user_id: user?.id,
-    });
-    const spec = await MetaData.findOne({
-      type: "CopilotConstructMgr",
-      name: "spec",
-    });
-    if (!spec) return;
-    const reqAnswer = await getState().functions.llm_generate.run(
-      `The following application is being built:
 
-Description: ${spec.body.description}
-Audience: ${spec.body.audience}
-Core features: ${spec.body.core_features}
-Out of scope: ${spec.body.out_of_scope}
-Visual style: ${spec.body.visual_style}
-
-A new piece of feedback has come in from a user:
-
-Title: ${use_title}
-Description: ${use_description}
+    const generator = await PromptGenerator.createInstance();
+    if (!generator.spec) return;
+
+    const feedbackResearchSection = research_context
+      ? `\nThe user also answered clarifying questions about this feedback:\n\n${research_context}\n`
+      : "";
+
+    let urlSection = "";
+    if (use_url) {
+      const mView = use_url.match(/\/view\/([^/?#]+)/);
+      const mPage = use_url.match(/\/page\/([^/?#]+)/);
+      if (mView)
+        urlSection =
+          `\nThe feedback was submitted from the Saltcorn view named "${mView[1]}"` +
+          ` (URL: ${use_url}).\n`;
+      else if (mPage)
+        urlSection =
+          `\nThe feedback was submitted from the Saltcorn page named "${mPage[1]}"` +
+          ` (URL: ${use_url}).\n`;
+      else urlSection = `\nThe feedback was submitted from: ${use_url}\n`;
+    }
 
-Now use the make_requirements tool to create a single or several (a single is prefered) new requirements that captures this new piece of feedback.
-`,
+    // plan requirements for a feedback
+    const reqAnswer = await getState().functions.llm_generate.run(
+      generator.feedbackReqPrompt({
+        title: use_title,
+        description: use_description,
+        urlSection,
+        feedbackResearchSection,
+      }),
       {
         tools: [requirements_tool],
         ...tool_choice("make_requirements"),
         systemPrompt:
-          "You are a project manager. The user wants to build an application, and you must analyse their application description and any feedback available",
-      },
+          "You are a project manager. The user wants to build an application, and you\n" +
+          "must analyse their application description and any feedback available.",
+      }
     );
     const tc = reqAnswer.getToolCalls()[0];
-    console.log("gotr new requiremenrts", tc.input.requirements);
+    console.log("got new requiremenrts", tc.input.requirements);
 
     for (const reqm of tc.input.requirements)
       await MetaData.create({
         type: "CopilotConstructMgr",
         name: "requirement",
-        body: reqm,
+        body: { ...reqm, source: "feedback", feedback_title: use_title },
         user_id: req.user?.id,
       });
 
+    // plan tasks for the new requirements
     const taskAnswer = await getState().functions.llm_generate.run(
-      `The following application is being built:
-
-Description: ${spec.body.description}
-Audience: ${spec.body.audience}
-Core features: ${spec.body.core_features}
-Out of scope: ${spec.body.out_of_scope}
-Visual style: ${spec.body.visual_style}
-
-This application will be implemented in Saltcorn, a database application development
-environment. 
-
-A new piece of feedback has come in from a user:
-
-Title: ${use_title}
-Description: ${use_description}
-
-A product manager has determined that the following requirements should be added to the list of application requirements:
-
-${tc.input.requirements.map((r) => "  * " + r.requirement).join("\n")}
-
-Your plan for implementing this new fedback and requirements should not include any clarification or questions to the product owner. The 
-information you have been given so far is all that is available. Every step in the plan 
-should be immediately implementable in Saltcorn. You are writing the steps in the plan
-for a person who is competent in using saltcorn but has no other business knowledge.
-
-Now use the plan_tasks tool to create the tasks to implement this new feedback
-`,
+      generator.feedbackPrompt({
+        title: use_title,
+        description: use_description,
+        urlSection,
+        feedbackResearchSection,
+        newRequirements: tc.input.requirements,
+      }),
       {
         tools: [task_tool],
         ...tool_choice("plan_tasks"),
         systemPrompt:
-          "You are a project manager. The user wants to build an application, and you must analyse their application description and any feedback available",
-      },
+          "You are a project manager. The user wants to build an application, and you\n" +
+          "must analyse their application description and any feedback available.",
+      }
     );
     const tcTasks = taskAnswer.getToolCalls()[0];
     console.log("got new tasks", tcTasks.input.tasks);
@@ -168,8 +156,22 @@ Now use the plan_tasks tool to create the tasks to implement this new feedback
       await MetaData.create({
         type: "CopilotConstructMgr",
         name: "task",
-        body: task,
+        body: { ...task, source: "feedback", feedback_title: use_title },
         user_id: req.user?.id,
       });
+
+    await MetaData.create({
+      type: "CopilotConstructMgr",
+      name: "feedback",
+      body: {
+        title: use_title,
+        description: use_description,
+        url: use_url,
+        research_context,
+        scope: row.scope || "overall",
+        phase_idx: row.phase_idx ?? null,
+      },
+      user_id: user?.id,
+    });
   },
 };