paperclip-plugin-mattermost 0.18.0 → 0.18.2

package/README.md

@@ -85,7 +85,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.0 -m v0.18.0 && git push origin main v0.18.0
+git tag -a v0.18.2 -m v0.18.2 && git push origin main v0.18.2
 ```
 
 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.0",
+  version: "0.18.2",
   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

@@ -45383,11 +45383,16 @@ var WorkLinks = class {
     const c = (await this.d.comments(issueId)).find((x) => x.id === commentId);
     if (!c?.body?.trim()) return;
     const body = c.body.trim().slice(0, 12e3);
-    const own2 = c.authorAgentId && this.d.hasBot(c.authorAgentId);
-    const text2 = own2 ? body : `**${c.authorAgentId ? this.d.agentName(c.authorAgentId) : "A team member"}** commented on ${this.label(hit.link)}:
+    const quoted = `**${c.authorAgentId ? this.d.agentName(c.authorAgentId) : "A team member"}** commented on ${this.label(hit.link)}:
 
 ${body}`;
-    await this.d.post(own2 ? c.authorAgentId : hit.link.agentId, hit.channelId, "", text2);
+    if (c.authorAgentId && c.authorAgentId !== hit.link.agentId && this.d.hasBot(c.authorAgentId)) {
+      try {
+        return await this.d.post(c.authorAgentId, hit.channelId, "", body);
+      } catch {
+      }
+    }
+    await this.d.post(hit.link.agentId, hit.channelId, "", c.authorAgentId === hit.link.agentId ? body : quoted);
   }
   /**
    * A task asked for in a Mattermost thread (created by the agent while answering there): when it is
@@ -45399,14 +45404,20 @@ ${body}`;
     if (!at) return;
     const task2 = await this.d.task(issueId);
     if (!task2 || task2.status === at.status || !THREAD_REPORTS[task2.status]) return;
+    const by = [at.agentId, task2.assigneeAgentId].find((a) => Boolean(a && this.d.hasBot(a)));
+    if (!by) return;
     await this.d.store.set(`issuethread:${issueId}`, { ...at, status: task2.status });
     const last = (await this.d.comments(issueId)).at(-1)?.body?.trim();
     const outcome = last ? `
 
 ${last.length > 3e3 ? last.slice(0, 3e3) + "\u2026" : last}` : "";
-    const by = [task2.assigneeAgentId, at.agentId].find((a) => Boolean(a && this.d.hasBot(a)));
-    if (!by) return;
-    await this.d.post(by, at.channelId, at.rootId, `${THREAD_REPORTS[task2.status]} **${task2.identifier ?? "The task"}** ${task2.title}${outcome}`);
+    const doer = task2.assigneeAgentId && task2.assigneeAgentId !== by ? ` _(by ${this.d.agentName(task2.assigneeAgentId)})_` : "";
+    try {
+      await this.d.post(by, at.channelId, at.rootId, `${THREAD_REPORTS[task2.status]} **${task2.identifier ?? "The task"}** ${task2.title}${doer}${outcome}`);
+    } catch (err) {
+      await this.d.store.set(`issuethread:${issueId}`, at);
+      throw err;
+    }
   }
   /** The task changed: note a new status; on done or cancelled, archive and report back. */
   async updated(issueId) {
@@ -45530,6 +45541,9 @@ ${HELP}`;
 import { randomUUID as randomUUID2 } from "node:crypto";
 
 // src/bridge.ts
+var IN_FLIGHT = "inflight";
+var IN_FLIGHT_MAX_AGE = 3 * 60 * 60 * 1e3;
+var RESUME_PROMPT = "The Mattermost plugin restarted while you were working on the conversation above, so your reply did not reach the thread. When you have finished, give your answer to the latest message again; it is posted in the thread.";
 var DEFAULT_TURN_LIMIT = 10;
 var TYPING_EVERY_MS = 3e3;
 var OLD_PLACEHOLDER = /^_(thinking…|.+ is working on it…)_/;
@@ -45790,25 +45804,82 @@ To send files back with your reply, save them in ${outbox}` : "");
     this.active.set(member.agentId, here);
     try {
       let sessionId = thread && thread.agentId === member.agentId ? thread.sessionId : null;
+      const flight = (id) => this.inFlight(rootId, { agentId: member.agentId, sessionId: id, channelId: post.channel_id, channelType: evt.channelType, channelName: evt.channelName, at: Date.now() });
       try {
         if (!sessionId) throw new Error("no session yet");
+        await flight(sessionId);
         reply = await this.agents.ask(sessionId, prompt);
-      } catch (first2) {
-        if (sessionId) this.log("session unusable, starting a new one", { sessionId, err: String(first2) });
+      } catch (first) {
+        if (sessionId) this.log("session unusable, starting a new one", { sessionId, err: String(first) });
         sessionId = await this.agents.createSession(member.agentId, `mattermost:${rootId}`);
         await this.store.set(threadKey, { agentId: member.agentId, sessionId });
+        await flight(sessionId);
         reply = await this.agents.ask(sessionId, prompt);
       }
     } catch (err) {
       if (this.active.get(member.agentId) === here) this.active.delete(member.agentId);
       this.inbox.delete(member.agentId);
+      await this.inFlight(rootId, null);
       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);
     this.inbox.delete(member.agentId);
+    await this.inFlight(rootId, null);
+    await this.postReply(member, { channelId: post.channel_id, rootId, channelType: evt.channelType, channelName: evt.channelName }, reply, outbox);
+  }
+  /** Records (or with null clears) the reply this thread is waiting for. */
+  async inFlight(rootId, f) {
+    const all = await this.store.get(IN_FLIGHT) ?? {};
+    if (f) all[rootId] = f;
+    else delete all[rootId];
+    await this.store.set(IN_FLIGHT, all);
+  }
+  /**
+   * After a plugin restart: every reply that was being waited for is asked for again from the same
+   * agent session (which queues behind the run still going), and posted in its thread when it comes.
+   */
+  async resume() {
+    const all = await this.store.get(IN_FLIGHT) ?? {};
+    let n = 0;
+    for (const [rootId, f] of Object.entries(all)) {
+      const member = this.roster().byAgentId(f.agentId);
+      if (!member || Date.now() - f.at > IN_FLIGHT_MAX_AGE) {
+        await this.inFlight(rootId, null);
+        continue;
+      }
+      n++;
+      const prev = this.queues.get(rootId) ?? Promise.resolve();
+      const next = prev.then(async () => {
+        const typing = () => {
+          void member.chat.typing(f.channelId, rootId).catch(() => {
+          });
+        };
+        typing();
+        const timer = setInterval(typing, TYPING_EVERY_MS);
+        try {
+          const reply = await this.agents.ask(f.sessionId, RESUME_PROMPT);
+          await this.inFlight(rootId, null);
+          await this.postReply(member, { channelId: f.channelId, rootId, channelType: f.channelType, channelName: f.channelName }, reply, null);
+        } catch (err) {
+          await this.inFlight(rootId, null);
+          await member.chat.createPost(f.channelId, rootId, `:warning: ${member.agentName}'s reply was lost when the plugin restarted: ${String(err?.message ?? err).slice(0, 300)}. Ask again here.`).catch(() => {
+          });
+        } finally {
+          clearInterval(timer);
+        }
+      }).catch((err) => this.log("resume failed", { err: String(err) }));
+      this.queues.set(rootId, next);
+      void next.finally(() => {
+        if (this.queues.get(rootId) === next) this.queues.delete(rootId);
+      });
+    }
+    return n;
+  }
+  async postReply(member, origin, reply, outbox) {
+    const post = { channel_id: origin.channelId };
+    const rootId = origin.rootId;
     const { text: body, choices } = extractChoices(linkTasks(absoluteLinks(reply ?? "", this.linkBase), this.linkBase, this.taskPrefix));
-    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}
 
@@ -46305,7 +46376,7 @@ var route = (routeKey, method, path3) => ({ routeKey, method, path: path3, auth:
 var manifest = {
   id: "mattermost-bridge",
   apiVersion: 1,
-  version: "0.18.0",
+  version: "0.18.2",
   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",
@@ -46681,7 +46752,9 @@ var Tenant = class {
         this.status = `agent bot sync failed: ${errText(err)}`;
         ctx.logger.error(this.status, { companyId });
       });
-      void sync();
+      void sync().then(() => bridge.resume()).then((n) => {
+        if (n) ctx.logger.info("resuming replies interrupted by a restart", { companyId, threads: n });
+      }).catch((err) => warn("could not resume interrupted replies", { err: errText(err) }));
       this.timers.push(setInterval(sync, SYNC_EVERY_MS));
       void ensureSkill(companyId).catch((err) => warn("could not install the Mattermost skill", { err: errText(err) }));
       if (cards) {

package/package.json

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