@weaveprotocol/cli 0.2.3 → 0.2.5

package/dist/weave.mjs

@@ -7527,14 +7527,18 @@ async function proveRead(access, label, provider) {
 }
 async function checkRead(access, peerDid, label, proof, provider) {
   const current = access.current();
+  const admit = (readKey2) => {
+    access.admitted?.(peerDid, readKey2);
+    return true;
+  };
   const claimed = typeof proof.readKey === "string" ? proof.readKey : current;
   if (claimed.startsWith("did:key:") && await verifyBy(provider, claimed, proof.read, label)) {
-    if (claimed === current) return true;
-    if (access.admits && await access.admits(peerDid, claimed, proof.member)) return true;
+    if (claimed === current) return admit(current);
+    if (access.admits && await access.admits(peerDid, claimed, proof.member)) return admit(claimed);
   }
   const earlier = Array.isArray(proof.earlier) ? proof.earlier.slice(0, MAX_EARLIER_READ_KEYS) : [];
   const ours = earlier.find((item) => item?.readKey === current);
-  return ours !== void 0 && current.startsWith("did:key:") && verifyBy(provider, current, ours.read, label);
+  return ours !== void 0 && current.startsWith("did:key:") && await verifyBy(provider, current, ours.read, label) && admit(current);
 }
 function peerNonce() {
   return base64UrlEncode(globalThis.crypto.getRandomValues(new Uint8Array(16)));
@@ -8016,6 +8020,12 @@ function createMesh(config) {
         broadcast: (message) => {
           for (const peer of room.peers.keys()) send2(peer, message);
         },
+        drop(peer) {
+          if (rooms.get(name) !== room || !room.peers.has(peer)) return;
+          sendFrame(peer, { room: name, type: LEAVE_MESSAGE });
+          drop(room, peer);
+          closeIfIdle(peer);
+        },
         getPeers: () => [...room.peers.values()],
         on: room.events.on,
         off: room.events.off,
@@ -8066,6 +8076,9 @@ function createNetworkManager(config) {
     broadcast: (message) => {
       for (const peerId of peers.keys()) send2(peerId, message);
     },
+    drop: (peerId) => {
+      if (peers.has(peerId)) transport.close(peerId);
+    },
     getPeers: () => [...peers.values()],
     on,
     off,
@@ -9011,6 +9024,8 @@ var writeCapability = (spaceId) => ({
 });
 var noteCid = (encoded) => cidFromBytes(utf8Encode(encoded));
 var NO_ACCOUNT = Object.freeze({ account: null, agent: false });
+var STALE_ADMISSION_MS = 6e4;
+var WHO_WAIT_MS = 1e4;
 var WHO_MESSAGE = "who";
 var LIVE_MESSAGE = "live";
 var MAX_LIVE_BYTES = 64 * 1024;
@@ -9564,6 +9579,8 @@ async function openSpaceRuntime(deps) {
     for (const mirror of mirrors) mirror.changed();
     void refreshHolds().catch(() => {
     });
+    void letGoOfOutsiders().catch(() => {
+    });
   };
   function currentKey2(state) {
     const epoch = state.keys.at(-1);
@@ -9721,6 +9738,7 @@ async function openSpaceRuntime(deps) {
       keysRunning = null;
     });
   }
+  const admittedOn = /* @__PURE__ */ new Map();
   const readAccess = space2.visibility !== "private" ? null : {
     async key() {
       const held = newestKey((await access()).history.current);
@@ -9744,6 +9762,9 @@ async function openSpaceRuntime(deps) {
       if (!held) return false;
       const { account } = await accountOf(peerDid, await openWith(held, membership, membershipContext(space2.id)));
       return account !== null && readers(history.current).has(account);
+    },
+    admitted(peerDid, readKey2) {
+      admittedOn.set(peerDid, { readKey: readKey2, at: Date.now() });
     }
   };
   const mirrors = [];
@@ -9853,6 +9874,24 @@ async function openSpaceRuntime(deps) {
     if (!routes.has(peer)) return;
     emit({ type: "message", space: space2.id, from: account, peer, agent, message: payload });
   }
+  async function letGoOfOutsiders() {
+    if (admittedOn.size === 0) return;
+    const connected = new Set(connectedPeers());
+    for (const [peer, { at }] of admittedOn) {
+      if (!connected.has(peer) && Date.now() - at > STALE_ADMISSION_MS) admittedOn.delete(peer);
+    }
+    const allowed = readers((await access()).history.current);
+    for (const peer of connected) {
+      const admission = admittedOn.get(peer);
+      if (!admission || admission.readKey === currentReadKey) continue;
+      if (!peerAccounts.has(peer) && Date.now() - admission.at < WHO_WAIT_MS) continue;
+      const { account } = await peerAccounts.get(peer) ?? NO_ACCOUNT;
+      if (account !== null && allowed.has(account)) continue;
+      if (admittedOn.get(peer) !== admission) continue;
+      admittedOn.delete(peer);
+      for (const network of networks) network.drop(peer);
+    }
+  }
   for (const network of networks) {
     network.on("message", (message) => {
       if (message.type === "sync") void sync.handleMessage(message.from, message.payload);
@@ -9864,6 +9903,8 @@ async function openSpaceRuntime(deps) {
           if (peerAccounts.get(message.from) !== checked) return;
           knownAccounts.set(message.from, known);
           emit({ type: "status", space: space2.id });
+          void letGoOfOutsiders().catch(() => {
+          });
         });
       } else if (message.type === LIVE_MESSAGE) void onLive(message.from, message.payload);
     });
@@ -9873,6 +9914,8 @@ async function openSpaceRuntime(deps) {
       sync.addPeer(info.did);
       sync.notifyPeers([info.did]);
       emit({ type: "status", space: space2.id });
+      void letGoOfOutsiders().catch(() => {
+      });
     });
     network.on("peer-disconnected", (info) => {
       if (routes.get(info.did) === network) {
@@ -9882,6 +9925,7 @@ async function openSpaceRuntime(deps) {
         knownAccounts.delete(info.did);
         liveAllowance.delete(info.did);
       }
+      if (!connectedPeers().includes(info.did)) admittedOn.delete(info.did);
       emit({ type: "status", space: space2.id });
     });
     network.on("error", () => {
@@ -12942,7 +12986,8 @@ var app = {
       title: { type: "string", minLength: 1, maxLength: 100 },
       description: { type: "string", maxLength: 1e3 },
       needs: { type: "array", minItems: 1, maxItems: MAX_APP_COLLECTIONS, items: { type: "object" } },
-      from: { type: "string", maxLength: 300 }
+      from: { type: "string", maxLength: 300 },
+      updates: { type: "string", minLength: 1, maxLength: 100 }
     },
     required: ["title", "needs"]
   },
@@ -12956,6 +13001,9 @@ function checkApp(value) {
   if (body.description !== void 0 && (typeof body.description !== "string" || body.description.length > 1e3)) {
     return "An app's description is at most 1000 characters";
   }
+  if (body.updates !== void 0 && (typeof body.updates !== "string" || !body.updates || body.updates.length > 100)) {
+    return `An app's "updates" is the key of the app it replaces`;
+  }
   if (!Array.isArray(body.needs) || body.needs.length === 0 || body.needs.length > MAX_APP_COLLECTIONS) {
     return `An app needs 1\u2013${MAX_APP_COLLECTIONS} collections`;
   }
@@ -13031,9 +13079,25 @@ function reviewApp(body, collections) {
   });
   return { needs, added: needs.every((need) => need.status === "same"), problem: null };
 }
+function supersededApps(records, collections) {
+  const replaces = /* @__PURE__ */ new Map();
+  for (const record of records) {
+    if (record.body?.updates && record.body.updates !== record.key) replaces.set(record.key, record.body.updates);
+  }
+  const superseded = /* @__PURE__ */ new Set();
+  for (const record of records) {
+    if (!record.body || !reviewApp(record.body, collections).added) continue;
+    for (let key3 = replaces.get(record.key); key3 && !superseded.has(key3) && key3 !== record.key; key3 = replaces.get(key3)) superseded.add(key3);
+  }
+  return superseded;
+}
 async function proposeApp(node, spaceId, body) {
   const problem = checkApp(body);
   if (problem) throw new Error(problem);
+  if (body.updates) {
+    const replaced = await node.records.get(spaceId, body.updates);
+    if (!replaced || replaced.collection !== app.name) throw new Error(`"updates" names no app in this space: ${body.updates}`);
+  }
   return node.records.put(spaceId, app.name, body);
 }
 
@@ -13280,7 +13344,7 @@ var NODE_ACTIONS = Object.freeze([
   },
   {
     name: "apps_list",
-    description: 'The apps proposed in a space: each with its title, who proposed it (viaAgent when an agent did), and for every collection it needs whether it is new, already there, or would change one \u2014 with what it allows, worked out from its rules. "added" is true once a person has added it.',
+    description: 'The apps proposed in a space: each with its title, who proposed it (viaAgent when an agent did), and for every collection it needs whether it is new, already there, or would change one \u2014 with what it allows, worked out from its rules. "added" is true once a person has added it. "updates" names the app it is a new version of; "superseded" is true once a newer version of it has been added, so it is only history.',
     input: { type: "object", properties: { space }, required: ["space"] },
     readOnly: true,
     peerContent: true,
@@ -13288,6 +13352,7 @@ var NODE_ACTIONS = Object.freeze([
       const spaceId = str(input, "space");
       const collections = await node.collections.list(spaceId);
       const found = await node.records.list(spaceId, { collection: app.name });
+      const superseded = supersededApps(found, collections);
       return found.map((record) => {
         const review = record.body ? reviewApp(record.body, collections) : null;
         return {
@@ -13297,7 +13362,9 @@ var NODE_ACTIONS = Object.freeze([
           proposedBy: record.createdBy,
           ...record.viaAgent ? { viaAgent: true } : {},
           ...record.body && appScreen(record.body) ? { screen: appScreen(record.body).collection } : {},
+          ...record.body?.updates ? { updates: record.body.updates } : {},
           added: review?.added ?? false,
+          superseded: superseded.has(record.key),
           problem: review?.problem ?? (record.body ? null : "It could not be read"),
           needs: review?.needs.map(({ definition, status, summary, changes }) => ({ name: definition.name, status, summary, changes })) ?? []
         };
@@ -13313,13 +13380,14 @@ var NODE_ACTIONS = Object.freeze([
   },
   {
     name: "apps_propose",
-    description: `Propose an app in a space: a new way for its people to work together \u2014 a carpool, a sign-up sheet, a decision log. Give it a title, a line on what it is for, and the collections it needs, each exactly as collections_define takes it (name, title, description, schema, links, permissions, rules \u2014 no version). Nothing is defined yet: everyone in the space sees the proposal, with what it allows worked out from its rules, and a person who may define collections adds it. Read collections_list first and reuse what the space already has (std.poll, std.task\u2026) rather than inventing a twin. For anything plain lists and forms can't show \u2014 a game board, a calendar, a whiteboard \u2014 give the main collection a "screen": its own HTML UI (one document, inline scripts and styles, no network unless the collection names exact origins in "network"). Inside it, use exactly: weave.me ({ did, name }), await weave.list("<collection>", { where: { "link:<rel>": key } }), await weave.put("<collection>", body, { links: [{ rel, to: key }] }), await weave.update(key, body), await weave.remove(key), weave.onChange(redraw). Records are { key, body, links, createdBy, mine }. Read apps_screen_guide for the rest. Returns what each collection will allow; tell the person that, not your own description.`,
+    description: `Propose an app in a space: a new way for its people to work together \u2014 a carpool, a sign-up sheet, a decision log. Give it a title, a line on what it is for, and the collections it needs, each exactly as collections_define takes it (name, title, description, schema, links, permissions, rules \u2014 no version). Nothing is defined yet: everyone in the space sees the proposal, with what it allows worked out from its rules, and a person who may define collections adds it. Read collections_list first and reuse what the space already has (std.poll, std.task\u2026) rather than inventing a twin. To change an app that is already here, read apps_list and pass the key of its newest version, the one not superseded, as "updates": the change then shows as an update to it, and once it is added the old version is not offered again. For anything plain lists and forms can't show \u2014 a game board, a calendar, a whiteboard \u2014 give the main collection a "screen": its own HTML UI (one document, inline scripts and styles, no network unless the collection names exact origins in "network"). Inside it, use exactly: weave.me ({ did, name }), await weave.list("<collection>", { where: { "link:<rel>": key } }), await weave.put("<collection>", body, { links: [{ rel, to: key }] }), await weave.update(key, body), await weave.remove(key), weave.onChange(redraw). Records are { key, body, links, createdBy, mine }. Read apps_screen_guide for the rest. Returns what each collection will allow; tell the person that, not your own description.`,
     input: {
       type: "object",
       properties: {
         space,
         title: { type: "string", description: 'What people will call it, e.g. "Carpool"' },
         description: { type: "string", description: "What it is for, in a sentence" },
+        updates: { type: "string", description: "The key of the app this is a new version of, from apps_list" },
         needs: {
           type: "array",
           description: "Collection definitions, as collections_define takes them \u2014 without version",
@@ -13334,6 +13402,7 @@ var NODE_ACTIONS = Object.freeze([
       const body = {
         title: str(input, "title"),
         ...typeof input.description === "string" ? { description: input.description } : {},
+        ...typeof input.updates === "string" ? { updates: input.updates } : {},
         needs: input.needs
       };
       const problem = checkApp(body);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@weaveprotocol/cli",
-  "version": "0.2.3",
+  "version": "0.2.5",
   "description": "The Weave protocol from a terminal: manage spaces, run an always-on node, serve MCP to agents",
   "type": "module",
   "bin": {