paperclip-plugin-mattermost 0.15.2 → 0.16.1

package/README.md

@@ -14,6 +14,7 @@ Your [Paperclip](https://github.com/paperclipai/paperclip) agents as Mattermost
   - **Single-choice questions** get a button per option. Your pick is posted on the task as a comment from you, which wakes the agent.
 - **Access control.** Choose who may talk to agents: everyone, or only the people you pick. Each person can be limited to some agents, and people outside Paperclip can be added by email.
 - **Agents work in Mattermost themselves.** Through plugin API routes that only agents can call, each agent reads the channels its bot is in, posts, reacts, searches, and DMs the people allowed to talk to it, always as its own bot. Each company gets a Mattermost skill that tells agents how, and saving the settings adds it to every agent with a bot, so they can message people from tasks and scheduled runs too.
+- **Steering.** A message you send in a thread while its agent is still working reaches that run: the agent reads it between steps (and an agent waiting at its computer stops waiting to read it), so "stop" or a correction lands mid-task. One it read is marked ✅ and not run again.
 - **Agents work with agents.** An agent mentioning another agent starts it, and it answers in the thread. After a set number of agent-to-agent messages in a thread (10 by default, set in settings), they pause until a person replies.
 - **Work channels.** For an investigation, incident or project, an agent opens a private channel (`inc-checkout-5xx`), pulls in the people and agents it needs, and ties it to a Paperclip task. Task comments and status changes show up in the channel. When the task is done or cancelled, the channel is archived and the outcome is posted back where the work was asked for.
 - **Ask first.** Some actions wait for an approver to click Approve: `@channel`, `@all` and `@here`, public channels, and adding people to a channel the agent didn't create. Agents can't change or archive channels they didn't create, remove anyone, or touch team and server settings.
@@ -83,7 +84,7 @@ PAPERCLIP_REF=<commit> node build.mjs   # build for another Paperclip version
 Bump `version` in `package.json` and `src/manifest.ts`, commit, then tag and push:
 
 ```bash
-git tag -a v0.15.2 -m v0.15.2 && git push origin main v0.15.2
+git tag -a v0.16.1 -m v0.16.1 && git push origin main v0.16.1
 ```
 
 GitHub Actions builds, tests and publishes to npm through npm trusted publishing, so no npm token is involved.

package/dist/manifest.js

@@ -32,6 +32,13 @@ tell whoever you are working with and carry on. A 403 says why something is not
 - Do not write @channel, @all or @here unless everyone in the channel must be notified: it needs
   approval.
 
+## While you work
+
+If people write in the thread you are answering while you work (a correction, "stop", "never mind"),
+it reaches you: GET /mm/inbox returns those messages, and any other /mm call you make carries them
+as \`newMessages\`. Check /mm/inbox between steps of anything that takes more than a minute or two,
+and act on what you find then. Each message is handed to you once; it is not sent again afterwards.
+
 ## Calls
 
 Reading (GET):
@@ -42,6 +49,7 @@ Reading (GET):
 - /mm/search?q=words                        search messages in your channels
 - /mm/people?q=name                         find people and agents by name
 - /mm/requests/{id}                         an approval request you made
+- /mm/inbox                                 what people wrote in your thread while you were working
 
 Talking (POST, JSON body):
 - /mm/post      {"channel": "...", "text": "...", "threadId": "optional post id to reply to"}
@@ -74,7 +82,7 @@ var route = (routeKey, method, path) => ({ routeKey, method, path, auth: "agent"
 var manifest = {
   id: "mattermost-bridge",
   apiVersion: 1,
-  version: "0.15.2",
+  version: "0.16.1",
   displayName: "Mattermost",
   description: "Every agent becomes its own Mattermost bot. DM an agent or mention it in a channel and it answers in the thread, showing its steps as it works; follow-ups continue the conversation. Paperclip approvals arrive with Approve / Reject buttons.",
   author: "Haseeb Azhar",
@@ -90,6 +98,7 @@ var manifest = {
     "plugin.state.write",
     "http.outbound",
     "events.subscribe",
+    "events.emit",
     "webhooks.receive",
     "approvals.read",
     "approvals.respond",
@@ -110,6 +119,7 @@ var manifest = {
   // checks the caller is an agent and scopes it to that agent's company.
   apiRoutes: [
     route("help", "GET", "/mm/help"),
+    route("inbox", "GET", "/mm/inbox"),
     route("channels", "GET", "/mm/channels"),
     route("channel-posts", "GET", "/mm/channels/:channel/posts"),
     route("thread", "GET", "/mm/posts/:postId/thread"),

package/dist/worker.js

@@ -45032,7 +45032,9 @@ var Actions = class {
     this.d = deps;
   }
   /** One route call. `params` are the route's path parameters, `input` its query or body. */
-  async handle(agentId, routeKey, params, input2) {
+  runId = null;
+  async handle(agentId, routeKey, params, input2, runId = null) {
+    this.runId = runId;
     const bot = this.d.bot(agentId);
     if (!bot) return bad(409, "You have no Mattermost bot in this company yet (your agent may be switched off in the plugin's settings).");
     try {
@@ -45184,7 +45186,7 @@ var Actions = class {
     const text2 = str3(input2.text);
     if (!text2) return bad(400, "text is empty");
     const ch = await this.channel(bot, str3(input2.channel));
-    const threadId = str3(input2.threadId);
+    const threadId = str3(input2.threadId) || await this.d.taskThread?.(agentId, this.runId, ch.id).catch(() => null) || "";
     const waiting = await this.gate(agentId, canPost(text2), "post", `post in ~${ch.name}: "${text2.slice(0, 200)}"`, { channelId: ch.id, threadId, text: text2 });
     if (waiting) return waiting;
     return ok(await this.doPost(bot, ch.id, threadId, text2));
@@ -45207,7 +45209,8 @@ var Actions = class {
     const verdict = canDm(await this.d.canTalk(user2.id, agentId));
     if (!verdict.ok) return bad(403, `Not allowed: ${verdict.why}.`);
     const channel2 = await bot.request("POST", "/channels/direct", [bot.botUserId, user2.id]);
-    return ok(await this.doPost(bot, channel2.id, "", text2));
+    const threadId = str3(input2.threadId) || await this.d.taskThread?.(agentId, this.runId, channel2.id).catch(() => null) || "";
+    return ok(await this.doPost(bot, channel2.id, threadId, text2));
   }
   // ---- channels ----------------------------------------------------------------------
   async created() {
@@ -45456,6 +45459,13 @@ tell whoever you are working with and carry on. A 403 says why something is not
 - Do not write @channel, @all or @here unless everyone in the channel must be notified: it needs
   approval.
 
+## While you work
+
+If people write in the thread you are answering while you work (a correction, "stop", "never mind"),
+it reaches you: GET /mm/inbox returns those messages, and any other /mm call you make carries them
+as \`newMessages\`. Check /mm/inbox between steps of anything that takes more than a minute or two,
+and act on what you find then. Each message is handed to you once; it is not sent again afterwards.
+
 ## Calls
 
 Reading (GET):
@@ -45466,6 +45476,7 @@ Reading (GET):
 - /mm/search?q=words                        search messages in your channels
 - /mm/people?q=name                         find people and agents by name
 - /mm/requests/{id}                         an approval request you made
+- /mm/inbox                                 what people wrote in your thread while you were working
 
 Talking (POST, JSON body):
 - /mm/post      {"channel": "...", "text": "...", "threadId": "optional post id to reply to"}
@@ -45513,6 +45524,11 @@ function mentions(text2) {
 function stripMention(text2, username) {
   return text2.replace(new RegExp(`(^|[^\\w@])@${username.replace(/[.-]/g, "\\$&")}\\b[:,]?`, "gi"), "$1").replace(/\s{2,}/g, " ").trim();
 }
+function absoluteLinks(text2, base) {
+  if (!base) return text2;
+  const root = base.replace(/\/+$/, "");
+  return text2.replace(/\]\((\/(?!\/)[^)\s]*)\)/g, (_m, path3) => `](${root}${path3})`);
+}
 function splitMessage(text2, max = MAX_POST) {
   const parts = [];
   let rest = text2;
@@ -45538,6 +45554,16 @@ var Bridge = class {
   choiceButtons;
   canTalk;
   turnLimit;
+  /** Paperclip's public URL, for agents' relative links. */
+  linkBase = "";
+  /**
+   * Steering: messages people send in a thread while its agent is mid-run, kept for that agent to
+   * read in the same run (`takeInbox`). One it read is not run again afterwards.
+   */
+  inbox = /* @__PURE__ */ new Map();
+  delivered = /* @__PURE__ */ new Set();
+  /** Told when a person writes to an agent that is busy (the computer plugin wakes a waiting agent). */
+  onSteer = null;
   constructor(roster, directory, agents, store, log = () => {
   }, files = null, choiceButtons = null, canTalk = null, turnLimit = DEFAULT_TURN_LIMIT) {
     this.files = files;
@@ -45559,6 +45585,7 @@ var Bridge = class {
     this.seen.add(evt.post.id);
     if (this.seen.size > 5e3) this.seen.delete(this.seen.values().next().value);
     const rootId = evt.post.root_id || evt.post.id;
+    this.steer(evt, rootId);
     const prev = this.queues.get(rootId) ?? Promise.resolve();
     const next = prev.then(() => this.process(evt, rootId)).catch((err) => this.log("bridge error", { err: String(err) }));
     this.queues.set(rootId, next);
@@ -45567,6 +45594,36 @@ var Bridge = class {
     });
     return next;
   }
+  /** A person writing in a thread whose agent is mid-run: offered to that run as well as queued. */
+  steer(evt, rootId) {
+    const { post } = evt;
+    if (!post.root_id || post.type || post.props?.from_webhook === "true" || post.props?.from_paperclip === "true" || post.props?.from_bot === "true") return;
+    if (this.roster().isBot(post.user_id) || !post.message?.trim()) return;
+    for (const [agentId, at] of this.active) {
+      if (at.rootId !== rootId) continue;
+      const list2 = this.inbox.get(agentId) ?? [];
+      list2.push({ id: post.id, rootId, userId: post.user_id, text: post.message.slice(0, 4e3), at: Date.now() });
+      this.inbox.set(agentId, list2.slice(-20));
+      this.onSteer?.(agentId, post.id);
+    }
+  }
+  /** Whether the agent has unread messages from people in the thread it is answering. */
+  hasInbox(agentId) {
+    return (this.inbox.get(agentId)?.length ?? 0) > 0;
+  }
+  /** What people wrote in the agent's thread since its run started; each is handed over once. */
+  async takeInbox(agentId) {
+    const list2 = this.inbox.get(agentId) ?? [];
+    this.inbox.delete(agentId);
+    const out = [];
+    for (const m of list2) {
+      this.delivered.add(m.id);
+      const who = await this.directory.userName(m.userId).catch(() => ({ username: m.userId, displayName: m.userId }));
+      out.push({ from: `${who.displayName} (@${who.username})`, text: m.text, at: new Date(m.at).toISOString() });
+    }
+    if (this.delivered.size > 2e3) this.delivered.delete(this.delivered.values().next().value);
+    return out;
+  }
   /** The thread an agent is answering right now, for posts its run causes (approvals). */
   activeThread(agentId) {
     return this.active.get(agentId) ?? null;
@@ -45644,6 +45701,11 @@ var Bridge = class {
       if (!fromAgent && post.root_id) await this.resetTurns(rootId);
       return;
     }
+    if (this.delivered.has(post.id)) {
+      await member.chat.react(post.id, "white_check_mark").catch(() => {
+      });
+      return;
+    }
     if (!await this.allowAgentTurn(rootId, fromAgent, member, post.channel_id)) return;
     const text2 = stripMention(post.message, member.username);
     const fileIds = this.files ? post.file_ids ?? [] : [];
@@ -45680,7 +45742,7 @@ var Bridge = class {
     const attached = fileIds.length ? await this.files.receive(member.chat, post.id, fileIds) : [];
     const outbox = this.files ? await this.files.outbox(post.id).catch(() => null) : null;
     const fromAgent = this.roster().isBot(post.user_id);
-    const prompt = `${sender.displayName} (@${sender.username}${fromAgent ? ", another agent" : ""}) wrote to you (@${member.username}) in ${where} on Mattermost. Your reply is posted back there, so answer in Markdown. To offer choices, end your reply with one line \`choices: First | Second\` (2 to ${MAX_CHOICES} short options); they are shown as buttons, and the pick comes back as the next message. You can also read channels, post, message people, mention other agents and open work channels in Mattermost: GET <your Paperclip API URL>/api/plugins/mattermost-bridge/api/mm/help shows how.` + (history ? `
+    const prompt = `${sender.displayName} (@${sender.username}${fromAgent ? ", another agent" : ""}) wrote to you (@${member.username}) in ${where} on Mattermost. Your reply is posted back there, so answer in Markdown. To offer choices, end your reply with one line \`choices: First | Second\` (2 to ${MAX_CHOICES} short options); they are shown as buttons, and the pick comes back as the next message. You can also read channels, post, message people, mention other agents and open work channels in Mattermost: GET <your Paperclip API URL>/api/plugins/mattermost-bridge/api/mm/help shows how. If this takes more than a minute or two, check GET \u2026/api/plugins/mattermost-bridge/api/mm/inbox between steps: it returns anything people write in this thread meanwhile (a correction, "stop", "never mind"); act on it then, as it is not sent to you again.` + (history ? `
 
 Earlier in this thread (oldest first):
 ${history}
@@ -45709,11 +45771,13 @@ To send files back with your reply, save them in ${outbox}` : "");
       }
     } catch (err) {
       if (this.active.get(member.agentId) === here) this.active.delete(member.agentId);
+      this.inbox.delete(member.agentId);
       await member.chat.createPost(post.channel_id, rootId, `:warning: ${member.agentName} could not answer: ${String(err?.message ?? err).slice(0, 500)}`);
       return;
     }
     if (this.active.get(member.agentId) === here) this.active.delete(member.agentId);
-    const { text: body, choices } = extractChoices(reply ?? "");
+    this.inbox.delete(member.agentId);
+    const { text: body, choices } = extractChoices(absoluteLinks(reply ?? "", this.linkBase));
     const origin = { channelId: post.channel_id, rootId, channelType: evt.channelType, channelName: evt.channelName };
     const buttons = choices.length && this.choiceButtons ? this.choiceButtons(origin, choices) : null;
     const shown = choices.length && !buttons ? `${body}
@@ -46211,7 +46275,7 @@ var route = (routeKey, method, path3) => ({ routeKey, method, path: path3, auth:
 var manifest = {
   id: "mattermost-bridge",
   apiVersion: 1,
-  version: "0.15.2",
+  version: "0.16.1",
   displayName: "Mattermost",
   description: "Every agent becomes its own Mattermost bot. DM an agent or mention it in a channel and it answers in the thread, showing its steps as it works; follow-ups continue the conversation. Paperclip approvals arrive with Approve / Reject buttons.",
   author: "Haseeb Azhar",
@@ -46227,6 +46291,7 @@ var manifest = {
     "plugin.state.write",
     "http.outbound",
     "events.subscribe",
+    "events.emit",
     "webhooks.receive",
     "approvals.read",
     "approvals.respond",
@@ -46247,6 +46312,7 @@ var manifest = {
   // checks the caller is an agent and scopes it to that agent's company.
   apiRoutes: [
     route("help", "GET", "/mm/help"),
+    route("inbox", "GET", "/mm/inbox"),
     route("channels", "GET", "/mm/channels"),
     route("channel-posts", "GET", "/mm/channels/:channel/posts"),
     route("thread", "GET", "/mm/posts/:postId/thread"),
@@ -46488,6 +46554,11 @@ var Tenant = class {
     onPosted = (evt) => {
       void bridge.handle(evt);
     };
+    bridge.linkBase = paperclipUrl;
+    bridge.onSteer = (agentId, postId) => {
+      void ctx.events.emit("person-wrote", companyId, { agentId, postId }).catch(() => {
+      });
+    };
     const approvers = parseApprovers(config2.approvers);
     const approvalsChannel = typeof config2.approvalsChannel === "string" ? config2.approvalsChannel.trim() : "";
     const agentName = (agentId) => agentId && roster.roster().byAgentId(agentId)?.agentName || "Paperclip";
@@ -46530,6 +46601,14 @@ var Tenant = class {
       agents: () => roster.all().map((m) => ({ agentId: m.agentId, agentName: m.agentName, username: m.username, botUserId: m.botUserId })),
       canTalk: async (userId, agentId) => !canTalk || canTalk(userId, agentId),
       origin: (agentId) => bridge.activeThread(agentId),
+      // The task this run works on (its execution or checkout run), and the thread it was asked for in.
+      taskThread: async (agentId, runId, channelId) => {
+        if (!runId) return null;
+        const issues = await ctx.issues.list({ companyId, assigneeAgentId: agentId, limit: 200 });
+        const issue2 = issues.find((i) => i.executionRunId === runId || i.checkoutRunId === runId);
+        const at = issue2 ? await store.get(`issuethread:${issue2.id}`) : null;
+        return at && at.channelId === channelId ? at.rootId : null;
+      },
       task: async (taskId) => await ctx.issues.get(taskId, companyId),
       askApproval: async (req) => {
         if (!paperclipUrl || !approvers.size) throw Object.assign(new Error("this needs a person's approval, and nobody can approve from Mattermost yet (the plugin needs its Paperclip public URL and approvers set)"), { status: 403 });
@@ -46600,9 +46679,9 @@ var Tenant = class {
     return null;
   }
   /** An agent's call to one of the plugin's `/mm/...` routes. */
-  async api(agentId, routeKey, params, input2) {
+  async api(agentId, routeKey, params, input2, runId = null) {
     if (!this.actions) return { status: 503, body: { error: `Mattermost is not connected for this company (${this.status})` } };
-    return this.actions.handle(agentId, routeKey, params, input2);
+    return this.actions.handle(agentId, routeKey, params, input2, runId);
   }
   /** The Agent computer plugin: an agent wants a person at its computer. Posted where the agent is working. */
   async computerNeedsPerson(p) {
@@ -46758,6 +46837,14 @@ var plugin = definePlugin({
     ctx.events.on("plugin.agent-computer.needs-person", (e) => quietly("could not post a computer help request", async () => {
       await tenants.get(e.companyId)?.computerNeedsPerson(e.payload ?? {});
     }));
+    ctx.events.on("issue.created", (e) => quietly("could not link a task to its thread", async () => {
+      const tenant = tenants.get(e.companyId);
+      if (!tenant?.bridge || !e.entityId) return;
+      const issue2 = await ctx.issues.get(e.entityId, e.companyId);
+      const by = issue2?.createdByAgentId;
+      const at = by ? tenant.bridge.activeThread(by) : null;
+      if (at) await tenant.store().set(`issuethread:${e.entityId}`, at);
+    }));
     ctx.events.on("approval.decided", (e) => quietly("could not update approval", async () => {
       if (e.entityId) await tenants.get(e.companyId)?.approvals?.decided(e.entityId);
     }));
@@ -46793,7 +46880,14 @@ var plugin = definePlugin({
     if (!tenant) return { status: 503, body: { error: "Mattermost is not set up for your company." } };
     const query = Object.fromEntries(Object.entries(input2.query).map(([k, v]) => [k, Array.isArray(v) ? v[0] : v]));
     const body = input2.body && typeof input2.body === "object" && !Array.isArray(input2.body) ? input2.body : {};
-    const res = await tenant.api(agentId, input2.routeKey, input2.params, { ...query, ...body });
+    if (input2.routeKey === "inbox") {
+      const messages = tenant.bridge ? await tenant.bridge.takeInbox(agentId) : [];
+      return { status: 200, body: { messages, note: messages.length ? "Written to you while you were working. Act on them now: they are not sent to you again." : "Nothing new." } };
+    }
+    const res = await tenant.api(agentId, input2.routeKey, input2.params, { ...query, ...body }, input2.actor.runId ?? null);
+    if (tenant.bridge?.hasInbox(agentId) && res.body && typeof res.body === "object" && !Array.isArray(res.body)) {
+      res.body = { ...res.body, newMessages: await tenant.bridge.takeInbox(agentId) };
+    }
     return { status: res.status, body: res.body };
   },
   async onHealth() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "paperclip-plugin-mattermost",
-  "version": "0.15.2",
+  "version": "0.16.1",
   "description": "Paperclip agents in Mattermost: a bot per agent, live progress, files, approval and decision buttons, and per-person access, for each Paperclip company.",
   "type": "module",
   "license": "MIT",