paperclip-plugin-mattermost 0.18.2 → 0.19.0

package/README.md

@@ -49,6 +49,7 @@ Or install it from **Settings → Plugins** in Paperclip.
    - **Mattermost admin token**: pick the secret from step 2.
    - **Paperclip public URL**: filled in from Paperclip's own settings. The page checks it by sending a test click through it.
    - **Approvals channel**: where approvals and decision cards are posted.
+   - **Channel per agent** (optional): send one agent's approvals, decision cards and computer help requests to its own channel, for example a client reporting agent's drafts to `#client-reporting`. Only approvers can decide them, but everyone in the channel sees them. A channel that cannot be found falls back to the approvals channel, with a note.
    - **Agents in Mattermost**: all agents, or the ones you pick.
    - **Who can talk to agents**: everyone, or the people you pick, each with all agents or some.
    - **Approvers**: who may decide approvals and cards from Mattermost. Their clicks count as their Paperclip decisions, matched to Mattermost by email.
@@ -85,7 +86,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.18.2 -m v0.18.2 && git push origin main v0.18.2
+git tag -a v0.19.0 -m v0.19.0 && git push origin main v0.19.0
 ```
 
 GitHub Actions builds, tests and publishes to npm through npm trusted publishing, so no npm token is involved.

package/dist/manifest.js

@@ -84,7 +84,7 @@ var route = (routeKey, method, path) => ({ routeKey, method, path, auth: "agent"
 var manifest = {
   id: "mattermost-bridge",
   apiVersion: 1,
-  version: "0.18.2",
+  version: "0.19.0",
   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",
@@ -170,6 +170,12 @@ var manifest = {
         title: "Approvals channel",
         description: "Channel name (as in its URL, e.g. approvals) where every approval is posted; one raised during a Mattermost conversation also appears in that thread."
       },
+      agentChannels: {
+        type: "array",
+        title: "Channel per agent",
+        description: "Agents whose approvals, decision cards and help requests go to their own channel instead of the approvals channel.",
+        items: { type: "object", properties: { agentId: { type: "string" }, channel: { type: "string" } }, required: ["agentId", "channel"] }
+      },
       agentsMode: {
         type: "string",
         enum: ["all", "selected"],

package/dist/ui/index.js

@@ -122,6 +122,26 @@ function AccessList({ members, agents, grants, accounts, onChange }) {
     ] })
   ] });
 }
+function AgentChannels({ agents, channels, value, onChange }) {
+  const named = (id) => agents.find((a) => a.id === id)?.name ?? "A removed agent";
+  const free = agents.filter((a) => !value.some((r) => r.agentId === a.id));
+  const update = (agentId, channel) => onChange(value.map((r) => r.agentId === agentId ? { agentId, channel } : r));
+  const picker = (r) => channels.length ? /* @__PURE__ */ jsxs("select", { style: s.input, value: r.channel, onChange: (e) => update(r.agentId, e.target.value), children: [
+    channels.some((ch) => ch.name === r.channel) ? null : /* @__PURE__ */ jsx("option", { value: r.channel, children: r.channel || "Pick a channel" }),
+    channels.map((ch) => /* @__PURE__ */ jsx("option", { value: ch.name, children: ch.displayName }, ch.name))
+  ] }) : /* @__PURE__ */ jsx("input", { style: s.input, value: r.channel, onChange: (e) => update(r.agentId, e.target.value.trim()), placeholder: "channel name, e.g. client-reporting" });
+  return /* @__PURE__ */ jsxs("div", { style: { display: "grid", gap: 6 }, children: [
+    value.map((r) => /* @__PURE__ */ jsxs("div", { style: s.row, children: [
+      /* @__PURE__ */ jsx("span", { style: { minWidth: 160 }, children: named(r.agentId) }),
+      picker(r),
+      /* @__PURE__ */ jsx("button", { style: { ...s.button, padding: "4px 9px" }, title: "Use the approvals channel", onClick: () => onChange(value.filter((x) => x.agentId !== r.agentId)), children: "\u2715" })
+    ] }, r.agentId)),
+    free.length ? /* @__PURE__ */ jsxs("select", { style: { ...s.input, maxWidth: 320 }, value: "", onChange: (e) => e.target.value && onChange([...value, { agentId: e.target.value, channel: channels[0]?.name ?? "" }]), children: [
+      /* @__PURE__ */ jsx("option", { value: "", children: "Add an agent\u2026" }),
+      free.map((a) => /* @__PURE__ */ jsx("option", { value: a.id, children: a.name }, a.id))
+    ] }) : null
+  ] });
+}
 function TokenHelp({ mattermostUrl }) {
   const base = /^https?:\/\/\S+/.test(mattermostUrl.trim()) ? mattermostUrl.trim().replace(/\/+$/, "") : null;
   const page = (path, label) => base ? /* @__PURE__ */ jsx("a", { href: `${base}${path}`, target: "_blank", rel: "noreferrer", children: label }) : /* @__PURE__ */ jsx("b", { children: label });
@@ -159,6 +179,7 @@ function validate(c) {
   if (!url) errors.mattermostUrl = "Enter your Mattermost address.";
   else if (!/^https?:\/\/[^\s/]+/.test(url)) errors.mattermostUrl = "Enter a full address starting with https://";
   if (!c.botToken?.secretId) errors.botToken = "Choose the secret that holds the Mattermost admin token.";
+  if (Array.isArray(c.agentChannels) && c.agentChannels.some((r) => !String(r.channel ?? "").trim())) errors.agentChannels = "Pick a channel for every agent listed, or remove it.";
   return errors;
 }
 function saveErrorText(raw) {
@@ -340,6 +361,15 @@ function SettingsPage({ context }) {
       /* @__PURE__ */ jsx("option", { value: "", children: "None: only in the agent's thread" }),
       setup.data.channels.map((ch) => /* @__PURE__ */ jsx("option", { value: ch.name, children: ch.displayName }, ch.name))
     ] }) : /* @__PURE__ */ jsx("input", { style: s.input, value: String(config.approvalsChannel ?? ""), onChange: (e) => set({ approvalsChannel: e.target.value }), placeholder: "channel name, e.g. approvals" }) }),
+    /* @__PURE__ */ jsx(Field, { label: "Channel per agent", error: fieldErrors.agentChannels, help: "Send one agent's approvals, decision cards and computer help requests to its own channel, for example a client reporting agent's drafts to #client-reporting. Only approvers can decide them, but everyone in that channel sees them. If its channel cannot be found, they go to the approvals channel with a note.", children: /* @__PURE__ */ jsx(
+      AgentChannels,
+      {
+        agents,
+        channels: setup.data?.channels ?? [],
+        value: Array.isArray(config.agentChannels) ? config.agentChannels : [],
+        onChange: (next) => set({ agentChannels: next })
+      }
+    ) }),
     /* @__PURE__ */ jsx(Field, { label: "Agent-to-agent turns", help: "Agents hand work to each other by mentioning one another in a thread. After this many agent messages in a row, they pause until a person replies.", children: /* @__PURE__ */ jsx(
       "input",
       {

package/dist/worker.js

@@ -44640,6 +44640,24 @@ import { createHmac as createHmac2 } from "node:crypto";
 
 // src/approvals.ts
 import { createHmac, timingSafeEqual } from "node:crypto";
+function parseAgentChannels(value) {
+  const out = {};
+  if (Array.isArray(value)) for (const r of value) {
+    if (typeof r?.agentId === "string" && typeof r.channel === "string" && r.channel.trim()) out[r.agentId] = r.channel.trim();
+  }
+  return out;
+}
+function decisionChannels(poster, perAgent, fallback) {
+  return async (agentId) => {
+    const own2 = agentId ? perAgent[agentId] : void 0;
+    if (own2) {
+      const id2 = await poster.channel(own2);
+      if (id2) return { channelId: id2 };
+    }
+    const id = fallback ? await poster.channel(fallback) : null;
+    return id ? { channelId: id, ...own2 ? { note: `Posted here because this agent's channel "${own2}" was not found.` } : {} } : null;
+  };
+}
 var TYPE_LABEL = {
   request_board_approval: "Approval requested",
   hire_agent: "Hire request",
@@ -44715,12 +44733,13 @@ var Approvals = class {
     const targets = [];
     const thread = a.requestedByAgentId ? d.activeThread(a.requestedByAgentId) : null;
     if (thread) targets.push(thread);
-    const channelId = d.fallbackChannel ? await d.poster.channel(d.fallbackChannel) : null;
-    if (channelId && channelId !== thread?.channelId) targets.push({ channelId, rootId: "" });
+    const home = await d.channelFor(a.requestedByAgentId);
+    if (home && home.channelId !== thread?.channelId) targets.push({ channelId: home.channelId, rootId: "", note: home.note });
     if (!targets.length) return;
     const { message: message2, props } = render(a, d.agentName(a.requestedByAgentId), d.actionUrl, d.key);
     const postIds = [];
-    for (const where of targets) postIds.push(await d.poster.post(a.requestedByAgentId, where, message2, props));
+    for (const { note, ...where } of targets) postIds.push(await d.poster.post(a.requestedByAgentId, where, note ? `${message2}
+_${note}_` : message2, props));
     await d.store.set(`approval:${approvalId}`, { postIds });
   }
   /** `approval.decided` (here or in Paperclip): drop the buttons, show the outcome. */
@@ -44862,8 +44881,11 @@ var Cards = class {
   }
   async pass() {
     const d = this.d;
-    const channelId = await d.poster.channel(d.channel);
-    if (!channelId) return;
+    const homes = /* @__PURE__ */ new Map();
+    const home = async (agentId) => {
+      if (!homes.has(agentId)) homes.set(agentId, await d.channelFor(agentId));
+      return homes.get(agentId) ?? null;
+    };
     const now = (d.now ?? (() => /* @__PURE__ */ new Date()))();
     let since = await d.store.get("cards:since");
     if (!since) {
@@ -44882,8 +44904,12 @@ var Cards = class {
             delete posted[c.id];
           }
         } else if (c.status === "pending" && new Date(c.createdAt).getTime() > Date.parse(since)) {
-          const { message: message2, props } = renderCard(c, issue2, d.agentName(c.createdByAgentId ?? issue2.assigneeAgentId ?? null), d);
-          posted[c.id] = { postId: await d.poster.post(c.createdByAgentId ?? issue2.assigneeAgentId ?? null, { channelId, rootId: "" }, message2, props), issueId: issue2.id };
+          const agentId = c.createdByAgentId ?? issue2.assigneeAgentId ?? null;
+          const where = await home(agentId);
+          if (!where) continue;
+          const { message: message2, props } = renderCard(c, issue2, d.agentName(agentId), d);
+          posted[c.id] = { postId: await d.poster.post(agentId, { channelId: where.channelId, rootId: "" }, where.note ? `${message2}
+_${where.note}_` : message2, props), issueId: issue2.id };
         }
       }
     }
@@ -45365,6 +45391,8 @@ var STATUS_WORDS = {
 };
 var WorkLinks = class {
   d;
+  /** One task's updates, one at a time: Paperclip sends several at once and each would report the change. */
+  queue = /* @__PURE__ */ new Map();
   constructor(deps) {
     this.d = deps;
   }
@@ -45394,12 +45422,25 @@ ${body}`;
     }
     await this.d.post(hit.link.agentId, hit.channelId, "", c.authorAgentId === hit.link.agentId ? body : quoted);
   }
+  serial(key, run) {
+    const next = (this.queue.get(key) ?? Promise.resolve()).catch(() => {
+    }).then(run);
+    this.queue.set(key, next);
+    void next.catch(() => {
+    }).finally(() => {
+      if (this.queue.get(key) === next) this.queue.delete(key);
+    });
+    return next;
+  }
   /**
    * A task asked for in a Mattermost thread (created by the agent while answering there): when it is
    * done, cancelled or blocked, its outcome (the last comment) is posted back in that thread, so the
    * result always reaches the conversation it came from.
    */
-  async threadUpdate(issueId) {
+  threadUpdate(issueId) {
+    return this.serial(`thread:${issueId}`, () => this.reportToThread(issueId));
+  }
+  async reportToThread(issueId) {
     const at = await this.d.store.get(`issuethread:${issueId}`);
     if (!at) return;
     const task2 = await this.d.task(issueId);
@@ -45420,7 +45461,10 @@ ${last.length > 3e3 ? last.slice(0, 3e3) + "\u2026" : last}` : "";
     }
   }
   /** The task changed: note a new status; on done or cancelled, archive and report back. */
-  async updated(issueId) {
+  updated(issueId) {
+    return this.serial(`link:${issueId}`, () => this.followLink(issueId));
+  }
+  async followLink(issueId) {
     const hit = await this.linked(issueId);
     if (!hit) return;
     const task2 = await this.d.task(issueId);
@@ -46376,7 +46420,7 @@ var route = (routeKey, method, path3) => ({ routeKey, method, path: path3, auth:
 var manifest = {
   id: "mattermost-bridge",
   apiVersion: 1,
-  version: "0.18.2",
+  version: "0.19.0",
   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",
@@ -46462,6 +46506,12 @@ var manifest = {
         title: "Approvals channel",
         description: "Channel name (as in its URL, e.g. approvals) where every approval is posted; one raised during a Mattermost conversation also appears in that thread."
       },
+      agentChannels: {
+        type: "array",
+        title: "Channel per agent",
+        description: "Agents whose approvals, decision cards and help requests go to their own channel instead of the approvals channel.",
+        items: { type: "object", properties: { agentId: { type: "string" }, channel: { type: "string" } }, required: ["agentId", "channel"] }
+      },
       agentsMode: {
         type: "string",
         enum: ["all", "selected"],
@@ -46535,7 +46585,7 @@ var Tenant = class {
   key = "";
   approvers = /* @__PURE__ */ new Map();
   paperclipUrl = "";
-  approvalsChannel = "";
+  channelFor = async () => null;
   timers = [];
   agents() {
     const companyId = this.companyId;
@@ -46665,6 +46715,8 @@ var Tenant = class {
     };
     const approvers = parseApprovers(config2.approvers);
     const approvalsChannel = typeof config2.approvalsChannel === "string" ? config2.approvalsChannel.trim() : "";
+    const agentChannels = parseAgentChannels(config2.agentChannels);
+    const channelFor = decisionChannels(this.poster(manager, roster), agentChannels, approvalsChannel);
     const agentName = (agentId) => agentId && roster.roster().byAgentId(agentId)?.agentName || "Paperclip";
     const approvals = paperclipUrl ? new Approvals({
       poster: this.poster(manager, roster),
@@ -46677,10 +46729,10 @@ var Tenant = class {
       store,
       actionUrl,
       key,
-      fallbackChannel: approvalsChannel,
+      channelFor,
       approvers
     }) : null;
-    const cards = paperclipUrl && approvalsChannel ? new Cards({
+    const cards = paperclipUrl && (approvalsChannel || Object.keys(agentChannels).length) ? new Cards({
       poster: this.poster(manager, roster),
       openIssues: async () => (await Promise.all(OPEN_STATUSES.map((status) => ctx.issues.list({ companyId, status, limit: 500 })))).flat(),
       cards: async (issueId) => await ctx.issues.listInteractions(issueId, companyId),
@@ -46695,7 +46747,7 @@ var Tenant = class {
       actionUrl,
       key,
       paperclipUrl,
-      channel: approvalsChannel,
+      channelFor,
       approvers
     }) : null;
     const poster = this.poster(manager, roster);
@@ -46718,7 +46770,8 @@ var Tenant = class {
       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 });
         const { message: message2, props } = requestCard(req, actionUrl, key);
-        const targets = [req.origin, approvalsChannel ? await poster.channel(approvalsChannel).then((id) => id && id !== req.origin?.channelId ? { channelId: id, rootId: "" } : null) : null];
+        const home = await channelFor(req.agentId);
+        const targets = [req.origin, home && home.channelId !== req.origin?.channelId ? { channelId: home.channelId, rootId: "" } : null];
         const postIds = [];
         for (const where of targets) if (where) postIds.push(await poster.post(req.agentId, where, message2, props));
         await store.set(`reqcard:${req.id}`, postIds);
@@ -46742,7 +46795,7 @@ var Tenant = class {
       task: async (issueId) => await ctx.issues.get(issueId, companyId),
       comments: async (issueId) => (await ctx.issues.listComments(issueId, companyId)).map((c) => ({ id: c.id, body: c.body, authorAgentId: c.authorAgentId }))
     });
-    Object.assign(this, { manager, bots: roster, bridge, approvals, cards, actions, work, key, approvers, paperclipUrl, approvalsChannel });
+    Object.assign(this, { manager, bots: roster, bridge, approvals, cards, actions, work, key, approvers, paperclipUrl, channelFor });
     this.status = `connecting to ${url2} as @${manager.botUsername}`;
     detached(() => {
       manager.connect(onPosted);
@@ -46795,7 +46848,7 @@ var Tenant = class {
   async computerNeedsPerson(p) {
     if (!this.manager || !this.bots || !this.bridge || !p.agentId) return;
     const poster = this.poster(this.manager, this.bots);
-    const where = this.bridge.activeThread(p.agentId) ?? (this.approvalsChannel ? await poster.channel(this.approvalsChannel).then((id) => id ? { channelId: id, rootId: "" } : null) : null);
+    const where = this.bridge.activeThread(p.agentId) ?? await this.channelFor(p.agentId).then((home) => home ? { channelId: home.channelId, rootId: "" } : null);
     if (!where) return;
     const link = this.paperclipUrl && p.path ? `${this.paperclipUrl}${p.path}` : null;
     const on = p.url ? ` on ${p.url}` : "";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "paperclip-plugin-mattermost",
-  "version": "0.18.2",
+  "version": "0.19.0",
   "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",