@things-factory/ai-assistant 10.1.178 → 10.1.179

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/ai-assistant",
-  "version": "10.1.178",
+  "version": "10.1.179",
   "main": "dist-server/index.js",
   "things-factory": true,
   "author": "heartyoh",
@@ -29,18 +29,19 @@
     "@material/web": "^2.0.0",
     "@operato/graphql": "^10.0.0",
     "@operato/i18n": "^10.0.0",
-    "@operato/input": "^10.0.0",
+    "@operato/input": "^10.29.37",
     "@operato/layout": "^10.20.0",
     "@operato/popup": "^10.16.0",
     "@operato/shell": "^10.0.0",
     "@operato/styles": "^10.0.0",
-    "@things-factory/ai-client-base": "^10.1.178",
-    "@things-factory/apptool-base": "^10.1.178",
-    "@things-factory/attachment-base": "^10.1.178",
-    "@things-factory/auth-base": "^10.1.178",
+    "@operato/utils": "^10.29.38",
+    "@things-factory/ai-client-base": "^10.1.179",
+    "@things-factory/apptool-base": "^10.1.179",
+    "@things-factory/attachment-base": "^10.1.179",
+    "@things-factory/auth-base": "^10.1.179",
     "@things-factory/env": "^10.1.149",
-    "@things-factory/setting-base": "^10.1.178",
-    "@things-factory/shell": "^10.1.178",
+    "@things-factory/setting-base": "^10.1.179",
+    "@things-factory/shell": "^10.1.179",
     "dompurify": "^3.0.0",
     "exceljs": "4.2.0",
     "graphql-scalars": "^1.22.0",
@@ -54,5 +55,5 @@
     "copyfiles": "^2.4.1",
     "rimraf": "^5.0.0"
   },
-  "gitHead": "d57448d3f3045f72a9f24b877a3e306eb34cbaf1"
+  "gitHead": "4c8263b08e06b2b15f11dc0575c61a280a0d9e27"
 }

package/server/service/chat-session/attachment-policy.test.ts

@@ -23,7 +23,7 @@ describe('attachment policy', () => {
   it('each limit refuses by name, before sending', () => {
     expect(refuseAttachments(policy, [{ name: 'a.pdf', type: 'application/pdf', size: 1 }])).toMatchObject({ code: 'attachment-kind-not-accepted', name: 'a.pdf' })
     expect(refuseAttachments(policy, [{ name: 'big.png', type: 'image/png', size: 1001 }])).toMatchObject({ code: 'attachment-too-large', name: 'big.png', maxBytes: 1000 })
-    expect(refuseAttachments(policy, [{}, {}, {}] as any)).toEqual({ code: 'too-many-attachments', maxFiles: 2 })
+    expect(refuseAttachments(policy, [{ name: 'a.png', type: 'image/png', size: 1 }, { name: 'b.png', type: 'image/png', size: 1 }, { name: 'c.png', type: 'image/png', size: 1 }])).toEqual({ code: 'too-many-attachments', maxFiles: 2 })
   })
 
   it('a kind outside the declared ones is refused', () => {

package/server/service/chat-session/attachment-policy.ts

@@ -64,16 +64,21 @@ export function refuseAttachments(
   if (!files.length) return null
   if (!policy || !policy.kinds?.length) return { code: 'attachments-not-accepted' }
 
+  /*
+   * File by file, in the order sent: its kind, then its size, then whether it is one too many. The screen's picking
+   * rule (@operato/utils sortPickedFiles) says them in this order, so the same batch hears the same "no" from both.
+   */
   const maxFiles = policy.maxFiles ?? DEFAULT_MAX_FILES
-  if (files.length > maxFiles) return { code: 'too-many-attachments', maxFiles }
-
   const maxBytes = policy.maxBytes ?? DEFAULT_MAX_BYTES
+  let taken = 0
   for (const file of files) {
     const kind = attachmentKindOf(file)
     if (!kind || !takes(policy, kind)) {
       return { code: 'attachment-kind-not-accepted', name: file.name || '', kinds: policy.kinds }
     }
     if ((file.size ?? 0) > maxBytes) return { code: 'attachment-too-large', name: file.name || '', maxBytes }
+    if (taken >= maxFiles) return { code: 'too-many-attachments', maxFiles }
+    taken++
   }
   return null
 }

package/test/assistant-dock.test.ts

@@ -139,7 +139,7 @@ describe('attachments in the chat follow the mode', () => {
   })
 
   it('said before sending, then uploaded to the conversation and sent by id', () => {
-    assert.match(chat, /refuseAttachments\(this\.modeView\?\.attachments/)
+    assert.match(chat, /refuseAttachments\(\s*this\.modeView\?\.attachments/)
     assert.match(chat, /mutation: ATTACH_TO_CONVERSATION_MUTATION/)
     /* Without it the client sends the File as {} and the server refuses the upload (found on :3700, 2026-09-25). */
     assert.match(chat, /context: \{ hasUpload: true \}/)

package/test/attachment-one-rule.test.ts

@@ -0,0 +1,46 @@
+import { readFileSync } from 'fs'
+import { join } from 'path'
+
+import * as screen from '../client/utils/attachment-policy'
+import * as server from '../server/service/chat-session/attachment-policy'
+
+/*
+ * A conversation's attachments are refused on the screen by the one file-picking rule (@operato/utils
+ * sortPickedFiles, ADR-0061 2026-10-17); the mode's policy is a limit, narrowed by the server's upload limit. The
+ * screen's "no" is only so the person hears it early - the door still refuses by the mode's policy on its own.
+ */
+const read = (file: string) => readFileSync(join(__dirname, '..', file), 'utf8')
+
+describe('one rule for a conversation attachment', () => {
+  const policy = { kinds: ['image'], maxBytes: 100, maxFiles: 5 } as any
+
+  it('★ the screen applies the tighter of the mode policy and the server upload limit', () => {
+    const file = [{ name: 'a.png', type: 'image/png', size: 60 }]
+    expect(screen.refuseAttachments(policy, file)).toBeNull()
+    expect(screen.refuseAttachments(policy, file, { maxFileSize: 50 })).toEqual({ code: 'attachment-too-large', name: 'a.png', maxBytes: 50 })
+    expect(screen.refuseAttachments(policy, file, { maxFileSize: 1000 })).toBeNull()
+    expect(screen.refuseAttachments(policy, [{ name: 'b.png', type: 'image/png', size: 200 }], { maxFileSize: 1000 })).toMatchObject({ maxBytes: 100 })
+  })
+
+  it('★ the screen judges with the shared rule, not a copy of its own', () => {
+    const source = read('client/utils/attachment-policy.ts')
+    expect(source).toMatch(/import \{ narrowLimits, sortPickedFiles, type FileUploadLimits \} from '@operato\/utils\/file-acceptance\.js'/)
+    expect(source).not.toMatch(/function takes\(|export function attachmentKindOf/)
+  })
+
+  it('★ the door still refuses by the mode policy itself, before and after saving', () => {
+    expect(server.refuseAttachments(policy, [{ name: 'a.pdf', type: 'application/pdf', size: 1 }])).toMatchObject({ code: 'attachment-kind-not-accepted' })
+    const door = read('server/service/chat-session-resolver.ts')
+    expect(door).toMatch(/import \{ refuseAttachments, type AttachmentRefusal \} from '\.\/chat-session\/attachment-policy\.js'/)
+    expect(door.match(/refuseAttachments\(policy, /g)?.length).toBe(2)
+  })
+
+  it('★ the attach button opens the one picker; paste and drop take the same rule', () => {
+    const chat = read('client/components/assistant-chat.ts')
+    expect(chat).not.toMatch(/type="file"/)
+    expect(chat).toMatch(/<ox-input-file\s+id="chat-file-input"\s+quiet\s+outside-trigger/)
+    expect(chat).toMatch(/\(this\.renderRoot\.querySelector\('#chat-file-input'\) as any\)\?\.pick\(\)/)
+    expect(chat).toMatch(/this\.onAttachFiles\(e\.dataTransfer\.files\)/)
+    expect(chat).toMatch(/await fileUploadLimits\(\)\s*\)/)
+  })
+})

package/test/attachment-policy-agree.test.ts

@@ -13,7 +13,10 @@ const fileSets = [
   [{ name: 'report.CSV', type: '', size: 10 }],
   [{ name: 'a.pdf', type: 'application/pdf', size: 10 }],
   [{ name: 'big.png', type: 'image/png', size: 101 }],
-  [{ name: 'a.png', type: 'image/png', size: 1 }, { name: 'b.png', type: 'image/png', size: 1 }, { name: 'c.png', type: 'image/png', size: 1 }]
+  [{ name: 'a.png', type: 'image/png', size: 1 }, { name: 'b.png', type: 'image/png', size: 1 }, { name: 'c.png', type: 'image/png', size: 1 }],
+  /* Mixed batches: the same "no" in the same order - kind, then size, then one too many, file by file. */
+  [{ name: 'a.png', type: 'image/png', size: 1 }, { name: 'b.png', type: 'image/png', size: 1 }, { name: 'c.pdf', type: 'application/pdf', size: 1 }],
+  [{ name: 'a.png', type: 'image/png', size: 1 }, { name: 'b.png', type: 'image/png', size: 1 }, { name: 'c.png', type: 'image/png', size: 101 }]
 ]
 
 describe('the screen and the door refuse the same things', () => {