@things-factory/ai-assistant 10.1.102 → 10.1.104

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/ai-assistant",
-  "version": "10.1.102",
+  "version": "10.1.104",
   "main": "dist-server/index.js",
   "things-factory": true,
   "author": "heartyoh",
@@ -51,5 +51,5 @@
     "copyfiles": "^2.4.1",
     "rimraf": "^5.0.0"
   },
-  "gitHead": "8bba629dd321caa7c047d52f451d61d2678cc6e2"
+  "gitHead": "0d05c7573220c6da2dec2654a4b86d7bd8e3c4fb"
 }

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

@@ -311,3 +311,33 @@ describe('a record with lines', () => {
   })
 })
 
+describe('checking the changes', () => {
+  const named: EntryTarget = {
+    ...expense,
+    update: {
+      ...expense.update!,
+      check: rows => rows.map(row => (row.values.merchant === '스타벅스' ? [{ code: 'name-taken', blocking: true }] : []))
+    }
+  }
+
+  it('★ the target checks a change when the card is made - and again when it is pressed', async () => {
+    declareEntryTarget(named)
+    const proposal: any = { ...(await proposeChanges(named, { changes: [{ ref: 'l1', values: { merchant: '스타벅스' } }, { ref: 'l2', values: { amount: 9000 } }] }, { host: {} }, run)), key: 'c1' }
+    expect(proposal.rows[0].issues).toEqual([{ code: 'name-taken', blocking: true }])
+    expect(proposal.rows[1].issues).toEqual([])
+    /* A card made before the clash: the check at pressing keeps it out. */
+    const before: any = { ...proposal, rows: proposal.rows.map((row: any) => ({ ...row, issues: [] })) }
+    const outcome = await applyEntryProposal('c1', { messages: [{ id: 'm1', proposals: [before] }], answered: false, passesDoor: async () => true, execute: run, state: {} })
+    expect(outcome.rows[0]).toEqual({ index: 0, ok: false, error: 'name-taken' })
+    expect(outcome.rows[1]).toMatchObject({ ok: true })
+  })
+})
+
+describe('a check that cannot run', () => {
+  it('★ keeps every change out - nothing is written unchecked', async () => {
+    const broken: EntryTarget = { ...expense, update: { ...expense.update!, check: () => { throw new Error('db down') } } }
+    const proposal: any = await proposeChanges(broken, { changes: [{ ref: 'l1', values: { amount: 1 } }] }, { host: {} }, run)
+    expect(proposal.rows[0].issues).toEqual([{ code: 'check-failed', blocking: true }])
+  })
+})
+

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

@@ -11,7 +11,7 @@
  * Dependencies come in as arguments so the rules are tested without a database.
  */
 import { PROPOSAL_OUTCOME_PREFIX, PROPOSAL_VERDICTS } from '../chat-message/proposal-outcome.js'
-import { readRecords, stillAsProposed, type ChangeRow } from './entry-update.js'
+import { readRecords, stillAsProposed, withChangeChecks, type ChangeRow } from './entry-update.js'
 import { changeToolName, zonedDateTimes, entryGroups, resolveReferences, entryDoorOf, entryTargetOf, entryToolName, rootFieldOf, isBlocked, recordEntryEvent, normalizeEntryRows, withCheckedIssues, type EntryRow, type EntryTarget } from './entry-target.js'
 
 export interface StoredProposalMessage {
@@ -185,7 +185,8 @@ async function applyChanges(key: string, proposal: any, target: EntryTarget, dep
   }
 
   const results: EntryRowResult[] = []
-  for (const row of stillAsProposed(target, stored, now)) {
+  /* The target's checks of the changes again - another record may have taken the new name since the card was made. */
+  for (const row of await withChangeChecks(target, stillAsProposed(target, stored, now), now, { state: deps.state })) {
     if (row.issues.some(one => one.blocking)) {
       const issue = row.issues.find(one => one.blocking)!
       results.push({ index: row.index, ok: false, error: issue.field ? `${issue.field}: ${issue.code}` : issue.code })

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

@@ -179,6 +179,12 @@ export interface EntryUpdate {
   labelOf?(record: EntryRecord): string
   /** The fields that may change. Default: every declared field. */
   fields?: string[]
+  /**
+   * Read-only checks of the changes - a new name that another record already has. Asked when the card is made and
+   * again when it is pressed, like an entry's check; one issue list per row. Without it a clash is caught only by
+   * the database's own refusal.
+   */
+  check?(rows: { id: string; record?: EntryRecord; values: Record<string, unknown> }[], context: EntryContext): EntryIssue[][] | Promise<EntryIssue[][]>
 }
 
 /**

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

@@ -252,6 +252,7 @@ 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.',
+      '- A row kept out because a name was not found, or matches several records, is settled in the conversation: say which name, list the candidates the card names, and ask; then propose again with the name the person chose. The card has no picker - never tell the person to choose on it.',
       '- 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.`,

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

@@ -148,7 +148,8 @@ 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 = await resolveReferences(changeableFields(target), zonedDateTimes(changeableFields(target), changeRows(target, picked, records), context?.state?.domain?.timezone), run)
+  const changed = await resolveReferences(changeableFields(target), zonedDateTimes(changeableFields(target), changeRows(target, picked, records), context?.state?.domain?.timezone), run)
+  const rows = await withChangeChecks(target, changed, records, { state: context?.state })
   const blocked = rows.filter(blockedChange).length
   return {
     proposed: true,
@@ -209,3 +210,19 @@ export function stillAsProposed(target: EntryTarget, rows: ChangeRow[], now: Map
     return moved ? { ...row, now: record, issues: [...row.issues, { field: moved, code: 'changed-since', blocking: true }] } : { ...row, now: record }
   })
 }
+
+/**
+ * The target's own checks of the changes, added to each row. A check that could not run keeps every row out - a
+ * change is not written unchecked (an entry's failed check refuses its card the same way).
+ */
+export async function withChangeChecks<T extends ChangeRow>(target: EntryTarget, rows: T[], records: Map<string, EntryRecord>, context: { state: any }): Promise<T[]> {
+  if (!target.update?.check) return rows
+  let found: EntryIssue[][] | undefined
+  try {
+    found = await target.update.check(rows.map(row => ({ id: row.id, record: records.get(row.id), values: row.values })), context)
+  } catch {
+    return rows.map(row => ({ ...row, issues: [...row.issues, { code: 'check-failed', blocking: true }] }))
+  }
+  return rows.map((row, i) => (found?.[i]?.length ? { ...row, issues: [...row.issues, ...found[i]] } : row))
+}
+

package/translations/en.json

@@ -275,5 +275,6 @@
   "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"
+  "ai-assistant.entry.groups-kept-out": "{count} records kept out whole",
+  "ai-assistant.entry.issue.check-failed": "could not be checked - not changed"
 }

package/translations/ja.json

@@ -275,5 +275,6 @@
   "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}件は行が止まり全体を入力しません"
+  "ai-assistant.entry.groups-kept-out": "{count}件は行が止まり全体を入力しません",
+  "ai-assistant.entry.issue.check-failed": "検査できなかったため修正しません"
 }

package/translations/ko.json

@@ -275,5 +275,6 @@
   "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}건은 줄이 막혀 통째로 입력하지 않습니다"
+  "ai-assistant.entry.groups-kept-out": "{count}건은 줄이 막혀 통째로 입력하지 않습니다",
+  "ai-assistant.entry.issue.check-failed": "검사를 하지 못해 고치지 않습니다"
 }

package/translations/ms.json

@@ -275,5 +275,6 @@
   "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"
+  "ai-assistant.entry.groups-kept-out": "{count} rekod ditahan sepenuhnya",
+  "ai-assistant.entry.issue.check-failed": "tidak dapat disemak - tidak diubah"
 }

package/translations/zh.json

@@ -275,5 +275,6 @@
   "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}条因有行被拦而整体不录入"
+  "ai-assistant.entry.groups-kept-out": "{count}条因有行被拦而整体不录入",
+  "ai-assistant.entry.issue.check-failed": "无法检查，未修改"
 }