@sparkelf/dsh-group-chat 0.5.2 → 0.5.4

package/lib/index.js

@@ -492,6 +492,29 @@ const messageId = (event) => {
 * message text. Parsing text would misread a code sample containing `@`, and it
 * would let any message smuggle itself into an execution path.
 */
+/**
+* Member ids a prompt's sender declared on its source, in pick order.
+*
+* The composer's roster source inserts chips with `appearance: 'mention'`, and the reference
+* pipeline hands those ids to the Host on the prompt; this reads them back. Only ids that source
+* owns qualify — another source's chip is a file, a session, or a quoted message, never a member.
+*/
+const declaredMentions = (source) => {
+	const raw = source?.mentions;
+	if (!Array.isArray(raw)) return [];
+	const out = [];
+	const seen = /* @__PURE__ */ new Set();
+	for (const entry of raw) {
+		if (typeof entry !== "object" || entry === null) continue;
+		const record = entry;
+		if (record.sourceId !== "@sparkelf/dsh-group-chat/member") continue;
+		const memberId = record.itemId;
+		if (typeof memberId !== "string" || memberId.length === 0 || seen.has(memberId)) continue;
+		seen.add(memberId);
+		out.push(memberId);
+	}
+	return out;
+};
 const mentionsOf = (event) => {
 	const raw = eventSource(event)?.["mentions"];
 	if (!Array.isArray(raw)) return [];
@@ -769,6 +792,49 @@ const cleanupRoomSessions = async (input) => {
 	};
 };
 /**
+* Register a room's Session with the workspace that owns its directory.
+*
+* The shell's `openSession` selects a Session that belongs to a Workspace, so a room created
+* with a `cwd` and no workspace id is not selectable until this runs. Registration is idempotent
+* on the registry (`attachSession` checks membership before writing), which is what lets the
+* discovery poll run it on every boot without duplicating rows.
+*
+* Never throws: a room that cannot be registered still reads and writes through its Host, only
+* the main view cannot follow it, and that is a state worth reporting rather than a failed open.
+* @param registry - the workspace registry surface, absent on a minimal host.
+* @param directory - the room directory the workspace is resolved by.
+* @param sessionId - the room's canonical Session.
+* @param log - optional warning sink; the plugin passes its Cordis logger.
+* @returns whether the Session is now attached.
+*/
+const attachRoomSession = async (registry, directory, sessionId, log) => {
+	if (registry === void 0) {
+		log?.warn?.("[group-chat] the workspace registry is unavailable; the room session stays unlisted", sessionId);
+		return {
+			attached: false,
+			reason: "registry-unavailable"
+		};
+	}
+	try {
+		const workspace = await registry.resolveByPath(directory);
+		if (workspace === void 0) {
+			log?.warn?.("[group-chat] no workspace owns the room directory; the room session stays unlisted", sessionId, directory);
+			return {
+				attached: false,
+				reason: "workspace-not-found"
+			};
+		}
+		await workspace.attachSession(sessionId);
+		return { attached: true };
+	} catch (error) {
+		log?.warn?.("[group-chat] attaching the room session to its workspace failed", sessionId, error);
+		return {
+			attached: false,
+			reason: "attach-failed"
+		};
+	}
+};
+/**
 * Wrapper for built-in http.js to emulate the browser XMLHttpRequest object.
 *
 * This can be used with JS designed for browsers to improve reuse of code and
@@ -9248,6 +9314,7 @@ var RoomSessions = class {
 		const resumed = await this.resolvePersisted(sessionId, directory);
 		if (resumed !== void 0) {
 			await this.installRoomModel(resumed, room, false);
+			await this.attachToWorkspace(sessionId, directory);
 			return resumed;
 		}
 		const created = await this.ctx.sessionController.create({
@@ -9262,6 +9329,7 @@ var RoomSessions = class {
 		const session = this.existing(roomId);
 		if (session === void 0) throw new Error(`group-chat could not open a session for room ${roomId}`);
 		await this.installRoomModel(session, room, true);
+		await this.attachToWorkspace(sessionId, directory);
 		return session;
 	}
 	/** Load a persisted room Session, or `undefined` only when the controller denies it exists. */
@@ -9308,6 +9376,20 @@ var RoomSessions = class {
 	get archiveRegistry() {
 		return hostService(this.ctx, "workspaceRegistry");
 	}
+	/**
+	* Attach the room's Session to the workspace that owns its directory.
+	*
+	* The shell's `openSession` selects a Session that belongs to a Workspace, so a room created
+	* with a `cwd` alone is not selectable and clicking it moves the highlight only. Attaching is
+	* idempotent on the registry side, and every failure here is logged rather than fatal: a room
+	* whose registration failed still reads and writes through its Host, only the main view
+	* cannot follow it.
+	* @param sessionId - the room's canonical Session.
+	* @param directory - the room directory the workspace is resolved by.
+	*/
+	async attachToWorkspace(sessionId, directory) {
+		await attachRoomSession(hostService(this.ctx, "workspaceRegistry"), directory, sessionId, this.ctx.logger);
+	}
 	/** Hide a replacement the controller minted instead of honoring the room id. */
 	async archiveReplacement(sessionId) {
 		try {
@@ -9755,7 +9837,8 @@ const activate = (ctx, target) => {
 			if (typeof messageId === "string" && messageId.startsWith(WARM_UP_PREFIX)) return;
 			if (data.source?.kind === QUOTE_CONTEXT_KIND) return;
 			const content = data.content;
-			const mentions = mentionedMemberIds(textOfContent(content), runtimes.get(roomId)?.members ?? []);
+			const declared = declaredMentions(data.source);
+			const mentions = declared.length > 0 ? declared : mentionedMemberIds(textOfContent(content), runtimes.get(roomId)?.members ?? []);
 			const quote = pendingQuotes.get(roomId);
 			const outgoing = quote === void 0 ? content : withQuote(content, quote);
 			backend.sendMessage(roomId, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sparkelf/dsh-group-chat",
-  "version": "0.5.2",
+  "version": "0.5.4",
   "description": "Human-agent group chat for DataOps-managed DSH workspaces: rooms broadcast to every member, and only a member's own @mention wakes that member's agent.",
   "type": "module",
   "main": "./lib/index.js",