@things-factory/ai-assistant 10.1.125 → 10.1.129

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/ai-assistant",
-  "version": "10.1.125",
+  "version": "10.1.129",
   "main": "dist-server/index.js",
   "things-factory": true,
   "author": "heartyoh",
@@ -33,7 +33,7 @@
     "@operato/popup": "^10.16.0",
     "@operato/shell": "^10.0.0",
     "@operato/styles": "^10.0.0",
-    "@things-factory/ai-client-base": "^10.1.114",
+    "@things-factory/ai-client-base": "^10.1.129",
     "@things-factory/apptool-base": "^10.1.123",
     "@things-factory/attachment-base": "^10.1.123",
     "@things-factory/auth-base": "^10.1.123",
@@ -52,5 +52,5 @@
     "copyfiles": "^2.4.1",
     "rimraf": "^5.0.0"
   },
-  "gitHead": "74e02381ea5f179dca2b7516078eb2709ac28ffe"
+  "gitHead": "4d1ef242d9b7e6669a34c27b6d31aed778c07a90"
 }

package/server/service/chat-session-participant/read-roster.test.ts

@@ -0,0 +1,18 @@
+import { readRoster } from './read-roster'
+
+describe('participant roster identities', () => {
+  it('loads the participating user relation for public conversations', async () => {
+    const find = jest.fn(async options => options.relations.includes('user') ? [{id:'p',user:{id:'u',name:'김희태'}}] : [{id:'p'}])
+    const isParticipant=jest.fn(async()=>false)
+    const rows=await readRoster({id:'room',domainId:'domain',visibility:'open'},{find,isParticipant})
+    expect(rows).toEqual([{id:'p',user:{id:'u',name:'김희태'}}])
+    expect(find).toHaveBeenCalledWith(expect.objectContaining({where:{session:{id:'room'},domain:{id:'domain'}},relations:['user']}))
+    expect(isParticipant).not.toHaveBeenCalled()
+  })
+  it('does not expose identities from a private room to an outsider', async () => {
+    const find=jest.fn(async()=>[{id:'p',user:{name:'Private'}}])
+    expect(await readRoster({id:'r',domainId:'d',visibility:'private'},{find,isParticipant:async()=>false})).toEqual([])
+    expect(find).not.toHaveBeenCalled()
+    expect(await readRoster({id:'r',domainId:'d',visibility:'private'},{find,isParticipant:async()=>true})).toEqual([{id:'p',user:{name:'Private'}}])
+  })
+})

package/server/service/chat-session-participant/read-roster.ts

@@ -0,0 +1,14 @@
+import { mayReadSession } from '../chat-session/session-visibility.js'
+
+/** Read the room roster with user identities hydrated, after applying the room's visibility gate. */
+export async function readRoster<T>(
+  room: { id: string; domainId: string; visibility?: string },
+  port: { isParticipant(): Promise<boolean>; find(options: any): Promise<T[]> }
+): Promise<T[]> {
+  if (!mayReadSession(room.visibility, room.visibility === 'private' ? await port.isParticipant() : false)) return []
+  return port.find({
+    where: { session: { id: room.id }, domain: { id: room.domainId } },
+    relations: ['user'],
+    order: { createdAt: 'ASC' }
+  })
+}

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

@@ -21,6 +21,7 @@ import { readerGate } from './chat-message/reader-gate.js'
 import { initialVisibility, mayReadSession, SESSION_VISIBILITIES } from './chat-session/session-visibility.js'
 import { inviteMentionedUsers } from './chat-session-participant/mention-invite.js'
 import { buildInviteNotification } from './chat-session-participant/invite-notification.js'
+import { readRoster } from './chat-session-participant/read-roster.js'
 import { isSessionParticipant } from './chat-session-participant/participant-lookup.js'
 import { assertMayWriteSession } from './chat-session/session-write-gate.js'
 
@@ -570,15 +571,15 @@ export class ChatSessionResolver {
     @Arg('sessionId') sessionId: string,
     @Ctx() context: ResolverContext
   ): Promise<ChatSessionParticipant[]> {
-    const { domain } = context.state
+    const { domain, user } = context.state
     const session = await getRepository(ChatSession).findOneBy({
       id: sessionId,
       domain: { id: domain.id }
     })
     if (!session) return []
-    return await getRepository(ChatSessionParticipant).find({
-      where: { session: { id: sessionId } as any, domain: { id: domain.id } },
-      order: { createdAt: 'ASC' }
+    return readRoster({id:sessionId,domainId:domain.id,visibility:(session as any).visibility}, {
+      isParticipant: () => isSessionParticipant(domain.id,sessionId,user?.id),
+      find: options => getRepository(ChatSessionParticipant).find(options)
     })
   }
 
@@ -872,6 +873,7 @@ export class ChatSessionResolver {
   async sayToRoom(
     @Arg('sessionId') sessionId: string,
     @Arg('content') content: string,
+    @Arg('replyToId', { nullable: true }) replyToId: string | undefined,
     @Ctx() context: ResolverContext
   ): Promise<string | null> {
     const { domain, user, tx } = context.state
@@ -882,10 +884,11 @@ export class ChatSessionResolver {
     const body = roomMessageBody(content)
     if (!body) return null
 
-    const previousLast = await getRepository(ChatMessage, tx).findOne({
-      where: { session: { id: session.id } as any },
-      order: { createdAt: 'DESC' }
-    })
+    const messages = getRepository(ChatMessage, tx)
+    const previousLast = replyToId
+      ? await messages.findOneBy({ id: replyToId, session: { id: session.id } as any })
+      : await messages.findOne({ where: { session: { id: session.id } as any }, order: { createdAt: 'DESC' } })
+    if (replyToId && !previousLast) throw new Error('The message to reply to is not in this conversation')
     const saved = await getRepository(ChatMessage, tx).save({
       session: { id: session.id } as any,
       role: 'user',

package/translations/en.json

@@ -91,7 +91,7 @@
   "ai-assistant.notice.stopped": "the request stopped partway, so only part of it was done.",
   "ai-assistant.notice.provider-busy": "the ai service did not answer just now. try again in a moment.",
   "ai-assistant.notice.provider-error": "something went wrong while handling this. tell an administrator if it keeps happening.",
-  "ai-assistant.notice.too-long": "this ran long and stopped at step {iter}. try asking in smaller pieces.",
+  "ai-assistant.notice.too-long": "this stopped after {iter} lookups without an answer.",
   "ai-assistant.notice.tool-kept-failing": "{tool} failed {count} times in a row, so it stopped. try saying it differently.",
   "ai-assistant.text.no-match": "no match",
   "ai-assistant.text.messages-unreadable": "could not read this conversation.",
@@ -309,5 +309,13 @@
   "ai-assistant.text.send-shortcut": "{key} to send",
   "ai-assistant.text.send-tooltip-wide": "Send ({key})",
   "ai-assistant.text.table-shape": "{rows} rows × {columns} columns",
-  "ai-assistant.button.table-to-words": "Put in as words"
+  "ai-assistant.button.table-to-words": "Put in as words",
+  "ai-assistant.text.invite-checking": "Checking participant identities before showing invitation eligibility.",
+  "ai-assistant.text.participant-unavailable": "User unavailable",
+  "ai-assistant.text.send-to-people": "To people",
+  "ai-assistant.text.send-to-ai": "To AI",
+  "ai-assistant.text.room-attachments-unavailable": "Attachments to participants are not supported yet. Remove the attachments before sending.",
+  "ai-assistant.button.reply": "Reply",
+  "ai-assistant.button.cancel-reply": "Cancel reply",
+  "ai-assistant.text.reply-to": "Reply to {name}"
 }

package/translations/ja.json

@@ -91,7 +91,7 @@
   "ai-assistant.notice.stopped": "リクエストが途中で止まり、一部だけ処理しました。",
   "ai-assistant.notice.provider-busy": "AI サービスが今応答していません。少し待ってからもう一度お試しください。",
   "ai-assistant.notice.provider-error": "処理中に問題が発生しました。同じことが続く場合は管理者にお知らせください。",
-  "ai-assistant.notice.too-long": "処理が長くなり {iter} 段階で止まりました。分けて依頼してみてください。",
+  "ai-assistant.notice.too-long": "{iter} 回の照会で答えを出せずに止まりました。",
   "ai-assistant.notice.tool-kept-failing": "{tool} の呼び出しが {count} 回続けて失敗したため止まりました。言い方を変えてみてください。",
   "ai-assistant.text.no-match": "一致するものがありません",
   "ai-assistant.text.messages-unreadable": "この会話を読み取れませんでした。",

package/translations/ko.json

@@ -91,7 +91,7 @@
   "ai-assistant.notice.stopped": "요청이 중간에 멈춰서 일부만 처리했습니다.",
   "ai-assistant.notice.provider-busy": "AI 서비스가 지금 응답하지 않습니다. 잠시 뒤에 다시 해 보세요.",
   "ai-assistant.notice.provider-error": "처리 중에 문제가 생겼습니다. 같은 문제가 계속되면 관리자에게 알려 주세요.",
-  "ai-assistant.notice.too-long": "일이 길어져서 {iter}단계에서 멈췄습니다. 나눠서 요청해 보세요.",
+  "ai-assistant.notice.too-long": "조회 {iter}번 안에 답을 만들지 못하고 멈췄습니다.",
   "ai-assistant.notice.tool-kept-failing": "{tool} 호출이 {count}번 잇따라 실패해서 멈췄습니다. 다르게 말해 보세요.",
   "ai-assistant.text.no-match": "맞는 것이 없습니다",
   "ai-assistant.text.messages-unreadable": "이 대화를 읽지 못했습니다.",
@@ -309,5 +309,13 @@
   "ai-assistant.text.send-shortcut": "{key} 보내기",
   "ai-assistant.text.send-tooltip-wide": "전송 ({key})",
   "ai-assistant.text.table-shape": "{rows}행 × {columns}열",
-  "ai-assistant.button.table-to-words": "글로 넣기"
+  "ai-assistant.button.table-to-words": "글로 넣기",
+  "ai-assistant.text.invite-checking": "참여자 정보를 확인 중입니다. 확인되면 초대 가능 여부를 표시합니다.",
+  "ai-assistant.text.participant-unavailable": "사용자 정보 없음",
+  "ai-assistant.text.send-to-people": "참여자에게",
+  "ai-assistant.text.send-to-ai": "AI에게",
+  "ai-assistant.text.room-attachments-unavailable": "참여자에게 첨부파일을 보내는 기능은 아직 지원하지 않습니다. 첨부파일을 제거한 뒤 보내주세요.",
+  "ai-assistant.button.reply": "답장",
+  "ai-assistant.button.cancel-reply": "답장 취소",
+  "ai-assistant.text.reply-to": "{name}에게 답장"
 }

package/translations/ms.json

@@ -91,7 +91,7 @@
   "ai-assistant.notice.stopped": "permintaan terhenti separuh jalan, jadi sebahagian sahaja selesai.",
   "ai-assistant.notice.provider-busy": "perkhidmatan ai tidak menjawab sekarang. cuba lagi sebentar lagi.",
   "ai-assistant.notice.provider-error": "ada masalah semasa mengendalikan ini. beritahu pentadbir jika ia berulang.",
-  "ai-assistant.notice.too-long": "ini berjalan lama dan berhenti pada langkah {iter}. cuba minta dalam bahagian yang lebih kecil.",
+  "ai-assistant.notice.too-long": "ini berhenti selepas {iter} carian tanpa jawapan.",
   "ai-assistant.notice.tool-kept-failing": "{tool} gagal {count} kali berturut-turut, jadi ia berhenti. cuba nyatakan dengan cara lain.",
   "ai-assistant.text.no-match": "tiada padanan",
   "ai-assistant.text.messages-unreadable": "tidak dapat membaca perbualan ini.",

package/translations/zh.json

@@ -91,7 +91,7 @@
   "ai-assistant.notice.stopped": "请求中途停止,只处理了一部分。",
   "ai-assistant.notice.provider-busy": "AI 服务暂时没有回应,请稍后再试。",
   "ai-assistant.notice.provider-error": "处理时出了问题。如果一直这样,请告知管理员。",
-  "ai-assistant.notice.too-long": "处理过长,在第 {iter} 步停止。请分成小一些的请求。",
+  "ai-assistant.notice.too-long": "查询 {iter} 次后仍未得出答案,已停止。",
   "ai-assistant.notice.tool-kept-failing": "{tool} 连续失败 {count} 次,已停止。请换一种说法。",
   "ai-assistant.text.no-match": "没有匹配项",
   "ai-assistant.text.messages-unreadable": "无法读取这个对话。",