critique of wizard design.

.opencode/package-lock.json

@@ -5,7 +5,7 @@
   "packages": {
     "": {
       "dependencies": {
-        "@opencode-ai/plugin": "1.15.10"
+        "@opencode-ai/plugin": "1.15.12"
       }
     },
     "node_modules/@msgpackr-extract/msgpackr-extract-darwin-arm64": {
@@ -87,19 +87,19 @@
       ]
     },
     "node_modules/@opencode-ai/plugin": {
-      "version": "1.15.10",
-      "resolved": "https://registry.npmjs.org/@opencode-ai/plugin/-/plugin-1.15.10.tgz",
-      "integrity": "sha512-V2p7CvpBtKWB+FID7Dl1y0Ci02zUT40A9b2RD9R9BOiuD8ZcKhHWov+irN0xVJA0Eg6OhEBfA0lPKRn1FNKPlw==",
+      "version": "1.15.12",
+      "resolved": "https://registry.npmjs.org/@opencode-ai/plugin/-/plugin-1.15.12.tgz",
+      "integrity": "sha512-BBteGXEwJt+1ehHqQ+yKXmoWltrW+2xO++B1Fm/dnMGYWT9luEKA5RlUuVYA2qDF6uwlE7kmHZvQZAM79zWHEA==",
       "license": "MIT",
       "dependencies": {
-        "@opencode-ai/sdk": "1.15.10",
+        "@opencode-ai/sdk": "1.15.12",
         "effect": "4.0.0-beta.66",
         "zod": "4.1.8"
       },
       "peerDependencies": {
-        "@opentui/core": ">=0.2.15",
-        "@opentui/keymap": ">=0.2.15",
-        "@opentui/solid": ">=0.2.15"
+        "@opentui/core": ">=0.2.16",
+        "@opentui/keymap": ">=0.2.16",
+        "@opentui/solid": ">=0.2.16"
       },
       "peerDependenciesMeta": {
         "@opentui/core": {
@@ -114,9 +114,9 @@
       }
     },
     "node_modules/@opencode-ai/sdk": {
-      "version": "1.15.10",
-      "resolved": "https://registry.npmjs.org/@opencode-ai/sdk/-/sdk-1.15.10.tgz",
-      "integrity": "sha512-CUhpmMGGOqzvPnNNjjWmEIodAfP6Qnuki2ChIUKWYF7UImZ4zUcMZnzO5BtUxu/Ni1P8qzWxDioXs+7aIZQEhA==",
+      "version": "1.15.12",
+      "resolved": "https://registry.npmjs.org/@opencode-ai/sdk/-/sdk-1.15.12.tgz",
+      "integrity": "sha512-lOaBNX93dkakZe6C42ttX1bkSx3K2c6+Yv+w8Qv02v5rPlu1vCXbmdfYDh9/bw+oq+NKPSaBm9d6kPA19hA5Lg==",
       "license": "MIT",
       "dependencies": {
         "cross-spawn": "7.0.6"

docs/superpowers/plans/2025-01-15-wizard-phase-i-trial.md

@@ -0,0 +1,298 @@
+# Phase I Trial: Django-Formtools Style Wizard (Server-Side Storage)
+
+## Goal
+Create a **copy** of one existing wizard using Approach B (server-side session storage) without modifying any existing multi_modal.clj code. This is an isolated trial to validate the pattern.
+
+## Trial Subject: Transaction Bulk Code Wizard
+**Why this one:**
+- Single-step form (simplest case)
+- Currently uses wizard protocols unnecessarily
+- ~420 lines in `transaction/bulk_code.clj`
+- Well-contained with clear inputs/outputs
+
+---
+
+## Architecture
+
+```
+Browser                    Server
+  |                          |
+  |-- GET /bulk-code-trial -->|
+  |                          |-- Create session entry
+  |                          |-- Return form with wizard-id
+  |<-- HTML + wizard-id -----|
+  |                          |
+  |-- POST (wizard-id +     -->|
+  |    current-step data)    |-- Validate step
+  |                          |-- Store in session
+  |                          |-- Return next step or done
+  |<-- HTML -----------------|
+```
+
+**Key difference from current approach:**
+- Current: EDN snapshot serialized in hidden form fields
+- Trial: Only `wizard-id` and current step fields in form. State lives server-side in atom.
+
+---
+
+## Files (All New - No Existing Files Modified)
+
+```
+src/clj/auto_ap/ssr/components/wizard_trial/
+  state.clj          - Session storage backend
+  core.clj           - Trial wizard engine (minimal)
+  
+src/clj/auto_ap/ssr/transaction/
+  bulk_code_trial.clj - Trial implementation of bulk code
+  
+test/clj/auto_ap/ssr/transaction/
+  bulk_code_trial_test.clj - Tests for trial
+```
+
+---
+
+## Phase I: Trial Implementation (This Week)
+
+### Step 1: Create Session Storage
+
+**File:** `src/clj/auto_ap/ssr/components/wizard_trial/state.clj`
+
+```clojure
+(ns auto-ap.ssr.components.wizard-trial.state)
+
+(defonce ^:private store (atom {}))
+
+(defn create!
+  "Creates new wizard session. Returns wizard-id."
+  [initial-data]
+  (let [id (str (java.util.UUID/randomUUID))]
+    (swap! store assoc id {:data initial-data
+                           :created-at (java.util.Date.)})
+    id))
+
+(defn get-wizard
+  "Retrieves wizard data by id."
+  [id]
+  (get @store id))
+
+(defn update-step!
+  "Merges step data into wizard session."
+  [id step-key step-data]
+  (swap! store assoc-in [id :data step-key] step-data))
+
+(defn get-all-data
+  "Returns merged data from all steps."
+  [id]
+  (-> (get-wizard id)
+      :data
+      vals
+      (apply merge)))
+
+(defn destroy!
+  "Removes wizard session."
+  [id]
+  (swap! store dissoc id))
+```
+
+### Step 2: Create Minimal Wizard Engine
+
+**File:** `src/clj/auto_ap/ssr/components/wizard_trial/core.clj`
+
+```clojure
+(ns auto-ap.ssr.components.wizard-trial.core
+  (:require [auto-ap.ssr.components.wizard-trial.state :as ws]
+            [malli.core :as mc]))
+
+(defn render-step
+  "Renders a single step form."
+  [{:keys [wizard-id step-config request]}]
+  (let [step-data (get-in (ws/get-wizard wizard-id) [:data (:key step-config)])]
+    [:form {:hx-post (:submit-route step-config)
+            :hx-target "this"
+            :hx-swap "outerHTML"}
+     [:input {:type "hidden" :name "wizard-id" :value wizard-id}]
+     [:input {:type "hidden" :name "step-key" :value (name (:key step-config))}]
+     ((:render step-config) (assoc request :step-data step-data))]))
+
+(defn handle-submit
+  "Handles step submission."
+  [step-config request]
+  (let [{:keys [wizard-id step-key]} (:form-params request)
+        wizard-id (str wizard-id)
+        step-key (keyword step-key)
+        step-data (select-keys (:form-params request) (:fields step-config))]
+    
+    (if-let [errors (mc/explain (:schema step-config) step-data)]
+      ;; Validation failed - re-render with errors
+      (render-step {:wizard-id wizard-id 
+                    :step-config step-config
+                    :request (assoc request :errors errors)})
+      
+      ;; Success - save and done (single step for trial)
+      (let [all-data (ws/get-all-data wizard-id)]
+        (ws/destroy! wizard-id)
+        ((:done-fn step-config) all-data request)))))
+```
+
+### Step 3: Create Trial Bulk Code Form
+
+**File:** `src/clj/auto_ap/ssr/transaction/bulk_code_trial.clj`
+
+```clojure
+(ns auto-ap.ssr.transaction.bulk-code-trial
+  (:require [auto-ap.ssr.components.wizard-trial.core :as wt]
+            [auto-ap.ssr.components.wizard-trial.state :as ws]
+            [auto-ap.ssr.components :as com]
+            [auto-ap.ssr.utils :refer [html-response]]
+            [auto-ap.datomic :refer [conn pull-attr]]
+            [datomic.api :as dc]))
+
+(def bulk-code-schema
+  [:map
+   [:vendor {:optional true} [:maybe int?]]
+   [:approval-status {:optional true} [:maybe keyword?]]
+   [:accounts {:optional true}
+    [:vector {:coerce? true}
+     [:map
+      [:account int?]
+      [:location :string]
+      [:percentage :double]]]]]])
+
+(defn render-bulk-code-form
+  "Pure function - renders the form given data."
+  [{:keys [step-data errors]}]
+  [:div.bulk-code-trial
+   [:h2 "Bulk Code (Trial - Phase I)"]
+   
+   [:div.space-y-4
+    ;; Vendor field
+    [:div
+     [:label "Vendor"]
+     (com/typeahead {:name "vendor"
+                     :value (:vendor step-data)
+                     :url "/api/vendors/search"})]
+    
+    ;; Accounts table
+    [:div
+     [:h3 "Accounts"]
+     [:table
+      [:thead
+       [:tr
+        [:th "Account"]
+        [:th "Location"]
+        [:th "%"]]]
+      [:tbody
+       (for [[idx account] (map-indexed vector (:accounts step-data []))]
+         [:tr {:key idx}
+          [:td (com/typeahead {:name (str "accounts[" idx "][account]")
+                               :value (:account account)})]
+          [:td (com/text-input {:name (str "accounts[" idx "][location]")
+                                :value (:location account)})]
+          [:td (com/money-input {:name (str "accounts[" idx "][percentage]")
+                                 :value (:percentage account)})]])]]]
+    
+    ;; Submit
+    [:button {:type "submit"} "Apply Bulk Code"]]])
+
+(def trial-step-config
+  {:key :bulk-code
+   :schema bulk-code-schema
+   :fields [:vendor :approval-status :accounts]
+   :render render-bulk-code-form
+   :submit-route "/transaction/bulk-code-trial"
+   :done-fn (fn [data request]
+              ;; Apply bulk coding logic here
+              (html-response [:div.success "Bulk code applied! (Trial)"]))})
+
+;; Route handlers
+(defn open-trial [request]
+  (let [wizard-id (ws/create! {:accounts []})]
+    (wt/render-step {:wizard-id wizard-id
+                     :step-config trial-step-config
+                     :request request})))
+
+(defn submit-trial [request]
+  (wt/handle-submit trial-step-config request))
+```
+
+### Step 4: Add Routes
+
+In your routes file (new entries, don't modify existing):
+
+```clojure
+{::route/bulk-code-trial open-trial
+ ::route/bulk-code-trial-submit submit-trial}
+```
+
+---
+
+## Phase II: Expand Trial (If Phase I Works)
+
+**Goal:** Test with a multi-step wizard
+
+**Subject:** New Invoice Wizard (2-3 steps)
+- Step 1: Basic details
+- Step 2: Accounts (conditional)
+- Step 3: Submit
+
+**New additions to trial engine:**
+- Step navigation (next/prev)
+- Conditional steps (skip accounts if not customizing)
+- Step validation per-step
+- Progress indicator
+
+**Files to create:**
+```
+src/clj/auto_ap/ssr/invoice/
+  new_invoice_trial.clj
+```
+
+---
+
+## Phase III: Full Migration Decision (If Phase II Works)
+
+**Goal:** Decide whether to migrate all wizards or keep both systems
+
+**Evaluation criteria:**
+1. ✅ Line count reduction (target: 50%+)
+2. ✅ Testability (pure functions easier to test)
+3. ✅ Performance (server-side storage vs EDN serialization)
+4. ✅ Complexity (fewer protocols/middleware)
+5. ⚠️  Session handling (what happens on server restart?)
+6. ⚠️  Multiple tabs (can user have two wizards open?)
+
+**Decision matrix:**
+
+| Criteria | Current | Trial | Winner |
+|----------|---------|-------|--------|
+| Lines of code | ~8,200 | ~3,000 (est.) | Trial |
+| Server restarts | Survives (state in form) | Loses state | Current |
+| Multiple tabs | Works (independent forms) | Needs separate IDs | Tie |
+| Testability | Hard (cursor context) | Easy (pure functions) | Trial |
+| Complex merges | Painful | Simple (keyed steps) | Trial |
+
+**If trial wins:** Migrate all wizards using Phase II pattern
+**If mixed:** Use trial for simple forms, keep current for complex multi-step
+
+---
+
+## How to Run the Trial
+
+1. **Start server:** `lein run`
+2. **Navigate to:** `/transaction/bulk-code-trial`
+3. **Test:** Fill form, submit, verify state handling
+4. **Compare:** Open existing `/transaction/bulk-code` in another tab
+5. **Evaluate:** Which feels simpler? Which is easier to debug?
+
+---
+
+## Success Criteria for Phase I
+
+- [ ] Trial renders without errors
+- [ ] Form submission validates correctly
+- [ ] Server-side state persists across requests
+- [ ] No modifications to existing multi_modal.clj
+- [ ] Code is < 200 lines (vs 420 original)
+- [ ] Developer can understand flow in 5 minutes
+
+**Ready to implement Phase I?**

e2e/transaction-edit.spec.ts

@@ -455,93 +455,6 @@ test.describe('Transaction Edit Vendor Pre-population', () => {
   });
 });
 
-// Drives the *real* vendor typeahead the way a user does: open the dropdown,
-// click a rendered result. The vendor search is backed by Solr (unavailable in
-// tests), so the result option is injected into the typeahead's Alpine
-// `elements` instead of being fetched. Everything else -- the dropdown's own
-// search input firing a native `change` on blur, the `value = element` click
-// handler, the Alpine reactivity, and the HTMX round-trip to
-// `edit-vendor-changed` -- runs exactly as in production. This is the flow that
-// regressed: a stale native `change` from the search input used to win the race
-// and revert the vendor to its previous value.
-async function selectVendorViaDropdown(page: any, vendorId: number, vendorName: string) {
-  const wrapper = page.locator('div[hx-post*="edit-vendor-changed"]').first();
-  const typeahead = wrapper.locator('div.relative[x-data]').first();
-
-  // Open the dropdown (tippy renders the popper into [data-tippy-root]).
-  await typeahead.locator('a[x-ref="input"]').click();
-
-  const search = page.locator('[data-tippy-root] input[x-model="search"]').first();
-  await search.waitFor({ state: 'visible' });
-
-  // Type under the 3-char search threshold so no Solr request fires and clears
-  // our injected option, while still dirtying the input so it fires a native
-  // `change` on blur -- the event that used to clobber the selection.
-  await search.fill('te');
-
-  // Inject a clickable result into the typeahead's Alpine state.
-  await typeahead.evaluate(
-    (el: HTMLElement, opt: { id: number; label: string }) => {
-      (window as any).Alpine.$data(el).elements = [{ value: opt.id, label: opt.label }];
-    },
-    { id: vendorId, label: vendorName }
-  );
-
-  // Click the rendered option: fires the search input's native change (stale
-  // value) AND the synthetic change carrying the new value, then HTMX swaps.
-  await page.locator('[data-tippy-root] a', { hasText: vendorName }).first().click();
-
-  await page.waitForResponse(
-    (response: any) =>
-      response.url().includes('/edit-vendor-changed') && response.status() === 200
-  );
-  await page.waitForTimeout(500);
-}
-
-// Opens the edit modal and activates the Manual tab, waiting on the vendor
-// typeahead rather than the account grid (which only exists in advanced mode).
-async function openManualVendorSection(page: any, transactionIndex: number) {
-  await page.goto('/transaction2');
-  await page.waitForSelector('table tbody tr');
-
-  const editButton = page
-    .locator('button[hx-get*="/transaction2/"][hx-get*="/edit"]')
-    .nth(transactionIndex);
-  await editButton.click();
-
-  await page.waitForSelector('#modal-holder[x-show="open"]', { state: 'visible' });
-  await page.waitForSelector('#wizardmodal');
-  await page.click('button:has-text("Manual")');
-  await page.waitForSelector('div[hx-post*="edit-vendor-changed"]');
-}
-
-test.describe('Transaction Edit Vendor Selection', () => {
-  test('selecting a vendor from the dropdown updates the displayed vendor', async ({ page }) => {
-    await openManualVendorSection(page, 3);
-
-    const testInfo = await getTestInfo(page);
-    const vendorId: number = testInfo.accounts.vendor;
-
-    await selectVendorViaDropdown(page, vendorId, 'Test Vendor');
-
-    // The displayed vendor label must reflect the selection after the HTMX
-    // round-trip. Before the fix this reverted to blank because a stale
-    // `change` event submitted the previous vendor and its response won.
-    const label = page
-      .locator('div[hx-post*="edit-vendor-changed"] span[x-text="value.label"]')
-      .first();
-    await expect(label).toHaveText('Test Vendor');
-
-    // The server-rendered hidden input must carry the newly selected vendor id.
-    const hidden = page
-      .locator(
-        'div[hx-post*="edit-vendor-changed"] input[type="hidden"][name="step-params[transaction/vendor]"]'
-      )
-      .first();
-    await expect(hidden).toHaveValue(vendorId.toString());
-  });
-});
-
 test.describe('Transaction Link Date Display', () => {
   test('should show payment date when linking to payment', async ({ page }) => {
     await openEditModalForTransaction(page, 'Transaction for payment link');

opencode.json

@@ -118,7 +118,12 @@
       "type": "local",
       "command": ["clojure", "-Tmcp", "start", ":config-profile", ":cli-assist"],
       "enabled": true
-    } 
+    } ,
+    "tavily": {
+      "type": "remote",
+      "url": "https://mcp.tavily.com/mcp/?tavilyApiKey=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",
+      "enabled": true
+    }
   },
   "permission": {
     "read": "allow",

src/clj/auto_ap/ssr/components/aside.clj

@@ -80,7 +80,9 @@
 (defn- transaction-nav-url [request route & {:keys [default-params] :or {default-params {:date-range "month"}}}]
   (let [preserved (transaction-nav-params request)]
     (hu/url (bidi/path-for ssr-routes/only-routes route)
-            {:date-range "month"})))
+            #_(if (or (:start-date preserved) (:end-date preserved))
+              preserved
+              (merge default-params preserved)))))
 
 (defn left-aside- [{:keys [nav page-specific]} & _]
   [:aside {:id         "left-nav",

src/clj/auto_ap/ssr/components/inputs.clj

@@ -63,14 +63,14 @@
                   :x-model (:x-model params)}
    (if (:disabled params)
      [:span {:x-text "value.label"}]
-     [:a {:class (-> (hh/add-class (or (:class params) "") default-input-classes)
-                     (hh/add-class "cursor-pointer"))
-          "x-tooltip.on.click" "{content: ()=>$refs.dropdown.innerHTML, placement: 'bottom', onMount(i) {htmx.process(i.popper); }, popperOptions: {strategy: 'fixed', modifiers: [{name: 'flip', options: {fallbackPlacements: ['top']}}]}, theme: 'dropdown', allowHTML: true, interactive:true}"
-          "@keydown.down.prevent.stop" "tippy.show();"
-          "@keydown.backspace" "tippy.hide(); value = {value: '', label: '' }"
-          :tabindex 0
-          :x-init (str "$nextTick(() => tippy = $el.__x_tippy); " (:x-init params))
-          :x-ref "input"}
+     [:a {:class                        (-> (hh/add-class (or (:class params) "") default-input-classes)
+                                            (hh/add-class "cursor-pointer"))
+          "x-tooltip.on.click"              "{content: ()=>$refs.dropdown.innerHTML, placement: 'bottom', onMount(i) {htmx.process(i.popper); }, popperOptions: {strategy: 'fixed', modifiers: [{name: 'flip', options: {fallbackPlacements: ['top']}}]}, theme: 'dropdown', allowHTML: true, interactive:true}"
+          "@keydown.down.prevent.stop"  "tippy.show();"
+          "@keydown.backspace"          "tippy.hide(); value = {value: '', label: '' }"
+          :tabindex                     0
+          :x-init                      (str  "$nextTick(() => tippy = $el.__x_tippy); " (:x-init params))
+          :x-ref                        "input"}
       [:input (-> params
                   (dissoc :class)
                   (dissoc :value-fn)
@@ -81,9 +81,9 @@
 
                   (assoc
                    "x-ref" "hidden"
-                   :type "hidden"
+                   :type    "hidden"
                    ":value" "value.value"
-                   :x-init (hiccup/raw (str "$watch('value', v => { $el.value = (v && v.value != null) ? v.value : ''; $nextTick(() => $dispatch('change')); }); "))))]
+                   :x-init (hiccup/raw (str "$watch('value', v => $dispatch('change')); "))))]
       [:div.flex.w-full.justify-items-stretch
        [:span.flex-grow.text-left {"x-text" "value.label"}]
        [:div {:class "w-3 h-3 m-1 inline ml-1 justify-self-end text-gray-500 self-center"}
@@ -93,72 +93,71 @@
                       :x-tooltip "value.warning"} "!")]]])
 
    [:template {:x-ref "dropdown"}
-    [:ul.dropdown-contents {:class "bg-gray-100 dark:bg-gray-600  ring-1"
-                            "@keydown.escape" "tippy.hide(); value = {value: '', label: '' };  "
+    [:ul.dropdown-contents {:class                     "bg-gray-100 dark:bg-gray-600  ring-1"
+                            "@keydown.escape"   "tippy.hide(); value = {value: '', label: '' };  "
                             :x-destroy "if ($refs.input) {$refs.input.focus();}"}
-     [:input {:type "text"
+     [:input {:type                    "text"
               :autofocus true
-              :class (-> (:class params)
-                         (or "")
-                         (hh/add-class default-input-classes)
-                         (hh/replace-wildcard ["rounded" "border"] "border-bottom bg-gray-100 rounded-t-lg w-full"))
-              "x-model" "search"
-              "placeholder" (:placeholder params)
-              "@change.stop" ""
-              "@keydown.down.prevent" "active ++; active = active >= elements.length - 1 ? elements.length - 1 : active"
-              "@keydown.up.prevent" "active --; active = active < 0 ? 0 : active"
-              "@keydown.enter.prevent.stop" "tippy.hide(); value = elements.length > 0 ? $data.elements[active >= 0 ? active : 0] : {'value': '', label: ''}; $refs.input.focus()"
-              "x-init" "$el.focus(); $watch('search', s => { if($el.value.length > 2) {fetch(addQueryParam(baseUrl, 'q', s)).then(data=>data.json()).then(data => {elements = data; active=-1; tippy.popperInstance.update()}) }})"}]
+              :class                   (-> (:class params)
+                                           (or "")
+                                           (hh/add-class default-input-classes)
+                                           (hh/replace-wildcard ["rounded" "border"] "border-bottom bg-gray-100 rounded-t-lg w-full"))
+              "x-model"                "search"
+              "placeholder"            (:placeholder params)
+              "@keydown.down.prevent"  "active ++; active = active >= elements.length - 1 ? elements.length - 1 : active"
+              "@keydown.up.prevent"    "active --; active = active < 0 ? 0 : active"
+              "@keydown.enter.prevent.stop" "tippy.hide(); value = elements.length > 0 ? $data.elements[active] : {'value': '', label: ''}; $refs.input.focus()"
+              "x-init"                 "$el.focus(); $watch('search', s => { if($el.value.length > 2) {fetch(addQueryParam(baseUrl, 'q', s)).then(data=>data.json()).then(data => {elements = data; active=-1; tippy.popperInstance.update()}) }})"}]
      [:div.dropdown-options {:class "rounded-b-lg overflow-hidden"}
       [:template {:x-for "(element, index) in elements"}
-       [:li [:a {:class "px-4 py-2 flex gap-2 items-center outline-0 focus:bg-neutral-100 hover:bg-neutral-100 whitespace-nowrap [&.active]:bg-primary-500 [&.active]:dark:bg-primary-700  text-gray-800  dark:text-gray-100"
-                 :href "#"
-                 ":class" "active == index ? 'active' : ''"
+       [:li [:a {:class           "px-4 py-2 flex gap-2 items-center outline-0 focus:bg-neutral-100 hover:bg-neutral-100 whitespace-nowrap [&.active]:bg-primary-500 [&.active]:dark:bg-primary-700  text-gray-800  dark:text-gray-100"
+                 :href            "#"
+                 ":class"         "active == index ? 'active' : ''"
 
-                 "@mouseover" "active = index"
-                 "@mouseout" "active = -1"
-                 "@click.prevent" "value = element; tippy.hide(); setTimeout(() => $refs.input.focus(), 10)"
-                 "x-html" "element.label"}]]]
+                 "@mouseover"     "active = index"
+                 "@mouseout"      "active = -1"
+                 "@click.prevent" "value = element; tippy.hide();  $refs.input.focus()"
+                 "x-html"         "element.label"}]]]
       [:template {:x-if "elements.length == 0"}
        [:li {:class "px-4 py-2 flex gap-2 items-center outline-0 focus:bg-neutral-100 hover:bg-neutral-100 whitespace-nowrap [&.active]:bg-primary-500 text-gray-800  dark:text-gray-100 text-xs "}
         "No results found"]]]]]])
 
 (defn multi-typeahead-dropdown- [params]
   [:template {:x-ref "dropdown"}
-   [:ul.dropdown-contents {:class "bg-gray-100 dark:bg-gray-600 rounded-lg shadow-2xl w-max z-50 ring-1 p-4"
-                           "@keydown.escape.prevent" "tippy.hide();"
+   [:ul.dropdown-contents {:class                     "bg-gray-100 dark:bg-gray-600 rounded-lg shadow-2xl w-max z-50 ring-1 p-4"
+                           "@keydown.escape.prevent"   "tippy.hide();"
                            :x-destroy "if ($refs.input) {$refs.input.focus();}"}
     [:div {:class (-> "relative"
                       #_(hh/replace-wildcard ["rounded" "border"] "border-bottom bg-gray-100 rounded-t-lg w-full"))}
      [:div {:class "absolute inset-y-0 start-0 flex items-center ps-3 pointer-events-none"}
       [:svg {:class "w-4 h-4 text-gray-500 dark:text-gray-400", :aria-hidden "true", :xmlns "http://www.w3.org/2000/svg", :fill "none", :viewbox "0 0 20 20"}
        [:path {:stroke "currentColor", :stroke-linecap "round", :stroke-linejoin "round", :stroke-width "2", :d "m19 19-4-4m0-7A7 7 0 1 1 1 8a7 7 0 0 1 14 0Z"}]]]
-     [:input {:type "text"
+     [:input {:type                    "text"
               :class (-> (:class params)
                          (or "")
                          (hh/add-class "block w-full p-2 ps-10 text-sm text-gray-900 border border-gray-300 rounded-lg bg-gray-50 focus:ring-blue-500 focus:border-blue-500 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-blue-500 dark:focus:border-blue-500")
                          (hh/add-class default-input-classes))
-              "x-model" "search"
-              "placeholder" (:placeholder params)
-              "@keydown.down.prevent" "active ++; active = active >= elements.length - 1 ? elements.length - 1 : active"
-              "@keydown.up.prevent" "active --; active = active < 0 ? 0 : active"
+              "x-model"                "search"
+              "placeholder"            (:placeholder params)
+              "@keydown.down.prevent"  "active ++; active = active >= elements.length - 1 ? elements.length - 1 : active"
+              "@keydown.up.prevent"    "active --; active = active < 0 ? 0 : active"
               "@keydown.enter.prevent.stop" "if ($data.elements[active]) { if (value.has($data.elements[active].value)) { value.delete($data.elements[active].value) } else {value.add($data.elements[active].value); lookup[$data.elements[active].value] = $data.elements[active].label} } "
-              "x-init" " $el.focus(); $watch('search', s => { if($el.value.length > 2) {fetch(addQueryParam(baseUrl, 'q',  s)).then(data=>data.json()).then(data => reset_elements(data)) }})"}]]
+              "x-init"                 " $el.focus(); $watch('search', s => { if($el.value.length > 2) {fetch(addQueryParam(baseUrl, 'q',  s)).then(data=>data.json()).then(data => reset_elements(data)) }})"}]]
     [:div.dropdown-options {:class "overflow-hidden  divide-y divide-gray-200 "}
      [:template {:x-for "(element, index) in elements"}
-      [:li {":style" "index  == 0  && 'border: 0 !important;'"}
-       [:label {:class "p-3 group rounded flex gap-2 items-center outline-0 focus:bg-neutral-100 hover:bg-neutral-100 whitespace-nowrap [&.active]:bg-primary-300 [&.active]:dark:bg-primary-700 [&.implied]:text-gray-500 text-gray-800  dark:text-gray-100 cursor-pointer"
+      [:li  {":style" "index  == 0  && 'border: 0 !important;'"}
+       [:label {:class           "p-3 group rounded flex gap-2 items-center outline-0 focus:bg-neutral-100 hover:bg-neutral-100 whitespace-nowrap [&.active]:bg-primary-300 [&.active]:dark:bg-primary-700 [&.implied]:text-gray-500 text-gray-800  dark:text-gray-100 cursor-pointer"
 
-                :href "#"
-                ":class" (hx/json {"active" (hx/js-fn "active==index")
+                :href            "#"
+                ":class" (hx/json {"active"  (hx/js-fn "active==index")
                                    "implied" (hx/js-fn "all_selected && index != 0")})
-                "@mouseover" "active = index"
-                "@mouseout" "active = -1"
+                "@mouseover"     "active = index"
+                "@mouseout"      "active = -1"
                 "@click.prevent" "toggle(element)"}
         (checkbox- {":checked" "value.has(element.value) || all_selected"
                     :class "group-[&.implied]:bg-green-200"})
         #_[:input {:type "checkbox"}]
-        [:span {"x-html" "element.label"}]]]]
+        [:span {"x-html"         "element.label"}]]]]
      [:template {:x-if "elements.length == 0"}
       [:li {:class "px-4 pt-4 flex gap-2 items-center outline-0 focus:bg-neutral-100 hover:bg-neutral-100 whitespace-nowrap [&.active]:bg-primary-500 text-gray-800  dark:text-gray-100 text-xs " "style" "border: 0 !important"}
        "No results found"]]]]])
@@ -226,7 +225,7 @@
                                     :x-init (str "$watch('value', v => $dispatch('change')); ")
                                     :search ""
                                     :active -1
-                                    :elements (cond-> [{:value "all" :label "All"}]
+                                    :elements (cond->  [{:value "all" :label "All"}]
                                                 (sequential? (:value params))
                                                 (into (map (fn [v]
                                                              {:value ((:value-fn params identity) v)
@@ -238,24 +237,24 @@
                   :x-init "value=new Set(value || []); "}
    (if (:disabled params)
      [:span {:x-text "value.label"}]
-     [:a {:class (-> (hh/add-class (or (:class params) "") default-input-classes)
-                     (hh/add-class "cursor-pointer"))
-          "x-tooltip.on.click.prevent" "{content: ()=>$refs.dropdown.innerHTML, placement: 'bottom', onMount(i) {htmx.process(i.popper); }, popperOptions: {strategy: 'fixed', modifiers: [{name: 'flip', options: {fallbackPlacements: ['top']}}]}, theme: 'dropdown', allowHTML: true, interactive:true}"
-          "@keydown.down.prevent.stop" "tippy.show();"
-          "@keydown.backspace" "tippy.hide(); value=new Set( []);"
-          :tabindex 0
-          :x-init (str "$nextTick(() => tippy = $el.__x_tippy); " (:x-init params))
-          :x-ref "input"}
+     [:a {:class                        (-> (hh/add-class (or (:class params) "") default-input-classes)
+                                            (hh/add-class "cursor-pointer"))
+          "x-tooltip.on.click.prevent"              "{content: ()=>$refs.dropdown.innerHTML, placement: 'bottom', onMount(i) {htmx.process(i.popper); }, popperOptions: {strategy: 'fixed', modifiers: [{name: 'flip', options: {fallbackPlacements: ['top']}}]}, theme: 'dropdown', allowHTML: true, interactive:true}"
+          "@keydown.down.prevent.stop"  "tippy.show();"
+          "@keydown.backspace"          "tippy.hide(); value=new Set( []);"
+          :tabindex                     0
+          :x-init                      (str  "$nextTick(() => tippy = $el.__x_tippy); " (:x-init params))
+          :x-ref                        "input"}
       [:template {:x-for "v in Array.from(value.values())"}
        [:input (-> params
                    (dissoc :class :value-fn :content-fn :placeholder :x-model)
                    (assoc
-                    :type "hidden"
+                    :type    "hidden"
                     "x-bind:value" "v"))]]
       [:template {:x-if "value.size == 0"}
        [:input (-> params
                    (dissoc :class :value-fn :content-fn :placeholder :x-model)
-                   (assoc :type "hidden"
+                   (assoc :type    "hidden"
                           :value ""))]]
       [:div.flex.w-full.justify-items-stretch
        (multi-typeahead-selected-pill- params)
@@ -297,23 +296,23 @@
 
 (defn money-input- [{:keys [size] :as params}]
   [:input
-   (-> params
-       (update :class (fnil hh/add-class "") default-input-classes)
-       (update :class hh/add-class "appearance-none text-right")
-       (update :class #(str % (use-size size)))
-       (assoc :type "number"
-              :step "0.01")
-       (dissoc :size))])
+   (->  params
+        (update :class (fnil hh/add-class "") default-input-classes)
+        (update :class hh/add-class "appearance-none text-right")
+        (update :class #(str % (use-size size)))
+        (assoc :type "number"
+               :step "0.01")
+        (dissoc :size))])
 
 (defn int-input- [{:keys [size] :as params}]
   [:input
-   (-> params
-       (update :class (fnil hh/add-class "") default-input-classes)
-       (update :class hh/add-class "appearance-none text-right")
-       (update :class #(str % (use-size size)))
-       (assoc :type "number"
-              :step "1")
-       (dissoc :size))])
+   (->  params
+        (update :class (fnil hh/add-class "") default-input-classes)
+        (update :class hh/add-class "appearance-none text-right")
+        (update :class #(str % (use-size size)))
+        (assoc :type "number"
+               :step "1")
+        (dissoc :size))])
 
 (defn date-input- [{:keys [size] :as params}]
   [:div.shrink {:x-data (hx/json {:value (:value params)
@@ -322,40 +321,40 @@
                 "x-effect" "console.log('changed to' +value)"
                 "@change-date.camel" "$dispatch('change')"}
    [:input
-    (-> params
-        (update :class (fnil hh/add-class "") default-input-classes)
-        (assoc :x-model "value")
-        (assoc "x-tooltip.on.focus" "{content: ()=>$refs.tooltip.innerHTML, theme: 'light', onMount(i) { htmx.process(i.popper); }, allowHTML: true, interactive:true}")
+    (->  params
+         (update :class (fnil hh/add-class "") default-input-classes)
+         (assoc :x-model "value")
+         (assoc "x-tooltip.on.focus" "{content: ()=>$refs.tooltip.innerHTML, theme: 'light', onMount(i) { htmx.process(i.popper); }, allowHTML: true, interactive:true}")
 
-        (assoc :x-init "$nextTick(() => tippy = $el.__x_tippy); ")
-        (assoc :type "text")
+         (assoc :x-init "$nextTick(() => tippy = $el.__x_tippy); ")
+         (assoc :type "text")
 
-        (assoc "autocomplete" "off")
-        (assoc "@change" "value = $event.target.value;")
+         (assoc "autocomplete" "off")
+         (assoc "@change" "value = $event.target.value;")
 
-        (assoc "@keydown.escape" "tippy.hide(); ")
-        #_(assoc "hx-on" (hiccup/raw "changeDate: htmx.trigger(this, \"change\") "))
-        (update :class #(str % (use-size size) " w-full"))
-        (dissoc :size))]
+         (assoc                              "@keydown.escape"   "tippy.hide(); ")
+         #_(assoc "hx-on" (hiccup/raw "changeDate: htmx.trigger(this, \"change\") "))
+         (update :class #(str % (use-size size) " w-full"))
+         (dissoc :size))]
    [:template {:x-ref "tooltip"}
 
     [:div.shrink
      [:div
-      (-> params
-          (update :class (fnil hh/add-class "") default-input-classes)
-          (assoc :type "text")
-          (assoc :value (:value params))
+      (->  params
+           (update :class (fnil hh/add-class "") default-input-classes)
+           (assoc :type "text")
+           (assoc :value (:value params))
                 ;; the data-date field has to be bound before the datepicker can be initialized
-          (assoc :x-init "$nextTick(() =>  { dp = initCalendar($el); ;}); ")
-          (assoc "x-effect" "if(dp) { dp.setDate(value); } ")
-          (assoc ":data-date" "value")
-          (assoc "@htmx:before-history-save" "destroyDatepicker(dp)")
-          (assoc "@htmx:before-cleanup-element" "destroyDatepicker(dp)")
-          (assoc "x-destroy" "destroyDatepicker(dp)")
-          (assoc "@change-date.camel" "value = dp.getDate(\"mm/dd/yyyy\");")
+           (assoc :x-init "$nextTick(() =>  { dp = initCalendar($el); ;}); ")
+           (assoc "x-effect" "if(dp) { dp.setDate(value); } ")
+           (assoc ":data-date" "value")
+           (assoc "@htmx:before-history-save" "destroyDatepicker(dp)")
+           (assoc "@htmx:before-cleanup-element" "destroyDatepicker(dp)")
+           (assoc "x-destroy" "destroyDatepicker(dp)")
+           (assoc "@change-date.camel" "value = dp.getDate(\"mm/dd/yyyy\");")
 
-          (update :class #(str % (use-size size) " w-full"))
-          (dissoc :size :name :x-model :x-modelable))]]]])
+           (update :class #(str % (use-size size) " w-full"))
+           (dissoc :size :name :x-model :x-modelable))]]]])
 
 (defn multi-calendar-input- [{:keys [size] :as params}]
   (let [value (str/join ", "
@@ -369,21 +368,21 @@
      [:template {:x-for "v in value"}
       [:input {:type "hidden" :name (:name params) :x-model "v"}]]
      [:div
-      (-> params
-          (update :class (fnil hh/add-class "") default-input-classes)
-          (assoc :type "text")
-          (assoc :value value)
+      (->  params
+           (update :class (fnil hh/add-class "") default-input-classes)
+           (assoc :type "text")
+           (assoc :value value)
            ;; the data-date field has to be bound before the datepicker can be initialized
-          (assoc :x-init "$nextTick(() =>  { dp = initMultiDatepicker($el, value); ;}); ")
-          (assoc "x-effect" "if(dp) { dp.setDate(Array.from(value), {clear: true}); } ")
-          (assoc ":data-date" "Array.prototype.join.call(value, ', ')")
-          (assoc "@htmx:before-history-save" "destroyDatepicker(dp)")
-          (assoc "@htmx:before-cleanup-element" "destroyDatepicker(dp)")
-          (assoc "x-destroy" "destroyDatepicker(dp)")
-          (assoc "@change-date.camel" "value = dp.getDate(\"mm/dd/yyyy\");")
+           (assoc :x-init "$nextTick(() =>  { dp = initMultiDatepicker($el, value); ;}); ")
+           (assoc "x-effect" "if(dp) { dp.setDate(Array.from(value), {clear: true}); } ")
+           (assoc ":data-date" "Array.prototype.join.call(value, ', ')")
+           (assoc "@htmx:before-history-save" "destroyDatepicker(dp)")
+           (assoc "@htmx:before-cleanup-element" "destroyDatepicker(dp)")
+           (assoc "x-destroy" "destroyDatepicker(dp)")
+           (assoc "@change-date.camel" "value = dp.getDate(\"mm/dd/yyyy\");")
 
-          (update :class #(str % (use-size size) " w-full"))
-          (dissoc :size :name :x-model :x-modelable))]]))
+           (update :class #(str % (use-size size) " w-full"))
+           (dissoc :size :name :x-model :x-modelable))]]))
 
 (defn calendar-input- [{:keys [size] :as params}]
   (let [value (:value params)]
@@ -393,21 +392,21 @@
                   :x-model (:x-model params)}
      [:input {:type "hidden" :name (:name params) :x-model "value"}]
      [:div
-      (-> params
-          (update :class (fnil hh/add-class "") default-input-classes)
-          (assoc :type "text")
-          (assoc :value value)
+      (->  params
+           (update :class (fnil hh/add-class "") default-input-classes)
+           (assoc :type "text")
+           (assoc :value value)
            ;; the data-date field has to be bound before the datepicker can be initialized
-          (assoc :x-init "$nextTick(() =>  { dp = initCalendar($el); ;}); ")
-          (assoc "x-effect" "if(dp) { dp.setDate(value); } ")
-          (assoc ":data-date" "value")
-          (assoc "@htmx:before-history-save" "destroyDatepicker(dp)")
-          (assoc "@htmx:before-cleanup-element" "destroyDatepicker(dp)")
-          (assoc "x-destroy" "destroyDatepicker(dp)")
-          (assoc "@change-date.camel" "value = dp.getDate(\"mm/dd/yyyy\");")
+           (assoc :x-init "$nextTick(() =>  { dp = initCalendar($el); ;}); ")
+           (assoc "x-effect" "if(dp) { dp.setDate(value); } ")
+           (assoc ":data-date" "value")
+           (assoc "@htmx:before-history-save" "destroyDatepicker(dp)")
+           (assoc "@htmx:before-cleanup-element" "destroyDatepicker(dp)")
+           (assoc "x-destroy" "destroyDatepicker(dp)")
+           (assoc "@change-date.camel" "value = dp.getDate(\"mm/dd/yyyy\");")
 
-          (update :class #(str % (use-size size) " w-full"))
-          (dissoc :size :name :x-model :x-modelable))]]))
+           (update :class #(str % (use-size size) " w-full"))
+           (dissoc :size :name :x-model :x-modelable))]]))
 
 (defn field-errors- [{:keys [source key]} & rest]
   (let [errors (:errors (cond-> (meta source)

src/clj/auto_ap/ssr/components/wizard_trial/core.clj

@@ -0,0 +1,54 @@
+(ns auto-ap.ssr.components.wizard-trial.core
+  (:require
+   [auto-ap.ssr.components.wizard-trial.state :as ws]
+   [auto-ap.ssr.utils :refer [html-response main-transformer modal-response]]
+   [malli.core :as mc]
+   [malli.error :as me]))
+
+(defn render-step
+  "Renders a single step form.
+   step-config is a map with:
+   - :key - step keyword
+   - :render - function taking {:keys [step-data errors request]} returning hiccup
+   - :submit-route - string URL for form POST"
+  [{:keys [wizard-id step-config request errors]}]
+  (let [{:keys [key render submit-route]} step-config
+        wizard (ws/get-wizard wizard-id)
+        step-data (get-in wizard [:data key] {})]
+    [:form {:hx-post submit-route
+            :hx-target "this"}
+     [:input {:type "hidden" :name "wizard-id" :value wizard-id}]
+     [:input {:type "hidden" :name "step-key" :value (name key)}]
+     (render {:step-data step-data :errors errors :request request})]))
+
+(defn handle-submit
+  "Handles step submission.
+   Validates step data against schema.
+   If valid: saves to session and calls done-fn.
+   If invalid: re-renders step with errors."
+  [step-config request]
+  (let [{:keys [form-params]} request
+        wizard-id (get form-params "wizard-id")
+        step-key (keyword (get form-params "step-key"))
+        fields (:fields step-config)
+        step-data (reduce (fn [acc field]
+                            (if-let [v (get form-params (name field))]
+                              (assoc acc field v)
+                              acc))
+                          {}
+                          fields)
+        schema (:schema step-config)
+        decoded (mc/decode schema step-data main-transformer)
+        valid? (mc/validate schema decoded)]
+    (if valid?
+      (do
+        (ws/update-step! wizard-id step-key decoded)
+        (let [all-data (ws/get-all-data wizard-id)]
+          (ws/destroy! wizard-id)
+          ((:done-fn step-config) all-data request)))
+      (let [errors (me/humanize (mc/explain schema decoded))]
+        (modal-response
+         (render-step {:wizard-id wizard-id
+                       :step-config step-config
+                       :request request
+                       :errors errors}))))))

src/clj/auto_ap/ssr/components/wizard_trial/state.clj

@@ -0,0 +1,35 @@
+(ns auto-ap.ssr.components.wizard-trial.state)
+
+(defonce ^:private store (atom {}))
+
+(defn create!
+  "Creates new wizard session with initial data. Returns wizard-id string."
+  [initial-data]
+  (let [id (str (java.util.UUID/randomUUID))]
+    (swap! store assoc id {:data initial-data
+                           :created-at (java.util.Date.)})
+    id))
+
+(defn get-wizard
+  "Retrieves wizard data by id. Returns nil if not found."
+  [id]
+  (get @store id))
+
+(defn update-step!
+  "Merges step data into wizard session under step-key."
+  [id step-key step-data]
+  (swap! store update-in [id :data step-key] merge step-data))
+
+(defn get-all-data
+  "Returns merged data from all steps for final submission."
+  [id]
+  (when-let [wizard (get-wizard id)]
+    (let [data (:data wizard)]
+      (apply merge
+             (into {} (remove (comp map? val) data))
+             (filter map? (vals data))))))
+
+(defn destroy!
+  "Removes wizard session."
+  [id]
+  (swap! store dissoc id))

src/clj/auto_ap/ssr/transaction.clj

@@ -15,6 +15,7 @@
    [auto-ap.ssr.grid-page-helper :as helper :refer [wrap-apply-sort]]
    [auto-ap.ssr.ledger :refer [wrap-ensure-bank-account-belongs]]
    [auto-ap.ssr.transaction.bulk-code :as bulk-code :refer [all-ids-not-locked]]
+   [auto-ap.ssr.transaction.bulk-code-trial :as bulk-code-trial]
    [auto-ap.ssr.transaction.common :refer [bank-account-filter* fetch-ids
                                            grid-page query-schema
                                            wrap-status-from-source]]
@@ -53,7 +54,7 @@
               all-selected
               (:ids (fetch-ids (dc/db conn) (-> request
                                                 (assoc-in [:form-params :start] 0)
-                                                (assoc-in [:form-params :per-page]  250))))
+                                                (assoc-in [:form-params :per-page] 250))))
               :else
               selected)
         all-ids (all-ids-not-locked ids)
@@ -101,16 +102,18 @@
 (def key->handler
   (merge edit/key->handler
          bulk-code/key->handler
+         {::route/bulk-code-trial bulk-code-trial/open-trial
+          ::route/bulk-code-trial-submit bulk-code-trial/submit-trial}
          (apply-middleware-to-all-handlers
-          {::route/page              page
+          {::route/page page
            ::route/approved-page (-> page (wrap-implied-route-param :status :transaction-approval-status/approved))
            ::route/unapproved-page (-> page (wrap-implied-route-param :status :transaction-approval-status/unapproved))
            ::route/requires-feedback-page (-> page (wrap-implied-route-param :status :transaction-approval-status/requires-feedback))
-           ::route/table             table
-           ::route/csv               csv
+           ::route/table table
+           ::route/csv csv
            ::route/bank-account-filter bank-account-filter
-           ::route/bulk-delete       (-> bulk-delete
-                                         (wrap-schema-enforce :form-schema query-schema))}
+           ::route/bulk-delete (-> bulk-delete
+                                   (wrap-schema-enforce :form-schema query-schema))}
           (fn [h]
             (-> h
                 (wrap-copy-qp-pqp)

src/clj/auto_ap/ssr/transaction/bulk_code_trial.clj

@@ -0,0 +1,172 @@
+(ns auto-ap.ssr.transaction.bulk-code-trial
+  (:require
+   [auto-ap.datomic :refer [conn pull-attr pull-many]]
+   [auto-ap.ssr.components :as com]
+   [auto-ap.ssr.components.wizard-trial.core :as wt]
+   [auto-ap.ssr.components.wizard-trial.state :as ws]
+   [auto-ap.ssr.transaction.edit :as edit :refer [account-typeahead* location-select*]]
+   [auto-ap.ssr.utils :refer [html-response modal-response percentage]]
+   [auto-ap.ssr.svg :as svg]
+   [bidi.bidi :as bidi]
+   [clojure.string :as str]
+   [datomic.api :as dc]
+   [malli.core :as mc]))
+
+(def bulk-code-schema
+  (mc/schema
+   [:map
+    [:vendor {:optional true} [:maybe int?]]
+    [:approval-status {:optional true} [:maybe keyword?]]
+    [:accounts {:optional true}
+     [:vector {:coerce? true}
+      [:map
+       [:account int?]
+       [:location :string]
+       [:percentage percentage]]]]]))
+
+(defn- account-row
+  "Renders a single account row with typeahead, location select, percentage, and delete button."
+  [index {:keys [account location percentage]} errors request]
+  (let [account-name (str "accounts[" index "][account]")
+        location-name (str "accounts[" index "][location]")
+        percentage-name (str "accounts[" index "][percentage]")
+        row-errors (get errors index)
+        client-id (-> request :clients first :db/id)
+        account-location (try
+                           (when (nat-int? account)
+                             (:account/location (dc/pull (dc/db conn) '[:account/location] account)))
+                           (catch Exception e nil))
+        client-locations (try
+                           (pull-attr (dc/db conn) :client/locations client-id)
+                           (catch Exception e nil))]
+    [:tr
+     [:td (com/validated-field
+           {:errors (get row-errors :account)}
+           (account-typeahead* {:value account
+                                :client-id client-id
+                                :name account-name}))]
+     [:td (com/validated-field
+           {:errors (get row-errors :location)}
+           (location-select* {:name location-name
+                              :account-location account-location
+                              :client-locations client-locations
+                              :value location}))]
+     [:td (com/validated-field
+           {:errors (get row-errors :percentage)}
+           (com/money-input {:name percentage-name
+                             :value (some-> percentage (* 100) long)
+                             :class "w-16"}))]
+     [:td (com/a-icon-button {"@click.prevent.stop" "this.closest('tr').remove()"}
+                             svg/x)]]))
+
+(defn render-bulk-code-form
+  "Renders the bulk code form inside a modal card structure.
+   Takes {:keys [step-data errors request]}"
+  [{:keys [step-data errors request]}]
+  (let [vendor (get step-data :vendor)
+        approval-status (get step-data :approval-status)
+        accounts (get step-data :accounts
+                      [{:account nil :location "Shared" :percentage 0.5}
+                       {:account nil :location "Shared" :percentage 0.5}
+                       {:account nil :location "" :percentage nil}])
+        selected-ids [] ; Would come from request in real implementation
+        all-ids []]
+    (com/modal-card-advanced
+     {:class "md:w-[750px] md:h-[600px] w-full h-full"}
+     (com/modal-header {}
+                       [:div.p-2 "Bulk editing " (count all-ids) " transactions"])
+     (com/modal-body {}
+                     [:div.space-y-4.p-4
+                      [:div.grid.grid-cols-2.gap-4
+                       ;; Vendor field
+                       [:div
+                        (com/validated-field
+                         {:label "Vendor"
+                          :errors (get errors :vendor)}
+                         (com/typeahead {:name "vendor"
+                                         :placeholder "Search for vendor..."
+                                         :url (bidi/path-for auto-ap.ssr-routes/only-routes :vendor-search)
+                                         :value vendor
+                                         :content-fn (fn [c]
+                                                       (try
+                                                         (pull-attr (dc/db conn) :vendor/name c)
+                                                         (catch Exception e
+                                                           "Vendor")))}))]
+
+                       ;; Approval status field
+                       [:div
+                        (com/validated-field
+                         {:label "Status"
+                          :errors (get errors :approval-status)}
+                         (com/select {:name "approval-status"
+                                      :value (some-> approval-status name)
+                                      :allow-blank? true
+                                      :options [["" "No Change"]
+                                                ["approved" "Approved"]
+                                                ["unapproved" "Unapproved"]
+                                                ["suppressed" "Suppressed"]
+                                                ["requires_feedback" "Requires Feedback"]]}))]]
+
+                      ;; Accounts section
+                      [:div.col-span-2.pt-4
+                       [:h3.text-lg.font-medium.mb-3 "Expense Accounts"]
+                       (com/validated-field
+                        {:errors (get errors :accounts)}
+                        [:table.w-full.text-sm.text-left
+                         [:thead
+                          [:tr
+                           [:th "Account"]
+                           [:th {:class "w-32"} "Location"]
+                           [:th {:class "w-16"} "%"]
+                           [:th {:class "w-16"}]]]
+                         [:tbody
+                          (map-indexed
+                           (fn [idx account]
+                             (account-row idx account (get errors :accounts) request))
+                           accounts)]])]
+
+                      ;; Add new account button
+                      [:div
+                       (com/button {:color :secondary
+                                    :type "button"
+                                    :class "mt-2"
+                                    "@click" (str "
+                                      const tbody = this.closest('form').querySelector('tbody');
+                                      const newRow = document.createElement('tr');
+                                      newRow.innerHTML = `
+                                        <td><input type='text' name='accounts[" (count accounts) "][account]' placeholder='Account ID' class='w-full'></td>
+                                        <td><input type='text' name='accounts[" (count accounts) "][location]' value='Shared' class='w-full'></td>
+                                        <td><input type='number' name='accounts[" (count accounts) "][percentage]' class='w-16'></td>
+                                        <td><button type='button' onclick='this.closest(\"tr\").remove()'>×</button></td>
+                                      `;
+                                      tbody.appendChild(newRow);
+                                    ")}
+                                   "New account")]])
+
+     (com/modal-footer {}
+                       [:div.flex.justify-end
+                        [:div.flex.items-baseline.gap-x-4
+                         (com/form-errors {:errors (seq errors)})
+                         (com/button {:color :primary :type "submit" :class "w-32"} "Save")]]))))
+
+(def trial-step-config
+  {:key :bulk-code
+   :schema bulk-code-schema
+   :fields [:vendor :approval-status :accounts]
+   :render render-bulk-code-form
+   :submit-route "/transaction/bulk-code-trial"
+   :done-fn (fn [data request]
+              (modal-response
+               (com/success-modal {:title "Transactions Coded (Trial)"}
+                                  [:p "This was a trial run. No transactions were actually modified."])
+               :headers {"hx-trigger" "refreshTable"}))})
+
+(defn open-trial [request]
+  (let [wizard-id (ws/create! {})]
+    (modal-response
+     (wt/render-step {:wizard-id wizard-id
+                      :step-config trial-step-config
+                      :request request}))))
+
+(defn submit-trial [request]
+  (wt/handle-submit trial-step-config request))

src/clj/auto_ap/ssr/transaction/common.clj

@@ -440,6 +440,12 @@
                                                  "x-bind:hx-vals" "JSON.stringify({selected: $data.selected, 'all-selected': $data.all_selected})"
                                                  "hx-include" "#transaction-filters"}
                                                 "Code")
+                                     (com/button {:color :secondary
+                                                  :hx-get (bidi/path-for ssr-routes/only-routes ::route/bulk-code-trial)
+                                                  :hx-target "#modal-holder"
+                                                  "x-bind:hx-vals" "JSON.stringify({selected: $data.selected, 'all-selected': $data.all_selected})"
+                                                  "hx-include" "#transaction-filters"}
+                                                 "Code (Trial)")
                                     (com/button {:color :primary
                                                  :hx-post (bidi/path-for ssr-routes/only-routes ::route/bulk-delete)
                                                  :hx-target "#modal-holder"

src/clj/auto_ap/ssr/transaction/edit.clj

@@ -514,7 +514,6 @@
             :hx-post (bidi/path-for ssr-routes/only-routes ::route/edit-vendor-changed)
             :hx-target "#manual-coding-section"
             :hx-swap "outerHTML"
-            :hx-sync "this:replace"
             :hx-include "closest form"}
       (fc/with-field :transaction/vendor
         (com/validated-field
@@ -883,13 +882,9 @@
     #_(require-approval (mut/select-keys (mm/form-schema linear-wizard) #{:transaction/client :transaction/vendor :transaction/memo :transaction/approval-status :db/id}))
     (mm/form-schema linear-wizard))
 
-  (render-step [this {{:keys [snapshot step-params] :as multi-form-state} :multi-form-state :as request}]
+  (render-step [this {{:keys [snapshot] :as multi-form-state} :multi-form-state :as request}]
     (let [tx-id (mm/get-mfs-field multi-form-state :db/id)
-          tx (d-transactions/get-by-id tx-id)
-          ;; Preserve explicit mode choice from step-params; only fall back to
-          ;; row-count heuristic on initial load when no mode has been chosen.
-          mode (keyword (or (:mode step-params)
-                            (name (manual-mode-initial snapshot))))]
+          tx (d-transactions/get-by-id tx-id)]
       (mm/default-render-step
        linear-wizard this
        :head [:div.p-2 "Edit Transaction"]
@@ -955,7 +950,7 @@
                  (transaction-rules-view request)]
                 [:div {:x-show "activeForm === 'manual'", :x-transition:enter "transition ease-out duration-500", :x-transition:enter-start "opacity-0 transform scale-95", :x-transition:enter-end "opacity-100 transform scale-100"}
                  [:div {}
-                  (manual-coding-section* mode request)
+                  (manual-coding-section* (manual-mode-initial snapshot) request)
                   (fc/with-field :transaction/approval-status
                     (com/validated-field
                      {:label "Status"
@@ -1434,13 +1429,10 @@
   (let [multi-form-state (:multi-form-state request)
         snapshot (:snapshot multi-form-state)
         step-params (:step-params multi-form-state)
-        mode (keyword (or (:mode step-params)
-                          (get (:form-params request) "mode")
-                          "simple"))
+        mode (keyword (or (:mode step-params) "simple"))
         client-id (or (:transaction/client snapshot)
                       (-> request :entity :transaction/client :db/id))
         vendor-id (or (:transaction/vendor step-params)
-                      (->db-id (get step-params "transaction/vendor"))
                       (:transaction/vendor snapshot))
         total (Math/abs (or (-> request :entity :transaction/amount)
                             (:transaction/amount snapshot)
@@ -1448,30 +1440,18 @@
         amount-mode (or (:amount-mode snapshot) "$")
         existing-accounts (or (seq (:transaction/accounts step-params))
                               (seq (:transaction/accounts snapshot)))
-        ;; The form always submits an account row (even when empty with account=nil),
-        ;; so we check if any row has a meaningful account ID.
-        has-meaningful-accounts? (some #(some? (:transaction-account/account %))
-                                       existing-accounts)
-        ;; Simple mode: always populate vendor default (overwrite existing).
-        ;; Advanced mode: populate only when 0 rows OR 1 empty row.
-        should-populate? (case mode
-                           :simple true
-                           :advanced (or (empty? existing-accounts)
-                                         (and (= 1 (count existing-accounts))
-                                              (not has-meaningful-accounts?))))
-        default-account (when (and should-populate? vendor-id client-id)
+        default-account (when (and (empty? existing-accounts) vendor-id client-id)
                           (vendor-default-account vendor-id client-id))
         render-request
-        (-> (if (and should-populate? vendor-id client-id)
-              (let [new-account (cond-> {:db/id (str (java.util.UUID/randomUUID))
-                                         :transaction-account/location (or (:account/location default-account) "Shared")
-                                         :transaction-account/amount (if (= amount-mode "%") 100.0 total)}
-                                   default-account (assoc :transaction-account/account (:db/id default-account)))]
-                (-> request
-                    (assoc-in [:multi-form-state :snapshot :transaction/accounts] [new-account])
-                    (assoc-in [:multi-form-state :step-params :transaction/accounts] [new-account])))
-              request)
-            (assoc-in [:multi-form-state :step-params :transaction/vendor] vendor-id))]
+        (if (and (empty? existing-accounts) vendor-id client-id)
+          (let [new-account (cond-> {:db/id (str (java.util.UUID/randomUUID))
+                                     :transaction-account/location (or (:account/location default-account) "Shared")
+                                     :transaction-account/amount (if (= amount-mode "%") 100.0 total)}
+                              default-account (assoc :transaction-account/account (:db/id default-account)))]
+            (-> request
+                (assoc-in [:multi-form-state :snapshot :transaction/accounts] [new-account])
+                (assoc-in [:multi-form-state :step-params :transaction/accounts] [new-account])))
+          request)]
     (html-response
      (fc/start-form (:multi-form-state render-request) nil
                     (fc/with-field :step-params

src/cljc/auto_ap/routes/transactions.cljc

@@ -10,7 +10,9 @@
                  "/bulk-code" {:get ::bulk-code
                                :put ::bulk-code-submit
                                "/new-account" ::bulk-code-new-account
-                               "/vendor-changed" ::bulk-code-vendor-changed}}
+                               "/vendor-changed" ::bulk-code-vendor-changed}
+                 "/bulk-code-trial" {:get ::bulk-code-trial
+                                     :post ::bulk-code-trial-submit}}
              "/new" {:get ::new
                      :post ::new-submit
                      "/location-select" ::location-select

test/clj/auto_ap/ssr/components/wizard_trial/core_test.clj

@@ -0,0 +1,114 @@
+(ns auto-ap.ssr.components.wizard-trial.core-test
+  (:require
+   [auto-ap.ssr.components.wizard-trial.core :as sut]
+   [auto-ap.ssr.components.wizard-trial.state :as ws]
+   [clojure.test :refer [deftest is testing]]
+   [hiccup.core :as hiccup]))
+
+(deftest render-step-test
+  (testing "render-step produces a form with hidden wizard-id and step-key inputs"
+    (let [wizard-id (ws/create! {})
+          step-config {:key :test-step
+                       :render (fn [{:keys [step-data errors request]}]
+                                 [:div (str "data: " step-data) (when errors [:span.error (str errors)])])
+                       :submit-route "/test-submit"}
+          result (sut/render-step {:wizard-id wizard-id
+                                   :step-config step-config
+                                   :request {}})]
+      (is (= :form (first result)))
+      (let [attrs (second result)
+            children (drop 2 result)]
+        (is (= "/test-submit" (:hx-post attrs)))
+        (is (= "this" (:hx-target attrs)))
+        (let [html (hiccup/html result)]
+          (is (re-find #"name=\"wizard-id\"" html))
+          (is (re-find #"value=\"" html))
+          (is (re-find #"name=\"step-key\"" html))
+          (is (re-find #"value=\"test-step\"" html))))))
+
+  (testing "render-step passes step-data, errors, and request to the render function"
+    (let [wizard-id (ws/create! {:test-step {:field "value"}})
+          captured (atom nil)
+          step-config {:key :test-step
+                       :render (fn [args] (reset! captured args) [:div "rendered"])
+                       :submit-route "/test-submit"}
+          _ (sut/render-step {:wizard-id wizard-id
+                              :step-config step-config
+                              :request {:client-id 123}
+                              :errors {:field ["is invalid"]}})
+          {:keys [step-data errors request]} @captured]
+      (is (= {:field "value"} step-data))
+      (is (= {:field ["is invalid"]} errors))
+      (is (= {:client-id 123} request)))))
+
+(deftest handle-submit-test
+  (testing "handle-submit with valid data saves step and calls done-fn"
+    (let [done-result (atom nil)
+          wizard-id (ws/create! {})
+          step-config {:key :test-step
+                       :schema [:map [:name :string]]
+                       :fields [:name]
+                       :render (fn [_] [:div "rendered"])
+                       :submit-route "/test-submit"
+                       :done-fn (fn [data request]
+                                  (reset! done-result {:data data :request request})
+                                  {:status 200 :body "done"})}
+          request {:form-params {"wizard-id" wizard-id
+                                 "step-key" "test-step"
+                                 "name" "Alice"}}
+          response (sut/handle-submit step-config request)]
+      (is (= 200 (:status response)))
+      (is (= "done" (:body response)))
+      (is (= "Alice" (get-in @done-result [:data :name])))
+      (is (nil? (ws/get-wizard wizard-id)) "Wizard session should be destroyed after successful submit")))
+
+  (testing "handle-submit with invalid data re-renders step with errors"
+    (let [wizard-id (ws/create! {})
+          step-config {:key :test-step
+                       :schema [:map [:name :string]]
+                       :fields [:name]
+                       :render (fn [{:keys [errors]}]
+                                 [:div (when errors [:span.error (str errors)])])
+                       :submit-route "/test-submit"
+                       :done-fn (fn [_ _] {:status 200 :body "done"})}
+          request {:form-params {"wizard-id" wizard-id
+                                 "step-key" "test-step"
+                                 "name" ""}}
+          response (sut/handle-submit step-config request)]
+      (is (= 200 (:status response)))
+      (is (string? (:body response)))
+      (is (re-find #"error" (:body response)) "Response body should contain error markup")
+      (is (some? (ws/get-wizard wizard-id)) "Wizard session should still exist after failed validation")))
+
+  (testing "handle-submit with missing required field shows validation error"
+    (let [wizard-id (ws/create! {})
+          step-config {:key :test-step
+                       :schema [:map [:name :string]]
+                       :fields [:name]
+                       :render (fn [{:keys [errors]}]
+                                 [:div (when errors [:span.error (str errors)])])
+                       :submit-route "/test-submit"
+                       :done-fn (fn [_ _] {:status 200 :body "done"})}
+          request {:form-params {"wizard-id" wizard-id
+                                 "step-key" "test-step"}}
+          response (sut/handle-submit step-config request)]
+      (is (= 200 (:status response)))
+      (is (re-find #"error" (:body response)) "Response body should contain error markup for missing field")))
+
+  (testing "handle-submit decodes step data using main-transformer"
+    (let [done-result (atom nil)
+          wizard-id (ws/create! {})
+          step-config {:key :test-step
+                       :schema [:map [:count int?]]
+                       :fields [:count]
+                       :render (fn [_] [:div "rendered"])
+                       :submit-route "/test-submit"
+                       :done-fn (fn [data _]
+                                  (reset! done-result data)
+                                  {:status 200 :body "done"})}
+          request {:form-params {"wizard-id" wizard-id
+                                 "step-key" "test-step"
+                                 "count" "42"}}
+          response (sut/handle-submit step-config request)]
+      (is (= 200 (:status response)))
+      (is (= 42 (:count @done-result)) "String count should be decoded to integer"))))

test/clj/auto_ap/ssr/components/wizard_trial/state_test.clj

@@ -0,0 +1,76 @@
+(ns auto-ap.ssr.components.wizard-trial.state-test
+  (:require
+   [auto-ap.ssr.components.wizard-trial.state :as sut]
+   [clojure.test :refer [deftest is testing]]))
+
+(deftest create-and-get-wizard-test
+  (testing "Session creation returns a non-nil wizard-id"
+    (let [wizard-id (sut/create! {:foo "bar"})]
+      (is (string? wizard-id))
+      (is (seq wizard-id))))
+
+  (testing "Session retrieval returns the stored data"
+    (let [wizard-id (sut/create! {:foo "bar"})
+          wizard (sut/get-wizard wizard-id)]
+      (is (map? wizard))
+      (is (= {:foo "bar"} (:data wizard)))
+      (is (inst? (:created-at wizard)))))
+
+  (testing "Session retrieval returns nil for unknown id"
+    (is (nil? (sut/get-wizard "non-existent-id")))))
+
+(deftest update-step-test
+  (testing "update-step! merges data into the specified step key"
+    (let [wizard-id (sut/create! {})
+          _ (sut/update-step! wizard-id :step1 {:field-a "a"})
+          wizard (sut/get-wizard wizard-id)]
+      (is (= {:field-a "a"} (get-in wizard [:data :step1])))))
+
+  (testing "update-step! merges without overwriting other step keys"
+    (let [wizard-id (sut/create! {})
+          _ (sut/update-step! wizard-id :step1 {:field-a "a"})
+          _ (sut/update-step! wizard-id :step2 {:field-b "b"})
+          wizard (sut/get-wizard wizard-id)]
+      (is (= {:field-a "a"} (get-in wizard [:data :step1])))
+      (is (= {:field-b "b"} (get-in wizard [:data :step2])))))
+
+  (testing "update-step! merges within the same step key"
+    (let [wizard-id (sut/create! {})
+          _ (sut/update-step! wizard-id :step1 {:field-a "a"})
+          _ (sut/update-step! wizard-id :step1 {:field-b "b"})
+          wizard (sut/get-wizard wizard-id)]
+      (is (= {:field-a "a" :field-b "b"} (get-in wizard [:data :step1]))))))
+
+(deftest destroy-test
+  (testing "destroy! removes the wizard session"
+    (let [wizard-id (sut/create! {:foo "bar"})
+          _ (sut/destroy! wizard-id)]
+      (is (nil? (sut/get-wizard wizard-id)))))
+
+  (testing "destroy! is a no-op for unknown id"
+    (sut/destroy! "non-existent-id")
+    (is (nil? (sut/get-wizard "non-existent-id")))))
+
+(deftest get-all-data-test
+  (testing "get-all-data merges non-map values and map values from all steps"
+    (let [wizard-id (sut/create! {:client-id 123})
+          _ (sut/update-step! wizard-id :step1 {:vendor 456})
+          _ (sut/update-step! wizard-id :step2 {:accounts [{:account 1}]})
+          all-data (sut/get-all-data wizard-id)]
+      (is (= {:client-id 123 :vendor 456 :accounts [{:account 1}]} all-data))))
+
+  (testing "get-all-data returns nil for unknown id"
+    (is (nil? (sut/get-all-data "non-existent-id")))))
+
+(deftest session-exists-test
+  (testing "Session exists after creation"
+    (let [wizard-id (sut/create! {})]
+      (is (some? (sut/get-wizard wizard-id)))))
+
+  (testing "Session does not exist after destruction"
+    (let [wizard-id (sut/create! {})
+          _ (sut/destroy! wizard-id)]
+      (is (nil? (sut/get-wizard wizard-id)))))
+
+  (testing "Session does not exist for random id"
+    (is (nil? (sut/get-wizard (str (java.util.UUID/randomUUID)))))))

test/clj/auto_ap/ssr/transaction/bulk_code_trial_test.clj

@@ -0,0 +1,104 @@
+(ns auto-ap.ssr.transaction.bulk-code-trial-test
+  (:require
+   [auto-ap.ssr.components.wizard-trial.state :as ws]
+   [auto-ap.ssr.transaction.bulk-code-trial :as sut]
+   [clojure.test :refer [deftest is testing use-fixtures]]
+   [mount.core :as mount]))
+
+(use-fixtures :each
+  (fn [test-fn]
+    (mount/start #'auto-ap.datomic/conn)
+    (test-fn)
+    (mount/stop #'auto-ap.datomic/conn)))
+
+(deftest open-trial-test
+  (testing "open-trial returns modal-response with a form containing expected fields"
+    (let [response (sut/open-trial {})]
+      (is (= 200 (:status response)))
+      (is (= "text/html" (get-in response [:headers "Content-Type"])))
+      (let [body (:body response)]
+        (is (string? body))
+        (is (re-find #"modal-card" body) "Should contain modal card structure")
+        (is (re-find #"Bulk editing" body) "Should show header with transaction count")
+        (is (re-find #"Vendor" body) "Form should contain Vendor label")
+        (is (re-find #"Status" body) "Form should contain Status label")
+        (is (re-find #"Expense Accounts" body) "Form should contain Expense Accounts heading")
+        (is (re-find #"Account" body) "Form should contain Account column header")
+        (is (re-find #"Location" body) "Form should contain Location column header")
+        (is (re-find #"%" body) "Form should contain percentage column header")
+        (is (re-find #"Save" body) "Form should contain Save button")
+        (is (re-find #"New account" body) "Form should contain New account button")
+        (is (re-find #"name=\"wizard-id\"" body) "Form should contain hidden wizard-id input")
+        (is (re-find #"name=\"step-key\"" body) "Form should contain hidden step-key input")))))
+
+(deftest submit-trial-valid-test
+  (testing "submit-trial with valid data returns success response and destroys session"
+    (let [wizard-id (ws/create! {})
+          request {:form-params {"wizard-id" wizard-id
+                                 "step-key" "bulk-code"
+                                 "vendor" "123"
+                                 "approval-status" "approved"
+                                 "accounts[0][account]" "1"
+                                 "accounts[0][location]" "DT"
+                                 "accounts[0][percentage]" "50"}}
+          response (sut/submit-trial request)]
+      (is (= 200 (:status response)))
+      (is (re-find #"Transactions Coded" (:body response)) "Response should indicate success")
+      (is (nil? (ws/get-wizard wizard-id)) "Wizard session should be destroyed after successful submit"))))
+
+(deftest submit-trial-invalid-test
+  (testing "submit-trial with invalid vendor id shows validation error"
+    (let [wizard-id (ws/create! {})
+          request {:form-params {"wizard-id" wizard-id
+                                 "step-key" "bulk-code"
+                                 "vendor" "not-a-number"
+                                 "approval-status" "approved"}}
+          response (sut/submit-trial request)]
+      (is (= 200 (:status response)))
+      (is (re-find #"error" (:body response)) "Response should contain error markup for invalid vendor")
+      (is (some? (ws/get-wizard wizard-id)) "Wizard session should persist after failed validation")))
+
+  (testing "submit-trial with invalid account data shows validation error"
+    (let [wizard-id (ws/create! {})
+          request {:form-params {"wizard-id" wizard-id
+                                 "step-key" "bulk-code"
+                                 "accounts[0][account]" "not-a-number"
+                                 "accounts[0][location]" "DT"
+                                 "accounts[0][percentage]" "50"}}
+          response (sut/submit-trial request)]
+      (is (= 200 (:status response)))
+      (is (re-find #"error" (:body response)) "Response should contain error markup for invalid account")
+      (is (some? (ws/get-wizard wizard-id)) "Wizard session should persist after failed validation")))
+
+  (testing "submit-trial with percentage over 100% shows validation error"
+    (let [wizard-id (ws/create! {})
+          request {:form-params {"wizard-id" wizard-id
+                                 "step-key" "bulk-code"
+                                 "accounts[0][account]" "1"
+                                 "accounts[0][location]" "DT"
+                                 "accounts[0][percentage]" "150"}}
+          response (sut/submit-trial request)]
+      (is (= 200 (:status response)))
+      (is (re-find #"error" (:body response)) "Response should contain error markup for percentage > 100%")
+      (is (some? (ws/get-wizard wizard-id)) "Wizard session should persist after failed validation"))))
+
+(deftest submit-trial-empty-test
+  (testing "submit-trial with empty form data shows validation errors"
+    (let [wizard-id (ws/create! {})
+          request {:form-params {"wizard-id" wizard-id
+                                 "step-key" "bulk-code"}}
+          response (sut/submit-trial request)]
+      (is (= 200 (:status response)))
+      (is (not (re-find #"Bulk code applied" (:body response))) "Empty form should not succeed")
+      (is (some? (ws/get-wizard wizard-id)) "Wizard session should persist after failed validation")))
+
+  (testing "submit-trial with no account rows selected shows validation errors"
+    (let [wizard-id (ws/create! {})
+          request {:form-params {"wizard-id" wizard-id
+                                 "step-key" "bulk-code"
+                                 "vendor" ""
+                                 "approval-status" ""}}
+          response (sut/submit-trial request)]
+      (is (= 200 (:status response)))
+      (is (not (re-find #"Bulk code applied" (:body response))) "Form with empty values should not succeed")
+      (is (some? (ws/get-wizard wizard-id)) "Wizard session should persist after failed validation"))))

test/clj/auto_ap/ssr/transaction/edit_simple_advanced_mode_test.clj

@@ -5,13 +5,12 @@
    [auto-ap.solr]
    [auto-ap.ssr.components.multi-modal :as mm]
    [auto-ap.ssr.form-cursor :as fc]
-   [auto-ap.ssr.transaction.edit
-    :refer [clientize-vendor
-            edit-vendor-changed-handler
-            edit-wizard-toggle-mode-handler
-            location-select*
-            manual-coding-section*
-            vendor-default-account]]
+   [auto-ap.ssr.transaction.edit :refer [clientize-vendor
+                                         edit-vendor-changed-handler
+                                         edit-wizard-toggle-mode-handler
+                                         location-select*
+                                         manual-coding-section*
+                                         vendor-default-account]]
    [clojure.test :refer [deftest is testing use-fixtures]]
    [datomic.api :as dc]
    [hiccup.core :as hiccup]))
@@ -53,7 +52,7 @@
   (testing "AC3: multi-account (2+) transaction opens in advanced mode"
     (is (= :advanced (manual-mode-initial {:db/id 123
                                            :transaction/accounts [{:transaction-account/account 1}
-                                                                  {:transaction-account/account 2}]})))
+                                                                   {:transaction-account/account 2}]})))
     (is (= :advanced (manual-mode-initial {:db/id 123
                                            :transaction/accounts [{} {} {}]})))))
 
@@ -106,7 +105,7 @@
       (is (re-find #"Test Account" body)
           "Response should contain the vendor's default account name")))
 
-  (testing "AC5: vendor selection in simple mode DOES overwrite already-set account"
+  (testing "AC5: vendor selection in simple mode does NOT overwrite already-set account"
     (let [result @(dc/transact conn [{:db/id "vendor-id"
                                       :vendor/name "Test Vendor"}
                                      {:db/id "account-id"
@@ -127,10 +126,9 @@
                                       :transaction/client "client-id"}])
           tx-id (tempid->id result "transaction-id")
           vendor-id (tempid->id result "vendor-id")
-          account-id (tempid->id result "account-id")
           other-account-id (tempid->id result "other-account-id")
           client-id (tempid->id result "client-id")
-          ;; existing-accounts already set — but simple mode should still overwrite
+          ;; existing-accounts already set means vendor should NOT overwrite
           existing-accounts [{:db/id "row-id"
                               :transaction-account/account other-account-id
                               :transaction-account/location "DT"
@@ -151,12 +149,12 @@
       ;; The handler returns an html-response; verify the body is HTML
       (is (re-find #"manual-coding-section" body)
           "Response body should contain the manual-coding-section element")
-      ;; The vendor's default account SHOULD appear (overwriting previous)
-      (is (re-find (re-pattern (str account-id)) body)
-          "Vendor change in simple mode should overwrite with vendor's default account")
-      ;; The previous account should NOT appear
-      (is (not (re-find (re-pattern (str other-account-id)) body))
-          "Previous account should be replaced by vendor default"))))
+      ;; The original account ID must still appear in the rendered HTML
+      (is (re-find (re-pattern (str other-account-id)) body)
+          "Response should contain the original (pre-existing) account ID")
+      ;; The vendor's default account ID must NOT appear — it was not used
+      (is (not (re-find (re-pattern (str (tempid->id result "account-id"))) body))
+          "Response should NOT contain the vendor's default account ID when existing account is set"))))
 
 ;;; ---------------------------------------------------------------------------
 ;;; AC6: save round-trip — manual mode saves vendor + account to DB
@@ -165,18 +163,18 @@
 (deftest save-manual-round-trip-test
   (testing "AC6: save in simple mode persists vendor/account/location — re-opening shows same values"
     (let [result @(dc/transact conn [{:db/id "vendor-id"
-                                      :vendor/name "Save Vendor"}
-                                     {:db/id "account-id"
-                                      :account/name "Save Account"
-                                      :account/type :account-type/expense}
-                                     {:db/id "client-id"
-                                      :client/code "SAVECL"
-                                      :client/locations ["DT"]}
-                                     {:db/id "transaction-id"
-                                      :transaction/amount 100.0
-                                      :transaction/date #inst "2023-01-01"
-                                      :transaction/id (str (java.util.UUID/randomUUID))
-                                      :transaction/client "client-id"}])
+                                       :vendor/name "Save Vendor"}
+                                      {:db/id "account-id"
+                                       :account/name "Save Account"
+                                       :account/type :account-type/expense}
+                                      {:db/id "client-id"
+                                       :client/code "SAVECL"
+                                       :client/locations ["DT"]}
+                                      {:db/id "transaction-id"
+                                       :transaction/amount 100.0
+                                       :transaction/date #inst "2023-01-01"
+                                       :transaction/id (str (java.util.UUID/randomUUID))
+                                       :transaction/client "client-id"}])
           tx-id (tempid->id result "transaction-id")
           vendor-id (tempid->id result "vendor-id")
           account-id (tempid->id result "account-id")
@@ -936,384 +934,3 @@
       ;; Should NOT show 'Switch to simple mode'
       (is (not (re-find #"Switch to simple mode" html))
           "AC20: Simple mode should NOT show 'Switch to simple mode' link"))))
-
-;;; ---------------------------------------------------------------------------
-;;; Bug: vendor selection gets erased on vendor-changed HTMX response
-;;; ---------------------------------------------------------------------------
-
-(deftest vendor-selection-preserved-in-htmx-response-test
-  (testing "BUG: vendor selection should be preserved when HTMX re-renders the edit form"
-    (let [result @(dc/transact conn [{:db/id "vendor-id"
-                                      :vendor/name "Test Vendor"}
-                                     {:db/id "account-id"
-                                      :account/name "Existing Account"
-                                      :account/type :account-type/expense}
-                                     {:db/id "client-id"
-                                      :client/code "VENDORCL"
-                                      :client/locations ["DT"]}
-                                     {:db/id "transaction-id"
-                                      :transaction/amount 100.0
-                                      :transaction/date #inst "2023-01-01"
-                                      :transaction/id (str (java.util.UUID/randomUUID))
-                                      :transaction/client "client-id"}])
-          tx-id (tempid->id result "transaction-id")
-          vendor-id (tempid->id result "vendor-id")
-          account-id (tempid->id result "account-id")
-          client-id (tempid->id result "client-id")
-          ;; Simulate the request after middleware decoding.
-          ;; In production, form values arrive as strings. The middleware decodes
-          ;; step-params with keyword keys but leaves values as strings.
-          existing-accounts [{:db/id "row-1"
-                              :transaction-account/account account-id
-                              :transaction-account/location "DT"
-                              :transaction-account/amount 100.0}]
-          request {:multi-form-state (mm/->MultiStepFormState
-                                      {:db/id tx-id
-                                       :transaction/client client-id
-                                       :transaction/accounts existing-accounts}
-                                      []
-                                      {:mode "simple"
-                                       ;; This is how the vendor ID arrives from the form:
-                                       ;; as a string, not a long.
-                                       :transaction/vendor (str vendor-id)
-                                       :transaction/accounts existing-accounts})
-                   :entity {:db/id tx-id
-                            :transaction/client {:db/id client-id}
-                            :transaction/amount 100.0}}
-          ;; The handler should return a successful response with the vendor
-          ;; preserved. Currently it crashes because the string vendor-id is
-          ;; not converted to a long before being passed to Datomic.
-          response (try
-                     (edit-vendor-changed-handler request)
-                     (catch Exception e
-                       {:error e}))]
-      (is (not (:error response))
-          (str "BUG: String vendor-id from form submission should be converted to long. "
-               "Server crashes with: " (some-> response :error ex-message)))
-      (when-not (:error response)
-        (is (= 200 (:status response))
-            "Response should be successful")
-        (is (re-find #"Test Vendor" (:body response))
-            "Vendor name should appear in the HTMX response")
-        (is (re-find (re-pattern (str vendor-id)) (:body response))
-            "Vendor ID should be preserved in the response HTML")))))
-
-;;; ---------------------------------------------------------------------------
-;;; Bug: vendor change does not populate account
-;;; ---------------------------------------------------------------------------
-
-(deftest vendor-change-simple-mode-overwrites-test
-  (testing "BUG: vendor change in simple mode should overwrite existing account"
-    ;; When a vendor is changed in simple mode, it should always populate
-    ;; the vendor's default account, even if an account was already set.
-    (let [result @(dc/transact conn [{:db/id "vendor-id"
-                                      :vendor/name "Vendor With Default"}
-                                     {:db/id "vendor-account-id"
-                                      :account/name "Vendor Default Account"
-                                      :account/type :account-type/expense}
-                                     {:db/id "vendor-id"
-                                      :vendor/default-account "vendor-account-id"}
-                                     {:db/id "existing-account-id"
-                                      :account/name "Previously Selected Account"
-                                      :account/type :account-type/expense}
-                                     {:db/id "client-id"
-                                      :client/code "VENDORCL"
-                                      :client/locations ["DT"]}
-                                     {:db/id "transaction-id"
-                                      :transaction/amount 100.0
-                                      :transaction/date #inst "2023-01-01"
-                                      :transaction/id (str (java.util.UUID/randomUUID))
-                                      :transaction/client "client-id"}])
-          tx-id (tempid->id result "transaction-id")
-          vendor-id (tempid->id result "vendor-id")
-          vendor-account-id (tempid->id result "vendor-account-id")
-          existing-account-id (tempid->id result "existing-account-id")
-          client-id (tempid->id result "client-id")
-          ;; Simulate form state with an already-selected account (as the form submits)
-          existing-accounts [{:db/id "row-1"
-                              :transaction-account/account existing-account-id
-                              :transaction-account/location "DT"
-                              :transaction-account/amount 100.0}]
-          request {:multi-form-state (mm/->MultiStepFormState
-                                      {:db/id tx-id
-                                       :transaction/client client-id
-                                       :transaction/accounts existing-accounts}
-                                      []
-                                      {:mode "simple"
-                                       :transaction/vendor vendor-id
-                                       :transaction/accounts existing-accounts})
-                   :entity {:db/id tx-id
-                            :transaction/client {:db/id client-id}
-                            :transaction/amount 100.0}}
-          response (edit-vendor-changed-handler request)
-          body (:body response)]
-      ;; The vendor's default account SHOULD appear (overwriting the previous)
-      (is (re-find (re-pattern (str vendor-account-id)) body)
-          "BUG: Vendor change in simple mode should overwrite with vendor's default account")
-      ;; The previously selected account should NOT appear
-      (is (not (re-find (re-pattern (str existing-account-id)) body))
-          "Previously selected account should be replaced by vendor default")
-      (is (re-find #"Vendor Default Account" body)
-          "Vendor default account name should appear"))))
-
-(deftest vendor-change-advanced-mode-empty-row-test
-  (testing "BUG: vendor change in advanced mode should populate empty row"
-    ;; In advanced mode with 1 empty row, changing vendor should populate it
-    (let [result @(dc/transact conn [{:db/id "vendor-id"
-                                      :vendor/name "Vendor With Default"}
-                                     {:db/id "vendor-account-id"
-                                      :account/name "Vendor Default Account"
-                                      :account/type :account-type/expense}
-                                     {:db/id "vendor-id"
-                                      :vendor/default-account "vendor-account-id"}
-                                     {:db/id "client-id"
-                                      :client/code "ADVEMPTYCL"
-                                      :client/locations ["DT"]}
-                                     {:db/id "transaction-id"
-                                      :transaction/amount 100.0
-                                      :transaction/date #inst "2023-01-01"
-                                      :transaction/id (str (java.util.UUID/randomUUID))
-                                      :transaction/client "client-id"}])
-          tx-id (tempid->id result "transaction-id")
-          vendor-id (tempid->id result "vendor-id")
-          vendor-account-id (tempid->id result "vendor-account-id")
-          client-id (tempid->id result "client-id")
-          ;; Simulate advanced mode with 1 empty row (account=nil, as form submits)
-          empty-row [{:db/id "row-1"
-                      :transaction-account/account nil
-                      :transaction-account/location "Shared"
-                      :transaction-account/amount 100.0}]
-          request {:multi-form-state (mm/->MultiStepFormState
-                                      {:db/id tx-id
-                                       :transaction/client client-id
-                                       :transaction/accounts empty-row}
-                                      []
-                                      {:mode "advanced"
-                                       :transaction/vendor vendor-id
-                                       :transaction/accounts empty-row})
-                   :entity {:db/id tx-id
-                            :transaction/client {:db/id client-id}
-                            :transaction/amount 100.0}}
-          response (edit-vendor-changed-handler request)
-          body (:body response)]
-      ;; The vendor's default account SHOULD appear in the row
-      (is (re-find (re-pattern (str vendor-account-id)) body)
-          "BUG: Vendor change in advanced mode with empty row should populate it")
-      (is (re-find #"Vendor Default Account" body)
-          "Vendor default account name should appear in the row"))))
-
-(deftest vendor-change-advanced-mode-filled-row-test
-  (testing "AC15b: vendor change in advanced mode with filled row should NOT overwrite"
-    ;; In advanced mode with 1 row that already has an account selected,
-    ;; changing vendor should NOT overwrite it
-    (let [result @(dc/transact conn [{:db/id "vendor-id"
-                                      :vendor/name "Vendor With Default"}
-                                     {:db/id "vendor-account-id"
-                                      :account/name "Vendor Default Account"
-                                      :account/type :account-type/expense}
-                                     {:db/id "vendor-id"
-                                      :vendor/default-account "vendor-account-id"}
-                                     {:db/id "existing-account-id"
-                                      :account/name "Manually Selected Account"
-                                      :account/type :account-type/expense}
-                                     {:db/id "client-id"
-                                      :client/code "ADVFILLEDCL"
-                                      :client/locations ["DT"]}
-                                     {:db/id "transaction-id"
-                                      :transaction/amount 100.0
-                                      :transaction/date #inst "2023-01-01"
-                                      :transaction/id (str (java.util.UUID/randomUUID))
-                                      :transaction/client "client-id"}])
-          tx-id (tempid->id result "transaction-id")
-          vendor-id (tempid->id result "vendor-id")
-          vendor-account-id (tempid->id result "vendor-account-id")
-          existing-account-id (tempid->id result "existing-account-id")
-          client-id (tempid->id result "client-id")
-          ;; Advanced mode with 1 row that already has an account
-          filled-row [{:db/id "row-1"
-                       :transaction-account/account existing-account-id
-                       :transaction-account/location "DT"
-                       :transaction-account/amount 100.0}]
-          request {:multi-form-state (mm/->MultiStepFormState
-                                      {:db/id tx-id
-                                       :transaction/client client-id
-                                       :transaction/accounts filled-row}
-                                      []
-                                      {:mode "advanced"
-                                       :transaction/vendor vendor-id
-                                       :transaction/accounts filled-row})
-                   :entity {:db/id tx-id
-                            :transaction/client {:db/id client-id}
-                            :transaction/amount 100.0}}
-          response (edit-vendor-changed-handler request)
-          body (:body response)]
-      ;; The existing account should still be there
-      (is (re-find (re-pattern (str existing-account-id)) body)
-          "Existing account should remain when vendor changes in advanced mode with filled row")
-      ;; The vendor's default account should NOT appear
-      (is (not (re-find (re-pattern (str vendor-account-id)) body))
-          "Vendor default should NOT overwrite filled row in advanced mode"))))
-
-(deftest vendor-change-advanced-mode-two-rows-test
-  (testing "AC15c: vendor change in advanced mode with 2+ rows should NOT modify any"
-    ;; In advanced mode with 2 or more rows, vendor change should not touch any row
-    (let [result @(dc/transact conn [{:db/id "vendor-id"
-                                      :vendor/name "Vendor With Default"}
-                                     {:db/id "vendor-account-id"
-                                      :account/name "Vendor Default Account"
-                                      :account/type :account-type/expense}
-                                     {:db/id "vendor-id"
-                                      :vendor/default-account "vendor-account-id"}
-                                     {:db/id "account-1"
-                                      :account/name "Account One"
-                                      :account/type :account-type/expense}
-                                     {:db/id "account-2"
-                                      :account/name "Account Two"
-                                      :account/type :account-type/expense}
-                                     {:db/id "client-id"
-                                      :client/code "ADVTWOROWCL"
-                                      :client/locations ["DT"]}
-                                     {:db/id "transaction-id"
-                                      :transaction/amount 100.0
-                                      :transaction/date #inst "2023-01-01"
-                                      :transaction/id (str (java.util.UUID/randomUUID))
-                                      :transaction/client "client-id"}])
-          tx-id (tempid->id result "transaction-id")
-          vendor-id (tempid->id result "vendor-id")
-          vendor-account-id (tempid->id result "vendor-account-id")
-          account-1 (tempid->id result "account-1")
-          account-2 (tempid->id result "account-2")
-          client-id (tempid->id result "client-id")
-          ;; Advanced mode with 2 rows
-          two-rows [{:db/id "row-1"
-                     :transaction-account/account account-1
-                     :transaction-account/location "DT"
-                     :transaction-account/amount 50.0}
-                    {:db/id "row-2"
-                     :transaction-account/account account-2
-                     :transaction-account/location "DT"
-                     :transaction-account/amount 50.0}]
-          request {:multi-form-state (mm/->MultiStepFormState
-                                      {:db/id tx-id
-                                       :transaction/client client-id
-                                       :transaction/accounts two-rows}
-                                      []
-                                      {:mode "advanced"
-                                       :transaction/vendor vendor-id
-                                       :transaction/accounts two-rows})
-                   :entity {:db/id tx-id
-                            :transaction/client {:db/id client-id}
-                            :transaction/amount 100.0}}
-          response (edit-vendor-changed-handler request)
-          body (:body response)]
-      ;; Both existing accounts should remain
-      (is (re-find (re-pattern (str account-1)) body)
-          "First row account should remain")
-      (is (re-find (re-pattern (str account-2)) body)
-          "Second row account should remain")
-      ;; Vendor default should NOT appear
-      (is (not (re-find (re-pattern (str vendor-account-id)) body))
-          "Vendor default should NOT modify rows when 2+ exist"))))
-
-(deftest vendor-change-client-specific-override-test
-  (testing "BUG: vendor change should use client-specific account override if present"
-    ;; When a vendor has a client-specific account override, changing vendor
-    ;; should populate the client-specific account, not the global default.
-    (let [result @(dc/transact conn [{:db/id "global-account-id"
-                                      :account/name "Global Default"
-                                      :account/type :account-type/expense}
-                                     {:db/id "client-specific-account-id"
-                                      :account/name "Client Specific Account"
-                                      :account/type :account-type/expense}
-                                     {:db/id "client-id"
-                                      :client/code "CLIOVERRIDE"
-                                      :client/locations ["DT"]}
-                                     {:db/id "vendor-id"
-                                      :vendor/name "Clientized Vendor"
-                                      :vendor/default-account "global-account-id"
-                                      :vendor/account-overrides [{:vendor-account-override/client "client-id"
-                                                                  :vendor-account-override/account "client-specific-account-id"}]}])
-          vendor-id (tempid->id result "vendor-id")
-          client-id (tempid->id result "client-id")
-          global-account-id (tempid->id result "global-account-id")
-          client-specific-account-id (tempid->id result "client-specific-account-id")
-          ;; Simple mode with empty account row
-          empty-row [{:db/id "row-1"
-                      :transaction-account/account nil
-                      :transaction-account/location "Shared"
-                      :transaction-account/amount 100.0}]
-          request {:multi-form-state (mm/->MultiStepFormState
-                                      {:db/id 999999
-                                       :transaction/client client-id
-                                       :transaction/accounts empty-row}
-                                      []
-                                      {:mode "simple"
-                                       :transaction/vendor vendor-id
-                                       :transaction/accounts empty-row})
-                   :entity {:db/id 999999
-                            :transaction/client {:db/id client-id}
-                            :transaction/amount 100.0}}
-          response (edit-vendor-changed-handler request)
-          body (:body response)]
-      ;; The client-specific account should appear, not the global default
-      (is (re-find (re-pattern (str client-specific-account-id)) body)
-          "BUG: Vendor change should populate client-specific account override")
-      (is (re-find #"Client Specific Account" body)
-          "Client-specific account name should appear")
-      ;; The global default should NOT appear
-      (is (not (re-find (re-pattern (str global-account-id)) body))
-          "Global vendor default should NOT appear when client override exists"))))
-
-;;; Update AC5: simple mode SHOULD overwrite existing accounts
-(deftest vendor-change-simple-mode-overwrites-ac5-test
-  (testing "AC5 UPDATED: vendor selection in simple mode DOES overwrite already-set account"
-    (let [result @(dc/transact conn [{:db/id "vendor-id"
-                                      :vendor/name "Test Vendor"}
-                                     {:db/id "account-id"
-                                      :account/name "Test Account"
-                                      :account/type :account-type/expense}
-                                     {:db/id "vendor-id"
-                                      :vendor/default-account "account-id"}
-                                     {:db/id "other-account-id"
-                                      :account/name "Other Account"
-                                      :account/type :account-type/expense}
-                                     {:db/id "client-id"
-                                      :client/code "TESTCL2"
-                                      :client/locations ["DT"]}
-                                     {:db/id "transaction-id"
-                                      :transaction/amount 100.0
-                                      :transaction/date #inst "2023-01-01"
-                                      :transaction/id (str (java.util.UUID/randomUUID))
-                                      :transaction/client "client-id"}])
-          tx-id (tempid->id result "transaction-id")
-          vendor-id (tempid->id result "vendor-id")
-          account-id (tempid->id result "account-id")
-          other-account-id (tempid->id result "other-account-id")
-          client-id (tempid->id result "client-id")
-          ;; existing-accounts already set — but simple mode should still overwrite
-          existing-accounts [{:db/id "row-id"
-                              :transaction-account/account other-account-id
-                              :transaction-account/location "DT"
-                              :transaction-account/amount 100.0}]
-          request {:multi-form-state (mm/->MultiStepFormState
-                                      {:db/id tx-id
-                                       :transaction/client client-id
-                                       :transaction/accounts existing-accounts}
-                                      []
-                                      {:mode "simple"
-                                       :transaction/vendor vendor-id
-                                       :transaction/accounts existing-accounts})
-                   :entity {:db/id tx-id
-                            :transaction/client {:db/id client-id}
-                            :transaction/amount 100.0}}
-          response (edit-vendor-changed-handler request)
-          body (:body response)]
-      ;; The handler returns an html-response; verify the body is HTML
-      (is (re-find #"manual-coding-section" body)
-          "Response body should contain the manual-coding-section element")
-      ;; The vendor's default account SHOULD appear (overwriting previous)
-      (is (re-find (re-pattern (str account-id)) body)
-          "BUG: Vendor change in simple mode should overwrite with vendor's default account")
-      ;; The previous account should NOT appear
-      (is (not (re-find (re-pattern (str other-account-id)) body))
-          "Previous account should be replaced by vendor default"))))