@desplega.ai/agent-swarm 1.162.0 → 1.164.0

package/src/http/webhooks.ts

@@ -52,6 +52,7 @@ import {
   isGitLabEnabled,
   verifyGitLabWebhook,
 } from "../gitlab";
+import { gitlabWorkflowActionName } from "../gitlab/workflow-action-name";
 import {
   type KapsoMessageActionResult,
   markKapsoMessageRead,
@@ -450,7 +451,8 @@ export async function handleWebhooks(
         case "merge_request": {
           const mr = body as unknown as MergeRequestEvent;
           const action = mr.object_attributes.action;
-          workflowEventBus.emit(`gitlab.merge_request.${action}`, {
+          const workflowAction = gitlabWorkflowActionName(action);
+          const eventPayload = {
             repo: mr.project.path_with_namespace,
             number: mr.object_attributes.iid,
             title: mr.object_attributes.title,
@@ -459,17 +461,27 @@ export async function handleWebhooks(
             merged: mr.object_attributes.state === "merged",
             html_url: mr.object_attributes.url,
             user_login: mr.user.username,
-          });
+          };
+          workflowEventBus.emit(`gitlab.merge_request.${workflowAction}`, eventPayload);
+          if (workflowAction !== action) {
+            workflowEventBus.emit(`gitlab.merge_request.${action}`, eventPayload);
+          }
           break;
         }
         case "issue": {
           const iss = body as unknown as GitLabIssueEvent;
-          workflowEventBus.emit(`gitlab.issue.${iss.object_attributes.action}`, {
+          const action = iss.object_attributes.action;
+          const workflowAction = gitlabWorkflowActionName(action);
+          const eventPayload = {
             repo: iss.project.path_with_namespace,
             number: iss.object_attributes.iid,
             title: iss.object_attributes.title,
-            action: iss.object_attributes.action,
-          });
+            action,
+          };
+          workflowEventBus.emit(`gitlab.issue.${workflowAction}`, eventPayload);
+          if (workflowAction !== action) {
+            workflowEventBus.emit(`gitlab.issue.${action}`, eventPayload);
+          }
           break;
         }
         case "note": {

package/src/prompts/base-prompt.ts

@@ -222,10 +222,15 @@ export const getBasePrompt = async (args: BasePromptArgs): Promise<string> => {
 
   // I. Tools and skills. Skipped without MCP: the discovery tools are MCP tools.
   if (hasMcp) {
-    const discoveryResult = await resolveTemplateAsync(
-      hasToolSearch ? "system.agent.tool_discovery.search" : "system.agent.tool_discovery.direct",
-      {},
-    );
+    // Amp's MCP tools sit behind its own `tool_search` + `code_exec` with
+    // underscored names, so the generic "load with your tool search" line is not enough.
+    const discoveryEvent =
+      provider === "amp"
+        ? "system.agent.tool_discovery.amp"
+        : hasToolSearch
+          ? "system.agent.tool_discovery.search"
+          : "system.agent.tool_discovery.direct";
+    const discoveryResult = await resolveTemplateAsync(discoveryEvent, {});
     const toolsResult = await resolveTemplateAsync(
       "system.agent.tools_skills",
       renderToolsAndSkillsVars({

package/src/prompts/resolver.ts

@@ -132,7 +132,7 @@ async function resolveTemplateViaHttp(
  * Fallback: resolve from code defaults only (no DB, no HTTP).
  * Used when both DB and HTTP are unavailable.
  */
-function resolveTemplateFromCode(
+export function resolveTemplateFromCode(
   eventType: string,
   variables: Record<string, unknown>,
 ): ResolveResult {

package/src/prompts/session-templates.ts

@@ -331,6 +331,25 @@ registerTemplate({
   category: "system",
 });
 
+/**
+ * First message of a cursor session on the first-message path. Cursor keeps
+ * its own system prompt there, so the swarm's rides on top of the task prompt.
+ */
+registerTemplate({
+  eventType: "system.agent.cursor.first_message",
+  header: "",
+  defaultBody: `<system_instructions>
+{{systemPrompt}}
+</system_instructions>
+
+{{prompt}}`,
+  variables: [
+    { name: "systemPrompt", description: "The swarm system prompt for the session" },
+    { name: "prompt", description: "The task prompt" },
+  ],
+  category: "system",
+});
+
 // ============================================================================
 // I. Tools and skills, K. Repository (appended by base-prompt; the dynamic
 // lists are rendered at the call site and interpolated into the static text)
@@ -354,6 +373,15 @@ registerTemplate({
   category: "system",
 });
 
+registerTemplate({
+  eventType: "system.agent.tool_discovery.amp",
+  header: "",
+  defaultBody:
+    'Swarm tools are not in your tool list. Reach them through `tool_search` and `code_exec`. Their names use underscores, so `store-progress` is `store_progress`. Find one with `tool_search`, then call it from `code_exec`: `import { store_progress } from "agent-swarm"; text(JSON.stringify(await store_progress({ ... })));`. Pass the tool\'s arguments as one object.',
+  variables: [],
+  category: "system",
+});
+
 registerTemplate({
   eventType: "system.agent.tool_discovery.direct",
   header: "",