@things-factory/ai-assistant 10.1.103 → 10.1.106

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/ai-assistant",
-  "version": "10.1.103",
+  "version": "10.1.106",
   "main": "dist-server/index.js",
   "things-factory": true,
   "author": "heartyoh",
@@ -34,11 +34,11 @@
     "@operato/shell": "^10.0.0",
     "@operato/styles": "^10.0.0",
     "@things-factory/ai-client-base": "^10.1.81",
-    "@things-factory/apptool-base": "^10.1.79",
-    "@things-factory/attachment-base": "^10.1.79",
-    "@things-factory/auth-base": "^10.1.79",
+    "@things-factory/apptool-base": "^10.1.106",
+    "@things-factory/attachment-base": "^10.1.106",
+    "@things-factory/auth-base": "^10.1.106",
     "@things-factory/env": "^10.1.20",
-    "@things-factory/shell": "^10.1.79",
+    "@things-factory/shell": "^10.1.106",
     "dompurify": "^3.0.0",
     "graphql-scalars": "^1.22.0",
     "graphql-tag": "^2.12.6",
@@ -51,5 +51,5 @@
     "copyfiles": "^2.4.1",
     "rimraf": "^5.0.0"
   },
-  "gitHead": "db9d51a78d29b96c2c9a5c6a5beac70998aaaeb5"
+  "gitHead": "8d78c14708420773ec32d18b8dd44c300771c44d"
 }

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

@@ -110,6 +110,13 @@ describe('the card', () => {
     expect(rows[0].issues).toEqual([{ field: 'spentDate', code: 'not-changeable', blocking: false }, { code: 'no-change', blocking: true }])
     expect(rows[1].issues).toEqual([{ field: 'category', code: 'not-in-list', params: { values: ['교통비', '회의비'] }, blocking: true }])
   })
+
+  it('★ a field restated as it already is is not a change - not shown, not written (the model sent the name back with the note)', async () => {
+    const result: any = await proposeChanges(expense, { changes: [{ ref: 'l1', values: { merchant: '카카오T', amount: '12400', category: '회의비' } }] }, { host: {} }, run)
+    expect(result.rows[0]).toMatchObject({ before: { category: '교통비' }, values: { category: '회의비' }, issues: [] })
+    expect(Object.keys(result.rows[0].values)).toEqual(['category'])
+    expect(result.columns.map((one: any) => one.name)).toEqual(['category'])
+  })
 })
 
 describe('changing what the person pressed', () => {
@@ -311,3 +318,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-update.ts

@@ -115,8 +115,12 @@ export function changeRows(target: EntryTarget, picked: { id: string; via: Chang
       if (record) before[name] = record[name] ?? null
     }
     if (!record) issues.push({ code: 'record-not-found', blocking: true })
-    else if (Object.keys(values).length && Object.keys(values).every(name => sameFieldValue(fields.get(name)!, before[name], values[name])))
-      issues.push({ code: 'no-change', blocking: true })
+    else {
+      /* A field the model restated as it already is does not change - the card shows it as no change, and it is not written. */
+      const same = Object.keys(values).filter(name => fields.has(name) && !issues.some(issue => issue.field === name) && sameFieldValue(fields.get(name)!, before[name], values[name]))
+      if (same.length && same.length === Object.keys(values).length) issues.push({ code: 'no-change', blocking: true })
+      else for (const name of same) delete values[name], delete before[name]
+    }
     if (!Object.keys(values).length && !issues.some(issue => issue.blocking)) issues.push({ code: 'nothing-to-change', blocking: true })
     return { index, id: one.id, via: one.via, ...(record && target.update?.labelOf ? { label: target.update.labelOf(record) } : {}), before, values, issues }
   })
@@ -148,7 +152,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 +214,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/test/entry-proposal.test.ts

@@ -11,6 +11,7 @@ import {
   entryOutcomeNote,
   entryProposalHandler,
   entryReadyCount,
+  entryTitle,
   latestEntryKeys,
   type EntryApplyAnswer
 } from '../client/utils/entry-proposal'
@@ -21,6 +22,24 @@ const t = (key: string, options: any = {}) =>
 const card = (key: string, target = 'office.expense-line', rows: any[] = []) => ({ key, kind: 'entry', target, rows })
 
 describe('the entry card', () => {
+  it('★ is titled by its kind - a 수정안 is never titled as a 입력안', () => {
+    const named = (key: string, options: any = {}) => (key === 'label.office-entry-counterparty' ? 'counterparty' : t(key, options))
+    expect(entryTitle({ kind: 'entry', target: 'office.counterparty', labelKey: 'label.office-entry-counterparty', rows: [] }, named)).toBe('counterparty to enter')
+    expect(entryTitle({ kind: 'entry', op: 'update', target: 'office.counterparty', labelKey: 'label.office-entry-counterparty', rows: [] }, named)).toBe('counterparty to change')
+  })
+
+  it('★ every target label names the record only - the card adds 입력안 or 수정안', () => {
+    /* The framework's own declarers; the applications hold the same rule in their translations. */
+    const offending: string[] = []
+    for (const root of ['../../ops-master', '../../organization', '../../i18n-base'])
+      for (const lang of ['ko', 'ja', 'zh', 'ms']) {
+        const table: Record<string, string> = JSON.parse(readFileSync(join(__dirname, root, 'translations', `${lang}.json`), 'utf8'))
+        for (const [key, value] of Object.entries(table))
+          if (/^label\.[a-z0-9-]+-entry-/.test(key) && /입력안|수정안|入力案|录入方案|cadangan/.test(value)) offending.push(`${root}/${lang}: ${key}`)
+      }
+    expect(offending).toEqual([])
+  })
+
   it('★ counts only the rows that will go in', () => {
     const p = card('k', undefined, [
       { index: 0, values: {}, sources: [], issues: [] },

package/translations/en.json

@@ -254,6 +254,8 @@
   "ai-assistant.workspace.contains-metrics": "{count} figures",
   "ai-assistant.workspace.contains-steps": "{count} progress",
   "ai-assistant.entry.change": "change {count} records",
+  "ai-assistant.entry.title-create": "{name} to enter",
+  "ai-assistant.entry.title-update": "{name} to change",
   "ai-assistant.entry.changed": "changed {count} records.",
   "ai-assistant.entry.changed-none": "no record was changed.",
   "ai-assistant.entry.changes": "{count} records",
@@ -275,5 +277,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

@@ -254,6 +254,8 @@
   "ai-assistant.workspace.contains-metrics": "指標 {count}",
   "ai-assistant.workspace.contains-steps": "経過 {count}",
   "ai-assistant.entry.change": "{count}件を修正",
+  "ai-assistant.entry.title-create": "{name}の入力案",
+  "ai-assistant.entry.title-update": "{name}の修正案",
   "ai-assistant.entry.changed": "{count}件を修正しました。",
   "ai-assistant.entry.changed-none": "修正された記録はありません。",
   "ai-assistant.entry.changes": "{count}件",
@@ -275,5 +277,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

@@ -254,6 +254,8 @@
   "ai-assistant.workspace.contains-metrics": "수치 {count}",
   "ai-assistant.workspace.contains-steps": "경과 {count}",
   "ai-assistant.entry.change": "{count}건 고치기",
+  "ai-assistant.entry.title-create": "{name} 입력안",
+  "ai-assistant.entry.title-update": "{name} 수정안",
   "ai-assistant.entry.changed": "{count}건을 고쳤습니다.",
   "ai-assistant.entry.changed-none": "고친 기록이 없습니다.",
   "ai-assistant.entry.changes": "{count}건",
@@ -275,5 +277,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

@@ -254,6 +254,8 @@
   "ai-assistant.workspace.contains-metrics": "{count} angka",
   "ai-assistant.workspace.contains-steps": "{count} kemajuan",
   "ai-assistant.entry.change": "ubah {count} rekod",
+  "ai-assistant.entry.title-create": "cadangan kemasukan {name}",
+  "ai-assistant.entry.title-update": "cadangan perubahan {name}",
   "ai-assistant.entry.changed": "{count} rekod diubah.",
   "ai-assistant.entry.changed-none": "tiada rekod diubah.",
   "ai-assistant.entry.changes": "{count} rekod",
@@ -275,5 +277,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

@@ -254,6 +254,8 @@
   "ai-assistant.workspace.contains-metrics": "指标 {count}",
   "ai-assistant.workspace.contains-steps": "进度 {count}",
   "ai-assistant.entry.change": "修改{count}条",
+  "ai-assistant.entry.title-create": "{name}录入方案",
+  "ai-assistant.entry.title-update": "{name}修改方案",
   "ai-assistant.entry.changed": "已修改{count}条。",
   "ai-assistant.entry.changed-none": "未修改任何记录。",
   "ai-assistant.entry.changes": "{count}条",
@@ -275,5 +277,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": "无法检查，未修改"
 }