@things-factory/ai-assistant 10.1.177 → 10.1.179

package/client/components/assistant-chat.ts

@@ -35,6 +35,8 @@ import {
   stripMentionRefids
 } from './markdown.js'
 import { acceptOf, chatAttachmentUrl, refuseAttachments, textCharsOf } from '../utils/attachment-policy.js'
+import { fileUploadLimits } from '@operato/utils/file-acceptance.js'
+import '@operato/input/ox-input-file.js'
 import { pastedTableFile } from '../utils/pasted-table.js'
 import { appendWords, composerHeight, composerKeyAction, composerSuggestion, sendShortcut, tableAsWords } from '../utils/composer-frame.js'
 import { readSpreadsheet, spreadsheetKindOf, type SpreadsheetRefusal } from '../utils/spreadsheet-text.js'
@@ -659,8 +661,12 @@ export class OxAssistantChat extends LitElement {
       list = read.files
     }
     if (this.usesAttachmentPolicy) {
-      /* Said before anything is sent - never cut silently (§9-1). */
-      const refusal = refuseAttachments(this.modeView?.attachments, [...this.attachments, ...list].map(f => ({ name: f.name, type: f.type, size: f.size })))
+      /* Said before anything is sent - never cut silently (§9-1). The one picking rule, the server's upload limit included. */
+      const refusal = refuseAttachments(
+        this.modeView?.attachments,
+        [...this.attachments, ...list].map(f => ({ name: f.name, type: f.type, size: f.size })),
+        await fileUploadLimits()
+      )
       if (refusal) {
         this.errorMessage = this.attachmentRefusalText(refusal)
         return
@@ -3234,20 +3240,21 @@ export class OxAssistantChat extends LitElement {
             `
           : nothing}
         <div class="actions-row">
-          <input
+          <ox-input-file
             id="chat-file-input"
-            type="file"
+            quiet
+            outside-trigger
+            hide-filelist
             multiple
             accept=${this.usesAttachmentPolicy ? acceptOf(this.modeView?.attachments) : 'image/*'}
-            style="display: none"
-            @change=${(e: Event) => {
-              const input = e.target as HTMLInputElement
-              if (input.files?.length) {
-                this.onAttachFiles(input.files)
-                input.value = ''
+            @change=${(e: CustomEvent) => {
+              const files: File[] = e.detail ?? []
+              if (files.length) {
+                this.onAttachFiles(files)
+                ;(e.target as any).reset()
               }
             }}
-          />
+          ></ox-input-file>
           ${hasMessages
             ? html`
                 <button
@@ -3385,7 +3392,7 @@ export class OxAssistantChat extends LitElement {
                 class="attach"
                 aria-label=${i18next.t('ai-assistant.button.attach', { defaultValue: 'Attach' })}
                 title=${i18next.t('ai-assistant.tooltip.attach-file', { defaultValue: 'attach an image (drag & drop or paste supported)' })}
-                @click=${() => this.renderRoot.querySelector<HTMLInputElement>('#chat-file-input')?.click()}>
+                @click=${() => (this.renderRoot.querySelector('#chat-file-input') as any)?.pick()}>
                 <md-icon>attach_file</md-icon>
               </button>`
             : nothing}

package/client/utils/attachment-policy.ts

@@ -1,10 +1,15 @@
 /*
- * What a conversation accepts as attachments - the screen's copy of the server rule
+ * What a conversation accepts as attachments - the screen's side of the server rule
  * (server/service/chat-session/attachment-policy.ts, design/ai/shared-dock.md §9-1).
  *
  * The screen checks first so the person hears "no" before anything is sent; the door checks again and is
- * the authority. `test/attachment-policy-agree.test.ts` runs both copies over one table so they cannot drift.
+ * the authority. `test/attachment-policy-agree.test.ts` runs both over one table so they cannot drift.
+ *
+ * The screen's check is the one file-picking rule (@operato/utils `sortPickedFiles`, ADR-0061 2026-10-17): the mode's
+ * kinds become an `accept` (the table below, the one place), its size and count become limits, narrowed by the
+ * server's upload limits. What stays here is the mode's words: kinds, and a spreadsheet read into text.
  */
+import { narrowLimits, sortPickedFiles, type FileUploadLimits } from '@operato/utils/file-acceptance.js'
 
 /*
  * 'spreadsheet' is a kind a mode opens, never a file the door receives: the screen reads each .xlsx sheet into CSV
@@ -27,60 +32,64 @@ export const TEXT_CHARS_FOR_MODEL = 20_000
 
 const TEXT_TYPES = ['text/plain', 'text/csv', 'text/markdown', 'application/json']
 const TEXT_EXTENSIONS = ['.txt', '.csv', '.md', '.json']
+const XLSX_TYPE = 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
 
-export function attachmentKindOf(file: { type?: string; name?: string }): AttachmentKind | null {
-  const type = (file.type || '').toLowerCase()
-  if (type.startsWith('image/')) return 'image'
-  if (TEXT_TYPES.includes(type)) return 'text'
-  const name = (file.name || '').toLowerCase()
-  if (TEXT_EXTENSIONS.some(ext => name.endsWith(ext))) return 'text'
-  return null
+/** Each kind as `accept` patterns - the one table from the mode's kinds to what a picker takes. */
+const KIND_ACCEPT: Record<AttachmentKind, string[]> = {
+  image: ['image/*'],
+  text: [...TEXT_EXTENSIONS, ...TEXT_TYPES],
+  spreadsheet: ['.xlsx', XLSX_TYPE]
 }
 
+/** A kind the policy takes - text also when it takes spreadsheets, which arrive as the text of their sheets. */
+const acceptFor = (kinds: AttachmentKind[]) => [...new Set(kinds.flatMap(kind => KIND_ACCEPT[kind]))].join(',')
+
 export type AttachmentRefusal =
   | { code: 'attachments-not-accepted' }
   | { code: 'attachment-kind-not-accepted'; name: string; kinds: AttachmentKind[] }
   | { code: 'attachment-too-large'; name: string; maxBytes: number }
   | { code: 'too-many-attachments'; maxFiles: number }
 
-/** A kind the policy takes - text also when it takes spreadsheets, which arrive as the text of their sheets. */
-function takes(policy: AttachmentPolicy, kind: AttachmentKind): boolean {
-  return policy.kinds.includes(kind) || (kind === 'text' && policy.kinds.includes('spreadsheet'))
-}
-
 /** The characters of a text file the model reads under this policy. */
 export function textCharsOf(policy: AttachmentPolicy | null | undefined): number {
   return policy?.maxChars ?? TEXT_CHARS_FOR_MODEL
 }
 
+/** The mode's size and count as picker limits. */
+export function limitsOf(policy: AttachmentPolicy | null | undefined): FileUploadLimits {
+  return { maxFileSize: policy?.maxBytes ?? DEFAULT_MAX_BYTES, maxFiles: policy?.maxFiles ?? DEFAULT_MAX_FILES }
+}
+
+/**
+ * Whether these files may go, by the one picking rule. `server` is the server's upload limit (shell
+ * `fileUploadLimits`); the tighter of it and the mode's policy applies. The first reason, by name: file by file, its
+ * kind, then its size, then whether it is one too many - the door says them in the same order.
+ */
 export function refuseAttachments(
   policy: AttachmentPolicy | null | undefined,
-  files: { name?: string; type?: string; size?: number }[]
+  files: { name?: string; type?: string; size?: number }[],
+  server?: FileUploadLimits
 ): AttachmentRefusal | null {
   if (!files.length) return null
   if (!policy || !policy.kinds?.length) return { code: 'attachments-not-accepted' }
 
-  const maxFiles = policy.maxFiles ?? DEFAULT_MAX_FILES
-  if (files.length > maxFiles) return { code: 'too-many-attachments', maxFiles }
+  /* What is sent: a spreadsheet arrives as the text of its sheets. */
+  const sent = policy.kinds.map(kind => (kind === 'spreadsheet' ? 'text' : kind))
+  const limits = narrowLimits(limitsOf(policy), server)
+  const { refused } = sortPickedFiles(files, { accept: acceptFor(sent), limits })
+  if (!refused.length) return null
 
-  const maxBytes = policy.maxBytes ?? DEFAULT_MAX_BYTES
-  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 }
-  }
-  return null
+  const [first] = refused
+  if (first.reason === 'count') return { code: 'too-many-attachments', maxFiles: limits.maxFiles! }
+  return first.reason === 'type'
+    ? { code: 'attachment-kind-not-accepted', name: first.file.name || '', kinds: policy.kinds }
+    : { code: 'attachment-too-large', name: first.file.name || '', maxBytes: limits.maxFileSize! }
 }
 
-/** The file picker's `accept` for a policy. */
+/** The file picker's `accept` for a policy - a spreadsheet as the person picks it (.xlsx). */
 export function acceptOf(policy: AttachmentPolicy | null | undefined): string {
-  const accept: string[] = []
-  if (policy?.kinds?.includes('image')) accept.push('image/*')
-  if (policy?.kinds?.includes('text') || policy?.kinds?.includes('spreadsheet')) accept.push(...TEXT_EXTENSIONS, ...TEXT_TYPES)
-  if (policy?.kinds?.includes('spreadsheet')) accept.push('.xlsx', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet')
-  return accept.join(',')
+  const kinds = policy?.kinds ?? []
+  return acceptFor(kinds.includes('spreadsheet') ? [...kinds, 'text'] : kinds)
 }
 
 /** Where a conversation's file opens - the gated route, under the page's domain path. */

package/dist-client/components/assistant-chat.d.ts

@@ -17,6 +17,7 @@ import '@material/web/icon/icon.js';
 import './assistant-session-toolbar.js';
 import { type AssistantRequestContext } from '../utils/assistant-request-context.js';
 import { LitElement } from 'lit';
+import '@operato/input/ox-input-file.js';
 import './mention-popup.js';
 import { type FilterResult } from './mention-popup.js';
 import { type AssistantMode } from './assistant-mode.js';

package/dist-client/components/assistant-chat.js

@@ -30,6 +30,8 @@ import { ScrollbarStyles } from '@operato/styles';
 import gql from 'graphql-tag';
 import { renderMarkdown, injectMentionRefids, injectMentionUserIds, stripMentionRefids } from './markdown.js';
 import { acceptOf, chatAttachmentUrl, refuseAttachments, textCharsOf } from '../utils/attachment-policy.js';
+import { fileUploadLimits } from '@operato/utils/file-acceptance.js';
+import '@operato/input/ox-input-file.js';
 import { pastedTableFile } from '../utils/pasted-table.js';
 import { appendWords, composerHeight, composerKeyAction, composerSuggestion, sendShortcut, tableAsWords } from '../utils/composer-frame.js';
 import { readSpreadsheet, spreadsheetKindOf } from '../utils/spreadsheet-text.js';
@@ -465,8 +467,8 @@ let OxAssistantChat = class OxAssistantChat extends LitElement {
             list = read.files;
         }
         if (this.usesAttachmentPolicy) {
-            /* Said before anything is sent - never cut silently (§9-1). */
-            const refusal = refuseAttachments(this.modeView?.attachments, [...this.attachments, ...list].map(f => ({ name: f.name, type: f.type, size: f.size })));
+            /* Said before anything is sent - never cut silently (§9-1). The one picking rule, the server's upload limit included. */
+            const refusal = refuseAttachments(this.modeView?.attachments, [...this.attachments, ...list].map(f => ({ name: f.name, type: f.type, size: f.size })), await fileUploadLimits());
             if (refusal) {
                 this.errorMessage = this.attachmentRefusalText(refusal);
                 return;
@@ -2880,20 +2882,21 @@ let OxAssistantChat = class OxAssistantChat extends LitElement {
             `
             : nothing}
         <div class="actions-row">
-          <input
+          <ox-input-file
             id="chat-file-input"
-            type="file"
+            quiet
+            outside-trigger
+            hide-filelist
             multiple
             accept=${this.usesAttachmentPolicy ? acceptOf(this.modeView?.attachments) : 'image/*'}
-            style="display: none"
             @change=${(e) => {
-            const input = e.target;
-            if (input.files?.length) {
-                this.onAttachFiles(input.files);
-                input.value = '';
+            const files = e.detail ?? [];
+            if (files.length) {
+                this.onAttachFiles(files);
+                e.target.reset();
             }
         }}
-          />
+          ></ox-input-file>
           ${hasMessages
             ? html `
                 <button
@@ -3028,7 +3031,7 @@ let OxAssistantChat = class OxAssistantChat extends LitElement {
                 class="attach"
                 aria-label=${i18next.t('ai-assistant.button.attach', { defaultValue: 'Attach' })}
                 title=${i18next.t('ai-assistant.tooltip.attach-file', { defaultValue: 'attach an image (drag & drop or paste supported)' })}
-                @click=${() => this.renderRoot.querySelector('#chat-file-input')?.click()}>
+                @click=${() => this.renderRoot.querySelector('#chat-file-input')?.pick()}>
                 <md-icon>attach_file</md-icon>
               </button>`
             : nothing}