@chipschat/hermes 1.0.14 → 1.0.16

package/dist/THIRD-PARTY-NOTICES.md

@@ -1,9 +1,9 @@
 # Third-party notices
 
-`dist/main.js` in @chipschat/hermes 1.0.14 carries these packages, bundled in. Each one's
+`dist/main.js` in @chipschat/hermes 1.0.16 carries these packages, bundled in. Each one's
 licence follows.
 
-## @chipschat/harness 1.0.1 (Apache-2.0)
+## @chipschat/harness 1.0.2 (Apache-2.0)
 
 Apache License
                            Version 2.0, January 2004
@@ -207,7 +207,7 @@ Apache License
    See the License for the specific language governing permissions and
    limitations under the License.
 
-## @chipschat/protocol 1.0.1 (Apache-2.0)
+## @chipschat/protocol 1.0.2 (Apache-2.0)
 
 Apache License
                            Version 2.0, January 2004

package/dist/main.js

@@ -20529,7 +20529,7 @@ var contextLine = external_exports.object({
 }).describe("One line of a room: something said, or something that happened to who is in it.");
 var roomContext = external_exports.object({
   lines: external_exports.array(contextLine).max(CONTEXT_CEILING.lines).describe("Oldest first, the newest that fit the budget."),
-  since_seq: external_exports.int().nonnegative().describe("Where they start: after this `seq`. With a message, where the turn that said the harness's own last message in the room began (ADR 0105), else its joining; from the pull route, 0."),
+  since_seq: external_exports.int().nonnegative().describe("Where they start: after this `seq`. With a message, where the harness's own last turn in the room began, one that said something or passed with NO_REPLY (ADR 0105), else its joining; from the pull route, 0."),
   truncated: external_exports.boolean().describe("Whether older lines after `since_seq` were left out to fit the budget."),
   before: external_exports.int().positive().describe("A cursor: `GET /v1/spaces/:id/context?before=` this reads what came before these lines."),
   files: roomFiles.max(ROOM_FILES_IN_CONTEXT).optional().describe("The room's files at their current version, newest first, the 20 newest (ADR 0099): with a message, as of it, its own files included; from the pull route, as of now. Each with a URL for this harness. Absent from a Chips before files, and when the room has none."),
@@ -21677,6 +21677,7 @@ var pairingPayload = external_exports.object({
 var JOIN_POLL_SECONDS = 3;
 var joinKind = external_exports.enum(["harness", "device", "invite", "pairing"]).describe("A harness asking for a key; a device asking to be paired; a person joining by an invite, or a device pairing by a code, that waits for whoever handed it out (ADR 0232).");
 var keyCode = external_exports.string().regex(/^[0-9]{6}$/, "six digits");
+var joinNonce = external_exports.string().regex(/^[A-Za-z0-9_-]{43}$/, "32 bytes, base64url");
 var requestCode = external_exports.union([pairingCode, keyCode]);
 var joinState = external_exports.enum(["waiting", "allowed", "denied", "expired", "redeemed"]).describe("`waiting` for a person; `allowed`, and not yet collected; `denied` by a person, or withdrawn; `expired` before it was collected; `redeemed`, which spends it.");
 var joinStartedBy = external_exports.enum(["requester", "person"]).describe("Who started it: the requester, with a code to compare, or a person, with a link that is allowed already.");
@@ -21712,12 +21713,15 @@ var joinAsk = external_exports.object({
   software: words2(120).optional(),
   machine: words2(120).optional(),
   wants: capabilities.optional().describe("For a harness: what it asks to be allowed."),
-  public_key: external_exports.string().regex(/^[A-Za-z0-9+/]{40,64}={0,2}$/).optional().describe("For a device: the public half of its Ed25519 key, SPKI DER, base64.")
+  public_key: external_exports.string().regex(/^[A-Za-z0-9+/]{40,64}={0,2}$/).optional().describe("For a device: the public half of its Ed25519 key, SPKI DER, base64."),
+  commit: joinNonce.optional().describe("For a device (S-1, ADR 0278): the SHA-256 of `joinCommitText` of a nonce it keeps, base64url. It sends the nonce with its first poll, once it holds the server's, and both ends work the code out.")
 }).describe("A request to join.");
 var joinAsked = external_exports.object({
   request_id: id("join"),
   secret: external_exports.string().min(16).max(200).describe("The requester's alone: it polls with it."),
-  code: requestCode,
+  code: requestCode.optional().describe("The code to show. Absent for a device that sent `commit`: it works its own out."),
+  server_key: external_exports.string().min(1).max(128).optional().describe("For a device that sent `commit`: the server's tunnel key, which the code is worked out from and the device pins once it is allowed (ADR 0191, 0278)."),
+  nonce: joinNonce.optional().describe("For a device that sent `commit`: the server's nonce, for the code (ADR 0278)."),
   expires_in: external_exports.int().positive().describe("Seconds until it expires."),
   interval: external_exports.int().positive().describe("Seconds between polls.")
 });
@@ -22649,6 +22653,17 @@ var jobChangeFrame = external_exports.object({
   asked_at: isoTimestamp
 }).describe("A person switched one of a harness's own jobs, or changed how often it runs (ADR 0252). Sent to a harness's socket that said `jobs` in its `hello`, now or never: it is not in the log. The harness answers with its copy of all its jobs, `answers` or `refuses` naming `change_id`.");
 
+// node_modules/@chipschat/protocol/dist/src/read-marks.js
+var READ_MARKS_MAX = 1e3;
+var readMarks = external_exports.record(id("space"), external_exports.int().nonnegative().describe("The `seq` the room is read up to.")).refine((marks) => Object.keys(marks).length <= READ_MARKS_MAX, {
+  message: `at most ${READ_MARKS_MAX} rooms`
+}).describe("How far each room is read, by room id.");
+var readMarksBody = external_exports.object({ spaces: readMarks });
+var readFrame = external_exports.object({
+  frame: external_exports.literal("read"),
+  spaces: readMarks.describe("The rooms whose marks moved, and where to.")
+}).describe("A person read further in some rooms, on one of their devices (ADR 0262). Sent to that person's sockets that said `reads` in their `hello`, never to anyone else's, now or never: `GET /v1/me/read` reads them again.");
+
 // node_modules/@chipschat/protocol/dist/src/frames.js
 var clientHelloFrame = external_exports.object({
   frame: external_exports.literal("hello"),
@@ -22665,7 +22680,7 @@ var clientHelloFrame = external_exports.object({
     autonomy: autonomyLevel.optional().describe("The level the harness believes it has.")
   })).max(64).optional().describe("Not read by Chips: a connection is its token's, and the server's `hello` names the token's harness and its agents (ADR 0087). Absent for a person's client."),
   since: external_exports.int().nonnegative().optional().describe("Not read by Chips: a stream resumes from `subscribe`'s `since`."),
-  accepts: external_exports.array(external_exports.string().min(1).max(40)).max(32).optional().describe("Server frames beyond the base set this client understands, by the names in `SERVER_EXTENSIONS`. A name the server does not know is ignored rather than refused, so a client may name a frame a newer server sends and still be answered by an older one (ADR 0211, Phase 3). A client that says `events` is sent its replay in pages rather than one frame per event; one that says `presence` is sent an agent's state as it changes (ADR 0083); a harness's socket that says `restart` is sent `restart` when a person asks it to restart (ADR 0094); an owner's or admin's that says `join` is sent each join request as it changes (ADR 0122); a harness's that says `context` is sent `context.edit` when a person changes one of its context files (ADR 0134); a harness's that says `models` is sent `model.change` when a person changes an agent's model or effort (ADR 0140); a harness's that says `heartbeats` is sent `heartbeat.change` when a person switches an agent's heartbeat or changes how often it beats (ADR 0143); a harness's that says `context_windows` is sent `context_window.compact` and `context_window.change` when a person asks an agent to compact now or changes the limit it compacts itself at (ADR 0146); a harness's that says `jobs` is sent `job.change` when a person switches one of the jobs it runs on its own (ADR 0252); a person's that says `folders` is sent `folder.open` when they ask, from another of their devices, for a room's folder to be opened in Finder (ADR 0225), and `folder.run` when they ask for its project to be run or stopped there (ADR 0226); a person's that says `folder_runs` is sent `folder.run_state` when their Mac says how a run of theirs stands (ADR 0226); one that says nothing is sent what it was always sent, since an unknown frame is dropped in silence."),
+  accepts: external_exports.array(external_exports.string().min(1).max(40)).max(32).optional().describe("Server frames beyond the base set this client understands, by the names in `SERVER_EXTENSIONS`. A name the server does not know is ignored rather than refused, so a client may name a frame a newer server sends and still be answered by an older one (ADR 0211, Phase 3). A client that says `events` is sent its replay in pages rather than one frame per event; one that says `presence` is sent an agent's state as it changes (ADR 0083); a harness's socket that says `restart` is sent `restart` when a person asks it to restart (ADR 0094); an owner's or admin's that says `join` is sent each join request as it changes (ADR 0122); a harness's that says `context` is sent `context.edit` when a person changes one of its context files (ADR 0134); a harness's that says `models` is sent `model.change` when a person changes an agent's model or effort (ADR 0140); a harness's that says `heartbeats` is sent `heartbeat.change` when a person switches an agent's heartbeat or changes how often it beats (ADR 0143); a harness's that says `context_windows` is sent `context_window.compact` and `context_window.change` when a person asks an agent to compact now or changes the limit it compacts itself at (ADR 0146); a harness's that says `jobs` is sent `job.change` when a person switches one of the jobs it runs on its own (ADR 0252); a person's that says `folders` is sent `folder.open` when they ask, from another of their devices, for a room's folder to be opened in Finder (ADR 0225), and `folder.run` when they ask for its project to be run or stopped there (ADR 0226); a person's that says `folder_runs` is sent `folder.run_state` when their Mac says how a run of theirs stands (ADR 0226); a person's that says `reads` is sent `read` when they read further on another of their devices (ADR 0262); one that says nothing is sent what it was always sent, since an unknown frame is dropped in silence."),
   context: contextBudget.optional().describe("How much of a room a harness is handed with each message for it (ADR 0088): 40 lines and 16,000 characters when absent, 200 and 32,000 at most. For this connection. A person's client is handed none.")
 }).describe("The first frame a client sends.");
 var subscribeFrame = external_exports.object({
@@ -22791,6 +22806,7 @@ var serverFrame = external_exports.discriminatedUnion("frame", [
   folderOpenFrame,
   folderRunFrame,
   folderRunStateFrame,
+  readFrame,
   contextEditFrame,
   modelChangeFrame,
   heartbeatChangeFrame,
@@ -22842,9 +22858,37 @@ var HTML_POLICY = "default-src 'none'; img-src data: blob:; font-src data:; medi
 var PAGE_SANDBOX = "allow-scripts allow-popups allow-popups-to-escape-sandbox";
 var PAGE_HEADER_POLICY = `${HTML_POLICY}; sandbox ${PAGE_SANDBOX}`;
 
-// node_modules/@chipschat/harness/dist/connect.js
-import { readFile as readFile2 } from "node:fs/promises";
-import { basename } from "node:path";
+// node_modules/@chipschat/protocol/dist/src/push.js
+var PUSH_WORDS = {
+  /** An ask of an agent's that waits on a person (ADR 0045). */
+  decision: {
+    title: "A decision is waiting",
+    body: "Approve or deny from here.",
+    categoryId: "decision"
+  },
+  /** A message that @s the person, or was sent to them (ADR 0158). */
+  messageForYou: { title: "A message for you", body: "Open Chips to read it." },
+  /** A message in a room they hear (ADR 0158). */
+  message: { title: "A new message", body: "Open Chips to read it." },
+  /** A join request for its maker or an owner (ADR 0122). */
+  join: { title: "Something asks to join", body: "Check its code, then allow it or not." },
+  /** The referee paused agents talking among themselves (ADR 0097). */
+  held: { title: "Chips paused the agents", body: "Open the space to let them carry on." },
+  warning: { title: "The agents need a look", body: "They have been talking among themselves." },
+  /** A guest's ask to go direct, and its answers (ADR 0211). */
+  directAsked: {
+    title: "A guest wants to connect directly",
+    body: "Share your server with them in Tailscale."
+  },
+  directShared: { title: "Your server is shared with you", body: "Open Chips to go direct." },
+  directDone: {
+    title: "Connected directly",
+    body: "A guest you shared your server with is direct now."
+  },
+  /** An owner is turning the relay off (ADR 0211, Phase 4). */
+  relayOff: { title: "The relay is going off", body: "Go direct to keep reaching the server." }
+};
+var KNOWN = new Set(Object.values(PUSH_WORDS).map((words4) => JSON.stringify([words4.title, words4.body, "categoryId" in words4 ? words4.categoryId : null])));
 
 // node_modules/@chipschat/harness/dist/asks.js
 var Asks = class {
@@ -22879,10 +22923,7 @@ var Asks = class {
     const from = event["from"];
     if (!this.listener.listening() || from?.kind !== "person")
       return false;
-    this.hand(spaceId, room, {
-      messageId: String(event["message_id"]),
-      text: String(event["text"] ?? "")
-    });
+    this.hand(spaceId, room, { messageId: String(event["message_id"]), text: String(event["text"] ?? "") }, event);
     return true;
   }
   /**
@@ -22918,11 +22959,42 @@ var Asks = class {
     this.rooms.set(spaceId, room);
     return room;
   }
-  hand(spaceId, room, first) {
+  hand(spaceId, room, first, message) {
     room.first = first.messageId;
-    this.listener.hand({ spaceId, askedBy: room.askedBy, firstMessage: first });
+    this.listener.hand({
+      spaceId,
+      askedBy: room.askedBy,
+      firstMessage: first,
+      ...message === void 0 ? {} : { message }
+    });
   }
 };
+function firstTurnOf(asked, agentId2) {
+  const { message } = asked;
+  if (message === void 0)
+    return void 0;
+  const room = message.room;
+  const notes = room?.notes ?? {};
+  const [place, ...more] = Object.keys(notes);
+  if (room === void 0 || place === void 0 || more.length > 0) {
+    return { ...message, for: [agentId2] };
+  }
+  const placed = (each) => each.participant_id === place ? { ...each, participant_id: agentId2 } : each;
+  const note = notes[place];
+  const rules = room.rules?.[place];
+  return {
+    ...message,
+    for: [agentId2],
+    room: {
+      ...room,
+      members: room.members.map(placed),
+      notes: note === void 0 ? {} : { [agentId2]: note },
+      ...room.rules === void 0 ? {} : { rules: rules === void 0 ? {} : { [agentId2]: rules } },
+      ...room.working === void 0 ? {} : { working: room.working.map(placed) },
+      ...room.idle === void 0 ? {} : { idle: room.idle.map(placed) }
+    }
+  };
+}
 function firstWords(history) {
   for (const event of history) {
     const actor2 = event["actor"];
@@ -22933,6 +23005,10 @@ function firstWords(history) {
   return void 0;
 }
 
+// node_modules/@chipschat/harness/dist/connect.js
+import { readFile as readFile2 } from "node:fs/promises";
+import { basename } from "node:path";
+
 // node_modules/@chipschat/harness/dist/events.js
 var Emitter = class {
   handlers = /* @__PURE__ */ new Map();
@@ -27675,6 +27751,8 @@ var Bridge = class {
   toldModels = false;
   /** While Hermes's gateway restarts (Chips ADR 0094), the health watch says nothing: the restart says how it went. */
   held = false;
+  /** Restarts begun, so a health check asked before one, and answered after, is let go. */
+  holds = 0;
   /** What went wrong in the last restart, said in place of the watch's own words while Hermes doesn't answer. */
   why;
   /** Register the agents, start hearing what is said to them, and say how their gateways are. */
@@ -27715,6 +27793,7 @@ var Bridge = class {
   }
   /** Hold the health watch's words while Hermes's gateway restarts, and let them go after. */
   hold(held) {
+    if (held && !this.held) this.holds += 1;
     this.held = held;
   }
   /**
@@ -28051,7 +28130,7 @@ ${hook.lines}`);
     await this.ownProfile(agent.agentId, agent.name);
     this.ours.add(agent.agentId);
     void this.agentsMoved();
-    const message = {
+    const message = firstTurnOf(asked, agent.agentId) ?? {
       type: "message.new",
       space_id: spaceId,
       message_id: firstMessage.messageId,
@@ -28179,11 +28258,18 @@ ${hook.lines}`);
       return note === void 0 ? {} : { note };
     }
   }
-  /** Trouble while a profile's gateway doesn't answer, and fine once all do (ADR 0083); nothing while a restart runs. */
+  /**
+   * Trouble while a profile's gateway doesn't answer, and fine once all do (ADR 0083); nothing while
+   * a restart runs, nor answers to a check asked before one began, even one over by now: they are of
+   * the gateways before, and a failed restart's words would go.
+   */
   async sayHowItIs() {
     if (this.held) return;
-    for (const agent of this.agents) agent.up = await agent.client.healthy();
-    if (this.held) return;
+    const holds2 = this.holds;
+    const answers2 = /* @__PURE__ */ new Map();
+    for (const agent of this.agents) answers2.set(agent, await agent.client.healthy());
+    if (this.holds !== holds2) return;
+    for (const [agent, up] of answers2) agent.up = up;
     const down = this.agents.filter((agent) => !agent.up);
     if (down.length === 0) this.why = void 0;
     const chips2 = this.options.chips;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@chipschat/hermes",
-  "version": "1.0.14",
+  "version": "1.0.16",
   "description": "Hermes Agent as a Chips harness, on its Runs API: each profile a Chips agent, each room a Hermes session.",
   "license": "Apache-2.0",
   "repository": {
@@ -33,9 +33,9 @@
     "release": "npm run build && npm test && npm pack"
   },
   "devDependencies": {
-    "@chipschat/conformance": "1.0.1",
-    "@chipschat/harness": "1.0.1",
-    "@chipschat/protocol": "1.0.1",
+    "@chipschat/conformance": "1.0.2",
+    "@chipschat/harness": "1.0.2",
+    "@chipschat/protocol": "1.0.2",
     "@types/node": "22.19.0",
     "esbuild": "0.27.7",
     "tsx": "4.21.0",