@ours.network/cowork 0.3.4 → 0.3.6

package/dist/daemon.js

@@ -107,6 +107,15 @@ function packInvite(raw) {
     }
   }).toString("base64url");
 }
+function unpackInvite(encoded, maximumBytes) {
+  const normalized = encoded.replace(/\s+/g, "");
+  if (maximumBytes !== void 0 && Buffer.byteLength(encoded, "utf8") > maximumBytes || normalized.length === 0 || !/^[A-Za-z0-9_-]+$/.test(normalized)) {
+    throw new Error("the invite blob is empty, oversized, or invalid base64url");
+  }
+  const compressed = Buffer.from(normalized, "base64url");
+  if (compressed.length === 0) throw new Error("the invite blob is empty or invalid base64url");
+  return Buffer.from(maximumBytes === void 0 ? brotliDecompressSync(compressed) : brotliDecompressSync(compressed, { maxOutputLength: maximumBytes }));
+}
 var commonSdk, executableSdk, wrapperSdk, wrappersSdk, AdaptObjectLifetime, adapt_wrapper, object_to_adapt_value, PacketWrapperConfigurator, LATE_RESULT_DRAIN_MS, Packet, AdaptHostShutdownError, AdaptHost;
 var init_adapt = __esm({
   async "src/adapt.ts"() {
@@ -4931,7 +4940,7 @@ function refineMessageCategory(message, context) {
     }
   }
 }
-var MAX_TEXT_BYTES, MAX_FILE_BYTES, MAX_HISTORY_PAGE_BYTES, MAX_MANAGEMENT_RESPONSE_BYTES, MAX_FILE_NAME_BYTES, MAX_MIME_BYTES, MAX_ROLE_BYTES, MAX_ROOM_NAME_CHARACTERS, NonEmptyStringSchema, PositiveSafeIntegerSchema, LowerCrockfordUlidSchema, Rfc3339Schema, RoomNameSchema, ROOM_IDENTITY_PREFIX, RoleSchema, MissionTextSchema, MessageTextSchema, FileNameSchema, FileMimeSchema, RoomStateSchema, SeatStateSchema, InviteModeSchema, DEFAULT_ROLE, InviteStateSchema, RelayStatusSchema, SeatV1Schema, SeatSchema, RoomInviteSchema, MissionV1Schema, MissionSchema, RoleBriefingSchema, RoomCommonShape, RoomV1Schema, CurrentRoomSchema, RoomSchema, CreateRoomInputSchema, UpdateRoomInputSchema, RoleBriefingSetInputSchema, RoleBriefingDeleteInputSchema, PostMessageInputSchema, AuthorSnapshotSchema, RecordCommonShape, AppendCommonShape, MembershipNoticeSchema, AuthorAliasSchema, MessageShape, RelayIntentShape, RelayResultStatusSchema, RelayResultShape, FileShape, MembershipIntentShape, MembershipResultShape, CloseNoticeIntentShape, CloseNoticeResultShape, MessageRecordSchema, FileRecordSchema, RelayIntentRecordSchema, RelayResultRecordSchema, MembershipIntentRecordSchema, MembershipResultRecordSchema, CloseNoticeIntentRecordSchema, CloseNoticeResultRecordSchema, RawCommunicationRecordSchema, CommunicationRecordSchema, AppendRecordSchema;
+var MAX_TEXT_BYTES, MAX_FILE_BYTES, MAX_HISTORY_PAGE_BYTES, MAX_MANAGEMENT_RESPONSE_BYTES, MAX_EXTERNAL_INVITE_BYTES, MAX_FILE_NAME_BYTES, MAX_MIME_BYTES, MAX_ROLE_BYTES, MAX_ROOM_NAME_CHARACTERS, NonEmptyStringSchema, PositiveSafeIntegerSchema, LowerCrockfordUlidSchema, Rfc3339Schema, RoomNameSchema, ROOM_IDENTITY_PREFIX, RoleSchema, MissionTextSchema, MessageTextSchema, FileNameSchema, FileMimeSchema, RoomStateSchema, SeatStateSchema, InviteModeSchema, DEFAULT_ROLE, InviteStateSchema, RelayStatusSchema, SeatV1Schema, SeatSchema, RoomInviteSchema, MissionV1Schema, MissionSchema, RoleBriefingSchema, RoomCommonShape, RoomV1Schema, CurrentRoomSchema, RoomSchema, CreateRoomInputSchema, UpdateRoomInputSchema, RoleBriefingSetInputSchema, RoleBriefingDeleteInputSchema, PostMessageInputSchema, ContainerIdSchema, AcceptExternalInviteInputSchema, AuthorSnapshotSchema, RecordCommonShape, AppendCommonShape, MembershipNoticeSchema, AuthorAliasSchema, MessageShape, RelayIntentShape, RelayResultStatusSchema, RelayResultShape, FileShape, MembershipIntentShape, MembershipResultShape, CloseNoticeIntentShape, CloseNoticeResultShape, MessageRecordSchema, FileRecordSchema, RelayIntentRecordSchema, RelayResultRecordSchema, MembershipIntentRecordSchema, MembershipResultRecordSchema, CloseNoticeIntentRecordSchema, CloseNoticeResultRecordSchema, RawCommunicationRecordSchema, CommunicationRecordSchema, AppendRecordSchema;
 var init_contracts = __esm({
   "src/contracts.ts"() {
     "use strict";
@@ -4940,6 +4949,7 @@ var init_contracts = __esm({
     MAX_FILE_BYTES = 2 * 1024 * 1024;
     MAX_HISTORY_PAGE_BYTES = 3 * 1024 * 1024;
     MAX_MANAGEMENT_RESPONSE_BYTES = MAX_HISTORY_PAGE_BYTES + 1024 * 1024;
+    MAX_EXTERNAL_INVITE_BYTES = 48 * 1024;
     MAX_FILE_NAME_BYTES = 255;
     MAX_MIME_BYTES = 255;
     MAX_ROLE_BYTES = 256;
@@ -4973,7 +4983,7 @@ var init_contracts = __esm({
       `file MIME metadata must be at most ${MAX_MIME_BYTES} UTF-8 bytes`
     );
     RoomStateSchema = external_exports.enum(["provisioning", "active", "closing", "closed"]);
-    SeatStateSchema = external_exports.enum(["active", "removed"]);
+    SeatStateSchema = external_exports.enum(["pending", "active", "removed"]);
     InviteModeSchema = external_exports.enum(["one_time", "public"]);
     DEFAULT_ROLE = "Participant";
     InviteStateSchema = external_exports.enum([
@@ -4996,7 +5006,9 @@ var init_contracts = __esm({
       display_name: NonEmptyStringSchema,
       role: RoleSchema,
       invite_id: NonEmptyStringSchema,
-      accepted_at: Rfc3339Schema,
+      accepted_at: Rfc3339Schema.optional(),
+      requested_at: Rfc3339Schema.optional(),
+      invite_sha256: external_exports.string().regex(/^[0-9a-f]{64}$/).optional(),
       participant_id: LowerCrockfordUlidSchema,
       state: SeatStateSchema,
       alias: NonEmptyStringSchema.optional(),
@@ -5005,7 +5017,25 @@ var init_contracts = __esm({
       replaces_seat: LowerCrockfordUlidSchema.optional(),
       bounced_at: Rfc3339Schema.optional()
     }).strict().superRefine((seat, context) => {
-      if (seat.state === "removed") {
+      if (seat.state === "pending") {
+        for (const field of ["requested_at", "invite_sha256"]) {
+          if (seat[field] === void 0) {
+            context.addIssue({ code: external_exports.ZodIssueCode.custom, path: [field], message: `pending seats require ${field}` });
+          }
+        }
+        for (const field of ["accepted_at", "removed_at", "removed_epoch", "bounced_at"]) {
+          if (seat[field] !== void 0) {
+            context.addIssue({ code: external_exports.ZodIssueCode.custom, path: [field], message: `${field} is forbidden on pending seats` });
+          }
+        }
+      } else if (seat.state === "removed") {
+        if (seat.accepted_at === void 0 && seat.requested_at === void 0) {
+          context.addIssue({
+            code: external_exports.ZodIssueCode.custom,
+            path: ["accepted_at"],
+            message: "removed seats require accepted_at unless they are cancelled external admissions"
+          });
+        }
         if (seat.removed_at === void 0) {
           context.addIssue({
             code: external_exports.ZodIssueCode.custom,
@@ -5021,6 +5051,9 @@ var init_contracts = __esm({
           });
         }
       } else {
+        if (seat.accepted_at === void 0) {
+          context.addIssue({ code: external_exports.ZodIssueCode.custom, path: ["accepted_at"], message: "active seats require accepted_at" });
+        }
         for (const field of ["removed_at", "removed_epoch", "bounced_at"]) {
           if (seat[field] !== void 0) {
             context.addIssue({
@@ -5031,6 +5064,13 @@ var init_contracts = __esm({
           }
         }
       }
+      if (seat.requested_at === void 0 !== (seat.invite_sha256 === void 0)) {
+        context.addIssue({
+          code: external_exports.ZodIssueCode.custom,
+          path: ["invite_sha256"],
+          message: "external admission metadata requires both requested_at and invite_sha256"
+        });
+      }
     });
     RoomInviteSchema = external_exports.object({
       invite_id: NonEmptyStringSchema,
@@ -5139,6 +5179,7 @@ var init_contracts = __esm({
       refineRoomLineage(room, context);
       const byParticipant = /* @__PURE__ */ new Map();
       const activeAliases = /* @__PURE__ */ new Set();
+      const authorizedCids = /* @__PURE__ */ new Set();
       for (const [index, seat] of room.seats.entries()) {
         if (byParticipant.has(seat.participant_id)) {
           context.addIssue({
@@ -5148,6 +5189,16 @@ var init_contracts = __esm({
           });
         }
         byParticipant.set(seat.participant_id, seat);
+        if (seat.state === "pending" || seat.state === "active") {
+          if (authorizedCids.has(seat.identity)) {
+            context.addIssue({
+              code: external_exports.ZodIssueCode.custom,
+              path: ["seats", index, "identity"],
+              message: "at most one pending or active seat may exist per CID"
+            });
+          }
+          authorizedCids.add(seat.identity);
+        }
         if (room.anonymous && seat.alias === void 0) {
           context.addIssue({
             code: external_exports.ZodIssueCode.custom,
@@ -5237,6 +5288,16 @@ var init_contracts = __esm({
     PostMessageInputSchema = external_exports.object({
       text: MessageTextSchema
     }).strict();
+    ContainerIdSchema = external_exports.string().regex(/^[0-9a-f]{64}$/i, "must be a 64-character hexadecimal CID").transform((value) => value.toUpperCase());
+    AcceptExternalInviteInputSchema = external_exports.object({
+      role: RoleSchema,
+      invite: external_exports.string().refine(
+        (value) => Buffer.byteLength(value, "utf8") <= MAX_EXTERNAL_INVITE_BYTES,
+        `invite input must be at most ${MAX_EXTERNAL_INVITE_BYTES} UTF-8 bytes`
+      ),
+      expected_cid: ContainerIdSchema.optional(),
+      replaces_seat: LowerCrockfordUlidSchema.optional()
+    }).strict();
     AuthorSnapshotSchema = external_exports.object({
       identity: NonEmptyStringSchema,
       display_name: NonEmptyStringSchema,
@@ -6036,6 +6097,25 @@ var init_packets = __esm({
           };
         });
       }
+      async addContact(invite) {
+        let decoded;
+        try {
+          decoded = unpackInvite(invite, MAX_EXTERNAL_INVITE_BYTES);
+        } catch (error) {
+          throw new Error("external invite could not be decoded within the 48 KiB limit", { cause: error });
+        }
+        return withScopeAsync(async (lifetime) => {
+          const result = await this.packet.mutatingTx("::a2a_messaging::add_contact", {
+            invite: this.packet.newBinary(decoded, lifetime)
+          }, lifetime);
+          return {
+            invite_id: result.Reduce("invite_id").Visualize(),
+            container_id: result.Reduce("container_id").Visualize(),
+            inviter_name: result.Reduce("inviter_name").Visualize(),
+            pending_name: result.Reduce("pending").Visualize()
+          };
+        });
+      }
       async revokeInvite(inviteId) {
         return withScopeAsync(async (lifetime) => {
           const result = await this.packet.mutatingTx("::a2a_messaging::revoke_invite", { invite_id: inviteId }, lifetime);
@@ -6639,6 +6719,7 @@ var init_intake = __esm({
 });
 
 // src/service.ts
+import { createHash as createHash3 } from "node:crypto";
 function byteBoundedHistoryPage(records) {
   const page = [];
   let bytes = 2;
@@ -6659,6 +6740,9 @@ function byteBoundedHistoryPage(records) {
 function activeSeats(room) {
   return room.seats.filter((seat) => seat.state === "active");
 }
+function isCancelledExternalSeat(seat) {
+  return seat.state === "removed" && seat.accepted_at === void 0 && seat.requested_at !== void 0 && seat.invite_sha256 !== void 0;
+}
 function mintAlias(seated, role) {
   return `${role} #${seated.filter((seat) => seat.role === role).length + 1}`;
 }
@@ -6670,10 +6754,11 @@ function currentContactIdentities(packet) {
 }
 var ROOM_ROLE, CreateInviteInputSchema, HistoryOptionsSchema, DeleteRoomInputSchema, RemoveParticipantInputSchema, ReplaceParticipantInputSchema, RoomServiceError, RoomService;
 var init_service = __esm({
-  "src/service.ts"() {
+  async "src/service.ts"() {
     "use strict";
     init_zod();
     init_contracts();
+    await init_adapt();
     init_intake();
     init_ulid();
     ROOM_ROLE = "room";
@@ -6928,6 +7013,81 @@ var init_service = __esm({
           });
         });
       }
+      /** Redeem an external invite without retaining its secret-bearing bytes. */
+      async acceptExternalInvite(roomId, input) {
+        const id = LowerCrockfordUlidSchema.parse(roomId);
+        const request = AcceptExternalInviteInputSchema.parse(input);
+        let decoded;
+        try {
+          decoded = unpackInvite(request.invite, MAX_EXTERNAL_INVITE_BYTES);
+        } catch {
+          throw new RoomServiceError("external invite is invalid or exceeds the 48 KiB decoded limit");
+        }
+        const digest = createHash3("sha256").update(decoded).digest("hex");
+        const receipt = await this.lock(id, async () => {
+          const room = await this.store.load(id);
+          this.assertMutable(room, "accept an external invite for");
+          const contactsBeforeRedemption = new Set(
+            this.packet(id).listContacts().map((contact) => contact.container_id)
+          );
+          const predecessor = request.replaces_seat === void 0 ? void 0 : room.seats.find((seat2) => seat2.participant_id === request.replaces_seat);
+          if (request.replaces_seat !== void 0 && (!predecessor || predecessor.state !== "removed" || predecessor.role !== request.role)) {
+            throw new RoomServiceError("external replacement must reference a removed seat with the configured role");
+          }
+          if (predecessor && room.seats.some((seat2) => seat2.replaces_seat === predecessor.participant_id && (seat2.state === "pending" || seat2.state === "active"))) {
+            throw new RoomServiceError("external replacement seat already has a pending or active successor");
+          }
+          let added;
+          try {
+            added = await this.packet(id).addContact(request.invite);
+          } catch {
+            throw new RoomServiceError("external invite was rejected");
+          }
+          const cid = ContainerIdSchema.parse(added.container_id);
+          if (request.expected_cid !== void 0 && cid !== request.expected_cid) {
+            throw new RoomServiceError("external invite inviter CID did not match --expected-cid");
+          }
+          if (contactsBeforeRedemption.has(cid)) {
+            throw new RoomServiceError("external invite inviter is already a contact; redemption provenance is ambiguous");
+          }
+          if (room.seats.some((seat2) => seat2.identity === cid && (seat2.state === "pending" || seat2.state === "active"))) {
+            throw new RoomServiceError("external inviter already has a pending or active seat in this room");
+          }
+          const requestedAt = this.now();
+          const participantId = LowerCrockfordUlidSchema.parse(generateUlid());
+          const seated = room.seats;
+          const pending = {
+            identity: cid,
+            display_name: added.inviter_name,
+            role: request.role,
+            invite_id: added.invite_id,
+            requested_at: requestedAt,
+            invite_sha256: digest,
+            participant_id: participantId,
+            state: "pending",
+            ...predecessor === void 0 ? {} : { replaces_seat: predecessor.participant_id },
+            ...room.anonymous ? { alias: predecessor?.alias ?? mintAlias(seated, request.role) } : {}
+          };
+          await this.store.save(RoomSchema.parse({ ...room, seats: [...room.seats, pending] }));
+          const reconciled = await this.reconcileUnlocked(await this.store.load(id), this.packet(id));
+          const seat = reconciled.seats.find((candidate) => candidate.participant_id === participantId);
+          return {
+            room_id: id,
+            participant_id: participantId,
+            state: seat.state,
+            role: seat.role,
+            identity: seat.identity,
+            invite_id: seat.invite_id,
+            inviter_name: added.inviter_name,
+            pending_name: added.pending_name,
+            requested_at: requestedAt,
+            ...seat.accepted_at === void 0 ? {} : { accepted_at: seat.accepted_at },
+            ...seat.replaces_seat === void 0 ? {} : { replaces_seat: seat.replaces_seat }
+          };
+        });
+        await this.intake.resumePending(id);
+        return receipt;
+      }
       async mintInviteUnlocked(room, request) {
         const packet = this.packet(room.room_id);
         const minted = await packet.mintInvite(request.mode);
@@ -6968,7 +7128,7 @@ var init_service = __esm({
         const receipt = await this.lock(id, async () => {
           const room = await this.store.load(id);
           this.assertMutable(room, "remove a participant from");
-          const seat = this.findActiveSeat(room, request.participant);
+          const seat = this.findSeatForRemoval(room, request.participant);
           const notify = (request.notify ?? true) && !room.quiet_membership;
           return this.beginRemovalUnlocked(room, seat, notify);
         });
@@ -7001,6 +7161,16 @@ var init_service = __esm({
         await this.intake.resumePending(id);
         return receipt;
       }
+      findSeatForRemoval(room, participant) {
+        const matches = (candidate) => candidate.identity === participant || candidate.participant_id === participant;
+        const seat = room.seats.find((candidate) => candidate.state !== "removed" && matches(candidate)) ?? room.seats.find((candidate) => isCancelledExternalSeat(candidate) && matches(candidate));
+        if (!seat) {
+          throw new RoomServiceError(
+            `"${participant}" is not a pending, active, or recoverable cancelled participant of room "${room.room_id}"`
+          );
+        }
+        return seat;
+      }
       findActiveSeat(room, participant) {
         const seat = room.seats.find((candidate) => candidate.state === "active" && (candidate.identity === participant || candidate.participant_id === participant));
         if (!seat) {
@@ -7009,6 +7179,40 @@ var init_service = __esm({
         return seat;
       }
       async beginRemovalUnlocked(room, seat, notify) {
+        if (seat.state === "pending" || isCancelledExternalSeat(seat)) {
+          let cancelled = seat;
+          if (seat.state === "pending") {
+            const removedAt = this.now();
+            cancelled = {
+              ...seat,
+              state: "removed",
+              removed_at: removedAt,
+              removed_epoch: room.membership_epoch
+            };
+          }
+          const seats = room.seats.map((candidate) => candidate.participant_id === seat.participant_id ? cancelled : candidate);
+          if (seat.state === "pending") await this.store.save(RoomSchema.parse({ ...room, seats }));
+          const established = this.packet(room.room_id).listContacts().some((contact) => contact.container_id === seat.identity);
+          if (established) {
+            const outcome = await this.packet(room.room_id).removeContact(seat.identity);
+            return {
+              room_id: room.room_id,
+              participant_id: seat.participant_id,
+              epoch: room.membership_epoch,
+              status: outcome.status,
+              notified: outcome.notified,
+              key_material_retained: true
+            };
+          }
+          return {
+            room_id: room.room_id,
+            participant_id: seat.participant_id,
+            epoch: room.membership_epoch,
+            status: "cancelled_pending",
+            notified: false,
+            key_material_retained: true
+          };
+        }
         const intent = await this.store.append(room.room_id, {
           version: 1,
           kind: "membership_intent",
@@ -7419,7 +7623,7 @@ var init_service = __esm({
         }
         const origins = packet.listContactOrigins();
         const inviteById = new Map(room.invites.map((invite) => [invite.invite_id, invite]));
-        const existingCids = new Set(room.seats.filter((seat) => seat.state === "active").map((seat) => seat.identity));
+        const existingCids = new Set(room.seats.filter((seat) => seat.state === "active" || seat.state === "pending").map((seat) => seat.identity));
         const lastRemovedAt = /* @__PURE__ */ new Map();
         for (const seat of room.seats) {
           if (seat.state !== "removed" || seat.removed_at === void 0) continue;
@@ -7428,6 +7632,35 @@ var init_service = __esm({
             lastRemovedAt.set(seat.identity, seat.removed_at);
           }
         }
+        const activatedPending = [];
+        const seatsWithActivations = [...room.seats];
+        for (const [seatIndex, seat] of room.seats.entries()) {
+          if (seat.state !== "pending") continue;
+          const displayName = contactsByCid.get(seat.identity);
+          const origin = origins[seat.identity];
+          if (displayName === void 0 || origin === void 0) continue;
+          const completedExternalRedemption = origin.via === "invite_redeemed" && origin.invite_id === seat.invite_id;
+          const fallbackInvite = origin.via === "invite_one_time" || origin.via === "invite_public" ? inviteById.get(origin.invite_id) : void 0;
+          const confirmedFallback = fallbackInvite !== void 0 && fallbackInvite.state !== "receipt_pending" && (fallbackInvite.recovery_of === void 0 || fallbackInvite.recovery_confirmed === true);
+          if (!completedExternalRedemption && !confirmedFallback) continue;
+          const removedAt = lastRemovedAt.get(seat.identity);
+          if (fallbackInvite !== void 0 && removedAt !== void 0 && fallbackInvite.created_at <= removedAt) continue;
+          const predecessor = fallbackInvite?.replaces_seat === void 0 ? void 0 : room.seats.find((candidate) => candidate.participant_id === fallbackInvite.replaces_seat && candidate.state === "removed");
+          if (fallbackInvite?.replaces_seat !== void 0 && predecessor === void 0) continue;
+          const { alias: _alias, replaces_seat: _replacesSeat, ...base } = seat;
+          const activated = {
+            ...base,
+            state: "active",
+            display_name: displayName,
+            accepted_at: origin.at,
+            role: fallbackInvite?.role ?? seat.role,
+            invite_id: fallbackInvite?.invite_id ?? seat.invite_id,
+            ...fallbackInvite === void 0 ? _replacesSeat === void 0 ? {} : { replaces_seat: _replacesSeat } : predecessor === void 0 ? {} : { replaces_seat: predecessor.participant_id },
+            ...room.anonymous ? { alias: fallbackInvite === void 0 ? _alias : predecessor?.alias ?? (fallbackInvite.role === seat.role ? _alias : mintAlias(seatsWithActivations, fallbackInvite.role)) } : {}
+          };
+          activatedPending.push(activated);
+          seatsWithActivations[seatIndex] = activated;
+        }
         const newSeats = [];
         for (const [cid, displayName] of contactsByCid) {
           if (existingCids.has(cid)) continue;
@@ -7437,7 +7670,7 @@ var init_service = __esm({
           if (!invite || invite.state === "receipt_pending" || invite.recovery_of !== void 0 && invite.recovery_confirmed !== true) continue;
           const removedAt = lastRemovedAt.get(cid);
           if (removedAt !== void 0 && invite.created_at <= removedAt) continue;
-          const seated = [...room.seats, ...newSeats];
+          const seated = [...seatsWithActivations, ...newSeats];
           const predecessor = invite.replaces_seat === void 0 ? void 0 : seated.find((seat) => seat.participant_id === invite.replaces_seat && seat.state === "removed");
           if (invite.replaces_seat !== void 0 && !predecessor) continue;
           newSeats.push({
@@ -7455,9 +7688,10 @@ var init_service = __esm({
           });
           existingCids.add(cid);
         }
-        const seats = [...room.seats, ...newSeats];
+        const seats = [...seatsWithActivations, ...newSeats];
         const acceptedByInvite = /* @__PURE__ */ new Map();
         for (const seat of seats) {
+          if (seat.state === "pending" || !inviteById.has(seat.invite_id)) continue;
           const accepted = acceptedByInvite.get(seat.invite_id) ?? [];
           if (!accepted.includes(seat.identity)) accepted.push(seat.identity);
           acceptedByInvite.set(seat.invite_id, accepted);
@@ -7481,7 +7715,7 @@ var init_service = __esm({
           ...room,
           seats,
           invites,
-          membership_epoch: room.membership_epoch + newSeats.length
+          membership_epoch: room.membership_epoch + activatedPending.length + newSeats.length
         });
         const journal = await this.store.read(next.room_id);
         const completedIntents = new Set(journal.filter((record) => record.kind === "membership_result").map((record) => record.kind === "membership_result" ? record.intent_record_id : ""));
@@ -7492,11 +7726,12 @@ var init_service = __esm({
           ({ room: next } = await this.completeRemovalUnlocked(next, intent));
         }
         const requirementsMet = invites.filter((invite) => invite.state !== "revoked").every((invite) => invite.accepted_cids.length >= invite.min_accepts);
-        if (next.state === "provisioning" && seats.length > 0 && requirementsMet) {
+        const admitted = [...activatedPending, ...newSeats];
+        if (next.state === "provisioning" && activeSeats(next).length > 0 && requirementsMet) {
           const activationAt = await this.ensureActivationBriefing(next, activeSeats(next));
           next = RoomSchema.parse({ ...next, state: "active", activated_at: activationAt });
-        } else if (next.state === "active" && newSeats.length > 0) {
-          await this.ensureActivationBriefing(next, newSeats);
+        } else if (next.state === "active" && admitted.length > 0) {
+          await this.ensureActivationBriefing(next, admitted);
         }
         return this.store.save(next);
       }
@@ -8609,6 +8844,14 @@ function createServiceRoutes(service) {
     } }
   };
 }
+function createPrivateServiceRoutes(service) {
+  return {
+    "room.accept": { auth: true, run: (params) => {
+      const { room_id, ...input } = ExternalInviteAcceptParams.parse(params);
+      return service.acceptExternalInvite(room_id, input);
+    } }
+  };
+}
 function errorResponse(id, code, message) {
   return { version: 1, id, error: { code, message } };
 }
@@ -8736,7 +8979,7 @@ function responseFinished2(response) {
     response.once("error", rejectResponse);
   });
 }
-var MAX_REQUEST_BYTES, HTTP_HEADERS_TIMEOUT_MS, HTTP_REQUEST_TIMEOUT_MS, HTTP_BODY_IDLE_TIMEOUT_MS, HTTP_KEEP_ALIVE_TIMEOUT_MS, MAX_STALE_PRIVATE_SOCKET_CLEANUP, RpcIdSchema, RpcRequestSchema, RpcDispatcher, RoomIdParams, InviteRevokeParams, RecoverConfirmParams, HistoryParams, RoleBriefingSetParams, RoleBriefingDeleteParams, ParticipantRemoveParams, ParticipantReplaceParams, TransportServer;
+var MAX_REQUEST_BYTES, HTTP_HEADERS_TIMEOUT_MS, HTTP_REQUEST_TIMEOUT_MS, HTTP_BODY_IDLE_TIMEOUT_MS, HTTP_KEEP_ALIVE_TIMEOUT_MS, MAX_STALE_PRIVATE_SOCKET_CLEANUP, RpcIdSchema, RpcRequestSchema, RpcDispatcher, RoomIdParams, InviteRevokeParams, RecoverConfirmParams, HistoryParams, RoleBriefingSetParams, RoleBriefingDeleteParams, ParticipantRemoveParams, ParticipantReplaceParams, ExternalInviteAcceptParams, TransportServer;
 var init_transports = __esm({
   "src/transports.ts"() {
     "use strict";
@@ -8835,6 +9078,13 @@ var init_transports = __esm({
       mode: external_exports.enum(["one_time", "public"]).optional(),
       min_accepts: external_exports.number().optional()
     }).strict();
+    ExternalInviteAcceptParams = external_exports.object({
+      room_id: external_exports.string(),
+      role: external_exports.string(),
+      invite: external_exports.string(),
+      expected_cid: external_exports.string().optional(),
+      replaces_seat: external_exports.string().optional()
+    }).strict();
     TransportServer = class {
       options;
       fs;
@@ -9260,7 +9510,7 @@ import * as nodeFs6 from "node:fs";
 import { join as join7 } from "node:path";
 import { fileURLToPath as fileURLToPath2 } from "node:url";
 function isIntakeNotification(event) {
-  return event === "message_received" || event === "file_received" || event === "contact_accepted";
+  return event === "message_received" || event === "file_received" || event === "contact_accepted" || event === "contact_added";
 }
 function createDaemonControlRoutes(control) {
   if (!/^[0-9a-f]{32}$/.test(control.session)) throw new TypeError("invalid daemon control session");
@@ -9478,7 +9728,7 @@ var init_daemon_runtime = __esm({
     init_config();
     init_config();
     await init_packets();
-    init_service();
+    await init_service();
     init_storage();
     init_transports();
     init_web();
@@ -9582,7 +9832,7 @@ var init_daemon_runtime = __esm({
           }
           const realService = this.service;
           const serviceRoutes = createServiceRoutes(realService);
-          const unixRoutes = this.options.control ? { ...serviceRoutes, ...createDaemonControlRoutes(this.options.control) } : serviceRoutes;
+          const unixRoutes = this.options.control ? { ...serviceRoutes, ...createPrivateServiceRoutes(realService), ...createDaemonControlRoutes(this.options.control) } : { ...serviceRoutes, ...createPrivateServiceRoutes(realService) };
           const unixDispatcher = new RpcDispatcher(unixRoutes);
           const restDispatcher = new RpcDispatcher(serviceRoutes);
           const staticHandler = createStaticWebHandler(loadWebAssets(