@saltcorn/copilot 0.8.1 → 0.8.3

package/app-constructor/tools.js

@@ -46,12 +46,19 @@ const task_tool = {
           type: "array",
           items: {
             type: "object",
-            required: ["requirement", "priority"],
+            required: [
+              "name",
+              "description",
+              "priority",
+              "depends_on",
+              "task_type",
+            ],
             additionalProperties: false,
             properties: {
               name: {
                 type: "string",
-                description: "A short name for the task",
+                description:
+                  "A short unique name for the task (snake_case). Every other task that depends on this task must use exactly this name in their depends_on array.",
               },
               description: {
                 type: "string",
@@ -65,11 +72,17 @@ const task_tool = {
               depends_on: {
                 type: "array",
                 description:
-                  "The names of the tasks that must be completed before this tasks can be started",
+                  "Names of tasks in THIS plan that must complete before this task starts. Every name listed here MUST exactly match the name of another task in this same plan_tasks call. Never reference a task name that is not present in the tasks array.",
                 items: {
                   type: "string",
                 },
               },
+              task_type: {
+                type: "string",
+                enum: ["plugin", "data_model", "feature"],
+                description:
+                  "plugin: specialized — installs a plugin from the Saltcorn plugin store. data_model: specialized — creates or modifies database tables/fields only. feature: broad catch-all — creates views, pages, triggers, workflows, or anything else not covered by the specialized types. Order: plugin tasks first, then data_model, then feature.",
+              },
             },
           },
         },
@@ -78,4 +91,4 @@ const task_tool = {
   },
 };
 
-module.exports = { requirements_tool,task_tool };
+module.exports = { requirements_tool, task_tool };

package/app-constructor/view.js

@@ -36,14 +36,20 @@ const {
 const { getState } = require("@saltcorn/data/db/state");
 const renderLayout = require("@saltcorn/markup/layout");
 const { viewname } = require("./common");
-const { requirementsList, req_routes } = require("./requirements");
-const { showSchema, schema_routes } = require("./schema");
-const { makeTaskList, task_routes } = require("./tasks");
-const { errorList, error_routes } = require("./errors");
+const { showSchema, schema_routes, schemaStaticScript } = require("./schema");
+const { task_routes } = require("./tasks");
+const {
+  errorList,
+  doCreateErrorFixTask,
+  error_routes,
+  errTableStaticHtml,
+} = require("./errors");
+const { req_routes, requirementsStaticScript } = require("./requirements");
 const { feedbackList, feedback_routes } = require("./feedback");
-const { progressList, progress_routes } = require("./progress");
+const { progress_routes } = require("./progress");
 const { runNextTask } = require("./run_task");
-const { makeTaskChart } = require("./taskchart");
+const { researchPanel, research_routes } = require("./research");
+const { phasesPanel, phasesStaticScript, phase_routes } = require("./phases");
 
 const get_state_fields = () => [];
 
@@ -56,37 +62,14 @@ const makeSpecForm = async (req) => {
   });
 
   return new Form({
-    blurb: "Provide a high-level description of the application",
+    blurb: "Describe the application you want to build",
     fields: [
       {
-        name: "description",
-        label: "Description",
-        type: "String",
-        fieldview: "textarea",
-      },
-      {
-        name: "audience",
-        label: "Audience",
-        type: "String",
-        fieldview: "textarea",
-      },
-      {
-        name: "core_features",
-        label: "Core features",
-        type: "String",
-        fieldview: "textarea",
-      },
-      {
-        name: "out_of_scope",
-        label: "Out of scope",
-        type: "String",
-        fieldview: "textarea",
-      },
-      {
-        name: "visual_style",
-        label: "Visual style",
+        name: "specification",
+        label: "Specification",
         type: "String",
         fieldview: "textarea",
+        attributes: { rows: 10 },
       },
     ],
     xhrSubmit: true,
@@ -95,14 +78,95 @@ const makeSpecForm = async (req) => {
   });
 };
 
+const specDepsModal = `
+<div class="modal fade" id="specDepsModal" tabindex="-1" aria-hidden="true">
+  <div class="modal-dialog">
+    <div class="modal-content">
+      <div class="modal-header">
+        <h5 class="modal-title">Specification changed</h5>
+        <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
+      </div>
+      <div class="modal-body">
+        <p>The following items were generated from the previous specification
+        and may now be outdated. Select any you want to clear:</p>
+        <div id="spec-deps-checks"></div>
+      </div>
+      <div class="modal-footer">
+        <button type="button" class="btn btn-secondary" id="specDepsKeepBtn">Save (keep all)</button>
+        <button type="button" class="btn btn-primary" id="specDepsSaveBtn">Clear selected &amp; save</button>
+      </div>
+    </div>
+  </div>
+</div>`;
+
+const specDepsScript = (vn) =>
+  script(
+    domReady(`
+const _specVn = ${JSON.stringify(vn)};
+const form = document.querySelector('form[action*="submit_specs"]');
+if (!form) return;
+const btn = form.querySelector('button[onclick*="ajaxSubmitForm"]');
+if (!btn) return;
+
+const doSaveSpec = () => {
+  const data = {};
+  for (const [k, v] of new FormData(form)) data[k] = v;
+  view_post(_specVn, 'submit_specs', data);
+};
+
+// Remove Saltcorn's inline onclick and replace with our own handler
+btn.removeAttribute('onclick');
+btn.addEventListener('click', (e) => {
+  e.preventDefault();
+  e.stopPropagation();
+  view_post(_specVn, 'check_spec_dependencies', {}, (deps) => {
+    const items = [];
+    if (deps.hasResearch) items.push({ key: 'clearResearch', label: 'Research questions & answers' });
+    if (deps.hasRequirements) items.push({ key: 'clearRequirements', label: 'Requirements' });
+    if (deps.hasSchema) items.push({ key: 'clearSchema', label: 'Schema' });
+    if (deps.hasPhases) items.push({ key: 'clearPhases', label: 'Phases' });
+    if (deps.hasTasks) items.push({ key: 'clearTasks', label: 'Tasks' });
+    if (!items.length) { doSaveSpec(); return; }
+    document.getElementById('spec-deps-checks').innerHTML = items.map((item) =>
+      '<div class="form-check">' +
+        '<input class="form-check-input" type="checkbox" id="dep_' + item.key +
+        '" value="' + item.key + '" checked>' +
+        '<label class="form-check-label" for="dep_' + item.key + '">' + item.label + '</label>' +
+        '</div>'
+    ).join('');
+    new bootstrap.Modal(document.getElementById('specDepsModal')).show();
+  });
+});
+
+document.getElementById('specDepsSaveBtn').addEventListener('click', () => {
+  const modal = bootstrap.Modal.getInstance(document.getElementById('specDepsModal'));
+  const clearData = {};
+  document.querySelectorAll('#spec-deps-checks input:checked').forEach((cb) => {
+    clearData[cb.value] = '1';
+  });
+  modal.hide();
+  if (Object.keys(clearData).length) {
+    const formData = {};
+    for (const [k, v] of new FormData(form)) formData[k] = v;
+    view_post(_specVn, 'clear_and_save_spec', Object.assign(formData, clearData));
+  } else {
+    doSaveSpec();
+  }
+});
+
+document.getElementById('specDepsKeepBtn').addEventListener('click', () => {
+  bootstrap.Modal.getInstance(document.getElementById('specDepsModal')).hide();
+  doSaveSpec();
+});
+`)
+  );
+
 const run = async (table_id, viewname, cfg, state, { req, res }) => {
   const specForm = await makeSpecForm(req);
-  const reqList = await requirementsList(req);
-  const taskList = await makeTaskList(req);
+  const research = await researchPanel(req);
+  const phases = await phasesPanel(req);
   const errList = await errorList(req);
   const feedbacks = await feedbackList(req);
-  const progress = await progressList(req);
-  const taskChart = await makeTaskChart(req);
   const schema = await showSchema(req);
   const layout = {
     type: "tabs",
@@ -111,26 +175,40 @@ const run = async (table_id, viewname, cfg, state, { req, res }) => {
     lazyLoadViews: true,
     titles: [
       "Specification",
-      "Requirements",
+      "Research",
+      "Phases",
       "Schema",
-      "Tasks",
-      "Task chart",
-      "Progress",
       "Feedback",
       "Errors",
     ],
     contents: [
       {
         type: "blank",
-        contents: div({ class: "mt-2" }, renderForm(specForm, req.csrfToken())),
+        contents: div(
+          { class: "mt-2" },
+          renderForm(specForm, req.csrfToken()),
+          specDepsModal,
+          specDepsScript(viewname)
+        ),
+      },
+      { type: "blank", contents: research },
+      { type: "blank", contents: div(phasesStaticScript, phases) },
+      {
+        type: "blank",
+        contents: div(
+          schemaStaticScript,
+          div({ id: "schema-list-area" }, schema)
+        ),
       },
-      { type: "blank", contents: reqList },
-      { type: "blank", contents: schema },
-      { type: "blank", contents: taskList },
-      { type: "blank", contents: taskChart },
-      { type: "blank", contents: progress },
       { type: "blank", contents: feedbacks },
-      { type: "blank", contents: errList },
+      {
+        type: "blank",
+        contents: div(
+          requirementsStaticScript,
+          errTableStaticHtml,
+          div({ id: "err-list-area" }, errList)
+        ),
+      },
     ],
     deeplink: true,
     tabsStyle: "Tabs",
@@ -144,6 +222,119 @@ const run = async (table_id, viewname, cfg, state, { req, res }) => {
   });
 };
 
+const check_spec_dependencies = async (
+  table_id,
+  viewname,
+  config,
+  body,
+  { req, res }
+) => {
+  const hasResearch =
+    !!(await MetaData.findOne({
+      type: "CopilotConstructMgr",
+      name: "research_questions",
+    })) ||
+    !!(await MetaData.findOne({
+      type: "CopilotConstructMgr",
+      name: "research_answers",
+    }));
+  const hasRequirements =
+    (
+      await MetaData.find({
+        type: "CopilotConstructMgr",
+        name: "requirement",
+      })
+    ).length > 0;
+  const hasSchema = !!(await MetaData.findOne({
+    type: "CopilotConstructMgr",
+    name: "schema",
+  }));
+  const hasPhases =
+    (
+      await MetaData.find({
+        type: "CopilotConstructMgr",
+        name: "phase",
+      })
+    ).length > 0;
+  const hasTasks =
+    (
+      await MetaData.find({
+        type: "CopilotConstructMgr",
+        name: "task",
+      })
+    ).length > 0;
+  return {
+    json: { hasResearch, hasRequirements, hasPhases, hasSchema, hasTasks },
+  };
+};
+
+// Clears selected dependencies, saves the spec, and reloads — all in one round trip
+const clear_and_save_spec = async (
+  table_id,
+  viewname,
+  config,
+  body,
+  { req, res }
+) => {
+  const {
+    _csrf,
+    clearResearch,
+    clearRequirements,
+    clearSchema,
+    clearPhases,
+    clearTasks,
+    ...specBody
+  } = body;
+  if (clearResearch) {
+    for (const name of ["research_questions", "research_answers"]) {
+      const md = await MetaData.findOne({ type: "CopilotConstructMgr", name });
+      if (md) await md.delete();
+    }
+  }
+  if (clearRequirements) {
+    const rs = await MetaData.find({
+      type: "CopilotConstructMgr",
+      name: "requirement",
+    });
+    for (const r of rs) await r.delete();
+  }
+  if (clearSchema) {
+    const md = await MetaData.findOne({
+      type: "CopilotConstructMgr",
+      name: "schema",
+    });
+    if (md) await md.delete();
+  }
+  if (clearTasks) {
+    const ts = await MetaData.find({
+      type: "CopilotConstructMgr",
+      name: "task",
+    });
+    for (const t of ts) await t.delete();
+  }
+  if (clearPhases) {
+    const ps = await MetaData.find({
+      type: "CopilotConstructMgr",
+      name: "phase",
+    });
+    for (const ph of ps) await ph.delete();
+  }
+  const existing = await MetaData.findOne({
+    type: "CopilotConstructMgr",
+    name: "spec",
+  });
+  if (existing)
+    await db.update("_sc_metadata", { body: specBody }, existing.id);
+  else
+    await MetaData.create({
+      type: "CopilotConstructMgr",
+      name: "spec",
+      user_id: req.user?.id || undefined,
+      body: specBody,
+    });
+  return { json: { reload_page: true } };
+};
+
 const submit_specs = async (table_id, viewname, config, body, { req, res }) => {
   const { _csrf, ...spec } = body;
   const existing = await MetaData.findOne({
@@ -159,6 +350,42 @@ const submit_specs = async (table_id, viewname, config, body, { req, res }) => {
       user_id: req.user?.id || undefined,
       body: spec,
     });
+  return {
+    json: {
+      success: "ok",
+      notify: "Specification saved",
+      notify_type: "success",
+    },
+  };
+};
+
+// Creates fix tasks for application errors recorded while self-healing was off.
+const healPendingErrors = async () => {
+  const settings = await MetaData.findOne({
+    type: "CopilotConstructMgr",
+    name: "settings",
+  });
+  if (!settings?.body?.error_heal) return;
+  const spec = await MetaData.findOne({
+    type: "CopilotConstructMgr",
+    name: "spec",
+  });
+  if (!spec) return;
+  const errors = await MetaData.find({
+    type: "CopilotConstructMgr",
+    name: "error",
+  });
+  for (const err of errors) {
+    if (
+      err.body.source !== "application" ||
+      err.body.fix_task_created ||
+      err.body.cannot_fix_reason
+    )
+      continue;
+    doCreateErrorFixTask(err, null).catch((e) =>
+      console.error("healPendingErrors failed", e)
+    );
+  }
 };
 
 const virtual_triggers = () => {
@@ -170,20 +397,49 @@ const virtual_triggers = () => {
           type: "CopilotConstructMgr",
           name: "error",
         });
-        const messages = new Set(existing.map((m) => m.body?.error?.stack));
-        if (!messages.has(row.stack))
-          await MetaData.create({
+        // Allow a new record once a fix task exists — same error recurring after a fix gets another task.
+        const unfixedDuplicate =
+          row.stack &&
+          existing.find(
+            (m) =>
+              m.body?.error?.stack === row.stack && !m.body?.fix_task_created
+          );
+        if (unfixedDuplicate) return;
+
+        const source = (row.stack || "").includes("/app-constructor/")
+          ? "constructor"
+          : "application";
+
+        const errorMd = await MetaData.create({
+          type: "CopilotConstructMgr",
+          name: "error",
+          body: { status: "New", error: row, source },
+          user_id: null,
+        });
+
+        if (source === "application") {
+          const settings = await MetaData.findOne({
             type: "CopilotConstructMgr",
-            name: "error",
-            body: { status: "New", error: row },
-            user_id: null,
+            name: "settings",
           });
+          if (settings?.body?.error_heal) {
+            const spec = await MetaData.findOne({
+              type: "CopilotConstructMgr",
+              name: "spec",
+            });
+            if (spec)
+              doCreateErrorFixTask(errorMd, null).catch((e) =>
+                console.error("auto error fix task failed", e)
+              );
+          }
+        }
       },
     },
     {
       when_trigger: "Often",
       run: async () => {
         await runNextTask();
+        await healPendingErrors();
       },
     },
   ];
@@ -198,12 +454,16 @@ module.exports = {
   run,
   routes: {
     submit_specs,
+    check_spec_dependencies,
+    clear_and_save_spec,
     ...req_routes,
+    ...research_routes,
     ...task_routes,
     ...error_routes,
     ...feedback_routes,
     ...progress_routes,
     ...schema_routes,
+    ...phase_routes,
   },
   virtual_triggers,
 };