@things-factory/board-ai 10.1.207 → 10.1.210

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/board-ai",
-  "version": "10.1.207",
+  "version": "10.1.210",
   "main": "dist-server/index.js",
   "browser": "dist-client/client/index.js",
   "things-factory": true,
@@ -32,12 +32,12 @@
     "@operato/i18n": "^10.0.0",
     "@operato/scene-ops": "^10.14.1",
     "@operato/styles": "^10.0.0",
-    "@things-factory/ai-assistant": "^10.1.207",
-    "@things-factory/ai-client-base": "^10.1.207",
-    "@things-factory/auth-base": "^10.1.206",
-    "@things-factory/board-import": "^10.1.207",
+    "@things-factory/ai-assistant": "^10.1.210",
+    "@things-factory/ai-client-base": "^10.1.208",
+    "@things-factory/auth-base": "^10.1.208",
+    "@things-factory/board-import": "^10.1.208",
     "@things-factory/env": "^10.1.149",
-    "@things-factory/shell": "^10.1.206",
+    "@things-factory/shell": "^10.1.208",
     "dompurify": "^3.0.0",
     "graphql-tag": "^2.12.6",
     "lit": "^3.1.2",
@@ -47,5 +47,5 @@
     "copyfiles": "^2.4.1",
     "rimraf": "^5.0.0"
   },
-  "gitHead": "e6e3fbf5c353629adbeb8850093150b14254e059"
+  "gitHead": "89fbda12d43d8532ba4e95ba6d6d7e05e2da2502"
 }

package/server/service/board-ai-resolver.ts

@@ -45,13 +45,11 @@ import { publishChatMessage } from '@things-factory/ai-assistant'
 import { PatchEntry } from './patch-entry/patch-entry.js'
 import { publishBoardPatch } from './patch-entry/board-patch-subscription.js'
 import { ChatSessionParticipant } from '@things-factory/ai-assistant'
-import { buildInviteNotification } from '@things-factory/ai-assistant'
+import { seatTurn, sendInviteNotification } from '@things-factory/ai-assistant'
 import {
   injectMentionRefids,
   injectAiMentionRefids,
-  stripMentionRefids,
-  extractMentionUserIds,
-  newParticipantUserIds
+  stripMentionRefids
 } from './mention-marker.js'
 
 @InputType()
@@ -392,7 +390,9 @@ export class BoardAIChatResolver {
       // C4: @user 멘션 → 세션 참여자(member) 자동 등록 (초대). best-effort — 실패해도 chat 흐름 무영향.
       // enriched content 의 {userId:UUID} 마커에서 추출 → 기존 참여자/자기 제외한 신규만 member 로 등록.
       try {
-        await this._inviteMentionedUsers(enriched, session.id!, domain.id, user, session.boardId, (context.state as any).notify)
+        await this._inviteMentionedUsers(enriched, session as any, domain.id, user, (context.state as any).notify, (key, options) =>
+          typeof (context as any).t === 'function' ? (context as any).t(key, options) : String(options?.defaultValue ?? key)
+        )
       } catch {
         /* 초대 실패는 대화를 막지 않는다 */
       }
@@ -691,66 +691,30 @@ export class BoardAIChatResolver {
   }
 
   /**
-   * C4: 메시지에 @멘션된 사용자를 세션 참여자(member)로 자동 등록 — 초대.
-   * enriched content 의 {userId:UUID} 마커에서 추출 → 기존 참여자·자기 제외한 신규만 등록.
-   * 소프트삭제(deletedAt)된 과거 참여자는 다시 살린다(재초대). 신규 등록 후 협업 초대 알림 발송(C4b-2, best-effort).
+   * C4: 메시지에 @멘션된 사용자를 세션 참여자(member)로 등록 — 초대.
+   *
+   * 자리는 ai-assistant 의 한 곳(`seatTurn` — 공개 방의 글쓴이, 그리고 멘션 → `seatParticipants`)이 준다. 여기에 따로 있던 사본은 공개
+   * 범위를 보지 않아, 그룹 · 비공개 보드 대화에서도 누구의 멘션이든 사람을 앉혔다(2026-10-24, ADR-0073 결정 3).
+   * 알림도 같은 한 곳(`sendInviteNotification`) — 보드 문구와 모델러 링크.
    */
   private async _inviteMentionedUsers(
     content: string,
-    sessionId: string,
+    session: { id?: string; boardId?: string; name?: string; visibility?: string },
     domainId: string,
     inviter: any,
-    boardId?: string,
-    notify?: (arg: any) => Promise<void>
+    notify?: (arg: any) => Promise<void>,
+    t?: (key: string, options: Record<string, unknown>) => string
   ): Promise<void> {
-    const mentioned = extractMentionUserIds(content)
-    if (mentioned.length === 0) return
-
-    const repo = getRepository(ChatSessionParticipant)
-    const existing = await repo.find({
-      where: { session: { id: sessionId } as any, domain: { id: domainId } as any },
-      withDeleted: true
+    const { invited } = await seatTurn({
+      content,
+      sessionId: session.id!,
+      domainId,
+      inviter,
+      participants: getRepository(ChatSessionParticipant),
+      visibility: session.visibility
     })
-    const activeIds = existing.filter(p => !p.deletedAt).map(p => p.userId!).filter(Boolean)
-    const fresh = newParticipantUserIds(mentioned, activeIds, inviter?.id)
-    if (fresh.length === 0) return
-
-    for (const userId of fresh) {
-      // 과거에 나갔던(soft-deleted) 참여자면 되살리고, 아니면 새로 등록.
-      const prior = existing.find(p => p.userId === userId && p.deletedAt)
-      if (prior) {
-        await repo.update(prior.id!, { deletedAt: null as any, role: 'member', updater: inviter } as any)
-      } else {
-        await repo.save({
-          domain: { id: domainId } as any,
-          session: { id: sessionId } as any,
-          user: { id: userId } as any,
-          role: 'member',
-          creator: inviter,
-          updater: inviter
-        } as any)
-      }
-    }
-
-    // C4b-2: 초대 알림 — notification 모듈의 기존 발송 메커니즘 재사용(중복 구현 금지).
-    // context.state.notify 는 notification-middleware 가 전역 주입(FCM/pubsub). duck-typed →
-    // board-ai 에 의존성 추가 없이 런타임 호출. 미로드 환경이면 undefined → graceful skip.
-    this._notifyInvited(notify, fresh, boardId, inviter)
+    await sendInviteNotification(notify, invited, inviter, session.name, session.boardId, t)
   }
 
-  /** 초대된 사용자들에게 협업 초대 알림 발송 (best-effort, capability 있을 때만). */
-  private _notifyInvited(
-    notify: ((arg: any) => Promise<void>) | undefined,
-    userIds: string[],
-    boardId: string | undefined,
-    inviter: any
-  ): void {
-    if (typeof notify !== 'function') return
-    const payload = buildInviteNotification(userIds, boardId, inviter)
-    if (!payload) return
-    Promise.resolve(notify(payload)).catch(() => {
-      /* 알림 실패는 초대·대화를 막지 않는다 */
-    })
-  }
 }
 

package/server/service/board-session-resolver.ts

@@ -30,8 +30,7 @@ import { publishSessionActivity } from '@things-factory/ai-assistant'
 import { ChatMessage } from '@things-factory/ai-assistant'
 import { publishChatMessage } from '@things-factory/ai-assistant'
 import { ChatSessionResolver } from '@things-factory/ai-assistant'
-import { ChatSessionParticipant } from '@things-factory/ai-assistant'
-import { mayReadSession } from '@things-factory/ai-assistant'
+import { isSessionParticipant, mayReadSession } from '@things-factory/ai-assistant'
 import { PatchEntry } from './patch-entry/patch-entry.js'
 import { mayRevertPatch } from './patch-entry/revert-permission.js'
 import { publishBoardPatch } from './patch-entry/board-patch-subscription.js'
@@ -187,13 +186,8 @@ export class BoardSessionResolver {
       relations: ['session']
     })
     const session: any = patch?.session
-    const isParticipant =
-      !!session && !!user?.id
-        ? !!(await getRepository(ChatSessionParticipant, tx).findOneBy({
-            session: { id: session.id },
-            user: { id: user.id }
-          } as any))
-        : false
+    /* The room's own lookup - a hide-only `viewer` row is not a seat, and a group or private room asks it (ADR-0073). */
+    const isParticipant = !!session && (await isSessionParticipant(domain.id, session.id, user?.id, tx))
 
     if (!mayRevertPatch(patch ? { sessionVisibility: session?.visibility } : null, isParticipant, mayReadSession)) {
       throw new Error(`PatchEntry ${patchId} not found`)

package/test/mention-seat-one-place.test.ts

@@ -0,0 +1,28 @@
+/*
+ * A board conversation seats people the way every conversation does (ADR-0073 decision 3).
+ *
+ * board-ai had its own copy of "a mention seats the person": it never asked the room's visibility, so in a group
+ * or private board conversation anyone's mention seated anyone. The seat now comes from ai-assistant's one place,
+ * which asks `maySeat`. This holds the resolver to it - a second copy fails here.
+ */
+import { describe, it } from 'node:test'
+import assert from 'node:assert/strict'
+import { readFileSync } from 'node:fs'
+import { join } from 'node:path'
+
+const resolver = readFileSync(join(import.meta.dirname, '../server/service/board-ai-resolver.ts'), 'utf-8')
+
+describe('a board conversation seats people through the one place', () => {
+  it('★ the turn\'s seats (writer, then mentions) go through seatTurn, with the room visibility', () => {
+    assert.match(resolver, /await seatTurn\(\{[\s\S]*?visibility: session\.visibility[\s\S]*?\}\)/)
+  })
+
+  it('★ no seat is written here - no member row, no own mention parser', () => {
+    assert.doesNotMatch(resolver, /role: 'member'/)
+    assert.doesNotMatch(resolver, /newParticipantUserIds|extractMentionUserIds/)
+  })
+
+  it('the invite is told the shared way, with the board link', () => {
+    assert.match(resolver, /sendInviteNotification\(notify, invited, inviter, session\.name, session\.boardId, t\)/)
+  })
+})