@things-factory/ai-assistant 10.1.99 → 10.1.101

package/server/service/data-entry/entry-tools.ts

@@ -22,6 +22,9 @@ import {
   entryToolName,
   isBlocked,
   normalizeEntryRows,
+  entryGroups,
+  referenceDoorsOf,
+  resolveReferences,
   recordEntryEvent,
   withCheckedIssues,
   type EntryField,
@@ -35,10 +38,12 @@ function fieldSchema(field: EntryField): any {
    * whole request with it: "12,400" or "₩12,400" is the model's to write as 12400 (2026-10-01, office).
    */
   const type = field.type === 'number' ? 'number' : field.type === 'integer' ? 'integer' : field.type === 'boolean' ? 'boolean' : 'string'
+  if (field.type === 'reference') return { type: 'string', description: [field.description, field.required ? 'required' : 'optional', 'the name or code as the material or the person gives it - the server finds the record'].filter(Boolean).join('. ') }
   const said = [
     field.description,
     field.required ? 'required' : 'optional',
     field.type === 'date' ? 'YYYY-MM-DD' : undefined,
+    field.type === 'datetime' ? 'YYYY-MM-DD HH:mm, with the offset only when the material gives one' : undefined,
     field.type === 'enum' ? `one of: ${field.values!.join(', ')}` : undefined
   ]
     .filter(Boolean)
@@ -61,7 +66,7 @@ export type SourceTextLoader = (attachmentIds: string[], context: any) => Promis
 
 const readSources: SourceTextLoader = async (ids, context) => (await import('./entry-sources.js')).loadSourceTexts(ids, context)
 
-export async function proposeEntries(target: EntryTarget, args: any, context: any, loadTexts: SourceTextLoader = readSources) {
+export async function proposeEntries(target: EntryTarget, args: any, context: any, loadTexts: SourceTextLoader = readSources, run?: GraphqlRunner) {
   const tool = entryToolName(target.key)
   const told = (event: Omit<Parameters<typeof recordEntryEvent>[1], 'phase' | 'tool'>) => recordEntryEvent(target, { phase: 'propose', tool, ...event }, { state: context?.state })
   const { rows: normalized, cut } = normalizeEntryRows(target, args?.rows)
@@ -74,7 +79,9 @@ export async function proposeEntries(target: EntryTarget, args: any, context: an
   const declared = args?.declaredTotal && typeof args.declaredTotal === 'object' ? args.declaredTotal : undefined
   const cited = [...normalized.flatMap(row => row.sources.map(source => source.attachmentId)), declared?.attachmentId].filter((id): id is string => typeof id === 'string' && !!id)
   const texts = cited.length ? await loadTexts(cited, context).catch(() => new Map<string, string>()) : new Map<string, string>()
-  const read = verifyRowsAgainstSources(normalized, target.fields, texts)
+  /* A name the model wrote for another record is settled to its id by the application's query, as the person. */
+  const resolved = await resolveReferences(target.fields, normalized, run ?? runAsCaller(context))
+  const read = verifyRowsAgainstSources(resolved, target.fields, texts)
 
   let rows: EntryRow[] = read
   let checkFailed: string | undefined
@@ -87,6 +94,9 @@ export async function proposeEntries(target: EntryTarget, args: any, context: an
   }
 
   const blocked = rows.filter(isBlocked).length
+  /* With lines grouped into records, the card counts the records and says which are kept out whole. */
+  const groups = target.group ? entryGroups(rows, target.group.by) : undefined
+  const groupCounts = groups ? { groups: groups.length, groupsReady: groups.filter(([, members]) => !members.some(isBlocked)).length } : {}
   const totals = entryTotals(rows, target.fields, declared, texts)
   const verified = rows.filter(row => row.evidence).length
   const unmatched = rows.filter(row => row.issues.some(issue => issue.code === 'not-in-source')).length
@@ -100,7 +110,8 @@ export async function proposeEntries(target: EntryTarget, args: any, context: an
     icon: 'playlist_add',
     columns: columnsOf(target),
     rows,
-    counts: { rows: rows.length, ready: rows.length - blocked, blocked, cut, verified, unmatched },
+    counts: { rows: rows.length, ready: rows.length - blocked, blocked, cut, verified, unmatched, ...groupCounts },
+    ...(target.group ? { groupBy: target.group.by } : {}),
     ...(totals.length ? { totals } : {}),
     ...(typeof args?.note === 'string' && args.note.trim() ? { reason: args.note.trim().slice(0, 300) } : {}),
     ...(checkFailed ? { checkFailed } : {}),
@@ -138,7 +149,7 @@ function changeSpecs(target: EntryTarget, run: (context: any) => GraphqlRunner):
       kind: 'read',
       name: changeToolName(target.key),
       /* The person must be able to read the records and change them by hand. */
-      doors: [rootFieldOf(update.mutation, 'mutation'), readDoor],
+      doors: [...new Set([rootFieldOf(update.mutation, 'mutation'), readDoor, ...referenceDoorsOf(changeableFields(target))])],
       description:
         `Propose changes to existing records: ${target.description} ` +
         'Name each record by ref: "current" (the one on screen), "selected" (every row selected on screen) or an id a find tool returned. ' +
@@ -183,9 +194,10 @@ export function entryCategoryOf(target: EntryTarget, run: (context: any) => Grap
     kind: 'read',
     name,
     /* The person must be able to enter these records themselves - the tool is not a second way in. */
-    doors: [entryDoorOf(target.mutation)],
+    doors: [entryDoorOf(target.mutation), ...referenceDoorsOf(target.fields)],
     description:
       `Propose records to enter: ${target.description} ` +
+      (target.group ? `Each row is one line; the rows of one record share the same ${target.group.by}. ` : '') +
       'Pass every record found in the material as one row. The rows are shown to the person as a card; nothing is written until they press it.',
     schema: {
       type: 'object',
@@ -202,8 +214,15 @@ export function entryCategoryOf(target: EntryTarget, run: (context: any) => Grap
               },
               sources: {
                 type: 'array',
-                description: 'Where this row came from: the attachment id and where in it ("row 3", "the receipt photo"), or where: "the person\'s message".',
-                items: { type: 'object', properties: { attachmentId: { type: 'string' }, where: { type: 'string' } } }
+                description: 'Where this row came from: the attachment id and where in it, and { person: true } for a value the person said.',
+                items: {
+                  type: 'object',
+                  properties: {
+                    attachmentId: { type: 'string' },
+                    where: { type: 'string', description: 'Where in the attachment, in the person\'s language ("3번째 줄", "영수증 사진").' },
+                    person: { type: 'boolean', description: 'true when the value came from what the person said in the conversation.' }
+                  }
+                }
               }
             },
             required: ['values', 'sources']
@@ -223,7 +242,7 @@ export function entryCategoryOf(target: EntryTarget, run: (context: any) => Grap
       },
       required: ['rows']
     },
-    builder: (args: any, context: any) => proposeEntries(target, args, context)
+    builder: (args: any, context: any) => proposeEntries(target, args, context, readSources, run(context))
   } as ToolSpec
 
   return {
@@ -232,8 +251,8 @@ export function entryCategoryOf(target: EntryTarget, run: (context: any) => Grap
     guidance: [
       `- When the person gives material to enter as records (files, photos, pasted text), read all of it first - call readChatAttachment for a file sent in an earlier turn - then call ${name} once with every record as a row.`,
       '- Never invent a value. Leave a field out when the material does not say it; the card marks it, and you ask the person for it.',
-      '- Give each row its sources: which attachment and where in it. A value the person gave or corrected in the conversation adds the source where: "the person\'s message". The server looks for each row\'s numbers and dates in the cited file and marks what it does not find.',
-      '- When the material prints a total, pass it as declaredTotal exactly as printed - do not add it up yourself.',
+      '- Give each row its sources: which attachment and where in it, written in the person\'s language. A value the person gave or corrected in the conversation adds the source { person: true }. The server looks for each row\'s numbers and dates in the cited file and marks what it does not find.',
+      '- When the material prints a total, always pass it as declaredTotal exactly as printed - do not add it up yourself. The server also reads a total line of a text file itself.',
       `- ${name} only proposes. Nothing is entered until the person presses the button on the card - never say the records were entered.`,
       `- When the person corrects or drops rows, call ${name} again with the whole corrected set. The newest card replaces the earlier ones; an earlier card can no longer be entered.`,
       ...(target.update

package/server/service/data-entry/entry-update.ts

@@ -13,6 +13,7 @@ import {
   changeToolName,
   findToolName,
   readFieldValue,
+  resolveReferences,
   sameFieldValue,
   type EntryField,
   type EntryIssue,
@@ -85,7 +86,7 @@ export async function readRecords(target: EntryTarget, ids: string[], run: Graph
   const update = target.update!
   const answer = await run(update.read.query, update.read.variables([...new Set(ids)]))
   if (answer.errors?.length) throw new Error(answer.errors.map(one => one.message).join('; '))
-  return new Map((update.read.recordsOf(answer.data) ?? []).filter(record => record && typeof record.id === 'string').map(record => [record.id, record]))
+  return new Map((update.read.recordsOf(answer.data, [...new Set(ids)]) ?? []).filter(record => record && typeof record.id === 'string').map(record => [record.id, record]))
 }
 
 /** The change rows against what the records hold now. */
@@ -146,7 +147,7 @@ export async function proposeChanges(target: EntryTarget, args: any, context: an
   } catch (error: any) {
     return { rejected: true, error: 'read-failed', message: `could not read the records: ${error?.message ?? error}` }
   }
-  const rows = changeRows(target, picked, records)
+  const rows = await resolveReferences(changeableFields(target), changeRows(target, picked, records), run)
   const blocked = rows.filter(blockedChange).length
   return {
     proposed: true,
@@ -181,7 +182,7 @@ export async function findRecords(target: EntryTarget, args: any, run: GraphqlRu
   }
   const answer = await run(find.query, find.variables(criteria))
   if (answer.errors?.length) return { rejected: true, error: 'find-failed', message: answer.errors.map(one => one.message).join('; ') }
-  const found = (find.recordsOf(answer.data) ?? []).filter(record => record && typeof record.id === 'string')
+  const found = (find.recordsOf(answer.data, criteria) ?? []).filter(record => record && typeof record.id === 'string')
   return {
     total: found.length,
     candidates: found.slice(0, MAX_CANDIDATES).map(record => ({ id: record.id, ...(target.update?.labelOf ? { label: target.update.labelOf(record) } : {}), record })),

package/test/entry-proposal.test.ts

@@ -77,4 +77,15 @@ describe('the entry card', () => {
       'changed 1 records.\nrow 2: amount: changed-since'
     )
   })
+
+  it('★ the button counts only the lines of records that go in whole', () => {
+    const p = { ...card('g'), groupBy: 'order', rows: [
+      { index: 0, values: { order: 'A' }, sources: [], issues: [] },
+      { index: 1, values: { order: 'A' }, sources: [], issues: [] },
+      { index: 2, values: { order: 'B' }, sources: [], issues: [] },
+      { index: 3, values: { order: 'B' }, sources: [], issues: [{ code: 'required', field: 'qty', blocking: true }] }
+    ] }
+    expect(entryReadyCount(p)).toBe(2)
+  })
 })
+

package/translations/en.json

@@ -267,5 +267,13 @@
   "ai-assistant.entry.issue.changed-since": "changed since the card was made",
   "ai-assistant.entry.issue.no-change": "already that value",
   "ai-assistant.entry.issue.nothing-to-change": "nothing to change",
-  "ai-assistant.entry.issue.not-changeable": "this field cannot be changed - left out"
+  "ai-assistant.entry.issue.not-changeable": "this field cannot be changed - left out",
+  "ai-assistant.entry.source-person": "said in the conversation",
+  "ai-assistant.entry.total-declared-file": "the file's total line {sum}",
+  "ai-assistant.entry.issue.reference-not-found": "\"{text}\" - not found",
+  "ai-assistant.entry.issue.reference-ambiguous": "\"{text}\" - matches several: {candidates}",
+  "ai-assistant.entry.issue.reference-unreadable": "\"{text}\" - could not be looked up",
+  "ai-assistant.entry.issue.not-a-reference": "not a record it can point to",
+  "ai-assistant.entry.groups": "{count} records",
+  "ai-assistant.entry.groups-kept-out": "{count} records kept out whole"
 }

package/translations/ja.json

@@ -267,5 +267,13 @@
   "ai-assistant.entry.issue.changed-since": "その間に変更されました",
   "ai-assistant.entry.issue.no-change": "すでにその値です",
   "ai-assistant.entry.issue.nothing-to-change": "修正する項目がありません",
-  "ai-assistant.entry.issue.not-changeable": "修正できない項目のため除外しました"
+  "ai-assistant.entry.issue.not-changeable": "修正できない項目のため除外しました",
+  "ai-assistant.entry.source-person": "会話で伝えた値",
+  "ai-assistant.entry.total-declared-file": "資料の合計行 {sum}",
+  "ai-assistant.entry.issue.reference-not-found": "「{text}」— 見つかりません",
+  "ai-assistant.entry.issue.reference-ambiguous": "「{text}」— 複数に一致: {candidates}",
+  "ai-assistant.entry.issue.reference-unreadable": "「{text}」— 検索できませんでした",
+  "ai-assistant.entry.issue.not-a-reference": "参照先の記録が分かりません",
+  "ai-assistant.entry.groups": "{count}件",
+  "ai-assistant.entry.groups-kept-out": "{count}件は行が止まり全体を入力しません"
 }

package/translations/ko.json

@@ -267,5 +267,13 @@
   "ai-assistant.entry.issue.changed-since": "그사이 바뀌었습니다",
   "ai-assistant.entry.issue.no-change": "이미 그 값입니다",
   "ai-assistant.entry.issue.nothing-to-change": "고칠 칸이 없습니다",
-  "ai-assistant.entry.issue.not-changeable": "고칠 수 없는 칸이라 뺐습니다"
+  "ai-assistant.entry.issue.not-changeable": "고칠 수 없는 칸이라 뺐습니다",
+  "ai-assistant.entry.source-person": "대화에서 말한 값",
+  "ai-assistant.entry.total-declared-file": "자료의 합계 줄 {sum}",
+  "ai-assistant.entry.issue.reference-not-found": "\"{text}\" — 찾지 못했습니다",
+  "ai-assistant.entry.issue.reference-ambiguous": "\"{text}\" — 여럿과 맞습니다: {candidates}",
+  "ai-assistant.entry.issue.reference-unreadable": "\"{text}\" — 찾아보지 못했습니다",
+  "ai-assistant.entry.issue.not-a-reference": "가리키는 기록을 알 수 없습니다",
+  "ai-assistant.entry.groups": "{count}건",
+  "ai-assistant.entry.groups-kept-out": "{count}건은 줄이 막혀 통째로 입력하지 않습니다"
 }

package/translations/ms.json

@@ -267,5 +267,13 @@
   "ai-assistant.entry.issue.changed-since": "telah berubah sejak kad dibuat",
   "ai-assistant.entry.issue.no-change": "sudah nilai itu",
   "ai-assistant.entry.issue.nothing-to-change": "tiada yang perlu diubah",
-  "ai-assistant.entry.issue.not-changeable": "medan ini tidak boleh diubah - ditinggalkan"
+  "ai-assistant.entry.issue.not-changeable": "medan ini tidak boleh diubah - ditinggalkan",
+  "ai-assistant.entry.source-person": "dinyatakan dalam perbualan",
+  "ai-assistant.entry.total-declared-file": "baris jumlah fail {sum}",
+  "ai-assistant.entry.issue.reference-not-found": "\"{text}\" - tidak ditemui",
+  "ai-assistant.entry.issue.reference-ambiguous": "\"{text}\" - sepadan dengan beberapa: {candidates}",
+  "ai-assistant.entry.issue.reference-unreadable": "\"{text}\" - tidak dapat dicari",
+  "ai-assistant.entry.issue.not-a-reference": "bukan rekod yang boleh dirujuk",
+  "ai-assistant.entry.groups": "{count} rekod",
+  "ai-assistant.entry.groups-kept-out": "{count} rekod ditahan sepenuhnya"
 }

package/translations/zh.json

@@ -267,5 +267,13 @@
   "ai-assistant.entry.issue.changed-since": "在此期间已被修改",
   "ai-assistant.entry.issue.no-change": "已是该值",
   "ai-assistant.entry.issue.nothing-to-change": "没有要修改的字段",
-  "ai-assistant.entry.issue.not-changeable": "此字段不可修改，已忽略"
+  "ai-assistant.entry.issue.not-changeable": "此字段不可修改，已忽略",
+  "ai-assistant.entry.source-person": "对话中提供的值",
+  "ai-assistant.entry.total-declared-file": "资料合计行 {sum}",
+  "ai-assistant.entry.issue.reference-not-found": "\"{text}\" — 未找到",
+  "ai-assistant.entry.issue.reference-ambiguous": "\"{text}\" — 匹配多个：{candidates}",
+  "ai-assistant.entry.issue.reference-unreadable": "\"{text}\" — 无法查找",
+  "ai-assistant.entry.issue.not-a-reference": "无法确定所指记录",
+  "ai-assistant.entry.groups": "{count}条",
+  "ai-assistant.entry.groups-kept-out": "{count}条因有行被拦而整体不录入"
 }