paperclip-plugin-mattermost 0.11.1 → 0.11.3

package/dist/manifest.js

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

@@ -45281,7 +45281,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() {
@@ -45541,18 +45541,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,12 +45579,32 @@ 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);
@@ -45614,9 +45635,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 +45675,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 +45714,7 @@ var AgentBots = class {
 var manifest = {
   id: "mattermost-bridge",
   apiVersion: 1,
-  version: "0.11.1",
+  version: "0.11.3",
   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",
@@ -45875,12 +45906,19 @@ var Tenant = class {
         await manager.request("PUT", `/posts/${postId}/patch`, { message: message2, props: this.tag(props) });
       },
       async channel(name) {
-        for (const team of await manager.request("GET", "/users/me/teams")) {
+        const wanted = name.replace(/^[#~]/, "").trim();
+        const teams = await manager.request("GET", "/users/me/teams");
+        for (const team of teams) {
           try {
-            return (await manager.request("GET", `/teams/${team.id}/channels/name/${encodeURIComponent(name.replace(/^[#~]/, ""))}`)).id;
+            return (await manager.request("GET", `/teams/${team.id}/channels/name/${encodeURIComponent(wanted.toLowerCase())}`)).id;
           } catch {
           }
         }
+        for (const team of teams) {
+          const list = await manager.request("GET", `/teams/${team.id}/channels?per_page=200`).catch(() => []);
+          const hit = list.find((ch) => ch.display_name.trim().toLowerCase() === wanted.toLowerCase());
+          if (hit) return hit.id;
+        }
         return null;
       },
       async email(userId) {
@@ -45995,11 +46033,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));
@@ -46044,6 +46083,9 @@ async function saveBoot(companyId, config2) {
   await ctx.state.set(BOOT, all);
 }
 var plugin = definePlugin({
+  // One worker serves every company, each with its own Mattermost (Tenant above).
+  // Without this Paperclip refuses a second company's settings as a cross-tenant risk.
+  multiCompanyConfig: true,
   async setup(c) {
     ctx = c;
     ctx.data.register("setup", async (params) => {

package/package.json

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