hazo_collab_forms 3.1.6 → 5.0.0

package/dist/components/hazo_fb_form/hazo_fb_form.js

@@ -11,6 +11,8 @@ import { cn } from '../../utils/cn.js';
 import { use_logger } from '../../logger/index.js';
 import { is_fb_terminal_status } from '../../types/fb_form_instance.js';
 import { flat_to_data } from '../../utils/fb_data_adapter.js';
+import { flat_to_data_v2 } from '../../utils/fb_data_adapter_v2.js';
+import { set_review_decision } from '../../utils/fb_data_mutations_v2.js';
 import { FbFormContext } from './context.js';
 import { use_fb_form_state } from './hooks/use_fb_form_state.js';
 import { use_llm_run } from './hooks/use_llm_run.js';
@@ -25,6 +27,7 @@ import { register_ihelp_icon } from '../shared/ihelp_icon.js';
 import { AgentStepper } from './shared/agent_stepper.js';
 import { ReviewQueueView } from './views/review_queue_view.js';
 import { SendBackView } from './views/send_back_view.js';
+import { FileStatusAccordion } from './shared/file_status_accordion.js';
 export const VIRTUAL_INSTANCE_ID = '__single__';
 export function HazoFbForm(props) {
     const logger = use_logger();
@@ -93,7 +96,7 @@ export function HazoFbForm(props) {
             });
         }
     }, [props.data, props.on_data_change]);
-    const state = use_fb_form_state(effective_props, active_instance_id, active_instance, pending_clarification_responses);
+    const state = use_fb_form_state(effective_props, active_instance_id, active_instance, pending_clarification_responses, form_data_entries);
     const { trigger_run, trigger_complete, trigger_classify_file, trigger_assign_file, route_skipped_files, trigger_backoffice_run } = use_llm_run({
         props: effective_props,
         update_progress: state.update_progress,
@@ -116,6 +119,7 @@ export function HazoFbForm(props) {
         set_validating_file_ids: state.set_validating_file_ids,
         skipped_file_ids: state.skipped_file_ids,
         update_form_data,
+        form_data_entries,
     });
     // Restore group_autofill_log from persisted autofill activities in the data model.
     // This runs on mount (and when form_data_entries changes) so that after a page refresh,
@@ -127,7 +131,7 @@ export function HazoFbForm(props) {
         if (form_data_entries.length === 0)
             return;
         const autofill_activities = [];
-        // Walk all entries looking for autofill activities
+        // Walk all entries looking for autofill activities (v1 structure during migration)
         for (const entry of form_data_entries) {
             const walk = (items) => {
                 if (!items)
@@ -150,8 +154,10 @@ export function HazoFbForm(props) {
                 }
             };
             walk(entry.client_data);
-            if (entry.clarification?.client_data)
-                walk(entry.clarification.client_data);
+            // v1 compat: check for old clarification structure during migration
+            const v1_entry = entry;
+            if (v1_entry.clarification?.client_data)
+                walk(v1_entry.clarification.client_data);
         }
         if (autofill_activities.length > 0) {
             autofill_restore_ran.current = true;
@@ -193,102 +199,174 @@ export function HazoFbForm(props) {
             state.set_group_autofill_log(restored_log);
         }
     }, [form_data_entries]); // eslint-disable-line react-hooks/exhaustive-deps
+    // Restore classification_results from form_data_entries when empty (e.g. Instance 2 after send-back).
+    // Files already classified in a previous instance have tags in the data model — reconstruct
+    // the classification results so trigger_backoffice_run can route and autofill them.
+    const classification_restore_ran = useRef(false);
+    useEffect(() => {
+        if (classification_restore_ran.current)
+            return;
+        if (state.classification_results.length > 0)
+            return;
+        if (form_data_entries.length === 0)
+            return;
+        const field_map = new Map();
+        const seen_file_ids = new Set();
+        const add_file = (field_id, pd, inherit_tags) => {
+            if (pd.processed_data_type !== 'file' || !pd.processed_data_files?.file_id)
+                return;
+            if (seen_file_ids.has(pd.processed_data_files.file_id))
+                return;
+            seen_file_ids.add(pd.processed_data_files.file_id);
+            if (!field_map.has(field_id))
+                field_map.set(field_id, { tags: new Set(), files: [] });
+            const bucket = field_map.get(field_id);
+            // Use pd tags, fall back to inherited tags from the original file in the same entry
+            const tags = (pd.tags && pd.tags.length > 0) ? pd.tags : (inherit_tags ?? []);
+            for (const t of tags)
+                bucket.tags.add(t);
+            bucket.files.push({
+                file_id: pd.processed_data_files.file_id,
+                file_name: pd.processed_data_files.file_name ?? '',
+                tags,
+                document_nature: pd.processed_data_nature?.[0],
+                document_type: pd.processed_data_category,
+            });
+        };
+        for (const entry of form_data_entries) {
+            const field_id = entry.question?.question_field_id;
+            if (!field_id)
+                continue;
+            // Collect tags from original client uploads first
+            const entry_tags = [];
+            for (const cdi of entry.client_data ?? []) {
+                const input = cdi.client_input;
+                if (!input?.processed_data)
+                    continue;
+                for (const pd of input.processed_data) {
+                    add_file(field_id, pd);
+                    if (pd.tags)
+                        for (const t of pd.tags)
+                            if (!entry_tags.includes(t))
+                                entry_tags.push(t);
+                }
+            }
+            // Files from clarification responses inherit tags from the original file
+            for (const clr of entry.clarifications ?? []) {
+                for (const rd of clr.response_data ?? []) {
+                    for (const rpd of rd.processed_data ?? [])
+                        add_file(field_id, rpd, entry_tags);
+                }
+            }
+        }
+        if (field_map.size > 0) {
+            classification_restore_ran.current = true;
+            const results = [];
+            for (const [field_id, { tags, files }] of field_map) {
+                results.push({ field_id, tags: Array.from(tags), file_classifications: files });
+            }
+            state.set_classification_results(results);
+            logger.info('[HazoFbForm] classification_results_restored_from_data', { count: results.length, files: results.flatMap(r => r.file_classifications.map(f => f.file_id)) });
+        }
+    }, [form_data_entries, state.classification_results.length]); // eslint-disable-line react-hooks/exhaustive-deps
     // Sync flat LLM results → hierarchical data model
     // Rebuild data[] whenever classification, validation, or clarification state changes.
     // Combines ALL instances into a single data[] array (matching the reference JSON structure).
     // IMPORTANT: The JSON must be stable regardless of which instance is active — every instance
     // is built from persisted data. The active instance additionally applies live enrichments.
+    // ── Build v2 data model from ALL instances (instance-independent) ──
+    // Uses the flattened adapter: validations and clarifications are direct arrays,
+    // thread captures full cross-instance conversation, no activities nesting.
+    //
+    // IMPORTANT: When the consumer provides persisted v2 data via `props.data`,
+    // we DON'T overwrite it with a fresh rebuild from instances — the v2 data
+    // is the single source of truth. We only rebuild when no v2 data exists yet
+    // (initial build) or when classification/validation results change (new pipeline data).
+    // ── Build v2 data model from ALL instances ──
+    // Always rebuilds from instances. The rebuild is the truth for structure (validations,
+    // classifications, review decisions). But client responses added via v2_add_client_response
+    // may not be in the v1 instances yet — so we merge those thread entries in.
     useEffect(() => {
-        if (!active_instance)
+        if (instances.length === 0)
             return;
-        // Enrichment helpers that apply live state (only relevant for the active instance)
-        const sent_map = new Map(state.sent_clarifications.map(s => [s.id, s]));
-        const enrich = (item) => {
-            let result = item;
-            const sent = sent_map.get(item.id);
-            if (sent?.response_choice || sent?.user_comment) {
-                result = sent;
-            }
-            else {
-                const pending = pending_clarification_responses.get(item.id);
-                if (pending?.response_choice || pending?.user_comment) {
-                    result = {
-                        ...item,
-                        status: 'responded',
-                        response_choice: pending.response_choice,
-                        user_comment: pending.user_comment,
-                        response_files: pending.response_files ?? [],
-                    };
-                }
-            }
-            const decision = state.review_queue_decisions.get(item.id);
-            if (decision) {
-                result = { ...result, review_decision: decision === 'accept' ? 'approve' : 'skip_process' };
-            }
-            const comment = state.send_back_comments.get(item.id);
-            if (comment) {
-                result = { ...result, agent_feedback: comment };
+        const v2_data = flat_to_data_v2(instances);
+        if (v2_data.length === 0)
+            return;
+        update_form_data(prev => {
+            if (!prev || prev.length === 0) {
+                return v2_data;
             }
-            return result;
-        };
-        /** Collect all clarifications for an instance from its persisted sources */
-        const collect_instance_clarifications = (inst) => {
-            const front_clrs = Array.isArray(inst.front_form_data?.['__clarifications'])
-                ? inst.front_form_data['__clarifications']
-                : [];
-            const clrs = [...(inst.sent_clarifications ?? [])];
-            const seen = new Set(clrs.map(c => c.id));
-            for (const c of front_clrs) {
-                if (!seen.has(c.id)) {
-                    seen.add(c.id);
-                    clrs.push(c);
+            // Build index of existing v2 clarifications for thread merging
+            const prev_clrs = new Map();
+            for (const entry of prev) {
+                for (const clr of entry.clarifications ?? []) {
+                    prev_clrs.set(clr.clarification_id, clr);
                 }
             }
-            return clrs;
-        };
-        // Build data for ALL instances
-        const all_data = [];
-        for (let inst_idx = 0; inst_idx < instances.length; inst_idx++) {
-            const inst = instances[inst_idx];
-            const inst_num = inst_idx + 1;
-            const is_active = inst.instance_id === active_instance_id;
-            // Start with persisted clarifications from all sources
-            let inst_clrs = collect_instance_clarifications(inst);
-            if (is_active) {
-                // Active instance: merge in live draft clarifications and apply enrichments
-                const draft_ids = new Set(state.draft_clarifications.map(d => d.id));
-                const persisted_ids = new Set(inst_clrs.map(c => c.id));
-                // Add any draft clarifications not already in persisted data
-                for (const d of state.draft_clarifications) {
-                    if (!persisted_ids.has(d.id))
-                        inst_clrs.push(d);
-                }
-                // Replace persisted versions with enriched ones
-                inst_clrs = inst_clrs.map(c => {
-                    // If in drafts, use draft version (may have updated response_options)
-                    const draft = draft_ids.has(c.id) ? state.draft_clarifications.find(d => d.id === c.id) : undefined;
-                    return enrich(draft ?? c);
+            if (prev_clrs.size === 0)
+                return v2_data;
+            // Use the FRESH rebuild as base (it has the latest structure from instances).
+            // Only supplement with thread entries from existing v2 that the rebuild is missing.
+            // This handles: v2_add_client_response added a thread entry that isn't in v1 yet.
+            const merged = v2_data.map((entry) => {
+                if (!entry.clarifications?.length)
+                    return entry;
+                const merged_clrs = entry.clarifications.map((fresh_clr) => {
+                    const existing = prev_clrs.get(fresh_clr.clarification_id);
+                    if (!existing)
+                        return fresh_clr;
+                    // If existing v2 has MORE thread entries than the rebuild, the extra entries
+                    // are from v2_add_client_response and need to be preserved.
+                    const fresh_thread = fresh_clr.thread ?? [];
+                    const existing_thread = existing.thread ?? [];
+                    if (existing_thread.length > fresh_thread.length) {
+                        // Find the extra thread entries (entries in existing but not in fresh)
+                        const extra_entries = existing_thread.slice(fresh_thread.length);
+                        // Only keep client responses (the ones added by v2_add_client_response)
+                        const client_extras = extra_entries.filter((t) => t.role === 'client' && t.action === 'responded');
+                        if (client_extras.length > 0) {
+                            console.log('[DEBUG] v2 merge: appending', client_extras.length, 'client thread entries to', fresh_clr.clarification_id?.slice(-8), 'fresh_status:', fresh_clr.status);
+                            return {
+                                ...fresh_clr,
+                                thread: [...fresh_thread, ...client_extras],
+                                status: 'responded', // Client has responded
+                                review: null, // Needs fresh review
+                                response_data: existing.response_data?.length > fresh_clr.response_data?.length
+                                    ? existing.response_data : fresh_clr.response_data,
+                            };
+                        }
+                    }
+                    // Preserve 'accepted' status set in the CURRENT session via set_review_decision.
+                    // Only preserve if the acceptance was made AFTER the last client response
+                    // (i.e., it's a current-session decision, not a stale one from a prior instance).
+                    if (existing.status === 'accepted' && existing.review?.thread_ref) {
+                        const merged_thread = existing_thread.length >= fresh_thread.length ? existing_thread : fresh_thread;
+                        const review_idx = merged_thread.findIndex((t) => t.thread_id === existing.review.thread_ref);
+                        const has_newer_response = merged_thread.some((t, i) => i > review_idx && t.role === 'client' && t.action === 'responded');
+                        if (!has_newer_response) {
+                            return {
+                                ...fresh_clr,
+                                thread: merged_thread,
+                                status: 'accepted',
+                                review: existing.review,
+                                response_data: existing.response_data?.length > (fresh_clr.response_data?.length ?? 0)
+                                    ? existing.response_data : fresh_clr.response_data,
+                            };
+                        }
+                    }
+                    return fresh_clr;
                 });
-            }
-            const synthetic = {
-                ...inst,
-                ...(is_active ? {
-                    classification_results: state.classification_results.length > 0 ? state.classification_results : inst.classification_results,
-                    file_validation_results: Object.keys(state.file_validation_results).length > 0 ? state.file_validation_results : inst.file_validation_results,
-                } : {}),
-                sent_clarifications: inst_clrs.length > 0 ? inst_clrs : inst.sent_clarifications,
-            };
-            const has_data = (synthetic.classification_results?.length ?? 0) > 0
-                || Object.keys(synthetic.file_validation_results ?? {}).length > 0
-                || (synthetic.sent_clarifications?.length ?? 0) > 0;
-            if (has_data) {
-                all_data.push(...flat_to_data(synthetic, inst_num));
-            }
-        }
-        if (all_data.length > 0) {
-            update_form_data(() => all_data);
-        }
-    }, [state.classification_results, state.file_validation_results, state.sent_clarifications, state.draft_clarifications, pending_clarification_responses, state.review_queue_decisions, state.send_back_comments, instances, active_instance_id]);
+                // Preserve autofill_runs from existing data (not in v1 instances)
+                const prev_entry = prev.find((e) => e.clarifications?.some((c) => entry.clarifications?.some((fc) => fc.clarification_id === c.clarification_id)));
+                const merged_entry = { ...entry, clarifications: merged_clrs };
+                if (prev_entry?.autofill_runs?.length > 0 && !merged_entry.autofill_runs?.length) {
+                    merged_entry.autofill_runs = prev_entry.autofill_runs;
+                }
+                return merged_entry;
+            });
+            return merged;
+        });
+    }, [instances]);
     // Persist classification_results to instance when they change
     const prev_cls_ref = useRef(state.classification_results);
     useEffect(() => {
@@ -320,9 +398,15 @@ export function HazoFbForm(props) {
         let changed = false;
         const updated = current_sent.map(c => {
             let result = c;
+            // Don't overwrite clarifications where client has already responded —
+            // their status has progressed beyond the review decision stage
+            if (c.status === 'responded' || c.response_choice || c.user_comment)
+                return result;
             const decision = state.review_queue_decisions.get(c.id);
-            if (decision && result.review_decision !== (decision === 'accept' ? 'approve' : 'skip_process')) {
-                result = { ...result, review_decision: decision === 'accept' ? 'approve' : 'skip_process' };
+            // Match confirm_review_decisions: accept → skip_process, send_back → approve
+            const mapped_decision = decision === 'accept' ? 'skip_process' : 'approve';
+            if (decision && result.review_decision !== mapped_decision) {
+                result = { ...result, review_decision: mapped_decision };
                 changed = true;
             }
             const comment = state.send_back_comments.get(c.id);
@@ -426,8 +510,23 @@ export function HazoFbForm(props) {
             // Upsert: if item wasn't in sent_clarifications (e.g. validation draft), add it
             if (!found) {
                 const draft = state.draft_clarifications.find((d) => d.id === id);
-                if (draft)
+                if (draft) {
                     updated.push({ ...draft, ...updates, updated_at: now });
+                }
+                else {
+                    // Fallback: search all validation errors for the item (draft may have been deduped)
+                    for (const vr of Object.values(state.file_validation_results)) {
+                        const err = vr.errors?.find((e) => e.id === id);
+                        if (err) {
+                            updated.push({ ...err, ...updates, updated_at: now });
+                            break;
+                        }
+                    }
+                    // Last resort: create minimal item from updates
+                    if (!updated.some((c) => c.id === id)) {
+                        updated.push({ id, type: 'validation_override', status: 'pending', target_field_id: '', target_label: '', issue_description: '', doc_references: [], response_options: [], created_at: now, ...updates, updated_at: now });
+                    }
+                }
             }
             // Also update front_form_data.__clarifications if the item lives there
             const front_clrs = active_instance.front_form_data?.['__clarifications'];
@@ -438,6 +537,11 @@ export function HazoFbForm(props) {
                     __clarifications: front_clrs.map(c => c.id === id ? { ...c, ...updates, updated_at: now } : c),
                 };
             }
+            logger.info('[HazoFbForm] update_clarification_status → on_instance_update', {
+                instance_id: active_instance_id,
+                sent_clrs_count: inst_updates.sent_clarifications?.length,
+                found_in_existing: found,
+            });
             props.on_instance_update?.(active_instance_id, inst_updates);
         }
         else {
@@ -455,34 +559,122 @@ export function HazoFbForm(props) {
             });
             if (!found) {
                 const draft = state.draft_clarifications.find((d) => d.id === id);
-                if (draft)
+                if (draft) {
                     updated.push({ ...draft, ...updates, updated_at: now });
+                }
+                else {
+                    for (const vr of Object.values(state.file_validation_results)) {
+                        const err = vr.errors?.find((e) => e.id === id);
+                        if (err) {
+                            updated.push({ ...err, ...updates, updated_at: now });
+                            break;
+                        }
+                    }
+                    if (!updated.some((c) => c.id === id)) {
+                        updated.push({ id, type: 'validation_override', status: 'pending', target_field_id: '', target_label: '', issue_description: '', doc_references: [], response_options: [], created_at: now, ...updates, updated_at: now });
+                    }
+                }
             }
             props.on_back_change?.('__clarifications', updated);
         }
-    }, [props, is_multi_instance, active_instance, active_instance_id, state.draft_clarifications]);
+    }, [props, is_multi_instance, active_instance, active_instance_id, state.draft_clarifications, state.file_validation_results]);
     const update_clarification_response = useCallback((id, response) => {
-        // If the clarification has a thread (resent item), append the client's new response to it
-        const all_items = [
-            ...(is_multi_instance ? (active_instance?.sent_clarifications ?? []) : []),
-            ...(Array.isArray(props.back_form_data?.['__clarifications'])
+        const now = new Date().toISOString();
+        // Find the base item from ALL available sources to ensure we have the full data
+        const find_base = () => {
+            // 1. Sent clarifications on instance
+            const sent = active_instance?.sent_clarifications?.find(c => c.id === id);
+            if (sent)
+                return sent;
+            // 2. Draft clarifications (in-memory)
+            const draft = state.draft_clarifications.find(d => d.id === id);
+            if (draft)
+                return draft;
+            // 3. File validation results errors
+            for (const vr of Object.values(state.file_validation_results)) {
+                const err = vr.errors?.find(e => e.id === id);
+                if (err)
+                    return err;
+            }
+            // 4. Back form data clarifications
+            const back_clrs = Array.isArray(props.back_form_data?.['__clarifications'])
                 ? props.back_form_data['__clarifications']
-                : []),
-        ];
-        const existing_item = all_items.find(c => c.id === id);
-        const has_thread = existing_item?.thread && existing_item.thread.length > 0;
+                : [];
+            const back = back_clrs.find(c => c.id === id);
+            if (back)
+                return back;
+            // 5. Front form data clarifications
+            const front_clrs = Array.isArray(active_instance?.front_form_data?.['__clarifications'])
+                ? active_instance.front_form_data['__clarifications']
+                : [];
+            return front_clrs.find(c => c.id === id);
+        };
+        const base = find_base();
+        // Build thread entry for the client's response
+        const existing_thread = base?.thread ?? [];
+        const client_thread_entry = {
+            role: 'client',
+            action: 'responded',
+            response_choice: response.response_choice,
+            message: response.user_comment || undefined,
+            files: response.response_files?.map(f => ({
+                file_id: f.file_id,
+                ref_id: f.file_id,
+                file_name: f.file_name,
+                file_size: f.file_size ?? 0,
+                mime_type: f.mime_type ?? 'application/octet-stream',
+                visibility: 'public',
+                attached_at: now,
+            })),
+            timestamp: now,
+        };
+        // Only add if not already in thread (avoid duplicates from handle_sourced_respond)
+        const already_in_thread = existing_thread.some(t => t.role === 'client' && t.action === 'responded' && t.timestamp === now);
+        const updated_thread = already_in_thread ? existing_thread : [...existing_thread, client_thread_entry];
         const updates = {
             status: 'responded',
             response_choice: response.response_choice,
             user_comment: response.user_comment,
             response_files: response.response_files ?? [],
+            updated_at: now,
+            thread: updated_thread,
         };
-        // Do NOT append client response to thread history here — the thread captures
-        // completed conversation rounds (issue → client response → agent rejection).
-        // The current response is displayed in the response form section, and will be
-        // added to the thread when the agent reviews and sends back again.
-        update_clarification_status(id, updates);
-    }, [update_clarification_status, is_multi_instance, active_instance, props.back_form_data]);
+        const merged = base
+            ? { ...base, ...updates }
+            : { id, type: 'validation_override', target_field_id: '', target_label: '', issue_description: '', doc_references: [], response_options: [], created_at: now, ...updates };
+        if (is_multi_instance && active_instance) {
+            // Upsert into sent_clarifications on the instance
+            const existing = active_instance.sent_clarifications ?? [];
+            const found = existing.some(c => c.id === id);
+            const updated_sent = found
+                ? existing.map(c => c.id === id ? merged : c)
+                : [...existing, merged];
+            const inst_updates = { sent_clarifications: updated_sent };
+            // Also update front_form_data.__clarifications if needed
+            const front_clrs = active_instance.front_form_data?.['__clarifications'];
+            if (Array.isArray(front_clrs) && front_clrs.some((c) => c.id === id)) {
+                inst_updates.front_form_data = {
+                    ...active_instance.front_form_data,
+                    __clarifications: front_clrs.map(c => c.id === id ? merged : c),
+                };
+            }
+            props.on_instance_update?.(active_instance_id, inst_updates);
+            // Note: v2 data model will be updated by the useEffect([instances]) rebuild
+            // triggered by the on_instance_update call above. The rebuild uses the
+            // updated instance data which includes the response.
+        }
+        else {
+            // Single-instance: update in back_form_data
+            const existing = Array.isArray(props.back_form_data?.['__clarifications'])
+                ? props.back_form_data['__clarifications']
+                : [];
+            const found = existing.some(c => c.id === id);
+            const updated = found
+                ? existing.map(c => c.id === id ? merged : c)
+                : [...existing, merged];
+            props.on_back_change?.('__clarifications', updated);
+        }
+    }, [is_multi_instance, active_instance, active_instance_id, props, state.draft_clarifications, state.file_validation_results]);
     /** Batch-update multiple responses in a single write to avoid stale-state overwrites */
     const batch_update_clarification_responses = useCallback((responses) => {
         if (responses.size === 0)
@@ -716,7 +908,7 @@ export function HazoFbForm(props) {
             rule_id: rule.rule_id,
             rule_name: rule.rule_name,
             issue_description: message,
-            validation_details: rule.issue_description ?? rule.raw_response ?? '',
+            validation_details: rule.summary ?? rule.issues[0]?.issue_description ?? rule.raw_response ?? '',
             doc_references: [{
                     file_id: file.file_id,
                     file_name: file.file_name,
@@ -830,8 +1022,14 @@ export function HazoFbForm(props) {
         if (!data)
             return false;
         return Object.entries(data).some(([key, val]) => {
+            // File keys count as data (client may submit files only)
+            if (key.startsWith('__files_') || key.startsWith('__private_files_')) {
+                if (Array.isArray(val) && val.length > 0)
+                    return true;
+                return false;
+            }
             if (key.startsWith('__'))
-                return false; // Skip internal keys
+                return false; // Skip other internal keys
             if (val === undefined || val === null || val === '')
                 return false;
             if (Array.isArray(val) && val.length === 0)
@@ -841,6 +1039,25 @@ export function HazoFbForm(props) {
     }, [effective_props.front_form_data]);
     // Send to Client button: show when callback is provided, instance is not past/terminal, and on front tab
     const can_send_to_client = !is_past_instance && !!props.on_send_to_client;
+    // Wrap confirm_review_decisions to also persist accept/send_back to form_data_entries (v2 data model)
+    const confirm_review_decisions_with_data = useCallback(() => {
+        // Persist ALL decisions in a single update_form_data call to avoid stale-state overwrites
+        // (controlled mode reads from props.data which doesn't change between calls)
+        const current_user = props.current_user;
+        const decisions = Array.from(state.review_queue_decisions.entries());
+        if (decisions.length > 0) {
+            update_form_data(prev => {
+                let data = prev;
+                for (const [item_id, decision] of decisions) {
+                    const comment = decision === 'send_back' ? state.send_back_comments.get(item_id) : undefined;
+                    data = set_review_decision(data, item_id, decision, comment, current_user?.id, current_user?.name);
+                }
+                return data;
+            });
+        }
+        // Then run the original confirm logic (UI state, file routing, step advance)
+        return state.confirm_review_decisions();
+    }, [state.review_queue_decisions, state.send_back_comments, state.confirm_review_decisions, update_form_data, props.current_user]);
     const ctx = {
         props: effective_props,
         active_tab: state.active_tab,
@@ -926,7 +1143,7 @@ export function HazoFbForm(props) {
         send_back_items: state.send_back_items,
         send_back_comments: state.send_back_comments,
         set_send_back_comments: state.set_send_back_comments,
-        confirm_review_decisions: state.confirm_review_decisions,
+        confirm_review_decisions: confirm_review_decisions_with_data,
         // Reject & send back
         reject_clarification,
         // Override resolved validation
@@ -945,7 +1162,7 @@ export function HazoFbForm(props) {
                                                 : 'border-transparent text-muted-foreground hover:text-foreground', props.tab_class_name), children: [props.front_tab_label ?? 'Client View', props.front_tab_badge && _jsx("span", { className: "ml-2", children: props.front_tab_badge })] }), props.agent_stepper && show_back_office ? (_jsx(AgentStepper, { steps: state.step_configs, active_step: state.active_step, on_step_click: (step) => {
                                                 // Confirm review decisions when navigating away from review step
                                                 if (state.active_step === 'review' && step !== 'review' && state.review_complete) {
-                                                    const accepted_file_ids = state.confirm_review_decisions();
+                                                    const accepted_file_ids = confirm_review_decisions_with_data();
                                                     if (accepted_file_ids.length > 0) {
                                                         route_skipped_files(accepted_file_ids);
                                                         props.on_review_accepted?.(accepted_file_ids);
@@ -965,7 +1182,7 @@ export function HazoFbForm(props) {
                                                                 ? `${clarification_badge.reviewed} / ${clarification_badge.total}`
                                                                 : clarification_badge.total }))] }))] }))] }), _jsxs("div", { className: "flex items-center gap-2", children: [can_send_to_client && state.active_tab === 'front' && (_jsx("button", { type: "button", onClick: () => props.on_send_to_client(active_instance_id), disabled: !has_front_data, className: cn('inline-flex items-center gap-1.5 px-3 py-1.5 text-sm font-medium rounded-md transition-colors', has_front_data
                                                 ? 'bg-primary text-primary-foreground hover:bg-primary/90'
-                                                : 'bg-muted text-muted-foreground cursor-not-allowed opacity-50'), children: "Send to Client" })), is_past_instance && (_jsx("span", { className: "text-xs text-muted-foreground bg-muted px-2 py-1 rounded", children: "Read-only" }))] })] }), _jsxs("div", { className: cn('flex-1 overflow-y-auto px-4'), children: [_jsx("div", { style: { display: state.active_tab === 'front' ? undefined : 'none' }, children: _jsx(FrontOfficeView, {}) }), state.active_tab === 'client_data' && show_back_office && (_jsxs(_Fragment, { children: [show_backoffice_run_button && !is_past_instance && (_jsx("div", { className: "flex justify-end pt-2 mb-4", children: _jsx(BackofficeRunButton, { progress: state.run_progress, on_run: trigger_backoffice_run, disabled: !has_front_data, className: props.run_button_class_name, run_button_label: props.run_button_label, classification_results: state.classification_results, unassigned_files: state.unassigned_files, group_autofill_log: state.group_autofill_log }) })), _jsx(ClientDataView, {})] })), state.active_tab === 'back' && show_back_office && (_jsxs(_Fragment, { children: [show_backoffice_run_button && !is_past_instance && (_jsx("div", { className: "flex justify-end pt-2 mb-4", children: _jsx(BackofficeRunButton, { progress: state.run_progress, on_run: trigger_backoffice_run, disabled: !has_front_data, className: props.run_button_class_name, run_button_label: props.run_button_label, classification_results: state.classification_results, unassigned_files: state.unassigned_files, group_autofill_log: state.group_autofill_log }) })), _jsx(BackOfficeView, {})] })), state.active_tab === 'clarifications' && show_back_office && _jsx(ClarificationsView, {}), state.active_tab === 'agent_stepper' && show_back_office && (_jsxs(_Fragment, { children: [state.active_step === 'review' && _jsx(ReviewQueueView, {}), state.active_step === 'tax_data' && (_jsxs(_Fragment, { children: [show_backoffice_run_button && !is_past_instance && (_jsx("div", { className: "flex justify-end pt-2 mb-4", children: _jsx(BackofficeRunButton, { progress: state.run_progress, on_run: trigger_backoffice_run, disabled: !has_front_data, className: props.run_button_class_name, run_button_label: props.run_button_label, classification_results: state.classification_results, unassigned_files: state.unassigned_files, group_autofill_log: state.group_autofill_log }) })), _jsx(BackOfficeView, {}), _jsxs("div", { className: "flex items-center justify-between border-t border-border/60 pt-4 mt-6 pb-4", children: [state.step_configs.find(s => s.id === 'review')?.enabled && (_jsx("button", { type: "button", onClick: () => state.set_active_step('review'), className: "inline-flex items-center gap-1.5 px-3 py-1.5 text-sm font-medium text-muted-foreground hover:text-foreground transition-colors", children: "\u2190 Back to Review" })), state.send_back_items.length > 0 ? (_jsxs("button", { type: "button", onClick: () => state.set_active_step('send_back'), className: "inline-flex items-center gap-1.5 px-3 py-1.5 text-sm font-medium bg-primary text-primary-foreground hover:bg-primary/90 rounded-md transition-colors", children: ["Next: Send Back (", state.send_back_items.length, ") \u2192"] })) : (_jsx("span", { className: "text-sm text-green-600 font-medium", children: "&check; All resolved" }))] })] })), state.active_step === 'send_back' && _jsx(SendBackView, {})] }))] })] }), _jsx(RunDetailsDialog, { open: details_open, on_open_change: set_details_open, progress: state.run_progress, classification_results: state.classification_results, unassigned_files: state.unassigned_files, group_autofill_log: state.group_autofill_log, show_run_log: show_debug_dialogs })] }) }));
+                                                : 'bg-muted text-muted-foreground cursor-not-allowed opacity-50'), children: "Send to Client" })), is_past_instance && (_jsx("span", { className: "text-xs text-muted-foreground bg-muted px-2 py-1 rounded", children: "Read-only" }))] })] }), _jsxs("div", { className: cn('flex-1 overflow-y-auto px-4'), children: [_jsx("div", { style: { display: state.active_tab === 'front' ? undefined : 'none' }, children: _jsx(FrontOfficeView, {}) }), state.active_tab === 'client_data' && show_back_office && (_jsxs(_Fragment, { children: [show_backoffice_run_button && !is_past_instance && (_jsx("div", { className: "flex justify-end pt-2 mb-4", children: _jsx(BackofficeRunButton, { progress: state.run_progress, on_run: trigger_backoffice_run, disabled: !has_front_data, className: props.run_button_class_name, run_button_label: props.run_button_label, classification_results: state.classification_results, unassigned_files: state.unassigned_files, group_autofill_log: state.group_autofill_log }) })), _jsx(ClientDataView, {})] })), state.active_tab === 'back' && show_back_office && (_jsxs(_Fragment, { children: [show_backoffice_run_button && !is_past_instance && (_jsx("div", { className: "flex justify-end pt-2 mb-4", children: _jsx(BackofficeRunButton, { progress: state.run_progress, on_run: trigger_backoffice_run, disabled: !has_front_data, className: props.run_button_class_name, run_button_label: props.run_button_label, classification_results: state.classification_results, unassigned_files: state.unassigned_files, group_autofill_log: state.group_autofill_log }) })), _jsx(BackOfficeView, {})] })), state.active_tab === 'clarifications' && show_back_office && _jsx(ClarificationsView, {}), state.active_tab === 'agent_stepper' && show_back_office && (_jsxs(_Fragment, { children: [state.active_step === 'review' && _jsx(ReviewQueueView, {}), state.active_step === 'tax_data' && (_jsxs(_Fragment, { children: [show_backoffice_run_button && !is_past_instance && (_jsx("div", { className: "flex justify-end pt-2 mb-4", children: _jsx(BackofficeRunButton, { progress: state.run_progress, on_run: trigger_backoffice_run, disabled: !has_front_data && state.skipped_file_ids.size === 0 && state.classification_results.length === 0, className: props.run_button_class_name, run_button_label: props.run_button_label, classification_results: state.classification_results, unassigned_files: state.unassigned_files, group_autofill_log: state.group_autofill_log }) })), _jsx(FileStatusAccordion, {}), _jsx(BackOfficeView, {}), _jsxs("div", { className: "flex items-center justify-between border-t border-border/60 pt-4 mt-6 pb-4", children: [state.step_configs.find(s => s.id === 'review')?.enabled && (_jsx("button", { type: "button", onClick: () => state.set_active_step('review'), className: "inline-flex items-center gap-1.5 px-3 py-1.5 text-sm font-medium text-muted-foreground hover:text-foreground transition-colors", children: "\u2190 Back to Review" })), state.send_back_items.length > 0 ? (_jsxs("button", { type: "button", onClick: () => state.set_active_step('send_back'), className: "inline-flex items-center gap-1.5 px-3 py-1.5 text-sm font-medium bg-primary text-primary-foreground hover:bg-primary/90 rounded-md transition-colors", children: ["Next: Send Back (", state.send_back_items.length, ") \u2192"] })) : (_jsx("span", { className: "text-sm text-green-600 font-medium", children: "&check; All resolved" }))] })] })), state.active_step === 'send_back' && _jsx(SendBackView, {})] }))] })] }), _jsx(RunDetailsDialog, { open: details_open, on_open_change: set_details_open, progress: state.run_progress, classification_results: state.classification_results, unassigned_files: state.unassigned_files, group_autofill_log: state.group_autofill_log, show_run_log: show_debug_dialogs })] }) }));
 }
 HazoFbForm.displayName = 'HazoFbForm';
 //# sourceMappingURL=hazo_fb_form.js.map