message-cp 0.1.0 → 0.1.1

package/dist/dashboard.js

@@ -702,6 +702,9 @@ let peopleRowsKey = "";
 let inviteClosings = 0;
 // The id of the invite whose link the view shows, or undefined, so cancelling that invite takes its link away.
 let shownInvite;
+// How many times showInvite has shown a link, so a write with no answer hides only a link shown before it started, never
+// one another request showed meanwhile.
+let invitesShown = 0;
 // The invite the "People" view asks before cancelling ({ id, person, createdAt }), or undefined.
 let cancelTarget;
 // The list the people view's invites and the "New link" select were last built from, so a poll rebuilds them only when it
@@ -1545,12 +1548,22 @@ function showInvite(body) {
     "It works once and lasts " + INVITE_DAYS + " days, until " + when(invite.expiresAt) + ". It shows only here, until you leave this view.";
   inviteLink.value = link;
   shownInvite = invite.id;
+  invitesShown++;
   copyNote.textContent = "";
   inviteMade.hidden = false;
   inviteLink.focus();
   return true;
 }
 
+// Hides the invite link showInvite showed, with its line and its copy note.
+function hideInvite() {
+  inviteMade.hidden = true;
+  inviteFor.textContent = "";
+  inviteLink.value = "";
+  copyNote.textContent = "";
+  shownInvite = undefined;
+}
+
 // Reads the people and the invites again at once, after a write that may have changed them.
 function refresh() {
   cancel();
@@ -1573,6 +1586,7 @@ async function addInvitedPerson() {
   }
   adding = tokenGen;
   const closings = inviteClosings;
+  const shown = invitesShown;
   personAdd.disabled = true;
   personNote.textContent = "Adding…";
   const ac = new AbortController();
@@ -1598,7 +1612,10 @@ async function addInvitedPerson() {
     return;
   }
   if (answer.error) {
-    personNote.textContent = answer.error + ", so " + name + " may have been added: the agents panel and the invites below show whether.";
+    // A link may have been made, so the one shown before may be taken for it. A link another request showed meanwhile
+    // stays: it is that request's own result.
+    if (shown === invitesShown) hideInvite();
+    personNote.textContent = answer.error + ", so " + name + " may or may not have been added: the agents panel and the invites below show which once they have been read again.";
     refresh();
     return;
   }
@@ -1618,6 +1635,7 @@ async function makeInvite() {
   }
   linking = tokenGen;
   const closings = inviteClosings;
+  const shown = invitesShown;
   linkMake.disabled = true;
   linkNote.textContent = "Making a link…";
   const ac = new AbortController();
@@ -1640,7 +1658,10 @@ async function makeInvite() {
     return;
   }
   if (answer.error) {
-    linkNote.textContent = answer.error + ", so a link for " + person + " may have been made: the invites below show whether.";
+    // A link may have been made, so the one shown before may be taken for it. A link another request showed meanwhile
+    // stays: it is that request's own result.
+    if (shown === invitesShown) hideInvite();
+    linkNote.textContent = answer.error + ", so a link for " + person + " may or may not have been made: the invites below show which once they have been read again.";
     refresh();
     return;
   }
@@ -1714,17 +1735,12 @@ async function cancelInvite() {
   if (answer.status === 403) return unmarked();
   // A confirmation opened for another invite meanwhile stays.
   if (cancelTarget === invite) closeCancelInvite(true);
-  // Once the server says this invite is gone (200, or 404: used, cancelled or expired), its link, if shown, goes too.
-  if ((answer.status === 200 || answer.status === 404) && shownInvite === invite.id) {
-    inviteMade.hidden = true;
-    inviteFor.textContent = "";
-    inviteLink.value = "";
-    copyNote.textContent = "";
-    shownInvite = undefined;
-  }
+  // Once the server says this invite is gone (200, or 404: used, cancelled or expired), or may be (no answer), its link,
+  // if shown, goes too.
+  if ((answer.status === 200 || answer.status === 404 || answer.error) && shownInvite === invite.id) hideInvite();
   if (answer.status === 200) cancelNote.textContent = "Cancelled " + invite.person + "'s invite.";
   else if (answer.status === 404) cancelNote.textContent = invite.person + "'s invite was already used, cancelled or expired (404).";
-  else if (answer.error) cancelNote.textContent = answer.error + ", so " + invite.person + "'s invite may have been cancelled: the list below shows whether.";
+  else if (answer.error) cancelNote.textContent = answer.error + ", so " + invite.person + "'s invite may or may not have been cancelled: the list below shows which once it has been read again.";
   else cancelNote.textContent = refusal(answer);
   if (answer.status === 200 || answer.status === 404 || answer.error) refresh();
 }
@@ -1755,7 +1771,7 @@ async function markPerson(name, admin) {
   if (answer.status === 403) return unmarked();
   if (answer.status === 200) peopleNote.textContent = admin ? name + " is now an admin." : name + " is no longer an admin.";
   else if (answer.status === 404) peopleNote.textContent = name + " is already gone (404).";
-  else if (answer.error) peopleNote.textContent = answer.error + ", so " + name + " may have been changed: the list below shows whether.";
+  else if (answer.error) peopleNote.textContent = answer.error + ", so " + name + " may or may not have been changed: the list below shows which once it has been read again.";
   else peopleNote.textContent = refusal(answer);
   if (answer.status === 200 || answer.status === 404 || answer.error) refresh();
 }
@@ -1868,7 +1884,7 @@ async function removeAccountPerson() {
         ? "Removed " + name + ": " + counted(body.messages, "message") + " and " + counted(body.mentions, "mention") + " deleted."
         : "Removed " + name + ".") + stopped;
   } else if (answer.status === 404) peopleNote.textContent = name + " is already gone (404).";
-  else if (answer.error) peopleNote.textContent = answer.error + ", so " + name + " may have been removed: the list below shows whether.";
+  else if (answer.error) peopleNote.textContent = answer.error + ", so " + name + " may or may not have been removed: the list below shows which once it has been read again.";
   else peopleNote.textContent = refusal(answer);
   if (answer.status === 200 || answer.status === 404 || answer.error) refresh();
 }
@@ -1932,7 +1948,7 @@ async function removeWebhook() {
         ? "Removed webhook " + hook.id + " and its " + (body.deliveries === 1 ? "1 delivery" : body.deliveries + " deliveries") + "."
         : "Removed webhook " + hook.id + ".";
   } else if (answer.status === 404) webhookNote.textContent = "Webhook " + hook.id + " was already gone (404).";
-  else if (answer.error) webhookNote.textContent = answer.error + ", so webhook " + hook.id + " may have been removed: the list below shows whether.";
+  else if (answer.error) webhookNote.textContent = answer.error + ", so webhook " + hook.id + " may or may not have been removed: the list below shows which once it has been read again.";
   else webhookNote.textContent = refusal(answer);
   if (answer.status === 200 || answer.status === 404 || answer.error) refresh();
 }
@@ -2012,8 +2028,8 @@ async function addAccountWebhook() {
     // Another webhook may have been added, so the secret shown before may no longer be the newest.
     hideWebhookSecret();
     hookNote.textContent =
-      answer.error + ", so the webhook may or may not have been added: the list below shows whether. " +
-      "No secret can be shown for it, so if it is listed, remove it and add it again.";
+      answer.error + ", so the webhook may or may not have been added: the list below shows which once it has been read again. " +
+      "No secret can be shown for it, and the list cannot show which webhook this attempt added, so remove one there only if you know it is that one, then add it again.";
     refresh();
     return;
   }
@@ -2109,7 +2125,7 @@ async function revokeApproval() {
   const named = "token " + target.id + " (" + target.client + ")";
   if (answer.status === 200) approvalNote.textContent = "Revoked " + named + "." + endedAgents(answer.body);
   else if (answer.status === 404) approvalNote.textContent = "Token " + target.id + " (" + target.client + ") was already revoked or gone (404).";
-  else if (answer.error) approvalNote.textContent = answer.error + ", so " + named + " may have been revoked: the list below shows whether.";
+  else if (answer.error) approvalNote.textContent = answer.error + ", so " + named + " may or may not have been revoked: the list below shows which once it has been read again.";
   else approvalNote.textContent = refusal(answer);
   if (answer.status === 200 || answer.status === 404 || answer.error) refresh();
 }
@@ -2184,7 +2200,7 @@ async function revokeToken() {
     tokenNote.textContent = "Revoked token " + target.id + " (" + target.label + ")." + ended + endedAgents(answer.body);
   }
   else if (answer.status === 404) tokenNote.textContent = "Token " + target.id + " was already revoked or gone (404).";
-  else if (answer.error) tokenNote.textContent = answer.error + ", so token " + target.id + " may or may not have been revoked: the list below shows which.";
+  else if (answer.error) tokenNote.textContent = answer.error + ", so token " + target.id + " may or may not have been revoked: the list below shows which once it has been read again.";
   else tokenNote.textContent = refusal(answer);
   if (answer.status === 200 || answer.status === 404 || answer.error) refresh();
 }
@@ -2449,7 +2465,7 @@ async function removeAgent() {
         ? "Removed " + name + ": " + counted(body.messages, "message") + " and " + counted(body.mentions, "mention") + " deleted."
         : "Removed " + name + ".") + stopped;
   } else if (answer.status === 404) agentNote.textContent = name + " is already gone (404).";
-  else if (answer.error) agentNote.textContent = answer.error + ", so " + name + " may have been removed: the list shows whether.";
+  else if (answer.error) agentNote.textContent = answer.error + ", so " + name + " may or may not have been removed: the list shows which once it has been read again.";
   else agentNote.textContent = refusal(answer);
   if (forgot) refresh();
 }

package/dist/db.js

@@ -60,6 +60,37 @@ const MESSAGES_REPLY_INDEXES = `
 CREATE INDEX IF NOT EXISTS messages_by_reply ON messages (in_reply_to);
 -- \`ask\` finds the replies to one question sent to the asker through this, in id order, not by walking every reply to it.
 CREATE INDEX IF NOT EXISTS messages_by_question ON messages (in_reply_to, recipient_id);`;
+// Outgoing webhooks, added only with `message-cp webhook`; an admin person token also lists and removes them over
+// /api/webhooks. `event` is 'channel', 'mention' or 'agent' and `name` the channel or agent in the same account,
+// which need not exist yet. The secret is stored as is: deliveries sign with it.
+// So is the value of the one header a webhook may carry (`header_name`, `header_value`), since deliveries send it.
+// `max_per_hour` (null for none) caps its delivery requests in a fixed window: `window_started_at` is when the first
+// request after the last window ended was claimed, and `window_count` how many requests have been claimed since; the
+// window lasts 60 minutes. `fixed_body` is the JSON body the owner set with `webhook add --body`, sent in place of the
+// event body, or null to send the event body. AUTOINCREMENT so a webhook's id, which GET and DELETE /api/webhooks and
+// `webhook list` hand out, never names a later webhook once the highest one is removed. A table from before it is
+// rebuilt by rebuildWebhooks(), which creates the same table; the columns after `created_at` are added to it in
+// migrate first.
+const webhooksTable = (table) => `
+CREATE TABLE IF NOT EXISTS ${table} (
+  id INTEGER PRIMARY KEY AUTOINCREMENT,
+  account_id INTEGER NOT NULL REFERENCES accounts(id),
+  url TEXT NOT NULL,
+  event TEXT NOT NULL CHECK (event IN ('channel', 'mention', 'agent')),
+  name TEXT NOT NULL,
+  include_text INTEGER NOT NULL,
+  secret TEXT NOT NULL,
+  created_at INTEGER NOT NULL,
+  header_name TEXT,
+  header_value TEXT,
+  max_per_hour INTEGER,
+  window_started_at INTEGER,
+  window_count INTEGER NOT NULL DEFAULT 0,
+  fixed_body TEXT
+);`;
+// Dropping a table drops its indexes, so rebuildWebhooks() creates this again.
+const WEBHOOKS_INDEXES = `
+CREATE INDEX IF NOT EXISTS webhooks_by_name ON webhooks (account_id, event, name COLLATE NOCASE);`;
 // One-time dashboard sign-in codes from `message-cp login-link`, and invites an admin person made (src/login.ts). Only
 // the code's hash is kept. `person_id` is set for a link that signs in as that person; `used_at` once it has given its
 // token or, for an invite, was cancelled. AUTOINCREMENT so an invite's id, which GET and DELETE /api/invites hand out,
@@ -166,25 +197,8 @@ CREATE INDEX IF NOT EXISTS mentions_unread ON mentions (agent_id, read_at, post_
 -- GET /api/channel-posts reads a page of posts' mentions through this, not by scanning every mention.
 CREATE INDEX IF NOT EXISTS mentions_by_post ON mentions (post_id);
 
--- Outgoing webhooks, added only with \`message-cp webhook\`; an admin person token also lists and removes them over
--- /api/webhooks. \`event\` is 'channel', 'mention' or 'agent' and \`name\` the channel or agent in the same account,
--- which need not exist yet. The secret is stored as is: deliveries sign with it.
--- So is the value of the one header a webhook may carry (\`header_name\`, \`header_value\`, added in \`migrate\`), since
--- deliveries send it. \`max_per_hour\` (also added in \`migrate\`, null for none) caps its delivery requests in a fixed
--- window: \`window_started_at\` is when the first request after the last window ended was claimed, and \`window_count\`
--- how many requests have been claimed since; the window lasts 60 minutes. \`fixed_body\` (also added in \`migrate\`) is the
--- JSON body the owner set with \`webhook add --body\`, sent in place of the event body, or null to send the event body.
-CREATE TABLE IF NOT EXISTS webhooks (
-  id INTEGER PRIMARY KEY,
-  account_id INTEGER NOT NULL REFERENCES accounts(id),
-  url TEXT NOT NULL,
-  event TEXT NOT NULL CHECK (event IN ('channel', 'mention', 'agent')),
-  name TEXT NOT NULL,
-  include_text INTEGER NOT NULL,
-  secret TEXT NOT NULL,
-  created_at INTEGER NOT NULL
-);
-CREATE INDEX IF NOT EXISTS webhooks_by_name ON webhooks (account_id, event, name COLLATE NOCASE);
+${webhooksTable("webhooks")}
+${WEBHOOKS_INDEXES}
 
 -- What a webhook is owed: one row per webhook per message or post it is for, queued in the transaction that stores the
 -- message or post. Only ids are kept, so the body is built when it is sent. \`serve\` sends them: \`attempts\` is counted
@@ -460,6 +474,43 @@ function rebuildDashboardSessions(db) {
         db.exec(DASHBOARD_SESSIONS_INDEXES);
     }).immediate();
 }
+/** 1 when rebuildWebhooks() has copied every webhook into its new table. Both tables hold only webhooks, not history. */
+export const COUNT_WEBHOOKS_COPIED = "SELECT (SELECT count(*) FROM webhooks) = (SELECT count(*) FROM webhooks_autoincrement)";
+const webhooksAutoincrement = (db) => /\bAUTOINCREMENT\b/i.test(db.prepare("SELECT sql FROM sqlite_master WHERE type = 'table' AND name = 'webhooks'").get().sql);
+/**
+ * Rebuilds a `webhooks` table from before AUTOINCREMENT as `webhooksTable`, keeping every row, its id and every column,
+ * as rebuildLoginCodes() does for `login_codes`, so that no webhook id is handed out again once the highest webhook is
+ * removed. Under the write lock, so exactly one process rebuilds. `webhook_deliveries` refers to `webhooks`, so as in
+ * rebuildMessages() foreign keys are off around it. Ids are copied as they are, so every delivery still finds its webhook
+ * once every row is copied; it checks that by counting webhooks rather than with foreign_key_check, which would read every
+ * table's history under the write lock.
+ */
+function rebuildWebhooks(db) {
+    if (webhooksAutoincrement(db))
+        return;
+    // Dropping the old table must not cascade to the deliveries that reference it.
+    const foreignKeys = db.pragma("foreign_keys", { simple: true });
+    db.pragma("foreign_keys = OFF");
+    try {
+        db.transaction(() => {
+            if (webhooksAutoincrement(db))
+                return;
+            db.exec(webhooksTable("webhooks_autoincrement"));
+            db.exec(`INSERT INTO webhooks_autoincrement (id, account_id, url, event, name, include_text, secret, created_at, header_name, header_value,
+                                             max_per_hour, window_started_at, window_count, fixed_body)
+         SELECT id, account_id, url, event, name, include_text, secret, created_at, header_name, header_value,
+                max_per_hour, window_started_at, window_count, fixed_body FROM webhooks ORDER BY id`);
+            if (db.prepare(COUNT_WEBHOOKS_COPIED).pluck().get() !== 1)
+                throw new Error("webhooks migration lost a webhook");
+            db.exec("DROP TABLE webhooks");
+            db.exec("ALTER TABLE webhooks_autoincrement RENAME TO webhooks");
+            db.exec(WEBHOOKS_INDEXES);
+        }).immediate();
+    }
+    finally {
+        db.pragma(`foreign_keys = ${foreignKeys ? "ON" : "OFF"}`);
+    }
+}
 function migrate(db, path) {
     addColumn(db, "key_hash", "TEXT");
     // A random token per registration, so a session can tell its agent from a later one that reuses the id or name.
@@ -522,6 +573,8 @@ function migrate(db, path) {
     addColumn(db, "window_count", "INTEGER NOT NULL DEFAULT 0", "webhooks");
     // The JSON body a webhook sends in place of the event body (`webhook add --body`); null, so the event body, for one without.
     addColumn(db, "fixed_body", "TEXT", "webhooks");
+    // Every webhooks column above is added before rebuildWebhooks() copies it.
+    rebuildWebhooks(db);
     addColumn(db, "delivery_uuid", "TEXT", "webhook_deliveries");
     // Set once a DELETE ends an HTTP session, so no server restores it or records it again.
     addColumn(db, "ended", "INTEGER NOT NULL DEFAULT 0", "http_sessions");

package/dist/init.js

@@ -11,6 +11,7 @@ import { fileURLToPath } from "node:url";
 import { NAME_PATTERN, NOT_REGISTERED, PurgeError, purgeAgent } from "./agents.js";
 import { ConnectError, mcpEndpoint } from "./connect.js";
 import { dbPath, openDb } from "./db.js";
+import { VERSION } from "./server.js";
 import { shellQuote } from "./wait.js";
 // `message-cp init`: adds the stdio server `npx -y message-cp` to one coding agent's user-level MCP configuration on
 // this machine, then proves the server works by registering a test agent, sending it a message and reading it back.
@@ -521,7 +522,7 @@ export async function proveServer(server, env = process.env) {
         if (v !== undefined && k !== "MESSAGE_CP_AGENT" && k !== "MESSAGE_CP_AGENT_KEY")
             childEnv[k] = v;
     childEnv.MESSAGE_CP_DB = db;
-    const client = new Client({ name: "message-cp-init", version: "1.0.0" });
+    const client = new Client({ name: "message-cp-init", version: VERSION });
     let failure;
     let step = "starting the server";
     let stderr = "";
@@ -594,7 +595,7 @@ export async function proveServer(server, env = process.env) {
 }
 /** A client of the team server `r`, sending `headers` on every request. */
 function remoteClient(r, headers) {
-    const client = new Client({ name: "message-cp-init", version: "1.0.0" });
+    const client = new Client({ name: "message-cp-init", version: VERSION });
     const transport = new StreamableHTTPClientTransport(r.endpoint, { requestInit: { headers } });
     return { client, transport };
 }

package/dist/server.js

@@ -1,4 +1,5 @@
 import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
+import { createRequire } from "node:module";
 import { z } from "zod";
 import { DEFAULT_LIST_LIMIT, MAX_LIST_LIMIT, MAX_STATUS_LENGTH, NOT_REGISTERED, STATUS_TTL_MS, ToolError, getAgent, listAgents, markWaiting, nameOfIdentity, registerWithIdentity, removeAgent, setStatus, touchAgent, } from "./agents.js";
 import { OWNER_ACCOUNT } from "./db.js";
@@ -123,13 +124,15 @@ async function poll(deadline, signal, answer) {
             return found;
     }
 }
+/** The version in package.json, one directory up from this file whether it runs from src/ (tsx) or dist/ (a build or the npm package). */
+export const VERSION = createRequire(import.meta.url)("../package.json").version;
 /** One server per session. */
 export function createServer(db, session = new Session(OWNER_ACCOUNT), options = {}) {
     const remote = options.remote ?? false;
     const hold = options.hold ?? holdInProcess;
     session.attach(db);
     const account = session.account;
-    const server = new McpServer({ name: "message-cp", version: "0.1.0" }, { instructions: instructions(process.env, remote, options.publicUrl, options.agent, options.approval, session.account) });
+    const server = new McpServer({ name: "message-cp", version: VERSION }, { instructions: instructions(process.env, remote, options.publicUrl, options.agent, options.approval, session.account) });
     // Aborts when the call is cancelled or, where the transport knows it, the response that would carry its answer closes.
     const ended = (extra) => {
         const closed = options.closed?.(extra.requestId);

package/package.json

@@ -1,8 +1,9 @@
 {
   "name": "message-cp",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "A messaging service for AI agents: register a name, find each other, send messages and be woken when mail arrives",
   "license": "MIT",
+  "mcpName": "io.github.colinhallett/message-cp",
   "main": "dist/index.js",
   "files": [
     "dist"