@things-factory/ai-assistant 10.1.91 → 10.1.98

package/client/components/assistant-chat.ts

@@ -64,7 +64,7 @@ import { isDifferentConversation, resolveConversation, type AssistantMode, type
 import { parseProposalOutcomeLine, parseProposalRequestLine, proposalCardState, type ParsedProposalOutcome } from './proposal-outcome-line.js'
 import { availableTriggers, type TriggerChip } from './chat-triggers.js'
 import './entry-review.js'
-import { entryReadyCount, isEntryProposal, latestEntryKeys } from '../utils/entry-proposal.js'
+import { entryGroupOf, entryReadyCount, isChangeProposal, isEntryProposal, latestEntryKeys } from '../utils/entry-proposal.js'
 import { isWorkspaceProposal, versionOfCard, workspaceAddress } from '../utils/workspace.js'
 
 interface ChatLine {
@@ -3958,7 +3958,7 @@ export class OxAssistantChat extends LitElement {
           if (isWorkspaceProposal(p)) return this.renderWorkspaceCard(p, key)
           const card = proposalCardState(key, { outcomes, requested, sentHere: this.sentProposals.has(key) })
           const entry = isEntryProposal(p)
-          const replaced = entry && latestEntry?.get(p.target) !== key && card.state === 'ready'
+          const replaced = entry && latestEntry?.get(entryGroupOf(p)) !== key && card.state === 'ready'
           const ready = entry ? entryReadyCount(p) : 0
           const sent = card.state !== 'ready' || replaced || (entry && ready === 0)
           /*
@@ -4000,7 +4000,9 @@ export class OxAssistantChat extends LitElement {
                           ? this.proposalStateText(key)
                           : entry
                             ? ready
-                              ? i18next.t('ai-assistant.entry.enter', { defaultValue: 'enter {count} rows', count: ready })
+                              ? isChangeProposal(p)
+                                ? i18next.t('ai-assistant.entry.change', { defaultValue: 'change {count} records', count: ready })
+                                : i18next.t('ai-assistant.entry.enter', { defaultValue: 'enter {count} rows', count: ready })
                               : i18next.t('ai-assistant.entry.nothing-to-enter', { defaultValue: 'nothing to enter' })
                             : i18next.t('ai-assistant.button.run-proposal', { defaultValue: 'run' })}
                     </button>

package/client/components/entry-review.ts

@@ -103,6 +103,11 @@ export class AssistantEntryReview extends LitElement {
       text-underline-offset: 3px;
     }
 
+    .before {
+      color: var(--md-sys-color-on-surface-variant);
+      text-decoration: line-through;
+    }
+
     .missing {
       color: var(--md-sys-color-error);
       font-style: italic;
@@ -182,8 +187,59 @@ export class AssistantEntryReview extends LitElement {
     </div>`
   }
 
+  /**
+   * A 수정안 - each record by its name, each changing field as what it holds now and what it becomes, and how the
+   * record was picked. The "now" is the server's reading, never the model's memory.
+   */
+  private renderChanges(p: any) {
+    const columns: { name: string; type: string; labelKey?: string }[] = p.columns ?? []
+    const rows: any[] = p.rows ?? []
+    const counts = p.counts ?? {}
+    const via = (row: any) =>
+      row.via === 'current' ? t('via-current', 'the record on screen') : row.via === 'selected' ? t('via-selected', 'selected on screen') : t('via-id', 'found in the conversation')
+    return html`
+      <div class="summary" role="status">
+        <span>${t('changes', '{count} records', { count: counts.rows ?? rows.length })}</span>
+        <span>${t('ready', '{count} ready', { count: counts.ready ?? 0 })}</span>
+        ${counts.blocked ? html`<span class="blocked">${t('not-changed', '{count} will not be changed', { count: counts.blocked })}</span>` : nothing}
+      </div>
+      <div class="scroll">
+        <table>
+          <thead>
+            <tr>
+              <th>#</th>
+              <th>${t('record', 'record')}</th>
+              ${columns.map(column => html`<th>${column.labelKey ? i18next.t(column.labelKey) : column.name}</th>`)}
+              <th>${t('picked', 'picked')}</th>
+            </tr>
+          </thead>
+          <tbody>
+            ${rows.slice(0, SHOWN).map(row => {
+              const blocked = (row.issues ?? []).some((issue: EntryIssueView) => issue.blocking)
+              const whole = entryCellIssues(row)
+              return html`<tr class=${blocked ? 'blocked' : ''}>
+                <td class="num">${row.index + 1}</td>
+                <td>${row.label || row.id}${whole.map(issue => html`<span class="row-issue ${issue.blocking ? 'blocking' : ''}">${issueText(issue)}</span>`)}</td>
+                ${columns.map(column => {
+                  const issues = entryCellIssues(row, column.name)
+                  const bad = issues.some(issue => issue.blocking)
+                  const changes = column.name in (row.values ?? {})
+                  return html`<td class="${column.type === 'number' || column.type === 'integer' ? 'num' : ''} ${bad ? 'bad' : issues.length ? 'note' : ''}" title=${issues.map(issueText).join('\n')}>
+                    ${changes ? html`<span class="before">${shown(row.before?.[column.name]) || '—'}</span> → <strong>${shown(row.values[column.name]) || '—'}</strong>` : ''}
+                  </td>`
+                })}
+                <td class="source">${via(row)}</td>
+              </tr>`
+            })}
+          </tbody>
+        </table>
+      </div>
+    `
+  }
+
   render() {
     const p = this.proposal ?? {}
+    if (p.op === 'update') return this.renderChanges(p)
     const columns: { name: string; type: string; required?: boolean; labelKey?: string }[] = p.columns ?? []
     const rows: EntryRowView[] = p.rows ?? []
     const counts = p.counts ?? {}

package/client/utils/entry-proposal.ts

@@ -43,6 +43,8 @@ export interface EntryRowResult {
 
 export interface EntryApplyAnswer extends ProposalOutcome {
   rows?: EntryRowResult[]
+  /** Set by the handler from the card - which words the conversation line uses. */
+  op?: string
 }
 
 export function isEntryProposal(proposal: any): boolean {
@@ -66,9 +68,13 @@ export function entryCellIssues(row: EntryRowView, field?: string): EntryIssueVi
 /** What stays in the conversation - the model reads it on its next turn, and the person sees what went in. */
 export function entryOutcomeNote(answer: EntryApplyAnswer, t: (key: string, options?: any) => string): string {
   const refused = (answer.rows ?? []).filter(row => !row.ok)
-  const head = answer.applied
-    ? t('ai-assistant.entry.entered', { defaultValue: 'entered {count} rows.', count: answer.applied })
-    : t('ai-assistant.entry.entered-none', { defaultValue: 'no row was entered.' })
+  const head = answer.op === 'update'
+    ? answer.applied
+      ? t('ai-assistant.entry.changed', { defaultValue: 'changed {count} records.', count: answer.applied })
+      : t('ai-assistant.entry.changed-none', { defaultValue: 'no record was changed.' })
+    : answer.applied
+      ? t('ai-assistant.entry.entered', { defaultValue: 'entered {count} rows.', count: answer.applied })
+      : t('ai-assistant.entry.entered-none', { defaultValue: 'no row was entered.' })
   const lines = refused.slice(0, 20).map(row => t('ai-assistant.entry.row-refused', { defaultValue: 'row {n}: {reason}', n: row.index + 1, reason: row.error || '' }))
   const more = refused.length > 20 ? [t('ai-assistant.entry.more-refused', { defaultValue: '{count} more rows were not entered.', count: refused.length - 20 })] : []
   return [head, ...lines, ...more].join('\n')
@@ -81,7 +87,7 @@ export function entryProposalHandler(
 ) {
   return async (proposal: any, context: ProposalContext): Promise<ProposalOutcome> => {
     if (!context.sessionId || !proposal?.key) return { verdict: 'unavailable', errorCode: 'no-conversation' }
-    const answer = await apply(context.sessionId, proposal.key)
+    const answer = { ...(await apply(context.sessionId, proposal.key)), op: proposal.op }
     return {
       verdict: answer.verdict,
       ...(answer.errorCode ? { errorCode: answer.errorCode } : {}),
@@ -98,6 +104,15 @@ export function entryProposalHandler(
  */
 export function latestEntryKeys(proposalsInOrder: any[][]): Map<string, string> {
   const latest = new Map<string, string>()
-  for (const list of proposalsInOrder) for (const one of list ?? []) if (isEntryProposal(one) && one.key) latest.set(one.target, one.key)
+  for (const list of proposalsInOrder) for (const one of list ?? []) if (isEntryProposal(one) && one.key) latest.set(entryGroupOf(one), one.key)
   return latest
 }
+
+/** A 입력안 and a 수정안 of one record are counted apart - a newer one of the same kind replaces the older. */
+export function entryGroupOf(proposal: any): string {
+  return `${proposal?.target}:${proposal?.op ?? 'create'}`
+}
+
+export function isChangeProposal(proposal: any): boolean {
+  return isEntryProposal(proposal) && proposal.op === 'update'
+}

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

@@ -48,7 +48,7 @@ import { isDifferentConversation, resolveConversation, pickInitialMode } from '.
 import { parseProposalOutcomeLine, parseProposalRequestLine, proposalCardState } from './proposal-outcome-line.js';
 import { availableTriggers } from './chat-triggers.js';
 import './entry-review.js';
-import { entryReadyCount, isEntryProposal, latestEntryKeys } from '../utils/entry-proposal.js';
+import { entryGroupOf, entryReadyCount, isChangeProposal, isEntryProposal, latestEntryKeys } from '../utils/entry-proposal.js';
 import { isWorkspaceProposal, versionOfCard, workspaceAddress } from '../utils/workspace.js';
 function formatFileSize(bytes) {
     if (!bytes || bytes < 1024)
@@ -3514,7 +3514,7 @@ let OxAssistantChat = class OxAssistantChat extends LitElement {
                 return this.renderWorkspaceCard(p, key);
             const card = proposalCardState(key, { outcomes, requested, sentHere: this.sentProposals.has(key) });
             const entry = isEntryProposal(p);
-            const replaced = entry && latestEntry?.get(p.target) !== key && card.state === 'ready';
+            const replaced = entry && latestEntry?.get(entryGroupOf(p)) !== key && card.state === 'ready';
             const ready = entry ? entryReadyCount(p) : 0;
             const sent = card.state !== 'ready' || replaced || (entry && ready === 0);
             /*
@@ -3555,7 +3555,9 @@ let OxAssistantChat = class OxAssistantChat extends LitElement {
                         ? this.proposalStateText(key)
                         : entry
                             ? ready
-                                ? i18next.t('ai-assistant.entry.enter', { defaultValue: 'enter {count} rows', count: ready })
+                                ? isChangeProposal(p)
+                                    ? i18next.t('ai-assistant.entry.change', { defaultValue: 'change {count} records', count: ready })
+                                    : i18next.t('ai-assistant.entry.enter', { defaultValue: 'enter {count} rows', count: ready })
                                 : i18next.t('ai-assistant.entry.nothing-to-enter', { defaultValue: 'nothing to enter' })
                             : i18next.t('ai-assistant.button.run-proposal', { defaultValue: 'run' })}
                     </button>