paperclip-plugin-mattermost 0.11.2 → 0.12.0

package/README.md

@@ -5,7 +5,7 @@ Your [Paperclip](https://github.com/paperclipai/paperclip) agents as Mattermost
 ## What it does
 
 - **A bot per agent.** Bots are created, renamed and switched off as agents change (every 5 minutes). Choose all agents, or only the ones you pick.
-- **You see it working.** The agent's bot reacts 👀 to your message straight away. Its reply starts as _thinking…_ and lists the steps it runs, then the answer replaces the list.
+- **You see it working.** The agent's bot reacts 👀 to your message straight away, and shows Mattermost's "is typing…" indicator until its answer arrives.
 - **Files both ways.** Attach files to a message and the agent can read them. Files the agent saves are attached to its reply.
 - **Choices as buttons.** An agent can offer options (`choices: A | B | C` on its last line), which appear as buttons. A click is sent back as your answer.
 - **Approvals with buttons.** Every Paperclip approval is posted in an approvals channel with Approve / Reject buttons, including hires, budget overrides, board approvals and high-risk tool calls. An approval raised during a conversation also appears in that thread.
@@ -60,7 +60,6 @@ Or install it from **Settings → Plugins** in Paperclip.
 - **Multi-choice questions** and free-text "Other" answers are answered in Paperclip; the card links there.
 - **Mattermost can't hide bots** from particular people. Someone without access can still DM an agent bot; they get a private note and the agent doesn't run.
 - **Agents with a custom uploaded portrait** keep the default bot picture, because those images need a Paperclip login to download.
-- **Live progress** shows steps for agents run through ACPX (Claude Code, and others Paperclip runs that way). Other adapters show only _thinking…_.
 
 ## Development
 

package/dist/manifest.js

@@ -2,7 +2,7 @@
 var manifest = {
   id: "mattermost-bridge",
   apiVersion: 1,
-  version: "0.11.2",
+  version: "0.12.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",

package/dist/worker.js

@@ -44992,57 +44992,9 @@ function chosenProps(choice, who) {
   return { attachments: [{ text: `${who} chose **${choice}**`, actions: [] }] };
 }
 
-// src/progress.ts
-var THINKING = "_thinking\u2026_";
-var MAX_STEPS = 6;
-var MAX_LABEL2 = 100;
-var Progress = class {
-  buffer = "";
-  steps = /* @__PURE__ */ new Map();
-  /** Feeds one stdout chunk. Returns true when what `render` shows changed. */
-  feed(chunk) {
-    this.buffer += chunk;
-    const lines = this.buffer.split("\n");
-    this.buffer = lines.pop() ?? "";
-    let changed = false;
-    for (const line of lines) {
-      if (!line.startsWith("{")) continue;
-      let e;
-      try {
-        e = JSON.parse(line);
-      } catch {
-        continue;
-      }
-      if (e.type !== "acpx.tool_call" || !e.toolCallId) continue;
-      const prev = this.steps.get(e.toolCallId);
-      const tool3 = prev?.tool ?? e.name ?? "tool";
-      const label2 = e.name && e.name !== tool3 ? e.name : prev?.label ?? tool3;
-      const status = e.status ?? prev?.status ?? "pending";
-      if (prev?.label !== label2 || prev?.status !== status) {
-        this.steps.set(e.toolCallId, { tool: tool3, label: label2, status });
-        changed = true;
-      }
-    }
-    return changed;
-  }
-  render() {
-    const head = THINKING;
-    const all = [...this.steps.values()];
-    if (!all.length) return head;
-    const shown = all.slice(-MAX_STEPS);
-    const lines = shown.map((s) => {
-      const mark = s.status === "completed" ? "\u2713" : s.status === "failed" ? "\u2717" : "\u2026";
-      const label2 = s.label.replace(/\s+/g, " ").trim();
-      return `- ${mark} \`${(label2.length > MAX_LABEL2 ? label2.slice(0, MAX_LABEL2) + "\u2026" : label2).replace(/`/g, "'")}\``;
-    });
-    if (all.length > shown.length) lines.unshift(`- _${all.length - shown.length} earlier steps_`);
-    return `${head}
-${lines.join("\n")}`;
-  }
-};
-
 // src/bridge.ts
-var PROGRESS_EVERY_MS = 2e3;
+var TYPING_EVERY_MS = 3e3;
+var OLD_PLACEHOLDER = /^_(thinking…|.+ is working on it…)_/;
 var MAX_POST = 15e3;
 var MAX_HISTORY = 8e3;
 var MENTION = /(?:^|[^\w@])@([a-z0-9][a-z0-9._-]*)/gi;
@@ -45128,7 +45080,7 @@ var Bridge = class {
     const roster = this.roster();
     const lines = [];
     for (const p of await this.directory.threadPosts(rootId)) {
-      if (p.id === currentId || p.type || !p.message.trim() || p.message.startsWith(THINKING)) continue;
+      if (p.id === currentId || p.type || !p.message.trim() || OLD_PLACEHOLDER.test(p.message)) continue;
       const who = p.user_id === me.botUserId ? "You" : `@${roster.byBotId(p.user_id)?.username ?? (await this.directory.userName(p.user_id)).username}`;
       lines.push(`${who}: ${p.message}`);
     }
@@ -45159,10 +45111,23 @@ var Bridge = class {
     const sender = await this.directory.userName(post.user_id);
     const where = isDirect ? "a direct message" : `#${evt.channelName}`;
     const history = post.root_id ? await this.history(post.root_id, post.id, member) : "";
-    const progress = new Progress();
-    const placeholder = await member.chat.createPost(post.channel_id, rootId, progress.render());
-    await member.chat.typing(post.channel_id, rootId).catch(() => {
-    });
+    const typing = () => {
+      void member.chat.typing(post.channel_id, rootId).catch(() => {
+      });
+      void member.chat.typing(post.channel_id, "").catch(() => {
+      });
+    };
+    typing();
+    const typingTimer = setInterval(typing, TYPING_EVERY_MS);
+    try {
+      await this.answer(evt, member, rootId, threadKey, thread, { sender, where, history, text: text2, fileIds });
+    } finally {
+      clearInterval(typingTimer);
+    }
+  }
+  async answer(evt, member, rootId, threadKey, thread, m) {
+    const { post } = evt;
+    const { sender, where, history, text: text2, fileIds } = m;
     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 prompt = `${sender.displayName} (@${sender.username}) 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.` + (history ? `
@@ -45178,23 +45143,6 @@ Attached files, saved on disk (read them at these paths):
 ${attached.join("\n")}` : "") + (outbox ? `
 
 To send files back with your reply, save them in ${outbox}` : "");
-    let timer = null;
-    let edit = Promise.resolve();
-    let finished = false;
-    const onOutput = (chunk) => {
-      if (finished || !progress.feed(chunk) || timer) return;
-      timer = setTimeout(() => {
-        timer = null;
-        if (finished) return;
-        edit = edit.then(() => member.chat.patchPost(placeholder.id, progress.render())).catch(() => {
-        });
-      }, PROGRESS_EVERY_MS);
-    };
-    const settle2 = async () => {
-      finished = true;
-      if (timer) clearTimeout(timer);
-      await edit;
-    };
     let reply;
     const here = { channelId: post.channel_id, rootId };
     this.active.set(member.agentId, here);
@@ -45202,21 +45150,19 @@ To send files back with your reply, save them in ${outbox}` : "");
       let sessionId = thread && thread.agentId === member.agentId ? thread.sessionId : null;
       try {
         if (!sessionId) throw new Error("no session yet");
-        reply = await this.agents.ask(sessionId, prompt, onOutput);
+        reply = await this.agents.ask(sessionId, prompt);
       } catch (first2) {
         if (sessionId) this.log("session unusable, starting a new one", { sessionId, err: String(first2) });
         sessionId = await this.agents.createSession(member.agentId, `mattermost:${rootId}`);
         await this.store.set(threadKey, { agentId: member.agentId, sessionId });
-        reply = await this.agents.ask(sessionId, prompt, onOutput);
+        reply = await this.agents.ask(sessionId, prompt);
       }
     } catch (err) {
       if (this.active.get(member.agentId) === here) this.active.delete(member.agentId);
-      await settle2();
-      await member.chat.patchPost(placeholder.id, `:warning: ${member.agentName} could not answer: ${String(err?.message ?? err).slice(0, 500)}`);
+      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);
-    await settle2();
     const { text: body, choices } = extractChoices(reply ?? "");
     const origin = { channelId: post.channel_id, rootId, channelType: evt.channelType, channelName: evt.channelName };
     const buttons = choices.length && this.choiceButtons ? this.choiceButtons(origin, choices) : null;
@@ -45224,7 +45170,7 @@ To send files back with your reply, save them in ${outbox}` : "");
 
 ${choices.map((c, i) => `${i + 1}. ${c}`).join("\n")}` : body;
     const [first, ...more] = splitMessage(shown.trim() || `_${member.agentName} finished without a reply._`);
-    await member.chat.patchPost(placeholder.id, first);
+    await member.chat.createPost(post.channel_id, rootId, first);
     for (const part of more) await member.chat.createPost(post.channel_id, rootId, part);
     if (buttons) await member.chat.createPost(post.channel_id, rootId, "", buttons);
     if (outbox) {
@@ -45281,7 +45227,7 @@ var MattermostClient = class {
       body: body === void 0 ? void 0 : JSON.stringify(body),
       signal: AbortSignal.timeout(3e4)
     });
-    if (!r.ok) throw new Error(`Mattermost ${method} ${path3}: ${r.status} ${(await r.text()).slice(0, 200)}`);
+    if (!r.ok) throw Object.assign(new Error(`Mattermost ${method} ${path3}: ${r.status} ${(await r.text()).slice(0, 200)}`), { status: r.status });
     return r.status === 204 ? null : await r.json();
   }
   async init() {
@@ -45316,9 +45262,6 @@ var MattermostClient = class {
   async react(postId, emoji3) {
     await this.request("POST", "/reactions", { user_id: this.botUserId, post_id: postId, emoji_name: emoji3 });
   }
-  async patchPost(postId, message2) {
-    await this.request("PUT", `/posts/${postId}/patch`, { message: message2 });
-  }
   async typing(channelId, rootId) {
     await this.request("POST", "/users/me/typing", { channel_id: channelId, parent_id: rootId });
   }
@@ -45541,18 +45484,19 @@ async function verifyUrl(url2, pluginKey) {
 }
 
 // src/roster.ts
+var notFound = (err) => err?.status === 404;
 var TOKEN_DESCRIPTION = "paperclip-plugin";
 var AgentBots = class {
   members = /* @__PURE__ */ new Map();
   manager;
-  url;
+  newClient;
   listAgents;
   store;
   log;
   onPosted;
-  constructor(manager, url2, listAgents, store, log, onPosted) {
+  constructor(manager, url2, listAgents, store, log, onPosted, newClient) {
     this.manager = manager;
-    this.url = url2;
+    this.newClient = newClient ?? ((token) => new MattermostClient(url2, token, log));
     this.listAgents = listAgents;
     this.store = store;
     this.log = log;
@@ -45578,13 +45522,33 @@ var AgentBots = class {
   get size() {
     return this.members.size;
   }
+  /**
+   * The bot, or null only when Mattermost says it does not exist. Any other failure (the
+   * server restarting, a timeout) throws, so the agent is skipped this round rather than
+   * given a second bot: that is how Carma's Operations Agent became @operations-agent-agent
+   * while @operations-agent, the one people mention, was left with nobody behind it.
+   */
   async bot(id) {
     try {
       return await this.manager.request("GET", `/bots/${id}?include_deleted=true`);
-    } catch {
-      return null;
+    } catch (err) {
+      if (notFound(err)) return null;
+      throw err;
     }
   }
+  /** The bot at an agent's own username, if it is one of ours and no other agent uses it. */
+  async reclaimable(agent, map2) {
+    let user2;
+    try {
+      user2 = await this.manager.request("GET", `/users/username/${botUsername(agent.name)}`);
+    } catch (err) {
+      if (notFound(err)) return null;
+      throw err;
+    }
+    if (!user2.is_bot || Object.entries(map2).some(([other, id]) => other !== agent.id && id === user2.id)) return null;
+    const bot = await this.bot(user2.id);
+    return bot && bot.owner_id === this.manager.botUserId ? bot : null;
+  }
   async createBot(agent) {
     const base = botUsername(agent.name);
     let last;
@@ -45614,9 +45578,19 @@ var AgentBots = class {
       try {
         let bot = map2[agent.id] ? await this.bot(map2[agent.id]) : null;
         if (!bot) {
-          bot = await this.createBot(agent);
-          this.log("created agent bot", { agent: agent.name, username: bot.username });
-        } else {
+          const mine = await this.reclaimable(agent, map2);
+          bot = mine ?? await this.createBot(agent);
+          this.log(mine ? "reused the agent's existing bot" : "created agent bot", { agent: agent.name, username: bot.username });
+        } else if (bot.username !== botUsername(agent.name)) {
+          const original = await this.reclaimable(agent, map2);
+          if (original && original.user_id !== bot.user_id) {
+            await this.manager.request("POST", `/bots/${bot.user_id}/disable`).catch(() => {
+            });
+            this.log("moved agent back to its own bot", { agent: agent.name, from: bot.username, to: original.username });
+            bot = original;
+          }
+        }
+        {
           if (bot.delete_at > 0) await this.manager.request("POST", `/bots/${bot.user_id}/enable`);
           if (bot.display_name !== agent.name) {
             bot = await this.manager.request("PUT", `/bots/${bot.user_id}`, { username: bot.username, display_name: agent.name, description: agent.title || bot.description });
@@ -45644,7 +45618,7 @@ var AgentBots = class {
           continue;
         }
         current?.client.close();
-        const client = new MattermostClient(this.url, await this.mintToken(bot.user_id), this.log);
+        const client = this.newClient(await this.mintToken(bot.user_id));
         await client.init();
         client.connect(this.onPosted);
         this.members.set(agent.id, { agentId: agent.id, agentName: agent.name, botUserId: bot.user_id, username: bot.username, chat: client, client });
@@ -45683,7 +45657,7 @@ var AgentBots = class {
 var manifest = {
   id: "mattermost-bridge",
   apiVersion: 1,
-  version: "0.11.2",
+  version: "0.12.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",
@@ -45811,14 +45785,13 @@ var Tenant = class {
         const key = `plugin:${PLUGIN_KEY}:session:${taskKey}`;
         return (await ctx.agents.sessions.create(agentId, companyId, { taskKey: key, reason: "Mattermost thread" })).sessionId;
       },
-      ask(sessionId, prompt, onOutput) {
+      ask(sessionId, prompt) {
         return new Promise((resolve, reject) => {
           const timer = setTimeout(() => reject(new Error("no reply after 30 minutes")), ASK_TIMEOUT_MS);
           ctx.agents.sessions.sendMessage(sessionId, companyId, {
             prompt,
             reason: "Mattermost message",
             onEvent: (e) => {
-              if (e.eventType === "chunk" && e.stream === "stdout" && e.message) onOutput?.(e.message);
               if (e.eventType === "done") {
                 clearTimeout(timer);
                 resolve(e.message);
@@ -46002,11 +45975,12 @@ var Tenant = class {
       const who = req.user_name ? `@${req.user_name}` : "Someone";
       await this.manager.request("PUT", `/posts/${req.post_id}/patch`, { props: chosenProps(choice.choice, who) }).catch(() => {
       });
-      void this.bridge.handle({
+      const bridge = this.bridge;
+      detached(() => void bridge.handle({
         post: { id: `choice:${req.post_id}`, user_id: req.user_id, channel_id: choice.channelId, root_id: choice.rootId, message: choice.choice },
         channelType: choice.channelType,
         channelName: choice.channelName
-      });
+      }));
       return;
     }
     if (this.approvals) await this.notify(req, await this.approvals.click(req).catch(failed));

package/package.json

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