@saltcorn/agents 0.7.5 → 0.7.7

package/action.js

@@ -90,24 +90,28 @@ module.exports = {
     run_id,
     req,
     is_sub_agent,
+    agent_view_config,
+    dyn_updates,
     ...rest
   }) => {
     const userinput = interpolate(configuration.prompt, row, user);
 
-    const run = run_id
-      ? await WorkflowRun.findOne({ id: run_id })
-      : await WorkflowRun.create({
-          status: "Running",
-          started_by: user?.id,
-          trigger_id: trigger_id || undefined,
-          context: {
-            implemented_fcall_ids: [],
-            interactions: [{ role: "user", content: userinput }],
-            funcalls: {},
-          },
-        });
-    if (run_id)
-      run.context.interactions.push({ role: "user", content: userinput });
+    const run =
+      rest.run ||
+      (run_id
+        ? await WorkflowRun.findOne({ id: run_id })
+        : await WorkflowRun.create({
+            status: "Running",
+            started_by: user?.id,
+            trigger_id: trigger_id || undefined,
+            context: {
+              implemented_fcall_ids: [],
+              interactions: [],
+              funcalls: {},
+            },
+          }));
+
+    run.context.interactions.push({ role: "user", content: userinput });
     return await process_interaction(
       run,
       configuration,
@@ -115,9 +119,9 @@ module.exports = {
       undefined,
       [],
       row,
-      { stream: false },
-      false,
-      is_sub_agent
+      agent_view_config || { stream: false },
+      dyn_updates,
+      is_sub_agent,
     );
   },
 };

package/agent-view.js

@@ -18,6 +18,7 @@ const {
   input,
   h4,
   h3,
+  h2,
   style,
   h5,
   button,
@@ -192,13 +193,15 @@ const realTimeCollabScript = (viewname, rndid, layout) => {
         ['${view.getRealTimeEventName(
           "STREAM_CHUNK",
         )}' + \`?page_load_tag=\${_sc_pageloadtag}\`]: async (data) => {
+          $(".agent-waiting-indicator").remove();
           window['stream scratch ${viewname} ${rndid}'].push(data.content)
           const rendered = md.render(window['stream scratch ${viewname} ${rndid}'].join(""));
-          $('form.agent-view div.next_response_scratch').html(
+          $('div.next_response_scratch').html(
             (${JSON.stringify(layout || "")} || "").startsWith("Modern chat")
               ? '<div class="chat-message chat-assistant"><div class="chat-avatar"><i class="fas fa-robot"></i></div><div class="chat-bubble">' + rendered + '</div></div>'
               : rendered
           );
+          scrollAgentToBottom();
         }
       }
     };
@@ -434,7 +437,7 @@ const run = async (
   const rndid = Math.floor(Math.random() * 16777215).toString(16);
   const input_form = form(
     {
-      onsubmit: `event.preventDefault();spin_send_button();view_post('${viewname}', 'interact', new FormData(this), ${dyn_updates ? "null" : "processCopilotResponse"});return false;`,
+      onsubmit: `event.preventDefault();const _fd=new FormData(this);spin_send_button();view_post('${viewname}', 'interact', _fd, ${dyn_updates ? "null" : "processCopilotResponse"});return false;`,
       class: ["form-namespace copilot mt-2 agent-view"],
       method: "post",
     },
@@ -492,8 +495,7 @@ const run = async (
       explainer && small({ class: "explainer" }, i(explainer)),
     ),
     stream &&
-      realTimeCollabScript(viewname, rndid, layout) +
-        div({ class: "next_response_scratch" }),
+      realTimeCollabScript(viewname, rndid, layout),
   );
 
   const isModernSidebar = layout && layout.startsWith("Modern chat");
@@ -612,6 +614,7 @@ const run = async (
       req.__("Sessions"),
     ),
     div({ id: "copilotinteractions" }, runInteractions),
+    stream ? div({ class: "next_response_scratch" }) : "",
     input_form,
     style(
       `div.interaction-segment:not(:first-child) {border-top: 1px solid #e7e7e7; }
@@ -685,6 +688,14 @@ const run = async (
     margin-bottom: 0px;
     display: block;
     text-overflow: ellipsis;}
+            /* Typing / Waiting Indicator */
+            .agent-waiting-indicator { display:flex; align-items:center; padding:0.75rem 1rem; }
+            .typing-dots { display:flex; gap:4px; align-items:center; }
+            .typing-dots span { width:8px; height:8px; border-radius:50%; background:#6c757d; animation:typingBounce 1.4s infinite ease-in-out both; }
+            .typing-dots span:nth-child(1) { animation-delay:-0.32s; }
+            .typing-dots span:nth-child(2) { animation-delay:-0.16s; }
+            .typing-dots span:nth-child(3) { animation-delay:0s; }
+            @keyframes typingBounce { 0%,80%,100%{transform:scale(.6);opacity:.4} 40%{transform:scale(1);opacity:1} }
             /* Modern Chat Layout */
             .modern-chat-layout {
               display: flex;
@@ -811,6 +822,21 @@ const run = async (
             .modern-chat-layout .chat-user .chat-bubble table th {
               background: rgba(255,255,255,0.1);
             }
+            /* Skill attribution badge */
+            .modern-chat-layout .chat-bubble .badge.bg-info {
+              display: inline-block;
+              margin-bottom: 6px;
+              font-size: 0.7rem;
+              font-weight: 600;
+              letter-spacing: 0.3px;
+              text-transform: uppercase;
+              opacity: 0.85;
+            }
+            .modern-chat-layout .chat-bubble .card.bg-secondary-subtle {
+              border: none;
+              background-color: rgba(0,0,0,0.03) !important;
+              margin-bottom: 0.5rem;
+            }
             /* Input area for modern chat */
             .modern-chat-layout .copilot-entry {
               border-top: 1px solid var(--tblr-border-color, var(--bs-border-color, #dee2e6));
@@ -881,6 +907,16 @@ const run = async (
     script(domReady(`$( "#inputuserinput" ).autogrow({paddingBottom: 20});`)),
     script(
       `
+    function scrollAgentToBottom() {
+      const container = document.getElementById('copilotinteractions');
+      if (container) {
+        if (container.scrollHeight > container.clientHeight) {
+          container.scrollTo({ top: container.scrollHeight, behavior: 'smooth' });
+        }
+        const inputForm = document.querySelector('form.agent-view');
+        if (inputForm) inputForm.scrollIntoView({ behavior: 'smooth', block: 'end' });
+      }
+    }
     function close_session_list() {
       $("div.prev-runs-list").hide().parents(".col-3").removeClass("col-3").addClass("was-col-3").parent().children(".col-9").removeClass("col-9").addClass("col-12")
       $("div.open-prev-runs").show()
@@ -916,14 +952,21 @@ const run = async (
         if(user_input && (!${JSON.stringify(dyn_updates)}))
           $("#copilotinteractions").append(wrapSegment('<p>'+user_input+'</p>'+fileBadge, "You", true))
         $("textarea[name=userinput]").val("")
-        $('form.agent-view div.next_response_scratch').html("")
+        $('div.next_response_scratch').html("")
         window['stream scratch ${viewname} ${rndid}'] = []
-        if(res.response)
-            $("#copilotinteractions").append(res.response)
+        if(res.response) {
+            $(".agent-waiting-indicator").remove();
+            $("#copilotinteractions").append(res.response);
+            scrollAgentToBottom();
+        }
     }
     window.processCopilotResponse = processCopilotResponse;
     window.final_agent_response = () => {
       $("#sendbuttonicon").attr("class","far fa-paper-plane");
+      $(".agent-waiting-indicator").remove();
+      $("textarea[name=userinput]").prop("disabled", false).attr("placeholder", ${JSON.stringify(placeholder || "How can I help you?")}).focus();
+      $(".copilot-entry .submit-button").css("pointer-events", "");
+      scrollAgentToBottom();
     }
     window._agentDT = new DataTransfer();
     function setAgentFiles(files) {
@@ -1046,6 +1089,14 @@ const run = async (
     }
     function spin_send_button() {
       $("#sendbuttonicon").attr("class","fas fa-spinner fa-spin");
+      $("textarea[name=userinput]").prop("disabled", true).attr("placeholder", "Waiting for response...");
+      $(".copilot-entry .submit-button").css("pointer-events", "none");
+      const isModernLayout = ${JSON.stringify((layout || "").startsWith("Modern chat"))};
+      const indicator = isModernLayout
+        ? '<div class="agent-waiting-indicator chat-message chat-assistant"><div class="chat-avatar"><i class="fas fa-robot"></i></div><div class="chat-bubble"><div class="typing-dots"><span></span><span></span><span></span></div></div></div>'
+        : '<div class="agent-waiting-indicator"><div class="typing-dots"><span></span><span></span><span></span></div></div>';
+      $('div.next_response_scratch').before(indicator);
+      scrollAgentToBottom();
     };`,
       stream &&
         domReady(
@@ -1238,12 +1289,80 @@ const debug_info = async (table_id, viewname, config, body, { req, res }) => {
     );
     sysPrompt = complArgs.systemPrompt;
   }
+  const apiJson = JSON.stringify(run.context.api_interactions, null, 2);
   const debug_html = div(
-    div(h4("System prompt"), pre(text(escapeHtml(sysPrompt)))),
+    { class: "accordion", id: "debugAccordion" },
     div(
-      h4("API interactions"),
-      pre(
-        text(escapeHtml(JSON.stringify(run.context.api_interactions, null, 2))),
+      { class: "accordion-item" },
+      h2(
+        { class: "accordion-header", id: "debugHeadPrompt" },
+        button(
+          {
+            class: "accordion-button collapsed",
+            type: "button",
+            "data-bs-toggle": "collapse",
+            "data-bs-target": "#debugCollapsePrompt",
+            "aria-expanded": "false",
+            "aria-controls": "debugCollapsePrompt",
+          },
+          "System prompt",
+        ),
+      ),
+      div(
+        {
+          id: "debugCollapsePrompt",
+          class: "accordion-collapse collapse",
+          "aria-labelledby": "debugHeadPrompt",
+          "data-bs-parent": "#debugAccordion",
+        },
+        div(
+          { class: "accordion-body" },
+          pre({ style: "white-space:pre-wrap" }, text(escapeHtml(sysPrompt))),
+        ),
+      ),
+    ),
+    div(
+      { class: "accordion-item" },
+      h2(
+        { class: "accordion-header", id: "debugHeadAPI" },
+        button(
+          {
+            class: "accordion-button",
+            type: "button",
+            "data-bs-toggle": "collapse",
+            "data-bs-target": "#debugCollapseAPI",
+            "aria-expanded": "true",
+            "aria-controls": "debugCollapseAPI",
+          },
+          "API interactions",
+        ),
+      ),
+      div(
+        {
+          id: "debugCollapseAPI",
+          class: "accordion-collapse collapse show",
+          "aria-labelledby": "debugHeadAPI",
+          "data-bs-parent": "#debugAccordion",
+        },
+        div(
+          { class: "accordion-body" },
+          button(
+            {
+              class: "btn btn-sm btn-outline-secondary mb-2",
+              onclick: `
+                var t=document.getElementById('debugApiPre').textContent;
+                navigator.clipboard.writeText(t).then(function(){
+                  var b=event.target;b.textContent='Copied!';
+                  setTimeout(function(){b.textContent='Copy to clipboard'},1500)
+                })`,
+            },
+            "Copy to clipboard",
+          ),
+          pre(
+            { id: "debugApiPre", style: "white-space:pre-wrap" },
+            text(escapeHtml(apiJson)),
+          ),
+        ),
       ),
     ),
   );

package/common.js

@@ -489,6 +489,8 @@ const process_interaction = async (
               chat,
               req,
               run,
+              agent_view_config: agentsViewCfg,
+              dyn_updates,
               async generate(prompt, opts = {}) {
                 generateUsed = true;
                 return await sysState.functions.llm_generate.run(prompt, {
@@ -513,7 +515,7 @@ const process_interaction = async (
             });
             if (generateUsed)
               await addToContext(run, {
-                interactions: chat,
+                interactions: run.context.interactions,
               });
             if (postprocres.stop) stop = true;
             if (postprocres.add_system_prompt)
@@ -544,35 +546,35 @@ const process_interaction = async (
                   layout,
                 ),
               );
-              //replace tool response with this
-              // run.context.interactions.forEach((ic) => {});
+
               const result = add_resp;
               await sysState.functions.llm_add_message.run(
                 "assistant",
+
                 !result || typeof result === "string"
-                  ? {
-                      type: "text",
-                      value: result || "Action run",
-                    }
-                  : {
-                      type: "json",
-                      value: JSON.parse(JSON.stringify(result)),
-                    },
+                  ? result || "Action run"
+                  : JSON.stringify(result),
+
                 {
                   chat: run.context.interactions,
                 },
               );
-              if (!postprocres.stop)
-                await sysState.functions.llm_add_message.run(
-                  "user",
-                  {
-                    type: "text",
-                    value: "Continue",
-                  },
-                  {
-                    chat: run.context.interactions,
-                  },
-                );
+              await addToContext(run, {
+                interactions: run.context.interactions,
+              });
+            }
+            if (!postprocres.stop) {
+              await sysState.functions.llm_add_message.run(
+                "user",
+                postprocres.follow_up_prompt || "Continue with the query",
+                {
+                  chat: run.context.interactions,
+                },
+              );
+              await addToContext(run, {
+                interactions: run.context.interactions,
+              });
+              myHasResult = true;
             }
             if (postprocres.add_user_action && viewname) {
               const user_actions = Array.isArray()
@@ -635,7 +637,7 @@ const process_interaction = async (
   return {
     json: {
       success: "ok",
-      ...(is_sub_agent ? { raw_responses } : {}),
+      ...(is_sub_agent && !stream ? { raw_responses } : {}),
       response: [...prevResponses, ...responses].join(""),
       run_id: run?.id,
     },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@saltcorn/agents",
-  "version": "0.7.5",
+  "version": "0.7.7",
   "description": "AI agents for Saltcorn",
   "main": "index.js",
   "dependencies": {

package/skills/GenerateAndRunJsCode.js

@@ -18,6 +18,24 @@ const { validID } = require("@saltcorn/markup/layout_utils");
 const vm = require("vm");
 const { replaceUserContinue } = require("../common");
 
+function extractCode(str) {
+  // Try ```javascript fence
+  if (str.includes("```javascript")) {
+    return str.split("```javascript")[1].split("```")[0];
+  }
+  // Try ```js fence
+  if (str.includes("```js\n") || str.includes("```js\r")) {
+    return str.split(/```js\s/)[1].split("```")[0];
+  }
+  // Try generic ``` fence (code is between first and second ```)
+  const fenceMatch = str.match(/```\s*\n([\s\S]*?)```/);
+  if (fenceMatch) {
+    return fenceMatch[1];
+  }
+  // No fences found - return raw string
+  return str;
+}
+
 //const { fieldProperties } = require("./helpers");
 
 class GenerateAndRunJsCodeSkill {
@@ -105,6 +123,14 @@ class GenerateAndRunJsCodeSkill {
         sublabel: "Allow calls to functions from codepages and modules",
         type: "Bool",
       },
+      {
+        name: "follow_up_prompt",
+        label: "Follow-up prompt",
+        sublabel:
+          "If set, the agent will continue processing after code execution with this prompt. Leave empty to stop after code result.",
+        type: "String",
+        fieldview: "textarea",
+      },
       ...(Table.subClass
         ? [
             {
@@ -171,26 +197,34 @@ return { x, y }
 
 ${extra || ""}
 
+CRITICAL: Your response must contain ONLY a single JavaScript code block wrapped in \`\`\`javascript ... \`\`\` fences. Do not include any text, explanation, or commentary before or after the code block.
+
 Now generate the JavaScript code required by the user.`,
           );
           getState().log(
             6,
             "Generated code:\n--BEGIN CODE--\n" + str + "\n--END CODE--\n",
           );
-          const js_code = str.includes("```javascript")
-            ? str.split("```javascript")[1].split("```")[0]
-            : str;
+          const js_code = extractCode(str);
           return js_code;
         };
         const js_code = await gen_the_code();
         emit_update("Running code");
+        const ensureResult = (res) => {
+          if (res && typeof res === "object") return JSON.stringify(res);
+          if (res !== undefined && res !== null && res !== "") return res;
+          return "Code executed successfully but returned no output.";
+        };
         try {
           const res = await this.runCode(js_code, { user: req.user });
-          //console.log("code response", res);
           getState().log(6, "Code answer: " + JSON.stringify(res));
+          const effectiveRes = ensureResult(res);
           return {
-            stop: typeof res === "string",
-            add_response: res,
+            stop: typeof res === "string" && !this.follow_up_prompt,
+            add_response: effectiveRes,
+            ...(this.follow_up_prompt
+              ? { follow_up_prompt: this.follow_up_prompt }
+              : {}),
           };
         } catch (err) {
           console.error(err);
@@ -208,13 +242,27 @@ ${err.message}
 
 Correct this error.
 `);
-          const res = await this.runCode(retry_js_code, { user: req.user });
-          //console.log("code response", res);
-          getState().log(6, "Code retry answer: " + JSON.stringify(res));
-          return {
-            stop: typeof res === "string",
-            add_response: res,
-          };
+          try {
+            const res = await this.runCode(retry_js_code, {
+              user: req.user,
+            });
+            getState().log(6, "Code retry answer: " + JSON.stringify(res));
+            const effectiveRes = ensureResult(res);
+            return {
+              stop: typeof res === "string" && !this.follow_up_prompt,
+              add_response: effectiveRes,
+              ...(this.follow_up_prompt
+                ? { follow_up_prompt: this.follow_up_prompt }
+                : {}),
+            };
+          } catch (retryErr) {
+            console.error(retryErr);
+            return {
+              add_response:
+                "Error: code generation failed after retry: " +
+                retryErr.message,
+            };
+          }
         }
       },
       function: {

package/skills/Subagent.js

@@ -52,6 +52,12 @@ class SubagentToSkill {
         sublabel: `Optional. The prompt initialising the subagent. Example: "Continue answering my query using the tool now at you disposal"`,
         type: "String",
       },
+      {
+        name: "handoff_prompt",
+        label: "Handoff prompt",
+        sublabel: `Optional. A prompt to process the results of the subagent. Example: "Analyze this response in relation to my query"`,
+        type: "String",
+      },
     ];
   }
 
@@ -78,8 +84,10 @@ class SubagentToSkill {
         emit_update,
         run,
         chat,
+        agent_view_config,
+        dyn_updates,
       }) => {
-        getState().log(6, "Running subagent", this.agent_name);        
+        getState().log(6, "Running subagent", this.agent_name);
         const subres = await agent_action.run({
           row: {},
           configuration: {
@@ -89,15 +97,20 @@ class SubagentToSkill {
               "Your instructions and tools have changed. Continue answering my query using the instructions and tools at you disposal, if any",
           },
           user: req.user,
-          run_id: run.id,
+          run,
           is_sub_agent: true,
+          agent_view_config,
+          dyn_updates,
           req,
         });
-        getState().log(6, "Subagent response", subres.json.raw_responses);
-
-        if (subres.json.raw_responses)
-          return { add_responses: subres.json.raw_responses };
+        getState().log(6, "Subagent response", JSON.stringify(subres, null, 2));
+        //if (subres.json.raw_responses)
+        //  return { add_responses: subres.json.raw_responses };
         return {
+          ...(this.handoff_prompt
+            ? { follow_up_prompt: this.handoff_prompt }
+            : { stop: true }),
+
           //stop: true,
           //add_response: result,
         };

package/tests/action.test.js

@@ -38,7 +38,7 @@ beforeAll(async () => {
   });
 
   await getState().refresh_triggers(false);
-  //await getState().setConfig("log_level", 6);
+  await getState().setConfig("log_level", 6);
 });
 
 jest.setTimeout(40000);
@@ -46,6 +46,13 @@ jest.setTimeout(40000);
 const user = { id: 1, role_id: 1 };
 const action = require("../action");
 
+const getLastInteraction = async ({ run_id }) => {
+  const run = await WorkflowRuns.findOne({ id: run_id });
+  return JSON.stringify(
+    run.context.interactions[run.context.interactions.length - 1],
+  );
+};
+
 for (const nameconfig of require("./configs")) {
   const { name, ...config } = nameconfig;
   describe("agent action with " + name, () => {
@@ -114,7 +121,10 @@ for (const nameconfig of require("./configs")) {
         user,
         req: { user },
       });
-      expect(result.json.response).toContain("987");
+
+      const lastInteraction = await getLastInteraction(result.json);
+
+      expect(result.json.response || lastInteraction).toContain("987");
     });
     it("run multiple subagents concurrenty", async () => {
       const configuration = { ...require("./agentcfg").agent1 };
@@ -134,7 +144,8 @@ for (const nameconfig of require("./configs")) {
         user,
         req: { user },
       });
-      expect(result.json.response).toContain("987");
+      const lastInteraction = await getLastInteraction(result.json);
+      expect(lastInteraction).toContain("987");
     });
   });