From adf2b8efcc247d7dfaafe312380dc90f066df5db Mon Sep 17 00:00:00 2001
From: Scott Davis <stdavis@utah.gov>
Date: Tue, 1 Sep 2026 12:38:10 -0600
Subject: [PATCH 01/13] fix(add-in): prevent Update DFC

---
 .vscode/settings.json                         |  6 +++++-
 add-in/UGRC.UtransTools/Config.daml           |  2 +-
 .../Services/DfcSelectionService.cs           |  5 +++++
 .../UtransEditorDockpaneView.xaml             |  7 +++++--
 .../UtransEditorDockpaneViewModel.cs          | 21 +++++++++++++++++++
 5 files changed, 37 insertions(+), 4 deletions(-)

diff --git a/.vscode/settings.json b/.vscode/settings.json
index d5124d3..869a0bc 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -65,7 +65,11 @@
       "approve": true,
       "matchCommandLine": true
     },
-    "/^conda activate utrans-tools; ruff/": {
+    "/^conda activate utrans-tools; ruff[^;]*$/": {
+      "approve": true,
+      "matchCommandLine": true
+    },
+    "/^dotnet build \\.\\\\add-in\\\\UGRC\\.UtransTools\\\\UGRC\\.UtransTools\\.csproj --configuration Debug$/": {
       "approve": true,
       "matchCommandLine": true
     }
diff --git a/add-in/UGRC.UtransTools/Config.daml b/add-in/UGRC.UtransTools/Config.daml
index f28cff5..868fb60 100644
--- a/add-in/UGRC.UtransTools/Config.daml
+++ b/add-in/UGRC.UtransTools/Config.daml
@@ -5,7 +5,7 @@
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="http://schemas.esri.com/DADF/Registry file:///C:/Program%20Files/ArcGIS/Pro/bin/ArcGIS.Desktop.Framework.xsd">
 
-  <AddInInfo id="{f893be2f-ad95-46be-9d60-fd6dba457152}" version="1.16" desktopVersion="3.6.59527" product="ArcGISPro">
+  <AddInInfo id="{f893be2f-ad95-46be-9d60-fd6dba457152}" version="1.17" desktopVersion="3.6.59527" product="ArcGISPro">
     <Name>UGRC_UtransTools</Name>
     <Description>UGRC_UtransTools description</Description>
     <Image>Images\AddinDesktop32.png</Image>
diff --git a/add-in/UGRC.UtransTools/Services/DfcSelectionService.cs b/add-in/UGRC.UtransTools/Services/DfcSelectionService.cs
index 26f5230..5b83d83 100644
--- a/add-in/UGRC.UtransTools/Services/DfcSelectionService.cs
+++ b/add-in/UGRC.UtransTools/Services/DfcSelectionService.cs
@@ -11,6 +11,11 @@ namespace UGRC.UtransTools.Services;
 
 internal sealed class DfcSelectionService
 {
+    internal Task<bool> HasExactlyOneUtransRoadSelectedAsync(EditorLayerContext layers)
+    {
+        return QueuedTask.Run(() => layers.UtransRoads.GetSelection().GetObjectIDs().Count == 1);
+    }
+
     internal Task<DfcSelectionSnapshot?> LoadSelectedAsync(EditorLayerContext layers)
     {
         return QueuedTask.Run(() =>
diff --git a/add-in/UGRC.UtransTools/UtransEditorDockpaneView.xaml b/add-in/UGRC.UtransTools/UtransEditorDockpaneView.xaml
index 9869cae..f18b210 100644
--- a/add-in/UGRC.UtransTools/UtransEditorDockpaneView.xaml
+++ b/add-in/UGRC.UtransTools/UtransEditorDockpaneView.xaml
@@ -457,10 +457,13 @@
           <RowDefinition Height="Auto" />
         </Grid.RowDefinitions>
 
-        <GroupBox Header="Split a line OR wrong segment ID?" IsEnabled="{Binding HasReviewState}">
+        <GroupBox
+          Header="Split a line OR wrong segment ID?"
+          IsEnabled="{Binding CanRepairDfcIdentifier}"
+        >
           <StackPanel>
             <Button
-              Content="Update DFC ObjectID"
+              Content="Update DFC BASE__FID"
               Command="{Binding UpdateDfcObjectIdCommand}"
               Margin="3"
             />
diff --git a/add-in/UGRC.UtransTools/UtransEditorDockpaneViewModel.cs b/add-in/UGRC.UtransTools/UtransEditorDockpaneViewModel.cs
index b583c39..a0b1c27 100644
--- a/add-in/UGRC.UtransTools/UtransEditorDockpaneViewModel.cs
+++ b/add-in/UGRC.UtransTools/UtransEditorDockpaneViewModel.cs
@@ -36,6 +36,7 @@ internal sealed class UtransEditorDockpaneViewModel : DockPane, INotifyPropertyC
     private EditorReviewState? _newRoadValueState;
     private string _selectedDfcObjectIds = string.Empty;
     private bool _codedValueOptionsLoaded;
+    private bool _hasExactlyOneUtransRoadSelected;
 
     internal UtransEditorDockpaneViewModel()
     {
@@ -99,6 +100,8 @@ private set
             _reviewState = value;
             OnPropertyChanged();
             OnPropertyChanged(nameof(HasReviewState));
+            OnPropertyChanged(nameof(HasDfcSelection));
+            OnPropertyChanged(nameof(CanRepairDfcIdentifier));
             OnPropertyChanged(nameof(AvailableReviewState));
             OnPropertyChanged(nameof(CanAddNew));
             OnPropertyChanged(nameof(CanEditRoadValues));
@@ -109,6 +112,10 @@ private set
 
     public bool HasReviewState => ReviewState?.Selection?.UtransRoad is not null;
 
+    public bool HasDfcSelection => ReviewState?.Selection is not null;
+
+    public bool CanRepairDfcIdentifier => HasDfcSelection && _hasExactlyOneUtransRoadSelected;
+
     public bool CanAddNew =>
         _selectedNewRecords.Count > 0 || ReviewState?.Selection?.IsNotYetCopiedNewRecord == true;
 
@@ -345,6 +352,9 @@ private async Task LoadSelectedDfcAsync()
                 layers,
                 DefaultVersionMessage
             );
+            SetHasExactlyOneUtransRoadSelected(
+                await _dfcSelectionService.HasExactlyOneUtransRoadSelectedAsync(layers)
+            );
             await LoadCodedValueOptionsAsync(layers);
             RemainingDfcRecords = await _dfcSelectionService.GetRemainingCountAsync(layers);
             UtransDatabaseVersion = await versionTask;
@@ -405,6 +415,17 @@ private void SetSelectedNewRecords(IReadOnlyList<DfcSelectionSnapshot> selection
         OnPropertyChanged(nameof(RoadValueState));
     }
 
+    private void SetHasExactlyOneUtransRoadSelected(bool value)
+    {
+        if (_hasExactlyOneUtransRoadSelected == value)
+        {
+            return;
+        }
+
+        _hasExactlyOneUtransRoadSelected = value;
+        OnPropertyChanged(nameof(CanRepairDfcIdentifier));
+    }
+
     private async Task LoadCodedValueOptionsAsync(EditorLayerContext layers)
     {
         if (_codedValueOptionsLoaded)

From cdc804410bb3d6a40199c4a677a99878f8417f78 Mon Sep 17 00:00:00 2001
From: Scott Davis <stdavis@utah.gov>
Date: Tue, 1 Sep 2026 15:53:28 -0600
Subject: [PATCH 02/13] feat(add-in): allow editing change status for new
 features

This allows for ignoring features that we don't want to pull into UTRANS.
---
 CONTEXT.md                                    | 21 +++++++++++
 add-in/README.md                              |  6 ++++
 add-in/UGRC.UtransTools/Config.daml           |  2 +-
 .../Models/EditorReviewState.cs               | 16 ++++++++-
 .../UtransEditorDockpaneView.xaml             | 10 ++++--
 .../UtransEditorDockpaneViewModel.cs          | 35 ++++++++++++++++++-
 6 files changed, 84 insertions(+), 6 deletions(-)
 create mode 100644 CONTEXT.md

diff --git a/CONTEXT.md b/CONTEXT.md
new file mode 100644
index 0000000..da7b126
--- /dev/null
+++ b/CONTEXT.md
@@ -0,0 +1,21 @@
+# UTRANS Change Review
+
+This context covers the review of changes detected between county road data and UTRANS roads. It distinguishes the detected change from the optional UTRANS road it may reference.
+
+## Language
+
+**DFC result**:
+A detected feature-change record that a reviewer assesses against county road data and, when present, a linked UTRANS road.
+_Avoid_: DFC record, detected change
+
+**DFC disposition**:
+The review outcome stored on a DFC result: `COMPLETED`, `IGNORE`, or `REVISIT`.
+_Avoid_: change status
+
+**Linked UTRANS road**:
+The UTRANS road referenced by a DFC result as its target road. A DFC result may have no linked UTRANS road.
+_Avoid_: target road segment
+
+**Unlinked new record**:
+A DFC result with change type `N` and no target UTRANS road. It can be added as a new UTRANS road or assigned a non-completed disposition.
+_Avoid_: driveway candidate
diff --git a/add-in/README.md b/add-in/README.md
index 1b4b468..b811586 100644
--- a/add-in/README.md
+++ b/add-in/README.md
@@ -14,6 +14,12 @@ When multiple features are selected, the form values override the county-road va
 
 The add-in creates a UTRANS road using each selected county-road geometry and attributes, links the `DFC_RESULT` record to the new road, and marks the DFC disposition as `COMPLETED`. The map selections are cleared after the operation finishes.
 
+### Reviewing Detected Changes
+
+Select a `DFC_RESULT` feature to choose its Change Status. Use **IGNORE** for a change that should not update UTRANS, such as a driveway, or **REVISIT** to defer review. Click **Save** to store that disposition on the selected DFC result.
+
+For an unlinked new record, **Add New** remains available while Change Status is **COMPLETED**. Choosing **IGNORE** or **REVISIT** replaces it with **Save** so the record can be reviewed without creating a UTRANS road.
+
 ## Developer Set Up
 
 This project currently targets ArcGIS Pro v3.6. Make sure that your development machine has the same version of ArcGIS Pro installed.
diff --git a/add-in/UGRC.UtransTools/Config.daml b/add-in/UGRC.UtransTools/Config.daml
index 868fb60..75b216d 100644
--- a/add-in/UGRC.UtransTools/Config.daml
+++ b/add-in/UGRC.UtransTools/Config.daml
@@ -5,7 +5,7 @@
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="http://schemas.esri.com/DADF/Registry file:///C:/Program%20Files/ArcGIS/Pro/bin/ArcGIS.Desktop.Framework.xsd">
 
-  <AddInInfo id="{f893be2f-ad95-46be-9d60-fd6dba457152}" version="1.17" desktopVersion="3.6.59527" product="ArcGISPro">
+  <AddInInfo id="{f893be2f-ad95-46be-9d60-fd6dba457152}" version="1.18" desktopVersion="3.6.59527" product="ArcGISPro">
     <Name>UGRC_UtransTools</Name>
     <Description>UGRC_UtransTools description</Description>
     <Image>Images\AddinDesktop32.png</Image>
diff --git a/add-in/UGRC.UtransTools/Models/EditorReviewState.cs b/add-in/UGRC.UtransTools/Models/EditorReviewState.cs
index a4f93c2..072b526 100644
--- a/add-in/UGRC.UtransTools/Models/EditorReviewState.cs
+++ b/add-in/UGRC.UtransTools/Models/EditorReviewState.cs
@@ -19,6 +19,7 @@ internal sealed class EditorReviewState : INotifyPropertyChanged
     private string _verticalLevel = string.Empty;
     private string _speedLimit = string.Empty;
     private string _status = string.Empty;
+    private string _dfcStatus = string.Empty;
 
     internal EditorReviewState()
     {
@@ -175,7 +176,20 @@ public string SpeedLimit
         !string.Equals(VerticalLevel, _initialVerticalLevel, StringComparison.Ordinal);
     public bool IsSpeedLimitChanged =>
         !string.Equals(SpeedLimit, _initialSpeedLimit, StringComparison.Ordinal);
-    public string DfcStatus { get; set; } = string.Empty;
+    public string DfcStatus
+    {
+        get => _dfcStatus;
+        set
+        {
+            if (_dfcStatus == value)
+            {
+                return;
+            }
+
+            _dfcStatus = value;
+            OnPropertyChanged();
+        }
+    }
     public bool IsUdotRoad { get; }
     public bool IsAgrcAdjusted { get; }
 
diff --git a/add-in/UGRC.UtransTools/UtransEditorDockpaneView.xaml b/add-in/UGRC.UtransTools/UtransEditorDockpaneView.xaml
index f18b210..3a5d36a 100644
--- a/add-in/UGRC.UtransTools/UtransEditorDockpaneView.xaml
+++ b/add-in/UGRC.UtransTools/UtransEditorDockpaneView.xaml
@@ -513,7 +513,11 @@
             Margin="3"
           />
         </GroupBox>
-        <GroupBox Grid.Column="3" Header="Change Status" IsEnabled="{Binding HasReviewState}">
+        <GroupBox
+          Grid.Column="3"
+          Header="Change Status"
+          IsEnabled="{Binding CanEditDfcDisposition}"
+        >
           <ComboBox
             ItemsSource="{Binding DfcStatusValues}"
             SelectedItem="{Binding ReviewState.DfcStatus, Mode=TwoWay, FallbackValue=COMPLETED}"
@@ -530,10 +534,10 @@
         </Button>
         <Button
           Grid.Column="4"
-          Content="Save in UTRANS"
+          Content="Save"
           Command="{Binding SaveCommand}"
           Margin="6 12 6 6"
-          Visibility="{Binding HasReviewState, Converter={StaticResource BooleanToVisibilityConverter}}"
+          Visibility="{Binding CanSaveReview, Converter={StaticResource BooleanToVisibilityConverter}}"
         />
 
         <StackPanel
diff --git a/add-in/UGRC.UtransTools/UtransEditorDockpaneViewModel.cs b/add-in/UGRC.UtransTools/UtransEditorDockpaneViewModel.cs
index a0b1c27..bfaf647 100644
--- a/add-in/UGRC.UtransTools/UtransEditorDockpaneViewModel.cs
+++ b/add-in/UGRC.UtransTools/UtransEditorDockpaneViewModel.cs
@@ -97,13 +97,26 @@ private set
                 return;
             }
 
+            if (_reviewState is not null)
+            {
+                _reviewState.PropertyChanged -= OnReviewStatePropertyChanged;
+            }
+
             _reviewState = value;
+
+            if (_reviewState is not null)
+            {
+                _reviewState.PropertyChanged += OnReviewStatePropertyChanged;
+            }
+
             OnPropertyChanged();
             OnPropertyChanged(nameof(HasReviewState));
             OnPropertyChanged(nameof(HasDfcSelection));
+            OnPropertyChanged(nameof(CanEditDfcDisposition));
             OnPropertyChanged(nameof(CanRepairDfcIdentifier));
             OnPropertyChanged(nameof(AvailableReviewState));
             OnPropertyChanged(nameof(CanAddNew));
+            OnPropertyChanged(nameof(CanSaveReview));
             OnPropertyChanged(nameof(CanEditRoadValues));
             OnPropertyChanged(nameof(RoadValueState));
             OnPropertyChanged(nameof(DisplayDfcStatus));
@@ -114,10 +127,15 @@ private set
 
     public bool HasDfcSelection => ReviewState?.Selection is not null;
 
+    public bool CanEditDfcDisposition => HasDfcSelection;
+
     public bool CanRepairDfcIdentifier => HasDfcSelection && _hasExactlyOneUtransRoadSelected;
 
     public bool CanAddNew =>
-        _selectedNewRecords.Count > 0 || ReviewState?.Selection?.IsNotYetCopiedNewRecord == true;
+        _selectedNewRecords.Count > 0
+        || (ReviewState?.Selection?.IsNotYetCopiedNewRecord == true && IsDfcDispositionCompleted);
+
+    public bool CanSaveReview => HasReviewState || (HasDfcSelection && !IsDfcDispositionCompleted);
 
     public bool CanEditRoadValues => HasReviewState || CanAddNew;
 
@@ -130,6 +148,9 @@ private set
     public EditorReviewState RoadValueState =>
         _newRoadValueState ?? ReviewState ?? EmptyReviewState;
 
+    private bool IsDfcDispositionCompleted =>
+        string.Equals(ReviewState?.DfcStatus, "COMPLETED", StringComparison.OrdinalIgnoreCase);
+
     public string ChangeTypeMessage
     {
         get => _changeTypeMessage;
@@ -291,6 +312,18 @@ private async Task SaveAsync()
         }
     }
 
+    private void OnReviewStatePropertyChanged(object? sender, PropertyChangedEventArgs eventArgs)
+    {
+        if (eventArgs.PropertyName != nameof(EditorReviewState.DfcStatus))
+        {
+            return;
+        }
+
+        OnPropertyChanged(nameof(CanAddNew));
+        OnPropertyChanged(nameof(CanSaveReview));
+        OnPropertyChanged(nameof(DisplayDfcStatus));
+    }
+
     private async Task SelectNextDfcAsync()
     {
         try

From 6276c2852a04aeb230dcf1208ac8d335083c979d Mon Sep 17 00:00:00 2001
From: Scott Davis <stdavis@utah.gov>
Date: Tue, 1 Sep 2026 16:09:23 -0600
Subject: [PATCH 03/13] chore(add-in): standardize on change status rather than
 disposition

---
 CONTEXT.md                                    |  6 ++---
 add-in/README.md                              |  4 +--
 .../UtransEditorConfiguration.cs              |  2 +-
 .../{DfcDisposition.cs => DfcChangeStatus.cs} |  2 +-
 .../Models/EditorReviewState.cs               | 18 ++++++-------
 .../Services/UtransEditService.cs             |  8 +++---
 .../UtransEditorDockpaneView.xaml             | 10 +++----
 .../UtransEditorDockpaneViewModel.cs          | 26 +++++++++----------
 8 files changed, 36 insertions(+), 40 deletions(-)
 rename add-in/UGRC.UtransTools/Models/{DfcDisposition.cs => DfcChangeStatus.cs} (72%)

diff --git a/CONTEXT.md b/CONTEXT.md
index da7b126..1287732 100644
--- a/CONTEXT.md
+++ b/CONTEXT.md
@@ -8,14 +8,14 @@ This context covers the review of changes detected between county road data and
 A detected feature-change record that a reviewer assesses against county road data and, when present, a linked UTRANS road.
 _Avoid_: DFC record, detected change
 
-**DFC disposition**:
+**Change status**:
 The review outcome stored on a DFC result: `COMPLETED`, `IGNORE`, or `REVISIT`.
-_Avoid_: change status
+_Avoid_: DFC disposition
 
 **Linked UTRANS road**:
 The UTRANS road referenced by a DFC result as its target road. A DFC result may have no linked UTRANS road.
 _Avoid_: target road segment
 
 **Unlinked new record**:
-A DFC result with change type `N` and no target UTRANS road. It can be added as a new UTRANS road or assigned a non-completed disposition.
+A DFC result with change type `N` and no target UTRANS road. It can be added as a new UTRANS road or assigned a non-completed change status.
 _Avoid_: driveway candidate
diff --git a/add-in/README.md b/add-in/README.md
index b811586..108a7fd 100644
--- a/add-in/README.md
+++ b/add-in/README.md
@@ -12,11 +12,11 @@ Use **Add New** to copy an unlinked new record or records from `DFC_RESULT` into
 
 When multiple features are selected, the form values override the county-road values for `CARTOCODE`, `ONEWAY`, `VERT_LEVEL`, `SPEED_LMT`, and `STATUS`. Review these values before clicking **Add New** because the same editor values are applied to every new road.
 
-The add-in creates a UTRANS road using each selected county-road geometry and attributes, links the `DFC_RESULT` record to the new road, and marks the DFC disposition as `COMPLETED`. The map selections are cleared after the operation finishes.
+The add-in creates a UTRANS road using each selected county-road geometry and attributes, links the `DFC_RESULT` record to the new road, and marks the change status as `COMPLETED`. The map selections are cleared after the operation finishes.
 
 ### Reviewing Detected Changes
 
-Select a `DFC_RESULT` feature to choose its Change Status. Use **IGNORE** for a change that should not update UTRANS, such as a driveway, or **REVISIT** to defer review. Click **Save** to store that disposition on the selected DFC result.
+Select a `DFC_RESULT` feature to choose its Change Status. Use **IGNORE** for a change that should not update UTRANS, such as a driveway, or **REVISIT** to defer review. Click **Save** to store that change status on the selected DFC result.
 
 For an unlinked new record, **Add New** remains available while Change Status is **COMPLETED**. Choosing **IGNORE** or **REVISIT** replaces it with **Save** so the record can be reviewed without creating a UTRANS road.
 
diff --git a/add-in/UGRC.UtransTools/Configuration/UtransEditorConfiguration.cs b/add-in/UGRC.UtransTools/Configuration/UtransEditorConfiguration.cs
index eb6ccee..74c77f8 100644
--- a/add-in/UGRC.UtransTools/Configuration/UtransEditorConfiguration.cs
+++ b/add-in/UGRC.UtransTools/Configuration/UtransEditorConfiguration.cs
@@ -11,7 +11,7 @@ internal static class UtransEditorConfiguration
     internal const string ZipCodesAlias = "SGID.BOUNDARIES.ZipCodes";
     internal const string CountiesAlias = "SGID.BOUNDARIES.Counties";
     internal const string MunicipalitiesAlias = "SGID.BOUNDARIES.Municipalities";
-    internal const string DfcDispositionField = "CURRENT_NOTES";
+    internal const string DfcChangeStatusField = "CURRENT_NOTES";
     internal const string AttributeReferenceUrl =
         "https://docs.google.com/document/d/1h7FTFUEXWobA8fvctgxKLaxr6LslnwVPnGVgPlrHnz0/edit";
     internal const string DfcDefinitionQueryUrl =
diff --git a/add-in/UGRC.UtransTools/Models/DfcDisposition.cs b/add-in/UGRC.UtransTools/Models/DfcChangeStatus.cs
similarity index 72%
rename from add-in/UGRC.UtransTools/Models/DfcDisposition.cs
rename to add-in/UGRC.UtransTools/Models/DfcChangeStatus.cs
index 03215bf..4da457b 100644
--- a/add-in/UGRC.UtransTools/Models/DfcDisposition.cs
+++ b/add-in/UGRC.UtransTools/Models/DfcChangeStatus.cs
@@ -1,6 +1,6 @@
 namespace UGRC.UtransTools.Models;
 
-internal enum DfcDisposition
+internal enum DfcChangeStatus
 {
     Completed,
     Ignore,
diff --git a/add-in/UGRC.UtransTools/Models/EditorReviewState.cs b/add-in/UGRC.UtransTools/Models/EditorReviewState.cs
index 072b526..3733657 100644
--- a/add-in/UGRC.UtransTools/Models/EditorReviewState.cs
+++ b/add-in/UGRC.UtransTools/Models/EditorReviewState.cs
@@ -19,7 +19,7 @@ internal sealed class EditorReviewState : INotifyPropertyChanged
     private string _verticalLevel = string.Empty;
     private string _speedLimit = string.Empty;
     private string _status = string.Empty;
-    private string _dfcStatus = string.Empty;
+    private string _changeStatus = string.Empty;
 
     internal EditorReviewState()
     {
@@ -37,7 +37,7 @@ internal EditorReviewState()
         VerticalLevel = "0";
         SpeedLimit = "25";
         Status = "Active";
-        DfcStatus = "COMPLETED";
+        ChangeStatus = "COMPLETED";
         _initialCartocode = Cartocode;
         _initialOneway = Oneway;
         _initialVerticalLevel = VerticalLevel;
@@ -81,11 +81,11 @@ internal EditorReviewState(DfcSelectionSnapshot selection)
         _initialOneway = Oneway;
         _initialVerticalLevel = VerticalLevel;
         _initialSpeedLimit = SpeedLimit;
-        DfcStatus = string.IsNullOrWhiteSpace(
-            selection.DfcResult.GetText(UtransEditorConfiguration.DfcDispositionField)
+        ChangeStatus = string.IsNullOrWhiteSpace(
+            selection.DfcResult.GetText(UtransEditorConfiguration.DfcChangeStatusField)
         )
             ? "COMPLETED"
-            : selection.DfcResult.GetText(UtransEditorConfiguration.DfcDispositionField);
+            : selection.DfcResult.GetText(UtransEditorConfiguration.DfcChangeStatusField);
         IsUdotRoad = !string.IsNullOrWhiteSpace(utransRoad?.GetText("DOT_RTNAME"));
         IsAgrcAdjusted =
             utransRoad
@@ -176,17 +176,17 @@ public string SpeedLimit
         !string.Equals(VerticalLevel, _initialVerticalLevel, StringComparison.Ordinal);
     public bool IsSpeedLimitChanged =>
         !string.Equals(SpeedLimit, _initialSpeedLimit, StringComparison.Ordinal);
-    public string DfcStatus
+    public string ChangeStatus
     {
-        get => _dfcStatus;
+        get => _changeStatus;
         set
         {
-            if (_dfcStatus == value)
+            if (_changeStatus == value)
             {
                 return;
             }
 
-            _dfcStatus = value;
+            _changeStatus = value;
             OnPropertyChanged();
         }
     }
diff --git a/add-in/UGRC.UtransTools/Services/UtransEditService.cs b/add-in/UGRC.UtransTools/Services/UtransEditService.cs
index 6006eb2..9529382 100644
--- a/add-in/UGRC.UtransTools/Services/UtransEditService.cs
+++ b/add-in/UGRC.UtransTools/Services/UtransEditService.cs
@@ -70,7 +70,7 @@ EditorReviewState roadValues
                 var values = new Dictionary<string, object?>
                 {
                     ["BASE_FID"] = newRoad.NewRoad.ObjectID,
-                    [UtransEditorConfiguration.DfcDispositionField] = "COMPLETED",
+                    [UtransEditorConfiguration.DfcChangeStatusField] = "COMPLETED",
                 };
 
                 linkOperation.Modify(layers.DfcResults, newRoad.Selection.ObjectId, values);
@@ -140,7 +140,7 @@ internal Task SaveAsync(EditorLayerContext layers, EditorReviewState state)
             };
 
             var shouldWriteRoad = string.Equals(
-                state.DfcStatus,
+                state.ChangeStatus,
                 "COMPLETED",
                 System.StringComparison.OrdinalIgnoreCase
             );
@@ -160,7 +160,7 @@ internal Task SaveAsync(EditorLayerContext layers, EditorReviewState state)
                     state.Selection.ObjectId,
                     new Dictionary<string, object?>
                     {
-                        [UtransEditorConfiguration.DfcDispositionField] = state.DfcStatus,
+                        [UtransEditorConfiguration.DfcChangeStatusField] = state.ChangeStatus,
                     }
                 );
             }
@@ -171,7 +171,7 @@ internal Task SaveAsync(EditorLayerContext layers, EditorReviewState state)
                     state.Selection.ObjectId,
                     new Dictionary<string, object?>
                     {
-                        [UtransEditorConfiguration.DfcDispositionField] = state.DfcStatus,
+                        [UtransEditorConfiguration.DfcChangeStatusField] = state.ChangeStatus,
                     }
                 );
             }
diff --git a/add-in/UGRC.UtransTools/UtransEditorDockpaneView.xaml b/add-in/UGRC.UtransTools/UtransEditorDockpaneView.xaml
index 3a5d36a..b2db111 100644
--- a/add-in/UGRC.UtransTools/UtransEditorDockpaneView.xaml
+++ b/add-in/UGRC.UtransTools/UtransEditorDockpaneView.xaml
@@ -513,14 +513,10 @@
             Margin="3"
           />
         </GroupBox>
-        <GroupBox
-          Grid.Column="3"
-          Header="Change Status"
-          IsEnabled="{Binding CanEditDfcDisposition}"
-        >
+        <GroupBox Grid.Column="3" Header="Change Status" IsEnabled="{Binding CanEditChangeStatus}">
           <ComboBox
-            ItemsSource="{Binding DfcStatusValues}"
-            SelectedItem="{Binding ReviewState.DfcStatus, Mode=TwoWay, FallbackValue=COMPLETED}"
+            ItemsSource="{Binding ChangeStatusValues}"
+            SelectedItem="{Binding ReviewState.ChangeStatus, Mode=TwoWay, FallbackValue=COMPLETED}"
             Margin="3"
           />
         </GroupBox>
diff --git a/add-in/UGRC.UtransTools/UtransEditorDockpaneViewModel.cs b/add-in/UGRC.UtransTools/UtransEditorDockpaneViewModel.cs
index bfaf647..a2e4374 100644
--- a/add-in/UGRC.UtransTools/UtransEditorDockpaneViewModel.cs
+++ b/add-in/UGRC.UtransTools/UtransEditorDockpaneViewModel.cs
@@ -112,14 +112,14 @@ private set
             OnPropertyChanged();
             OnPropertyChanged(nameof(HasReviewState));
             OnPropertyChanged(nameof(HasDfcSelection));
-            OnPropertyChanged(nameof(CanEditDfcDisposition));
+            OnPropertyChanged(nameof(CanEditChangeStatus));
             OnPropertyChanged(nameof(CanRepairDfcIdentifier));
             OnPropertyChanged(nameof(AvailableReviewState));
             OnPropertyChanged(nameof(CanAddNew));
             OnPropertyChanged(nameof(CanSaveReview));
             OnPropertyChanged(nameof(CanEditRoadValues));
             OnPropertyChanged(nameof(RoadValueState));
-            OnPropertyChanged(nameof(DisplayDfcStatus));
+            OnPropertyChanged(nameof(DisplayChangeStatus));
         }
     }
 
@@ -127,29 +127,29 @@ private set
 
     public bool HasDfcSelection => ReviewState?.Selection is not null;
 
-    public bool CanEditDfcDisposition => HasDfcSelection;
+    public bool CanEditChangeStatus => HasDfcSelection;
 
     public bool CanRepairDfcIdentifier => HasDfcSelection && _hasExactlyOneUtransRoadSelected;
 
     public bool CanAddNew =>
         _selectedNewRecords.Count > 0
-        || (ReviewState?.Selection?.IsNotYetCopiedNewRecord == true && IsDfcDispositionCompleted);
+        || (ReviewState?.Selection?.IsNotYetCopiedNewRecord == true && IsChangeStatusCompleted);
 
-    public bool CanSaveReview => HasReviewState || (HasDfcSelection && !IsDfcDispositionCompleted);
+    public bool CanSaveReview => HasReviewState || (HasDfcSelection && !IsChangeStatusCompleted);
 
     public bool CanEditRoadValues => HasReviewState || CanAddNew;
 
     public bool HasMultipleNewRecords => _selectedNewRecords.Count > 1;
 
-    public string DisplayDfcStatus =>
-        HasMultipleNewRecords ? "COMPLETED" : ReviewState?.DfcStatus ?? string.Empty;
+    public string DisplayChangeStatus =>
+        HasMultipleNewRecords ? "COMPLETED" : ReviewState?.ChangeStatus ?? string.Empty;
 
     public EditorReviewState AvailableReviewState => ReviewState ?? EmptyReviewState;
     public EditorReviewState RoadValueState =>
         _newRoadValueState ?? ReviewState ?? EmptyReviewState;
 
-    private bool IsDfcDispositionCompleted =>
-        string.Equals(ReviewState?.DfcStatus, "COMPLETED", StringComparison.OrdinalIgnoreCase);
+    private bool IsChangeStatusCompleted =>
+        string.Equals(ReviewState?.ChangeStatus, "COMPLETED", StringComparison.OrdinalIgnoreCase);
 
     public string ChangeTypeMessage
     {
@@ -253,7 +253,7 @@ private set
     public IReadOnlyList<CodedValueOption> VerticalLevelValues { get; private set; } = [];
     public IReadOnlyList<CodedValueOption> StatusValues { get; private set; } = [];
     public IReadOnlyList<string> SpeedLimitValues { get; } = CreateRange(5, 80, 5);
-    public IReadOnlyList<string> DfcStatusValues { get; } =
+    public IReadOnlyList<string> ChangeStatusValues { get; } =
         new[] { "COMPLETED", "IGNORE", "REVISIT" };
 
     internal static void Show()
@@ -314,14 +314,14 @@ private async Task SaveAsync()
 
     private void OnReviewStatePropertyChanged(object? sender, PropertyChangedEventArgs eventArgs)
     {
-        if (eventArgs.PropertyName != nameof(EditorReviewState.DfcStatus))
+        if (eventArgs.PropertyName != nameof(EditorReviewState.ChangeStatus))
         {
             return;
         }
 
         OnPropertyChanged(nameof(CanAddNew));
         OnPropertyChanged(nameof(CanSaveReview));
-        OnPropertyChanged(nameof(DisplayDfcStatus));
+        OnPropertyChanged(nameof(DisplayChangeStatus));
     }
 
     private async Task SelectNextDfcAsync()
@@ -444,7 +444,7 @@ private void SetSelectedNewRecords(IReadOnlyList<DfcSelectionSnapshot> selection
         OnPropertyChanged(nameof(CanAddNew));
         OnPropertyChanged(nameof(CanEditRoadValues));
         OnPropertyChanged(nameof(HasMultipleNewRecords));
-        OnPropertyChanged(nameof(DisplayDfcStatus));
+        OnPropertyChanged(nameof(DisplayChangeStatus));
         OnPropertyChanged(nameof(RoadValueState));
     }
 

From 43c3cb5596314131f9329f40ca209bde2a50d56f Mon Sep 17 00:00:00 2001
From: Scott Davis <stdavis@utah.gov>
Date: Tue, 1 Sep 2026 16:18:13 -0600
Subject: [PATCH 04/13] chore: setup matts skills

---
 AGENTS.md                    | 13 +++++++++
 docs/agents/domain.md        | 51 ++++++++++++++++++++++++++++++++++++
 docs/agents/issue-tracker.md | 45 +++++++++++++++++++++++++++++++
 docs/agents/triage-labels.md | 15 +++++++++++
 4 files changed, 124 insertions(+)
 create mode 100644 AGENTS.md
 create mode 100644 docs/agents/domain.md
 create mode 100644 docs/agents/issue-tracker.md
 create mode 100644 docs/agents/triage-labels.md

diff --git a/AGENTS.md b/AGENTS.md
new file mode 100644
index 0000000..24afb8c
--- /dev/null
+++ b/AGENTS.md
@@ -0,0 +1,13 @@
+## Agent skills
+
+### Issue tracker
+
+Issues and specs are tracked in this repository's GitHub Issues. See `docs/agents/issue-tracker.md`.
+
+### Triage labels
+
+Uses the default canonical triage labels. See `docs/agents/triage-labels.md`.
+
+### Domain docs
+
+Uses a single-context layout rooted at `CONTEXT.md`. See `docs/agents/domain.md`.
diff --git a/docs/agents/domain.md b/docs/agents/domain.md
new file mode 100644
index 0000000..3524904
--- /dev/null
+++ b/docs/agents/domain.md
@@ -0,0 +1,51 @@
+# Domain Docs
+
+How the engineering skills should consume this repo's domain documentation when exploring the codebase.
+
+## Before exploring, read these
+
+- **`CONTEXT.md`** at the repo root, or
+- **`CONTEXT-MAP.md`** at the repo root if it exists: it points at one `CONTEXT.md` per context. Read each one relevant to the topic.
+- **`docs/adr/`**: read ADRs that touch the area you're about to work in. In multi-context repos, also check `src/<context>/docs/adr/` for context-scoped decisions.
+
+If any of these files don't exist, **proceed silently**. Don't flag their absence; don't suggest creating them upfront. The `/domain-modeling` skill (reached via `/grill-with-docs` and `/improve-codebase-architecture`) creates them lazily when terms or decisions actually get resolved.
+
+## File structure
+
+Single-context repo (most repos):
+
+```
+/
+├── CONTEXT.md
+├── docs/adr/
+│   ├── 0001-event-sourced-orders.md
+│   └── 0002-postgres-for-write-model.md
+└── src/
+```
+
+Multi-context repo (presence of `CONTEXT-MAP.md` at the root):
+
+```
+/
+├── CONTEXT-MAP.md
+├── docs/adr/                          ← system-wide decisions
+└── src/
+    ├── ordering/
+    │   ├── CONTEXT.md
+    │   └── docs/adr/                  ← context-specific decisions
+    └── billing/
+        ├── CONTEXT.md
+        └── docs/adr/
+```
+
+## Use the glossary's vocabulary
+
+When your output names a domain concept (in an issue title, a refactor proposal, a hypothesis, a test name), use the term as defined in `CONTEXT.md`. Don't drift to synonyms the glossary explicitly avoids.
+
+If the concept you need isn't in the glossary yet, that's a signal: either you're inventing language the project doesn't use (reconsider) or there's a real gap (note it for `/domain-modeling`).
+
+## Flag ADR conflicts
+
+If your output contradicts an existing ADR, surface it explicitly rather than silently overriding:
+
+> _Contradicts ADR-0007 (event-sourced orders), but worth reopening because…_
diff --git a/docs/agents/issue-tracker.md b/docs/agents/issue-tracker.md
new file mode 100644
index 0000000..b258aeb
--- /dev/null
+++ b/docs/agents/issue-tracker.md
@@ -0,0 +1,45 @@
+# Issue tracker: GitHub
+
+Issues and specs for this repo live as GitHub issues. Use the `gh` CLI for all operations.
+
+## Conventions
+
+- **Create an issue**: `gh issue create --title "..." --body "..."`. Use a heredoc for multi-line bodies.
+- **Read an issue**: `gh issue view <number> --comments`, filtering comments by `jq` and also fetching labels.
+- **List issues**: `gh issue list --state open --json number,title,body,labels,comments --jq '[.[] | {number, title, body, labels: [.labels[].name], comments: [.comments[].body]}]'` with appropriate `--label` and `--state` filters.
+- **Comment on an issue**: `gh issue comment <number> --body "..."`
+- **Apply / remove labels**: `gh issue edit <number> --add-label "..."` / `--remove-label "..."`
+- **Close**: `gh issue close <number> --comment "..."`
+
+Infer the repo from `git remote -v`; `gh` does this automatically when run inside a clone.
+
+## Pull requests as a triage surface
+
+**PRs as a request surface: no.** _(Set to `yes` if this repo treats external PRs as feature requests; `/triage` reads this flag.)_
+
+When set to `yes`, PRs run through the same labels and states as issues, using the `gh pr` equivalents:
+
+- **Read a PR**: `gh pr view <number> --comments` and `gh pr diff <number>` for the diff.
+- **List external PRs for triage**: `gh pr list --state open --json number,title,body,labels,author,authorAssociation,comments` then keep only `authorAssociation` of `CONTRIBUTOR`, `FIRST_TIME_CONTRIBUTOR`, or `NONE` (drop `OWNER`/`MEMBER`/`COLLABORATOR`).
+- **Comment / label / close**: `gh pr comment`, `gh pr edit --add-label`/`--remove-label`, `gh pr close`.
+
+GitHub shares one number space across issues and PRs, so a bare `#42` may be either: resolve with `gh pr view 42` and fall back to `gh issue view 42`.
+
+## When a skill says "publish to the issue tracker"
+
+Create a GitHub issue.
+
+## When a skill says "fetch the relevant ticket"
+
+Run `gh issue view <number> --comments`.
+
+## Wayfinding operations
+
+Used by `/wayfinder`. The **map** is a single issue with **child** issues as tickets.
+
+- **Map**: a single issue labelled `wayfinder:map`, holding the Notes / Decisions-so-far / Fog body. `gh issue create --label wayfinder:map`.
+- **Child ticket**: an issue linked to the map as a GitHub sub-issue (`gh api` on the sub-issues endpoint). Where sub-issues aren't enabled, add the child to a task list in the map body and put `Part of #<map>` at the top of the child body. Labels: `wayfinder:<type>` (`research`/`prototype`/`grilling`/`task`). Once claimed, the ticket is assigned to the driving dev.
+- **Blocking**: GitHub's **native issue dependencies**, the canonical, UI-visible representation. Add an edge with `gh api --method POST repos/<owner>/<repo>/issues/<child>/dependencies/blocked_by -F issue_id=<blocker-db-id>`, where `<blocker-db-id>` is the blocker's numeric **database id** (`gh api repos/<owner>/<repo>/issues/<n> --jq .id`, _not_ the `#number` or `node_id`). GitHub reports `issue_dependencies_summary.blocked_by` (open blockers only, the live gate). Where dependencies aren't available, fall back to a `Blocked by: #<n>, #<n>` line at the top of the child body. A ticket is unblocked when every blocker is closed.
+- **Frontier query**: list the map's open children (`gh issue list --state open`, scoped to the map's sub-issues / task list), drop any with an open blocker (`issue_dependencies_summary.blocked_by > 0`, or an open issue in the `Blocked by` line) or an assignee; first in map order wins.
+- **Claim**: `gh issue edit <n> --add-assignee @me`, the session's first write.
+- **Resolve**: `gh issue comment <n> --body "<answer>"`, then `gh issue close <n>`, then append a context pointer (gist + link) to the map's Decisions-so-far.
diff --git a/docs/agents/triage-labels.md b/docs/agents/triage-labels.md
new file mode 100644
index 0000000..b716855
--- /dev/null
+++ b/docs/agents/triage-labels.md
@@ -0,0 +1,15 @@
+# Triage Labels
+
+The skills speak in terms of five canonical triage roles. This file maps those roles to the actual label strings used in this repo's issue tracker.
+
+| Label in mattpocock/skills | Label in our tracker | Meaning                                  |
+| -------------------------- | -------------------- | ---------------------------------------- |
+| `needs-triage`             | `needs-triage`       | Maintainer needs to evaluate this issue  |
+| `needs-info`               | `needs-info`         | Waiting on reporter for more information |
+| `ready-for-agent`          | `ready-for-agent`    | Fully specified, ready for an AFK agent  |
+| `ready-for-human`          | `ready-for-human`    | Requires human implementation            |
+| `wontfix`                  | `wontfix`            | Will not be actioned                     |
+
+When a skill mentions a role (e.g. "apply the AFK-ready triage label"), use the corresponding label string from this table.
+
+Edit the right-hand column to match whatever vocabulary you actually use.

From 126b180492a1ea58e01ad0e68b50e1da7867f5fd Mon Sep 17 00:00:00 2001
From: Scott Davis <stdavis@utah.gov>
Date: Tue, 1 Sep 2026 16:41:06 -0600
Subject: [PATCH 05/13] refactor(add-in): extract portable review core

---
 UGRC.UtransTools.sln                          |  41 ++++++
 .../ReviewRulesTests.cs                       | 125 ++++++++++++++++
 .../UGRC.UtransTools.Core.Tests.csproj        |  19 +++
 add-in/UGRC.UtransTools.Core/ReviewRules.cs   | 121 ++++++++++++++++
 .../UGRC.UtransTools.Core.csproj              |   7 +
 .../Models/DfcChangeStatus.cs                 |   8 --
 .../Models/DfcSelectionSnapshot.cs            |   5 +-
 .../Services/UtransEditService.cs             | 136 +++++++-----------
 .../UGRC.UtransTools/UGRC.UtransTools.csproj  |   3 +
 9 files changed, 369 insertions(+), 96 deletions(-)
 create mode 100644 add-in/UGRC.UtransTools.Core.Tests/ReviewRulesTests.cs
 create mode 100644 add-in/UGRC.UtransTools.Core.Tests/UGRC.UtransTools.Core.Tests.csproj
 create mode 100644 add-in/UGRC.UtransTools.Core/ReviewRules.cs
 create mode 100644 add-in/UGRC.UtransTools.Core/UGRC.UtransTools.Core.csproj
 delete mode 100644 add-in/UGRC.UtransTools/Models/DfcChangeStatus.cs

diff --git a/UGRC.UtransTools.sln b/UGRC.UtransTools.sln
index d5b79bf..efc700b 100644
--- a/UGRC.UtransTools.sln
+++ b/UGRC.UtransTools.sln
@@ -5,16 +5,57 @@ VisualStudioVersion = 17.14.37411.7
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UGRC.UtransTools", "add-in\UGRC.UtransTools\UGRC.UtransTools.csproj", "{9112D502-5FDD-4284-BDF7-B0DA219C99EF}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UGRC.UtransTools.Core", "add-in\UGRC.UtransTools.Core\UGRC.UtransTools.Core.csproj", "{8EADADCE-DF0D-46F4-A64C-24BAB8438F5F}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UGRC.UtransTools.Core.Tests", "add-in\UGRC.UtransTools.Core.Tests\UGRC.UtransTools.Core.Tests.csproj", "{DA2F0C58-0D25-419B-A5CC-8498A4B47B2B}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "add-in", "add-in", "{89F9893B-E750-84D5-8801-D0B0E8294416}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
 		Release|Any CPU = Release|Any CPU
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{9112D502-5FDD-4284-BDF7-B0DA219C99EF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{9112D502-5FDD-4284-BDF7-B0DA219C99EF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9112D502-5FDD-4284-BDF7-B0DA219C99EF}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{9112D502-5FDD-4284-BDF7-B0DA219C99EF}.Debug|x64.Build.0 = Debug|Any CPU
+		{9112D502-5FDD-4284-BDF7-B0DA219C99EF}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{9112D502-5FDD-4284-BDF7-B0DA219C99EF}.Debug|x86.Build.0 = Debug|Any CPU
 		{9112D502-5FDD-4284-BDF7-B0DA219C99EF}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{9112D502-5FDD-4284-BDF7-B0DA219C99EF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9112D502-5FDD-4284-BDF7-B0DA219C99EF}.Release|x64.ActiveCfg = Release|Any CPU
+		{9112D502-5FDD-4284-BDF7-B0DA219C99EF}.Release|x64.Build.0 = Release|Any CPU
+		{9112D502-5FDD-4284-BDF7-B0DA219C99EF}.Release|x86.ActiveCfg = Release|Any CPU
+		{9112D502-5FDD-4284-BDF7-B0DA219C99EF}.Release|x86.Build.0 = Release|Any CPU
+		{8EADADCE-DF0D-46F4-A64C-24BAB8438F5F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8EADADCE-DF0D-46F4-A64C-24BAB8438F5F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8EADADCE-DF0D-46F4-A64C-24BAB8438F5F}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{8EADADCE-DF0D-46F4-A64C-24BAB8438F5F}.Debug|x64.Build.0 = Debug|Any CPU
+		{8EADADCE-DF0D-46F4-A64C-24BAB8438F5F}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{8EADADCE-DF0D-46F4-A64C-24BAB8438F5F}.Debug|x86.Build.0 = Debug|Any CPU
+		{8EADADCE-DF0D-46F4-A64C-24BAB8438F5F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8EADADCE-DF0D-46F4-A64C-24BAB8438F5F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8EADADCE-DF0D-46F4-A64C-24BAB8438F5F}.Release|x64.ActiveCfg = Release|Any CPU
+		{8EADADCE-DF0D-46F4-A64C-24BAB8438F5F}.Release|x64.Build.0 = Release|Any CPU
+		{8EADADCE-DF0D-46F4-A64C-24BAB8438F5F}.Release|x86.ActiveCfg = Release|Any CPU
+		{8EADADCE-DF0D-46F4-A64C-24BAB8438F5F}.Release|x86.Build.0 = Release|Any CPU
+		{DA2F0C58-0D25-419B-A5CC-8498A4B47B2B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DA2F0C58-0D25-419B-A5CC-8498A4B47B2B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DA2F0C58-0D25-419B-A5CC-8498A4B47B2B}.Debug|x64.ActiveCfg = Debug|x64
+		{DA2F0C58-0D25-419B-A5CC-8498A4B47B2B}.Debug|x64.Build.0 = Debug|x64
+		{DA2F0C58-0D25-419B-A5CC-8498A4B47B2B}.Debug|x86.ActiveCfg = Debug|x86
+		{DA2F0C58-0D25-419B-A5CC-8498A4B47B2B}.Debug|x86.Build.0 = Debug|x86
+		{DA2F0C58-0D25-419B-A5CC-8498A4B47B2B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DA2F0C58-0D25-419B-A5CC-8498A4B47B2B}.Release|x64.ActiveCfg = Release|x64
+		{DA2F0C58-0D25-419B-A5CC-8498A4B47B2B}.Release|x64.Build.0 = Release|x64
+		{DA2F0C58-0D25-419B-A5CC-8498A4B47B2B}.Release|x86.ActiveCfg = Release|x86
+		{DA2F0C58-0D25-419B-A5CC-8498A4B47B2B}.Release|x86.Build.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/add-in/UGRC.UtransTools.Core.Tests/ReviewRulesTests.cs b/add-in/UGRC.UtransTools.Core.Tests/ReviewRulesTests.cs
new file mode 100644
index 0000000..452fef0
--- /dev/null
+++ b/add-in/UGRC.UtransTools.Core.Tests/ReviewRulesTests.cs
@@ -0,0 +1,125 @@
+using Xunit;
+using UGRC.UtransTools.Core;
+
+namespace UGRC.UtransTools.Core.Tests;
+
+public sealed class ReviewRulesTests
+{
+    [Fact]
+    public void Creates_status_only_save_for_unlinked_record_with_ignore_status()
+    {
+        var plan = ReviewRules.CreateSavePlan(
+            ChangeStatus.Ignore,
+            hasLinkedUtransRoad: false,
+            new Dictionary<string, object?> { ["NAME"] = "County Road" }
+        );
+
+        Assert.False(plan.WritesUtransRoad);
+        Assert.Empty(plan.UtransRoadValues);
+        Assert.Equal(ChangeStatus.Ignore, plan.ChangeStatus);
+    }
+
+    [Fact]
+    public void Creates_road_save_for_linked_record_with_completed_status()
+    {
+        var plan = ReviewRules.CreateSavePlan(
+            ChangeStatus.Completed,
+            hasLinkedUtransRoad: true,
+            new Dictionary<string, object?> { ["NAME"] = "UTRANS Road" }
+        );
+
+        Assert.True(plan.WritesUtransRoad);
+        Assert.Equal("UTRANS Road", plan.UtransRoadValues["NAME"]);
+        Assert.Equal(ChangeStatus.Completed, plan.ChangeStatus);
+    }
+
+    [Fact]
+    public void Creates_status_only_save_for_linked_record_with_revisit_status()
+    {
+        var plan = ReviewRules.CreateSavePlan(
+            ChangeStatus.Revisit,
+            hasLinkedUtransRoad: true,
+            new Dictionary<string, object?> { ["NAME"] = "UTRANS Road" }
+        );
+
+        Assert.False(plan.WritesUtransRoad);
+        Assert.Empty(plan.UtransRoadValues);
+        Assert.Equal(ChangeStatus.Revisit, plan.ChangeStatus);
+    }
+
+    [Fact]
+    public void Rejects_completed_save_for_unlinked_record()
+    {
+        var exception = Assert.Throws<InvalidOperationException>(() =>
+            ReviewRules.CreateSavePlan(
+                ChangeStatus.Completed,
+                hasLinkedUtransRoad: false,
+                new Dictionary<string, object?>()
+            )
+        );
+
+        Assert.Equal("Click Add New to create the target UTRANS road before saving.", exception.Message);
+    }
+
+    [Fact]
+    public void Builds_road_payload_with_street_type_for_named_road()
+    {
+        var payload = ReviewRules.BuildRoadPayload(
+            new Dictionary<string, object?>
+            {
+                ["NAME"] = "Main",
+                ["POSTTYPE"] = "St",
+                ["POSTDIR"] = "E",
+            },
+            new RoadReviewValues("11", "0", "0", "25", "Active")
+        );
+
+        Assert.Equal("Main St", payload["FULLNAME"]);
+        Assert.Equal("11", payload["CARTOCODE"]);
+        Assert.Equal("0", payload["ONEWAY"]);
+        Assert.Equal("0", payload["VERT_LEVEL"]);
+        Assert.Equal("25", payload["SPEED_LMT"]);
+        Assert.Equal("Active", payload["STATUS"]);
+    }
+
+    [Fact]
+    public void Allows_new_road_creation_only_for_unlinked_new_records()
+    {
+        var selections = new[]
+        {
+            new DfcResultReview("N", -1),
+            new DfcResultReview("N", -1),
+        };
+
+        Assert.True(ReviewRules.CanCreateNewUtransRoads(selections));
+        Assert.False(
+            ReviewRules.CanCreateNewUtransRoads(
+                new[] { new DfcResultReview("M", -1) }
+            )
+        );
+    }
+
+    [Fact]
+    public void Builds_bulk_new_road_payload_from_editable_county_values_and_overrides()
+    {
+        var payload = ReviewRules.BuildNewRoadPayload(
+            new Dictionary<string, object?>
+            {
+                ["NAME"] = "County Road",
+                ["CARTOCODE"] = "10",
+                ["SYSTEM_FIELD"] = "excluded",
+            },
+            new[] { "NAME", "CARTOCODE", "ONEWAY", "VERT_LEVEL", "SPEED_LMT", "STATUS" },
+            new RoadReviewValues("11", "0", "0", "25", "Active"),
+            applyRoadValueOverrides: true
+        );
+
+        Assert.Equal("County Road", payload["NAME"]);
+        Assert.Equal("11", payload["CARTOCODE"]);
+        Assert.Equal("0", payload["ONEWAY"]);
+        Assert.Equal("0", payload["VERT_LEVEL"]);
+        Assert.Equal("25", payload["SPEED_LMT"]);
+        Assert.Equal("Active", payload["STATUS"]);
+        Assert.DoesNotContain("SYSTEM_FIELD", payload.Keys);
+    }
+}
\ No newline at end of file
diff --git a/add-in/UGRC.UtransTools.Core.Tests/UGRC.UtransTools.Core.Tests.csproj b/add-in/UGRC.UtransTools.Core.Tests/UGRC.UtransTools.Core.Tests.csproj
new file mode 100644
index 0000000..4e8b807
--- /dev/null
+++ b/add-in/UGRC.UtransTools.Core.Tests/UGRC.UtransTools.Core.Tests.csproj
@@ -0,0 +1,19 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+    <IsPackable>false</IsPackable>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
+    <PackageReference Include="xunit" Version="2.9.3" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\UGRC.UtransTools.Core\UGRC.UtransTools.Core.csproj" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/add-in/UGRC.UtransTools.Core/ReviewRules.cs b/add-in/UGRC.UtransTools.Core/ReviewRules.cs
new file mode 100644
index 0000000..7fd2841
--- /dev/null
+++ b/add-in/UGRC.UtransTools.Core/ReviewRules.cs
@@ -0,0 +1,121 @@
+using System.Collections.ObjectModel;
+
+namespace UGRC.UtransTools.Core;
+
+public enum ChangeStatus
+{
+    Completed,
+    Ignore,
+    Revisit,
+}
+
+public sealed record SavePlan(
+    ChangeStatus ChangeStatus,
+    bool WritesUtransRoad,
+    IReadOnlyDictionary<string, object?> UtransRoadValues
+);
+
+public sealed record RoadReviewValues(
+    string Cartocode,
+    string Oneway,
+    string VerticalLevel,
+    string SpeedLimit,
+    string Status
+);
+
+public sealed record DfcResultReview(string ChangeType, long BaseFeatureId)
+{
+    public bool IsUnlinkedNewRecord => ChangeType == "N" && BaseFeatureId == -1;
+}
+
+public static class ReviewRules
+{
+    public static bool CanCreateNewUtransRoads(
+        IReadOnlyCollection<DfcResultReview> selections
+    ) => selections.Count > 0 && selections.All(selection => selection.IsUnlinkedNewRecord);
+
+    public static IReadOnlyDictionary<string, object?> BuildNewRoadPayload(
+        IReadOnlyDictionary<string, object?> countyRoadValues,
+        IEnumerable<string> editableFieldNames,
+        RoadReviewValues reviewValues,
+        bool applyRoadValueOverrides
+    )
+    {
+        var values = new Dictionary<string, object?>(StringComparer.OrdinalIgnoreCase);
+        foreach (var fieldName in editableFieldNames)
+        {
+            if (countyRoadValues.TryGetValue(fieldName, out var value))
+            {
+                values[fieldName] = value;
+            }
+        }
+
+        if (applyRoadValueOverrides)
+        {
+            values["CARTOCODE"] = reviewValues.Cartocode;
+            values["ONEWAY"] = reviewValues.Oneway;
+            values["VERT_LEVEL"] = reviewValues.VerticalLevel;
+            values["SPEED_LMT"] = reviewValues.SpeedLimit;
+            values["STATUS"] = reviewValues.Status;
+        }
+
+        return new ReadOnlyDictionary<string, object?>(values);
+    }
+
+    public static IReadOnlyDictionary<string, object?> BuildRoadPayload(
+        IReadOnlyDictionary<string, object?> editedValues,
+        RoadReviewValues reviewValues
+    )
+    {
+        var values = new Dictionary<string, object?>(editedValues, StringComparer.OrdinalIgnoreCase)
+        {
+            ["CARTOCODE"] = reviewValues.Cartocode,
+            ["ONEWAY"] = reviewValues.Oneway,
+            ["VERT_LEVEL"] = reviewValues.VerticalLevel,
+            ["SPEED_LMT"] = reviewValues.SpeedLimit,
+            ["STATUS"] = reviewValues.Status,
+        };
+        values["FULLNAME"] = BuildFullName(values);
+
+        return new ReadOnlyDictionary<string, object?>(values);
+    }
+
+    public static SavePlan CreateSavePlan(
+        ChangeStatus changeStatus,
+        bool hasLinkedUtransRoad,
+        IReadOnlyDictionary<string, object?> editedRoadValues
+    )
+    {
+        var writesUtransRoad = changeStatus == ChangeStatus.Completed;
+        if (writesUtransRoad && !hasLinkedUtransRoad)
+        {
+            throw new InvalidOperationException(
+                "Click Add New to create the target UTRANS road before saving."
+            );
+        }
+
+        return new SavePlan(
+            changeStatus,
+            writesUtransRoad,
+            writesUtransRoad
+                ? new ReadOnlyDictionary<string, object?>(
+                    new Dictionary<string, object?>(editedRoadValues, StringComparer.OrdinalIgnoreCase)
+                )
+                : new ReadOnlyDictionary<string, object?>(new Dictionary<string, object?>())
+        );
+    }
+
+    private static string BuildFullName(IReadOnlyDictionary<string, object?> values)
+    {
+        var name = GetText(values, "NAME");
+        var suffix = name.All(char.IsDigit)
+            ? GetText(values, "POSTDIR")
+            : GetText(values, "POSTTYPE");
+        return string.IsNullOrWhiteSpace(suffix) ? name : $"{name} {suffix}".Trim();
+    }
+
+    private static string GetText(IReadOnlyDictionary<string, object?> values, string fieldName) =>
+        values.TryGetValue(fieldName, out var value)
+            ? value?.ToString()?.Replace("'", string.Empty, StringComparison.Ordinal) ?? string.Empty
+            : string.Empty;
+}
\ No newline at end of file
diff --git a/add-in/UGRC.UtransTools.Core/UGRC.UtransTools.Core.csproj b/add-in/UGRC.UtransTools.Core/UGRC.UtransTools.Core.csproj
new file mode 100644
index 0000000..a6b9113
--- /dev/null
+++ b/add-in/UGRC.UtransTools.Core/UGRC.UtransTools.Core.csproj
@@ -0,0 +1,7 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/add-in/UGRC.UtransTools/Models/DfcChangeStatus.cs b/add-in/UGRC.UtransTools/Models/DfcChangeStatus.cs
deleted file mode 100644
index 4da457b..0000000
--- a/add-in/UGRC.UtransTools/Models/DfcChangeStatus.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-namespace UGRC.UtransTools.Models;
-
-internal enum DfcChangeStatus
-{
-    Completed,
-    Ignore,
-    Revisit,
-}
diff --git a/add-in/UGRC.UtransTools/Models/DfcSelectionSnapshot.cs b/add-in/UGRC.UtransTools/Models/DfcSelectionSnapshot.cs
index 016260e..77ef045 100644
--- a/add-in/UGRC.UtransTools/Models/DfcSelectionSnapshot.cs
+++ b/add-in/UGRC.UtransTools/Models/DfcSelectionSnapshot.cs
@@ -1,3 +1,5 @@
+using UGRC.UtransTools.Core;
+
 namespace UGRC.UtransTools.Models;
 
 internal sealed record DfcSelectionSnapshot(
@@ -11,5 +13,6 @@ internal sealed record DfcSelectionSnapshot(
     RoadSnapshot? UtransRoad
 )
 {
-    internal bool IsNotYetCopiedNewRecord => ChangeType == "N" && BaseFeatureId == -1;
+    internal bool IsNotYetCopiedNewRecord =>
+        new DfcResultReview(ChangeType, BaseFeatureId).IsUnlinkedNewRecord;
 }
diff --git a/add-in/UGRC.UtransTools/Services/UtransEditService.cs b/add-in/UGRC.UtransTools/Services/UtransEditService.cs
index 9529382..bf1e286 100644
--- a/add-in/UGRC.UtransTools/Services/UtransEditService.cs
+++ b/add-in/UGRC.UtransTools/Services/UtransEditService.cs
@@ -7,6 +7,7 @@
 using ArcGIS.Desktop.Framework.Threading.Tasks;
 using ArcGIS.Desktop.Mapping;
 using UGRC.UtransTools.Configuration;
+using UGRC.UtransTools.Core;
 using UGRC.UtransTools.Models;
 
 namespace UGRC.UtransTools.Services;
@@ -22,8 +23,7 @@ EditorReviewState roadValues
         return QueuedTask.Run(async () =>
         {
             if (
-                selections.Count == 0
-                || selections.Any(selection => !selection.IsNotYetCopiedNewRecord)
+                !ReviewRules.CanCreateNewUtransRoads(selections.Select(ToDfcResultReview).ToArray())
             )
             {
                 throw new InvalidOperationException(
@@ -132,49 +132,40 @@ internal Task SaveAsync(EditorLayerContext layers, EditorReviewState state)
     {
         return QueuedTask.Run(async () =>
         {
-            var values = GetEditedValues(state);
+            var values = GetRoadPayload(state);
             var operation = new EditOperation
             {
                 Name = "Save UTRANS editor changes",
                 SelectModifiedFeatures = false,
             };
 
-            var shouldWriteRoad = string.Equals(
-                state.ChangeStatus,
-                "COMPLETED",
-                System.StringComparison.OrdinalIgnoreCase
+            var plan = ReviewRules.CreateSavePlan(
+                ParseChangeStatus(state.ChangeStatus),
+                state.Selection.UtransRoad is not null,
+                values
             );
 
-            if (shouldWriteRoad && state.Selection.UtransRoad is null)
-            {
-                throw new InvalidOperationException(
-                    "Click Add New to create the target UTRANS road before saving."
-                );
-            }
-
-            if (shouldWriteRoad)
-            {
-                operation.Modify(layers.UtransRoads, state.Selection.BaseFeatureId, values);
-                operation.Modify(
-                    layers.DfcResults,
-                    state.Selection.ObjectId,
-                    new Dictionary<string, object?>
-                    {
-                        [UtransEditorConfiguration.DfcChangeStatusField] = state.ChangeStatus,
-                    }
-                );
-            }
-            else
+            if (plan.WritesUtransRoad)
             {
                 operation.Modify(
-                    layers.DfcResults,
-                    state.Selection.ObjectId,
-                    new Dictionary<string, object?>
-                    {
-                        [UtransEditorConfiguration.DfcChangeStatusField] = state.ChangeStatus,
-                    }
+                    layers.UtransRoads,
+                    state.Selection.BaseFeatureId,
+                    new Dictionary<string, object?>(
+                        plan.UtransRoadValues,
+                        StringComparer.OrdinalIgnoreCase
+                    )
                 );
             }
+            operation.Modify(
+                layers.DfcResults,
+                state.Selection.ObjectId,
+                new Dictionary<string, object?>
+                {
+                    [UtransEditorConfiguration.DfcChangeStatusField] = plan
+                        .ChangeStatus.ToString()
+                        .ToUpperInvariant(),
+                }
+            );
 
             if (!await operation.ExecuteAsync())
             {
@@ -185,28 +176,8 @@ internal Task SaveAsync(EditorLayerContext layers, EditorReviewState state)
         });
     }
 
-    private static Dictionary<string, object?> GetEditedValues(EditorReviewState state)
-    {
-        var values = new Dictionary<string, object?>(StringComparer.OrdinalIgnoreCase);
-
-        foreach (var pair in state.GetEditedValues())
-        {
-            values[pair.Key] = pair.Value;
-        }
-
-        values = new Dictionary<string, object?>(values, StringComparer.OrdinalIgnoreCase)
-        {
-            ["CARTOCODE"] = state.Cartocode,
-            ["ONEWAY"] = state.Oneway,
-            ["VERT_LEVEL"] = state.VerticalLevel,
-            ["SPEED_LMT"] = state.SpeedLimit,
-            ["FULLNAME"] = BuildFullName(values),
-        };
-
-        values["STATUS"] = state.Status;
-
-        return values;
-    }
+    private static IReadOnlyDictionary<string, object?> GetRoadPayload(EditorReviewState state) =>
+        ReviewRules.BuildRoadPayload(state.GetEditedValues(), ToRoadReviewValues(state));
 
     private static Dictionary<string, object?> GetCountyRoadValues(
         RoadSnapshot countyRoad,
@@ -215,39 +186,30 @@ internal Task SaveAsync(EditorLayerContext layers, EditorReviewState state)
         bool applyRoadValueOverrides
     )
     {
-        var values = new Dictionary<string, object?>(StringComparer.OrdinalIgnoreCase);
-        foreach (var field in utransFeatureClass.GetDefinition().GetFields())
-        {
-            if (field.IsEditable && countyRoad.Attributes.TryGetValue(field.Name, out var value))
-            {
-                values[field.Name] = value;
-            }
-        }
-
-        if (applyRoadValueOverrides)
-        {
-            values["CARTOCODE"] = roadValues.Cartocode;
-            values["ONEWAY"] = roadValues.Oneway;
-            values["VERT_LEVEL"] = roadValues.VerticalLevel;
-            values["SPEED_LMT"] = roadValues.SpeedLimit;
-            values["STATUS"] = roadValues.Status;
-        }
-
-        return values;
+        var editableFieldNames = utransFeatureClass
+            .GetDefinition()
+            .GetFields()
+            .Where(field => field.IsEditable)
+            .Select(field => field.Name);
+        return new Dictionary<string, object?>(
+            ReviewRules.BuildNewRoadPayload(
+                countyRoad.Attributes,
+                editableFieldNames,
+                ToRoadReviewValues(roadValues),
+                applyRoadValueOverrides
+            ),
+            StringComparer.OrdinalIgnoreCase
+        );
     }
 
-    private static string BuildFullName(IReadOnlyDictionary<string, object?> values)
-    {
-        var name = GetText(values, "NAME");
-        var suffix = name.All(char.IsDigit)
-            ? GetText(values, "POSTDIR")
-            : GetText(values, "POSTTYPE");
-        return string.IsNullOrWhiteSpace(suffix) ? name : $"{name} {suffix}".Trim();
-    }
+    private static DfcResultReview ToDfcResultReview(DfcSelectionSnapshot selection) =>
+        new(selection.ChangeType, selection.BaseFeatureId);
+
+    private static RoadReviewValues ToRoadReviewValues(EditorReviewState state) =>
+        new(state.Cartocode, state.Oneway, state.VerticalLevel, state.SpeedLimit, state.Status);
 
-    private static string GetText(IReadOnlyDictionary<string, object?> values, string fieldName) =>
-        values.TryGetValue(fieldName, out var value)
-            ? value?.ToString()?.Replace("'", string.Empty, System.StringComparison.Ordinal)
-                ?? string.Empty
-            : string.Empty;
+    private static ChangeStatus ParseChangeStatus(string changeStatus) =>
+        Enum.TryParse<ChangeStatus>(changeStatus, ignoreCase: true, out var parsedStatus)
+            ? parsedStatus
+            : throw new InvalidOperationException($"Unsupported change status: {changeStatus}");
 }
diff --git a/add-in/UGRC.UtransTools/UGRC.UtransTools.csproj b/add-in/UGRC.UtransTools/UGRC.UtransTools.csproj
index 21b65bd..d9cb465 100644
--- a/add-in/UGRC.UtransTools/UGRC.UtransTools.csproj
+++ b/add-in/UGRC.UtransTools/UGRC.UtransTools.csproj
@@ -20,6 +20,9 @@
   <ItemGroup>
     <None Include="Properties\launchSettings.json" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\UGRC.UtransTools.Core\UGRC.UtransTools.Core.csproj" />
+  </ItemGroup>
   <ItemGroup>
     <Compile Remove="obj\**\*.cs" />
   </ItemGroup>

From fd4ca37868cceab5646764c2627f4c662fba4343 Mon Sep 17 00:00:00 2001
From: Scott Davis <stdavis@utah.gov>
Date: Tue, 1 Sep 2026 16:59:44 -0600
Subject: [PATCH 06/13] test(add-in): cover review rules without ArcGIS Pro

---
 .../ReviewRulesTests.cs                       | 97 +++++++++++++++++++
 add-in/UGRC.UtransTools.Core/ReviewRules.cs   | 23 +++++
 .../Models/EditorReviewState.cs               | 17 +---
 3 files changed, 125 insertions(+), 12 deletions(-)

diff --git a/add-in/UGRC.UtransTools.Core.Tests/ReviewRulesTests.cs b/add-in/UGRC.UtransTools.Core.Tests/ReviewRulesTests.cs
index 452fef0..b96720f 100644
--- a/add-in/UGRC.UtransTools.Core.Tests/ReviewRulesTests.cs
+++ b/add-in/UGRC.UtransTools.Core.Tests/ReviewRulesTests.cs
@@ -5,6 +5,32 @@ namespace UGRC.UtransTools.Core.Tests;
 
 public sealed class ReviewRulesTests
 {
+    [Theory]
+    [InlineData("123", true)]
+    [InlineData("123.5", true)]
+    [InlineData("12A", false)]
+    [InlineData("12-14", false)]
+    public void Validates_address_range_values(string value, bool isValid)
+    {
+        Assert.Equal(isValid, ReviewRules.IsValidAddressRange(value));
+    }
+
+    [Fact]
+    public void Normalizes_edited_road_values_for_saving()
+    {
+        var values = ReviewRules.NormalizeEditedRoadValues(
+            new Dictionary<string, string>
+            {
+                ["NAME"] = " O'Brien ",
+                ["L_F_ADD"] = " ",
+            },
+            new[] { "L_F_ADD" }
+        );
+
+        Assert.Equal("OBrien", values["NAME"]);
+        Assert.Equal(0d, values["L_F_ADD"]);
+    }
+
     [Fact]
     public void Creates_status_only_save_for_unlinked_record_with_ignore_status()
     {
@@ -19,6 +45,20 @@ public void Creates_status_only_save_for_unlinked_record_with_ignore_status()
         Assert.Equal(ChangeStatus.Ignore, plan.ChangeStatus);
     }
 
+    [Fact]
+    public void Creates_status_only_save_for_unlinked_record_with_revisit_status()
+    {
+        var plan = ReviewRules.CreateSavePlan(
+            ChangeStatus.Revisit,
+            hasLinkedUtransRoad: false,
+            new Dictionary<string, object?> { ["NAME"] = "County Road" }
+        );
+
+        Assert.False(plan.WritesUtransRoad);
+        Assert.Empty(plan.UtransRoadValues);
+        Assert.Equal(ChangeStatus.Revisit, plan.ChangeStatus);
+    }
+
     [Fact]
     public void Creates_road_save_for_linked_record_with_completed_status()
     {
@@ -47,6 +87,20 @@ public void Creates_status_only_save_for_linked_record_with_revisit_status()
         Assert.Equal(ChangeStatus.Revisit, plan.ChangeStatus);
     }
 
+    [Fact]
+    public void Creates_status_only_save_for_linked_record_with_ignore_status()
+    {
+        var plan = ReviewRules.CreateSavePlan(
+            ChangeStatus.Ignore,
+            hasLinkedUtransRoad: true,
+            new Dictionary<string, object?> { ["NAME"] = "UTRANS Road" }
+        );
+
+        Assert.False(plan.WritesUtransRoad);
+        Assert.Empty(plan.UtransRoadValues);
+        Assert.Equal(ChangeStatus.Ignore, plan.ChangeStatus);
+    }
+
     [Fact]
     public void Rejects_completed_save_for_unlinked_record()
     {
@@ -82,6 +136,22 @@ public void Builds_road_payload_with_street_type_for_named_road()
         Assert.Equal("Active", payload["STATUS"]);
     }
 
+    [Fact]
+    public void Builds_road_payload_with_direction_for_numeric_road()
+    {
+        var payload = ReviewRules.BuildRoadPayload(
+            new Dictionary<string, object?>
+            {
+                ["NAME"] = "200",
+                ["POSTTYPE"] = "St",
+                ["POSTDIR"] = "W",
+            },
+            new RoadReviewValues("11", "0", "0", "25", "Active")
+        );
+
+        Assert.Equal("200 W", payload["FULLNAME"]);
+    }
+
     [Fact]
     public void Allows_new_road_creation_only_for_unlinked_new_records()
     {
@@ -97,6 +167,33 @@ public void Allows_new_road_creation_only_for_unlinked_new_records()
                 new[] { new DfcResultReview("M", -1) }
             )
         );
+        Assert.False(
+            ReviewRules.CanCreateNewUtransRoads(
+                new[] { new DfcResultReview("N", 42) }
+            )
+        );
+        Assert.False(ReviewRules.CanCreateNewUtransRoads([]));
+    }
+
+    [Fact]
+    public void Transfers_editable_county_values_without_road_overrides()
+    {
+        var payload = ReviewRules.BuildNewRoadPayload(
+            new Dictionary<string, object?>
+            {
+                ["NAME"] = "County Road",
+                ["CARTOCODE"] = "10",
+                ["SYSTEM_FIELD"] = "excluded",
+            },
+            new[] { "NAME", "CARTOCODE", "ONEWAY" },
+            new RoadReviewValues("11", "0", "0", "25", "Active"),
+            applyRoadValueOverrides: false
+        );
+
+        Assert.Equal("County Road", payload["NAME"]);
+        Assert.Equal("10", payload["CARTOCODE"]);
+        Assert.DoesNotContain("ONEWAY", payload.Keys);
+        Assert.DoesNotContain("SYSTEM_FIELD", payload.Keys);
     }
 
     [Fact]
diff --git a/add-in/UGRC.UtransTools.Core/ReviewRules.cs b/add-in/UGRC.UtransTools.Core/ReviewRules.cs
index 7fd2841..2441c53 100644
--- a/add-in/UGRC.UtransTools.Core/ReviewRules.cs
+++ b/add-in/UGRC.UtransTools.Core/ReviewRules.cs
@@ -30,6 +30,29 @@ public sealed record DfcResultReview(string ChangeType, long BaseFeatureId)
 
 public static class ReviewRules
 {
+    public static bool IsValidAddressRange(string value) =>
+        value.All(character => char.IsDigit(character) || character == '.');
+
+    public static IReadOnlyDictionary<string, object?> NormalizeEditedRoadValues(
+        IReadOnlyDictionary<string, string> editedValues,
+        IEnumerable<string> addressRangeFieldNames
+    )
+    {
+        var addressRanges = new HashSet<string>(
+            addressRangeFieldNames,
+            StringComparer.OrdinalIgnoreCase
+        );
+        var values = new Dictionary<string, object?>(StringComparer.OrdinalIgnoreCase);
+        foreach (var (fieldName, value) in editedValues)
+        {
+            values[fieldName] = addressRanges.Contains(fieldName) && string.IsNullOrWhiteSpace(value)
+                ? 0d
+                : value.Trim().Replace("'", string.Empty, StringComparison.Ordinal);
+        }
+
+        return new ReadOnlyDictionary<string, object?>(values);
+    }
+
     public static bool CanCreateNewUtransRoads(
         IReadOnlyCollection<DfcResultReview> selections
     ) => selections.Count > 0 && selections.All(selection => selection.IsUnlinkedNewRecord);
diff --git a/add-in/UGRC.UtransTools/Models/EditorReviewState.cs b/add-in/UGRC.UtransTools/Models/EditorReviewState.cs
index 3733657..65bc4b8 100644
--- a/add-in/UGRC.UtransTools/Models/EditorReviewState.cs
+++ b/add-in/UGRC.UtransTools/Models/EditorReviewState.cs
@@ -5,6 +5,7 @@
 using System.Linq;
 using System.Runtime.CompilerServices;
 using UGRC.UtransTools.Configuration;
+using UGRC.UtransTools.Core;
 
 namespace UGRC.UtransTools.Models;
 
@@ -195,18 +196,10 @@ public string ChangeStatus
 
     internal IReadOnlyDictionary<string, object?> GetEditedValues()
     {
-        var values = new Dictionary<string, object?>();
-        foreach (var field in Fields)
-        {
-            values[field.FieldName] =
-                field.IsAddressRange && string.IsNullOrWhiteSpace(field.UtransValue)
-                    ? 0d
-                    : field
-                        .UtransValue.Trim()
-                        .Replace("'", string.Empty, System.StringComparison.Ordinal);
-        }
-
-        return values;
+        return ReviewRules.NormalizeEditedRoadValues(
+            Fields.ToDictionary(field => field.FieldName, field => field.UtransValue),
+            Fields.Where(field => field.IsAddressRange).Select(field => field.FieldName)
+        );
     }
 
     private void SetTrackedValue(

From 63d173976f968bc81239c9a77404b393b08aa7c1 Mon Sep 17 00:00:00 2001
From: Scott Davis <stdavis@utah.gov>
Date: Tue, 1 Sep 2026 17:11:45 -0600
Subject: [PATCH 07/13] ci(add-in): test review core on pull requests

---
 .github/workflows/pull_request.add_in.yml     | 21 +++++++++++-
 .../ReviewRulesTests.cs                       | 33 ++++++-------------
 .../UGRC.UtransTools.Core.Tests.csproj        |  6 +++-
 add-in/UGRC.UtransTools.Core/ReviewRules.cs   | 22 ++++++++-----
 .../UGRC.UtransTools.Core.csproj              |  2 +-
 5 files changed, 49 insertions(+), 35 deletions(-)

diff --git a/.github/workflows/pull_request.add_in.yml b/.github/workflows/pull_request.add_in.yml
index 3f31b34..c42f86f 100644
--- a/.github/workflows/pull_request.add_in.yml
+++ b/.github/workflows/pull_request.add_in.yml
@@ -29,4 +29,23 @@ jobs:
 
       - name: 🔪 Check CSharpier formatting
         working-directory: add-in/UGRC.UtransTools
-        run: dotnet csharpier check .
+        run: dotnet csharpier check ..
+
+  test-review-core:
+    name: Test review core
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: ⬇️ Set up code
+        uses: actions/checkout@v7
+
+      - name: 🥅 Setup .NET SDK
+        uses: actions/setup-dotnet@v6
+        with:
+          dotnet-version: "8.0"
+
+      - name: 🧪 Test review core with coverage
+        run: >
+          dotnet test
+          add-in/UGRC.UtransTools.Core.Tests/UGRC.UtransTools.Core.Tests.csproj
+          --collect:"XPlat Code Coverage"
diff --git a/add-in/UGRC.UtransTools.Core.Tests/ReviewRulesTests.cs b/add-in/UGRC.UtransTools.Core.Tests/ReviewRulesTests.cs
index b96720f..a3d2e4d 100644
--- a/add-in/UGRC.UtransTools.Core.Tests/ReviewRulesTests.cs
+++ b/add-in/UGRC.UtransTools.Core.Tests/ReviewRulesTests.cs
@@ -1,5 +1,5 @@
-using Xunit;
 using UGRC.UtransTools.Core;
+using Xunit;
 
 namespace UGRC.UtransTools.Core.Tests;
 
@@ -19,11 +19,7 @@ public void Validates_address_range_values(string value, bool isValid)
     public void Normalizes_edited_road_values_for_saving()
     {
         var values = ReviewRules.NormalizeEditedRoadValues(
-            new Dictionary<string, string>
-            {
-                ["NAME"] = " O'Brien ",
-                ["L_F_ADD"] = " ",
-            },
+            new Dictionary<string, string> { ["NAME"] = " O'Brien ", ["L_F_ADD"] = " " },
             new[] { "L_F_ADD" }
         );
 
@@ -112,7 +108,10 @@ public void Rejects_completed_save_for_unlinked_record()
             )
         );
 
-        Assert.Equal("Click Add New to create the target UTRANS road before saving.", exception.Message);
+        Assert.Equal(
+            "Click Add New to create the target UTRANS road before saving.",
+            exception.Message
+        );
     }
 
     [Fact]
@@ -155,23 +154,11 @@ public void Builds_road_payload_with_direction_for_numeric_road()
     [Fact]
     public void Allows_new_road_creation_only_for_unlinked_new_records()
     {
-        var selections = new[]
-        {
-            new DfcResultReview("N", -1),
-            new DfcResultReview("N", -1),
-        };
+        var selections = new[] { new DfcResultReview("N", -1), new DfcResultReview("N", -1) };
 
         Assert.True(ReviewRules.CanCreateNewUtransRoads(selections));
-        Assert.False(
-            ReviewRules.CanCreateNewUtransRoads(
-                new[] { new DfcResultReview("M", -1) }
-            )
-        );
-        Assert.False(
-            ReviewRules.CanCreateNewUtransRoads(
-                new[] { new DfcResultReview("N", 42) }
-            )
-        );
+        Assert.False(ReviewRules.CanCreateNewUtransRoads(new[] { new DfcResultReview("M", -1) }));
+        Assert.False(ReviewRules.CanCreateNewUtransRoads(new[] { new DfcResultReview("N", 42) }));
         Assert.False(ReviewRules.CanCreateNewUtransRoads([]));
     }
 
@@ -219,4 +206,4 @@ public void Builds_bulk_new_road_payload_from_editable_county_values_and_overrid
         Assert.Equal("Active", payload["STATUS"]);
         Assert.DoesNotContain("SYSTEM_FIELD", payload.Keys);
     }
-}
\ No newline at end of file
+}
diff --git a/add-in/UGRC.UtransTools.Core.Tests/UGRC.UtransTools.Core.Tests.csproj b/add-in/UGRC.UtransTools.Core.Tests/UGRC.UtransTools.Core.Tests.csproj
index 4e8b807..96696be 100644
--- a/add-in/UGRC.UtransTools.Core.Tests/UGRC.UtransTools.Core.Tests.csproj
+++ b/add-in/UGRC.UtransTools.Core.Tests/UGRC.UtransTools.Core.Tests.csproj
@@ -7,6 +7,10 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
+    <PackageReference Include="coverlet.collector" Version="6.0.4">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
     <PackageReference Include="xunit" Version="2.9.3" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
       <PrivateAssets>all</PrivateAssets>
@@ -16,4 +20,4 @@
   <ItemGroup>
     <ProjectReference Include="..\UGRC.UtransTools.Core\UGRC.UtransTools.Core.csproj" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/add-in/UGRC.UtransTools.Core/ReviewRules.cs b/add-in/UGRC.UtransTools.Core/ReviewRules.cs
index 2441c53..7629574 100644
--- a/add-in/UGRC.UtransTools.Core/ReviewRules.cs
+++ b/add-in/UGRC.UtransTools.Core/ReviewRules.cs
@@ -45,17 +45,17 @@ IEnumerable<string> addressRangeFieldNames
         var values = new Dictionary<string, object?>(StringComparer.OrdinalIgnoreCase);
         foreach (var (fieldName, value) in editedValues)
         {
-            values[fieldName] = addressRanges.Contains(fieldName) && string.IsNullOrWhiteSpace(value)
-                ? 0d
-                : value.Trim().Replace("'", string.Empty, StringComparison.Ordinal);
+            values[fieldName] =
+                addressRanges.Contains(fieldName) && string.IsNullOrWhiteSpace(value)
+                    ? 0d
+                    : value.Trim().Replace("'", string.Empty, StringComparison.Ordinal);
         }
 
         return new ReadOnlyDictionary<string, object?>(values);
     }
 
-    public static bool CanCreateNewUtransRoads(
-        IReadOnlyCollection<DfcResultReview> selections
-    ) => selections.Count > 0 && selections.All(selection => selection.IsUnlinkedNewRecord);
+    public static bool CanCreateNewUtransRoads(IReadOnlyCollection<DfcResultReview> selections) =>
+        selections.Count > 0 && selections.All(selection => selection.IsUnlinkedNewRecord);
 
     public static IReadOnlyDictionary<string, object?> BuildNewRoadPayload(
         IReadOnlyDictionary<string, object?> countyRoadValues,
@@ -122,7 +122,10 @@ public static SavePlan CreateSavePlan(
             writesUtransRoad,
             writesUtransRoad
                 ? new ReadOnlyDictionary<string, object?>(
-                    new Dictionary<string, object?>(editedRoadValues, StringComparer.OrdinalIgnoreCase)
+                    new Dictionary<string, object?>(
+                        editedRoadValues,
+                        StringComparer.OrdinalIgnoreCase
+                    )
                 )
                 : new ReadOnlyDictionary<string, object?>(new Dictionary<string, object?>())
         );
@@ -139,6 +142,7 @@ private static string BuildFullName(IReadOnlyDictionary<string, object?> values)
 
     private static string GetText(IReadOnlyDictionary<string, object?> values, string fieldName) =>
         values.TryGetValue(fieldName, out var value)
-            ? value?.ToString()?.Replace("'", string.Empty, StringComparison.Ordinal) ?? string.Empty
+            ? value?.ToString()?.Replace("'", string.Empty, StringComparison.Ordinal)
+                ?? string.Empty
             : string.Empty;
-}
\ No newline at end of file
+}
diff --git a/add-in/UGRC.UtransTools.Core/UGRC.UtransTools.Core.csproj b/add-in/UGRC.UtransTools.Core/UGRC.UtransTools.Core.csproj
index a6b9113..e8cd599 100644
--- a/add-in/UGRC.UtransTools.Core/UGRC.UtransTools.Core.csproj
+++ b/add-in/UGRC.UtransTools.Core/UGRC.UtransTools.Core.csproj
@@ -4,4 +4,4 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+</Project>

From aa6e9a2d19cc39369786c8fbc6fb7b1062f3beaa Mon Sep 17 00:00:00 2001
From: Scott Davis <stdavis@utah.gov>
Date: Tue, 1 Sep 2026 17:23:13 -0600
Subject: [PATCH 08/13] chore: auto-approve copilot commands

---
 .vscode/settings.json | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/.vscode/settings.json b/.vscode/settings.json
index 869a0bc..b8218fc 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -72,6 +72,14 @@
     "/^dotnet build \\.\\\\add-in\\\\UGRC\\.UtransTools\\\\UGRC\\.UtransTools\\.csproj --configuration Debug$/": {
       "approve": true,
       "matchCommandLine": true
+    },
+    "/^Set-Location 'C:\\\\projects\\\\utrans-tools'; dotnet test 'add-in\\\\UGRC\\.UtransTools\\.Core\\.Tests\\\\UGRC\\.UtransTools\\.Core\\.Tests\\.csproj'$/": {
+      "approve": true,
+      "matchCommandLine": true
+    },
+    "/^dotnet test add-in\\\\UGRC\\.UtransTools\\.Core\\.Tests\\\\UGRC\\.UtransTools\\.Core\\.Tests\\.csproj$/": {
+      "approve": true,
+      "matchCommandLine": true
     }
   },
   "[csharp]": {

From 0ab84cba5d00646ad88348adcaa39822188fa3ad Mon Sep 17 00:00:00 2001
From: Scott Davis <stdavis@utah.gov>
Date: Wed, 2 Sep 2026 13:01:44 -0600
Subject: [PATCH 09/13] fix: normalize UTRANS values that don't fit into
 domains and always write the dropdown value to UTRANS on save

---
 .vscode/settings.json                         | 11 +++-
 add-in/README.md                              | 38 ++++++++++++-
 .../ReviewRulesTests.cs                       | 48 ++++++++++++++++
 add-in/UGRC.UtransTools.Core/ReviewRules.cs   | 15 +++++
 add-in/UGRC.UtransTools/Config.daml           |  2 +-
 .../Models/EditorReviewState.cs               | 57 +++++++++++++------
 .../Services/LayerValidationService.cs        | 11 +++-
 .../Services/UtransEditService.cs             |  2 +-
 .../UtransEditorDockpaneView.xaml             | 12 ++--
 .../UtransEditorDockpaneViewModel.cs          | 36 +++++++++++-
 10 files changed, 202 insertions(+), 30 deletions(-)

diff --git a/.vscode/settings.json b/.vscode/settings.json
index b8218fc..b16df8c 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -34,8 +34,8 @@
     "recents",
     "ROADALIASNAME",
     "saltlake",
-    "SGID",
     "Sevier",
+    "SGID",
     "SRFTYP",
     "STREETNAME",
     "SUFDIR",
@@ -43,6 +43,7 @@
     "testpaths",
     "TOADDR",
     "Tooele",
+    "TRANSADMIN",
     "UGRC",
     "Uintah",
     "utrans",
@@ -80,6 +81,14 @@
     "/^dotnet test add-in\\\\UGRC\\.UtransTools\\.Core\\.Tests\\\\UGRC\\.UtransTools\\.Core\\.Tests\\.csproj$/": {
       "approve": true,
       "matchCommandLine": true
+    },
+    "/^dotnet build \"add-in\\\\UGRC\\.UtransTools\\\\UGRC\\.UtransTools\\.csproj\" --configuration Debug --no-restore$/": {
+      "approve": true,
+      "matchCommandLine": true
+    },
+    "/^dotnet build add-in\\\\UGRC\\.UtransTools\\\\UGRC\\.UtransTools\\.csproj --configuration Debug --no-restore --verbosity minimal$/": {
+      "approve": true,
+      "matchCommandLine": true
     }
   },
   "[csharp]": {
diff --git a/add-in/README.md b/add-in/README.md
index 108a7fd..fbc8c65 100644
--- a/add-in/README.md
+++ b/add-in/README.md
@@ -2,6 +2,34 @@
 
 ## Usage
 
+### Map Requirements
+
+Before opening the editor, the active map must contain these layers with these exact names:
+
+- `UTRANS.TRANSADMIN.ROADS_EDIT`
+- `COUNTY_STREETS`
+- `DFC_RESULT`
+- `SGID.LOCATION.AddressSystemQuadrants`
+- `SGID.BOUNDARIES.ZipCodes`
+- `SGID.BOUNDARIES.Counties`
+- `SGID.BOUNDARIES.Municipalities`
+
+Each layer must have an available feature-class data source. The `CARTOCODE`, `ONEWAY`, `VERT_LEVEL`, `SPEED_LMT`, and `STATUS` fields in `UTRANS.TRANSADMIN.ROADS_EDIT` must exist and use coded-value domains. The editor uses those domains for its dropdown values.
+
+### Dropdown Values and Highlights
+
+The five road dropdowns (`CARTOCODE`, `ONEWAY`, `VERT_LEVEL`, `SPEED_LMT`, and `STATUS`) display the descriptions from the coded-value domain, but save the corresponding domain codes. The available choices therefore come from the current `ROADS_EDIT` schema, not from a hard-coded list.
+
+When a DFC record is loaded, the initial selected value for each road dropdown is calculated independently:
+
+1. Use the non-blank value from the matching `COUNTY_STREETS` field.
+2. If the county value is blank, use the matching value from the linked `ROADS_EDIT` feature.
+3. If both values are blank, use the default: `CARTOCODE` `11`, `ONEWAY` `0`, `VERT_LEVEL` `0`, `SPEED_LMT` `25`, or `STATUS` `Active`.
+
+If the selected source value is not in its coded-value domain, the editor replaces it with that field's default. For a multi-select **Add New** operation, there is no single source road, so the editor starts with the defaults and applies the same dropdown values to every created road. For a single new record, the county-road values are used when available.
+
+A yellow highlighted border around a road dropdown means its current value differs from the value initially loaded into the editor. This can mean that you changed the value, that a value was normalized to its default because it was not a valid domain code, or that a multi-select new-road value was changed from its default. The highlight is a review indicator; it does not by itself mean that the value is invalid or that it has already been saved.
+
 ### Adding New Features
 
 Use **Add New** to copy an unlinked new record or records from `DFC_RESULT` into the UTRANS roads layer.
@@ -10,7 +38,9 @@ Use **Add New** to copy an unlinked new record or records from `DFC_RESULT` into
 2. Review or update the road attributes shown in the editor. When multiple records are selected, the values are used for each new road.
 3. Click **Add New**.
 
-When multiple features are selected, the form values override the county-road values for `CARTOCODE`, `ONEWAY`, `VERT_LEVEL`, `SPEED_LMT`, and `STATUS`. Review these values before clicking **Add New** because the same editor values are applied to every new road.
+The form values override the county-road values for `CARTOCODE`, `ONEWAY`, `VERT_LEVEL`, `SPEED_LMT`, and `STATUS`. Review these values before clicking **Add New** because the same editor values are applied to every new road, including when only one feature is selected.
+
+The editor starts these fields with the following defaults when no county-road or UTRANS value is available: `CARTOCODE` `11`, `ONEWAY` `0`, `VERT_LEVEL` `0`, `SPEED_LMT` `25`, and `STATUS` `Active`. If a loaded value is not present in the corresponding coded-value domain, it is replaced with the same default.
 
 The add-in creates a UTRANS road using each selected county-road geometry and attributes, links the `DFC_RESULT` record to the new road, and marks the change status as `COMPLETED`. The map selections are cleared after the operation finishes.
 
@@ -18,7 +48,11 @@ The add-in creates a UTRANS road using each selected county-road geometry and at
 
 Select a `DFC_RESULT` feature to choose its Change Status. Use **IGNORE** for a change that should not update UTRANS, such as a driveway, or **REVISIT** to defer review. Click **Save** to store that change status on the selected DFC result.
 
-For an unlinked new record, **Add New** remains available while Change Status is **COMPLETED**. Choosing **IGNORE** or **REVISIT** replaces it with **Save** so the record can be reviewed without creating a UTRANS road.
+For an unlinked new record, **Add New** is available only when the record's change type is `N` and `BASE_FID` is `-1`. **Add New** creates the UTRANS road from the county-road geometry, links the DFC record, and sets its status to **COMPLETED**. A **COMPLETED** save for an unlinked record is rejected; click **Add New** first. Choosing **IGNORE** or **REVISIT** saves only the DFC status and does not write a UTRANS road. For a linked record, **COMPLETED** saves the edited UTRANS attributes and DFC status, while **IGNORE** and **REVISIT** save only the DFC status.
+
+### Repairing a DFC Identifier
+
+Use **Update DFC BASE_FID** when a DFC record references the wrong UTRANS segment or after splitting a line. Select exactly one feature in `UTRANS.TRANSADMIN.ROADS_EDIT` before using the button. The repair changes `DFC_RESULT.BASE_FID` to that feature and appends the previous identifier to `DFC_RESULT.PREV__NOTES`.
 
 ## Developer Set Up
 
diff --git a/add-in/UGRC.UtransTools.Core.Tests/ReviewRulesTests.cs b/add-in/UGRC.UtransTools.Core.Tests/ReviewRulesTests.cs
index a3d2e4d..c49e2d7 100644
--- a/add-in/UGRC.UtransTools.Core.Tests/ReviewRulesTests.cs
+++ b/add-in/UGRC.UtransTools.Core.Tests/ReviewRulesTests.cs
@@ -162,6 +162,54 @@ public void Allows_new_road_creation_only_for_unlinked_new_records()
         Assert.False(ReviewRules.CanCreateNewUtransRoads([]));
     }
 
+    [Theory]
+    [InlineData("11", "9", "11")]
+    [InlineData("0", "1", "0")]
+    [InlineData("0", "2", "0")]
+    [InlineData("25", "15", "25")]
+    [InlineData("Active", "Retired", "Active")]
+    public void Prefers_primary_road_values_over_fallback_values(
+        string primaryValue,
+        string fallbackValue,
+        string defaultValue
+    )
+    {
+        var result = ReviewRules.ResolveRoadFieldValue(primaryValue, fallbackValue, defaultValue);
+
+        Assert.Equal(primaryValue, result);
+    }
+
+    [Theory]
+    [InlineData("", "15", "25", "15")]
+    [InlineData(" ", "", "25", "25")]
+    [InlineData("", null, "Active", "Active")]
+    public void Falls_back_when_county_road_value_is_blank(
+        string countyValue,
+        string? utransValue,
+        string defaultValue,
+        string expectedValue
+    )
+    {
+        var result = ReviewRules.ResolveRoadFieldValue(countyValue, utransValue, defaultValue);
+
+        Assert.Equal(expectedValue, result);
+    }
+
+    [Theory]
+    [InlineData("25", "25")]
+    [InlineData("0", "25")]
+    [InlineData("Unknown", "25")]
+    public void Normalizes_coded_values_to_allowed_values(string value, string expectedValue)
+    {
+        var result = ReviewRules.NormalizeCodedValue(
+            value,
+            "25",
+            new HashSet<string>(new[] { "5", "25", "80" }, StringComparer.OrdinalIgnoreCase)
+        );
+
+        Assert.Equal(expectedValue, result);
+    }
+
     [Fact]
     public void Transfers_editable_county_values_without_road_overrides()
     {
diff --git a/add-in/UGRC.UtransTools.Core/ReviewRules.cs b/add-in/UGRC.UtransTools.Core/ReviewRules.cs
index 7629574..1fa6c48 100644
--- a/add-in/UGRC.UtransTools.Core/ReviewRules.cs
+++ b/add-in/UGRC.UtransTools.Core/ReviewRules.cs
@@ -57,6 +57,21 @@ IEnumerable<string> addressRangeFieldNames
     public static bool CanCreateNewUtransRoads(IReadOnlyCollection<DfcResultReview> selections) =>
         selections.Count > 0 && selections.All(selection => selection.IsUnlinkedNewRecord);
 
+    public static string ResolveRoadFieldValue(
+        string countyValue,
+        string? utransValue,
+        string defaultValue
+    ) =>
+        !string.IsNullOrWhiteSpace(countyValue) ? countyValue
+        : !string.IsNullOrWhiteSpace(utransValue) ? utransValue
+        : defaultValue;
+
+    public static string NormalizeCodedValue(
+        string value,
+        string defaultValue,
+        IReadOnlySet<string> allowedValues
+    ) => allowedValues.Contains(value) ? value : defaultValue;
+
     public static IReadOnlyDictionary<string, object?> BuildNewRoadPayload(
         IReadOnlyDictionary<string, object?> countyRoadValues,
         IEnumerable<string> editableFieldNames,
diff --git a/add-in/UGRC.UtransTools/Config.daml b/add-in/UGRC.UtransTools/Config.daml
index 75b216d..42b6bc3 100644
--- a/add-in/UGRC.UtransTools/Config.daml
+++ b/add-in/UGRC.UtransTools/Config.daml
@@ -5,7 +5,7 @@
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="http://schemas.esri.com/DADF/Registry file:///C:/Program%20Files/ArcGIS/Pro/bin/ArcGIS.Desktop.Framework.xsd">
 
-  <AddInInfo id="{f893be2f-ad95-46be-9d60-fd6dba457152}" version="1.18" desktopVersion="3.6.59527" product="ArcGISPro">
+  <AddInInfo id="{f893be2f-ad95-46be-9d60-fd6dba457152}" version="1.19" desktopVersion="3.6.59527" product="ArcGISPro">
     <Name>UGRC_UtransTools</Name>
     <Description>UGRC_UtransTools description</Description>
     <Image>Images\AddinDesktop32.png</Image>
diff --git a/add-in/UGRC.UtransTools/Models/EditorReviewState.cs b/add-in/UGRC.UtransTools/Models/EditorReviewState.cs
index 65bc4b8..edd89d7 100644
--- a/add-in/UGRC.UtransTools/Models/EditorReviewState.cs
+++ b/add-in/UGRC.UtransTools/Models/EditorReviewState.cs
@@ -52,7 +52,6 @@ internal EditorReviewState(DfcSelectionSnapshot selection)
     {
         Selection = selection;
         var utransRoad = selection.UtransRoad;
-        var roadValues = utransRoad ?? selection.CountyRoad;
         Fields = new ObservableCollection<AttributeReviewField>(
             UtransEditorConfiguration
                 .EditableAddressFields.Select(field => CreateField(field, true))
@@ -63,21 +62,11 @@ internal EditorReviewState(DfcSelectionSnapshot selection)
                 )
         );
 
-        Cartocode = string.IsNullOrWhiteSpace(roadValues.GetText("CARTOCODE"))
-            ? "11"
-            : roadValues.GetText("CARTOCODE");
-        Oneway = string.IsNullOrWhiteSpace(roadValues.GetText("ONEWAY"))
-            ? "0"
-            : roadValues.GetText("ONEWAY");
-        VerticalLevel = string.IsNullOrWhiteSpace(roadValues.GetText("VERT_LEVEL"))
-            ? "0"
-            : roadValues.GetText("VERT_LEVEL");
-        SpeedLimit = string.IsNullOrWhiteSpace(roadValues.GetText("SPEED_LMT"))
-            ? "25"
-            : roadValues.GetText("SPEED_LMT");
-        Status = string.IsNullOrWhiteSpace(roadValues.GetText("STATUS"))
-            ? "Active"
-            : roadValues.GetText("STATUS");
+        Cartocode = ResolveRoadFieldValue("CARTOCODE", "11");
+        Oneway = ResolveRoadFieldValue("ONEWAY", "0");
+        VerticalLevel = ResolveRoadFieldValue("VERT_LEVEL", "0");
+        SpeedLimit = ResolveRoadFieldValue("SPEED_LMT", "25");
+        Status = ResolveRoadFieldValue("STATUS", "Active");
         _initialCartocode = Cartocode;
         _initialOneway = Oneway;
         _initialVerticalLevel = VerticalLevel;
@@ -100,6 +89,13 @@ AttributeReviewField CreateField(string fieldName, bool isAddressRange) =>
                 utransRoad?.GetText(fieldName) ?? string.Empty,
                 isAddressRange
             );
+
+        string ResolveRoadFieldValue(string fieldName, string defaultValue) =>
+            ReviewRules.ResolveRoadFieldValue(
+                selection.CountyRoad.GetText(fieldName),
+                utransRoad?.GetText(fieldName),
+                defaultValue
+            );
     }
 
     public string Status
@@ -202,6 +198,35 @@ public string ChangeStatus
         );
     }
 
+    internal void NormalizeCodedValues(
+        IEnumerable<CodedValueOption> cartocodeValues,
+        IEnumerable<CodedValueOption> onewayValues,
+        IEnumerable<CodedValueOption> verticalLevelValues,
+        IEnumerable<CodedValueOption> speedLimitValues,
+        IEnumerable<CodedValueOption> statusValues
+    )
+    {
+        Cartocode = NormalizeCodedValue(Cartocode, "11", cartocodeValues);
+        Oneway = NormalizeCodedValue(Oneway, "0", onewayValues);
+        VerticalLevel = NormalizeCodedValue(VerticalLevel, "0", verticalLevelValues);
+        SpeedLimit = NormalizeCodedValue(SpeedLimit, "25", speedLimitValues);
+        Status = NormalizeCodedValue(Status, "Active", statusValues);
+    }
+
+    private static string NormalizeCodedValue(
+        string value,
+        string defaultValue,
+        IEnumerable<CodedValueOption> options
+    ) =>
+        ReviewRules.NormalizeCodedValue(
+            value,
+            defaultValue,
+            new HashSet<string>(
+                options.Select(option => option.Code),
+                StringComparer.OrdinalIgnoreCase
+            )
+        );
+
     private void SetTrackedValue(
         ref string field,
         string value,
diff --git a/add-in/UGRC.UtransTools/Services/LayerValidationService.cs b/add-in/UGRC.UtransTools/Services/LayerValidationService.cs
index 5466616..ae4a612 100644
--- a/add-in/UGRC.UtransTools/Services/LayerValidationService.cs
+++ b/add-in/UGRC.UtransTools/Services/LayerValidationService.cs
@@ -100,7 +100,16 @@ internal Task<
                 StringComparer.OrdinalIgnoreCase
             );
 
-            foreach (var fieldName in new[] { "CARTOCODE", "ONEWAY", "VERT_LEVEL", "STATUS" })
+            foreach (
+                var fieldName in new[]
+                {
+                    "CARTOCODE",
+                    "ONEWAY",
+                    "VERT_LEVEL",
+                    "SPEED_LMT",
+                    "STATUS",
+                }
+            )
             {
                 var field =
                     fields.FirstOrDefault(candidate =>
diff --git a/add-in/UGRC.UtransTools/Services/UtransEditService.cs b/add-in/UGRC.UtransTools/Services/UtransEditService.cs
index bf1e286..0105c15 100644
--- a/add-in/UGRC.UtransTools/Services/UtransEditService.cs
+++ b/add-in/UGRC.UtransTools/Services/UtransEditService.cs
@@ -48,7 +48,7 @@ EditorReviewState roadValues
                             selection.CountyRoad,
                             utransFeatureClass,
                             roadValues,
-                            selections.Count > 1
+                            applyRoadValueOverrides: true
                         )
                     ),
                 })
diff --git a/add-in/UGRC.UtransTools/UtransEditorDockpaneView.xaml b/add-in/UGRC.UtransTools/UtransEditorDockpaneView.xaml
index b2db111..49a2b12 100644
--- a/add-in/UGRC.UtransTools/UtransEditorDockpaneView.xaml
+++ b/add-in/UGRC.UtransTools/UtransEditorDockpaneView.xaml
@@ -490,7 +490,7 @@
             ItemsSource="{Binding CartocodeValues}"
             DisplayMemberPath="Description"
             SelectedValuePath="Code"
-            SelectedValue="{Binding RoadValueState.Cartocode}"
+            SelectedValue="{Binding RoadValueState.Cartocode, Mode=TwoWay}"
             Margin="3"
           />
         </GroupBox>
@@ -509,7 +509,7 @@
             ItemsSource="{Binding OnewayValues}"
             DisplayMemberPath="Description"
             SelectedValuePath="Code"
-            SelectedValue="{Binding RoadValueState.Oneway}"
+            SelectedValue="{Binding RoadValueState.Oneway, Mode=TwoWay}"
             Margin="3"
           />
         </GroupBox>
@@ -566,7 +566,7 @@
             ItemsSource="{Binding VerticalLevelValues}"
             DisplayMemberPath="Description"
             SelectedValuePath="Code"
-            SelectedValue="{Binding RoadValueState.VerticalLevel}"
+            SelectedValue="{Binding RoadValueState.VerticalLevel, Mode=TwoWay}"
             Margin="3"
           />
         </GroupBox>
@@ -588,7 +588,9 @@
           </GroupBox.Style>
           <ComboBox
             ItemsSource="{Binding SpeedLimitValues}"
-            SelectedItem="{Binding RoadValueState.SpeedLimit}"
+            DisplayMemberPath="Description"
+            SelectedValuePath="Code"
+            SelectedValue="{Binding RoadValueState.SpeedLimit, Mode=TwoWay}"
             Margin="3"
           />
         </GroupBox>
@@ -602,7 +604,7 @@
             ItemsSource="{Binding StatusValues}"
             DisplayMemberPath="Description"
             SelectedValuePath="Code"
-            SelectedValue="{Binding RoadValueState.Status}"
+            SelectedValue="{Binding RoadValueState.Status, Mode=TwoWay}"
             Margin="3"
           />
         </GroupBox>
diff --git a/add-in/UGRC.UtransTools/UtransEditorDockpaneViewModel.cs b/add-in/UGRC.UtransTools/UtransEditorDockpaneViewModel.cs
index a2e4374..bda59c9 100644
--- a/add-in/UGRC.UtransTools/UtransEditorDockpaneViewModel.cs
+++ b/add-in/UGRC.UtransTools/UtransEditorDockpaneViewModel.cs
@@ -146,7 +146,7 @@ private set
 
     public EditorReviewState AvailableReviewState => ReviewState ?? EmptyReviewState;
     public EditorReviewState RoadValueState =>
-        _newRoadValueState ?? ReviewState ?? EmptyReviewState;
+        HasReviewState ? ReviewState! : _newRoadValueState ?? ReviewState ?? EmptyReviewState;
 
     private bool IsChangeStatusCompleted =>
         string.Equals(ReviewState?.ChangeStatus, "COMPLETED", StringComparison.OrdinalIgnoreCase);
@@ -252,7 +252,7 @@ private set
     public IReadOnlyList<CodedValueOption> OnewayValues { get; private set; } = [];
     public IReadOnlyList<CodedValueOption> VerticalLevelValues { get; private set; } = [];
     public IReadOnlyList<CodedValueOption> StatusValues { get; private set; } = [];
-    public IReadOnlyList<string> SpeedLimitValues { get; } = CreateRange(5, 80, 5);
+    public IReadOnlyList<CodedValueOption> SpeedLimitValues { get; private set; } = [];
     public IReadOnlyList<string> ChangeStatusValues { get; } =
         new[] { "COMPLETED", "IGNORE", "REVISIT" };
 
@@ -414,7 +414,9 @@ await _dfcSelectionService.HasExactlyOneUtransRoadSelectedAsync(layers)
                 return;
             }
 
-            ReviewState = new EditorReviewState(selection);
+            var reviewState = new EditorReviewState(selection);
+            NormalizeCodedValues(reviewState);
+            ReviewState = reviewState;
             ChangeTypeMessage = selection.ChangeLabel;
             StatusMessage = $"{selection.ChangeLabel} DFC record {selection.ObjectId} loaded.";
         }
@@ -437,6 +439,10 @@ private void SetSelectedNewRecords(IReadOnlyList<DfcSelectionSnapshot> selection
             1 => new EditorReviewState(selections[0]),
             _ => new EditorReviewState(),
         };
+        if (_newRoadValueState is not null)
+        {
+            NormalizeCodedValues(_newRoadValueState);
+        }
         SelectedDfcObjectIds = string.Join(
             ", ",
             selections.Select(selection => selection.ObjectId)
@@ -470,14 +476,38 @@ private async Task LoadCodedValueOptionsAsync(EditorLayerContext layers)
         CartocodeValues = options["CARTOCODE"];
         OnewayValues = options["ONEWAY"];
         VerticalLevelValues = options["VERT_LEVEL"];
+        SpeedLimitValues = options["SPEED_LMT"];
         StatusValues = options["STATUS"];
         _codedValueOptionsLoaded = true;
+        if (_newRoadValueState is not null)
+        {
+            NormalizeCodedValues(_newRoadValueState);
+            OnPropertyChanged(nameof(RoadValueState));
+        }
+
         OnPropertyChanged(nameof(CartocodeValues));
         OnPropertyChanged(nameof(OnewayValues));
         OnPropertyChanged(nameof(VerticalLevelValues));
+        OnPropertyChanged(nameof(SpeedLimitValues));
         OnPropertyChanged(nameof(StatusValues));
     }
 
+    private void NormalizeCodedValues(EditorReviewState state)
+    {
+        if (!_codedValueOptionsLoaded)
+        {
+            return;
+        }
+
+        state.NormalizeCodedValues(
+            CartocodeValues,
+            OnewayValues,
+            VerticalLevelValues,
+            SpeedLimitValues,
+            StatusValues
+        );
+    }
+
     private static IReadOnlyList<string> CreateRange(int start, int end)
     {
         var values = new List<string>();

From f27d38a3c61b1bef3c4e9a892e406f998de96933 Mon Sep 17 00:00:00 2001
From: Scott Davis <stdavis@utah.gov>
Date: Wed, 2 Sep 2026 14:04:30 -0600
Subject: [PATCH 10/13] chore(add-in): update test project configuration to use
 Any CPU

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
---
 UGRC.UtransTools.sln | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/UGRC.UtransTools.sln b/UGRC.UtransTools.sln
index efc700b..573291e 100644
--- a/UGRC.UtransTools.sln
+++ b/UGRC.UtransTools.sln
@@ -47,15 +47,15 @@ Global
 		{8EADADCE-DF0D-46F4-A64C-24BAB8438F5F}.Release|x86.Build.0 = Release|Any CPU
 		{DA2F0C58-0D25-419B-A5CC-8498A4B47B2B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{DA2F0C58-0D25-419B-A5CC-8498A4B47B2B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DA2F0C58-0D25-419B-A5CC-8498A4B47B2B}.Debug|x64.ActiveCfg = Debug|x64
-		{DA2F0C58-0D25-419B-A5CC-8498A4B47B2B}.Debug|x64.Build.0 = Debug|x64
-		{DA2F0C58-0D25-419B-A5CC-8498A4B47B2B}.Debug|x86.ActiveCfg = Debug|x86
-		{DA2F0C58-0D25-419B-A5CC-8498A4B47B2B}.Debug|x86.Build.0 = Debug|x86
+		{DA2F0C58-0D25-419B-A5CC-8498A4B47B2B}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{DA2F0C58-0D25-419B-A5CC-8498A4B47B2B}.Debug|x64.Build.0 = Debug|Any CPU
+		{DA2F0C58-0D25-419B-A5CC-8498A4B47B2B}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{DA2F0C58-0D25-419B-A5CC-8498A4B47B2B}.Debug|x86.Build.0 = Debug|Any CPU
 		{DA2F0C58-0D25-419B-A5CC-8498A4B47B2B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{DA2F0C58-0D25-419B-A5CC-8498A4B47B2B}.Release|x64.ActiveCfg = Release|x64
-		{DA2F0C58-0D25-419B-A5CC-8498A4B47B2B}.Release|x64.Build.0 = Release|x64
-		{DA2F0C58-0D25-419B-A5CC-8498A4B47B2B}.Release|x86.ActiveCfg = Release|x86
-		{DA2F0C58-0D25-419B-A5CC-8498A4B47B2B}.Release|x86.Build.0 = Release|x86
+		{DA2F0C58-0D25-419B-A5CC-8498A4B47B2B}.Release|x64.ActiveCfg = Release|Any CPU
+		{DA2F0C58-0D25-419B-A5CC-8498A4B47B2B}.Release|x64.Build.0 = Release|Any CPU
+		{DA2F0C58-0D25-419B-A5CC-8498A4B47B2B}.Release|x86.ActiveCfg = Release|Any CPU
+		{DA2F0C58-0D25-419B-A5CC-8498A4B47B2B}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

From 6b8f576f202945430945a48faaa8224cf953899c Mon Sep 17 00:00:00 2001
From: Scott Davis <stdavis@utah.gov>
Date: Wed, 2 Sep 2026 14:06:48 -0600
Subject: [PATCH 11/13] chore(add-in): remove fullname calculation in favor of
 letting the attribute rule take care of it

---
 .../ReviewRulesTests.cs                       | 19 +-------
 add-in/UGRC.UtransTools.Core/ReviewRules.cs   | 16 -------
 .../test/text_calculations.test.ts            | 44 ++++++++++++++-----
 3 files changed, 34 insertions(+), 45 deletions(-)

diff --git a/add-in/UGRC.UtransTools.Core.Tests/ReviewRulesTests.cs b/add-in/UGRC.UtransTools.Core.Tests/ReviewRulesTests.cs
index c49e2d7..daaaff9 100644
--- a/add-in/UGRC.UtransTools.Core.Tests/ReviewRulesTests.cs
+++ b/add-in/UGRC.UtransTools.Core.Tests/ReviewRulesTests.cs
@@ -115,7 +115,7 @@ public void Rejects_completed_save_for_unlinked_record()
     }
 
     [Fact]
-    public void Builds_road_payload_with_street_type_for_named_road()
+    public void Builds_road_payload()
     {
         var payload = ReviewRules.BuildRoadPayload(
             new Dictionary<string, object?>
@@ -127,7 +127,6 @@ public void Builds_road_payload_with_street_type_for_named_road()
             new RoadReviewValues("11", "0", "0", "25", "Active")
         );
 
-        Assert.Equal("Main St", payload["FULLNAME"]);
         Assert.Equal("11", payload["CARTOCODE"]);
         Assert.Equal("0", payload["ONEWAY"]);
         Assert.Equal("0", payload["VERT_LEVEL"]);
@@ -135,22 +134,6 @@ public void Builds_road_payload_with_street_type_for_named_road()
         Assert.Equal("Active", payload["STATUS"]);
     }
 
-    [Fact]
-    public void Builds_road_payload_with_direction_for_numeric_road()
-    {
-        var payload = ReviewRules.BuildRoadPayload(
-            new Dictionary<string, object?>
-            {
-                ["NAME"] = "200",
-                ["POSTTYPE"] = "St",
-                ["POSTDIR"] = "W",
-            },
-            new RoadReviewValues("11", "0", "0", "25", "Active")
-        );
-
-        Assert.Equal("200 W", payload["FULLNAME"]);
-    }
-
     [Fact]
     public void Allows_new_road_creation_only_for_unlinked_new_records()
     {
diff --git a/add-in/UGRC.UtransTools.Core/ReviewRules.cs b/add-in/UGRC.UtransTools.Core/ReviewRules.cs
index 1fa6c48..f0a34aa 100644
--- a/add-in/UGRC.UtransTools.Core/ReviewRules.cs
+++ b/add-in/UGRC.UtransTools.Core/ReviewRules.cs
@@ -113,7 +113,6 @@ RoadReviewValues reviewValues
             ["SPEED_LMT"] = reviewValues.SpeedLimit,
             ["STATUS"] = reviewValues.Status,
         };
-        values["FULLNAME"] = BuildFullName(values);
 
         return new ReadOnlyDictionary<string, object?>(values);
     }
@@ -145,19 +144,4 @@ public static SavePlan CreateSavePlan(
                 : new ReadOnlyDictionary<string, object?>(new Dictionary<string, object?>())
         );
     }
-
-    private static string BuildFullName(IReadOnlyDictionary<string, object?> values)
-    {
-        var name = GetText(values, "NAME");
-        var suffix = name.All(char.IsDigit)
-            ? GetText(values, "POSTDIR")
-            : GetText(values, "POSTTYPE");
-        return string.IsNullOrWhiteSpace(suffix) ? name : $"{name} {suffix}".Trim();
-    }
-
-    private static string GetText(IReadOnlyDictionary<string, object?> values, string fieldName) =>
-        values.TryGetValue(fieldName, out var value)
-            ? value?.ToString()?.Replace("'", string.Empty, StringComparison.Ordinal)
-                ?? string.Empty
-            : string.Empty;
 }
diff --git a/attribute-rules/test/text_calculations.test.ts b/attribute-rules/test/text_calculations.test.ts
index 99b649c..a849ed3 100644
--- a/attribute-rules/test/text_calculations.test.ts
+++ b/attribute-rules/test/text_calculations.test.ts
@@ -3,29 +3,51 @@ import { feature, loadExecutor } from "./_helpers.js";
 
 const whitespaceExecutor = await loadExecutor(
   "calculation/Roads_Edit/remove_extra_whitespace.arcade",
-  [{ name: "$feature", type: "feature" }]
+  [{ name: "$feature", type: "feature" }],
 );
 const fullnameExecutor = await loadExecutor(
   "calculation/Roads_Edit/fullname_calculation.arcade",
-  [{ name: "$feature", type: "feature" }]
+  [{ name: "$feature", type: "feature" }],
 );
 
 test("remove_extra_whitespace trims and collapses spaces", () => {
-  expect(whitespaceExecutor.execute({ "$feature": feature({ NAME: "  NORTH   MAIN  " }) })).toBe("NORTH MAIN");
+  expect(
+    whitespaceExecutor.execute({
+      $feature: feature({ NAME: "  NORTH   MAIN  " }),
+    }),
+  ).toBe("NORTH MAIN");
 });
 
 test("remove_extra_whitespace returns an empty string for a missing NAME", () => {
-  expect(whitespaceExecutor.execute({ "$feature": feature({ NAME: null }) })).toBe("");
+  expect(
+    whitespaceExecutor.execute({ $feature: feature({ NAME: null }) }),
+  ).toBe("");
 });
 
 test("fullname_calculation combines normalized name parts", () => {
-  expect(fullnameExecutor.execute({
-    "$feature": feature({ NAME: "  O'MAIN  ", POSTDIR: null, POSTTYPE: "  RD  " })
-  })).toBe("OMAIN RD");
+  expect(
+    fullnameExecutor.execute({
+      $feature: feature({
+        NAME: "  O'MAIN  ",
+        POSTDIR: null,
+        POSTTYPE: "  RD  ",
+      }),
+    }),
+  ).toBe("OMAIN RD");
+});
+
+test("fullname_calculation includes both suffixes for numeric names", () => {
+  expect(
+    fullnameExecutor.execute({
+      $feature: feature({ NAME: "200", POSTDIR: "W", POSTTYPE: "St" }),
+    }),
+  ).toBe("200 W St");
 });
 
 test("fullname_calculation omits missing name parts", () => {
-  expect(fullnameExecutor.execute({
-    "$feature": feature({ NAME: null, POSTDIR: " N ", POSTTYPE: null })
-  })).toBe("N");
-});
\ No newline at end of file
+  expect(
+    fullnameExecutor.execute({
+      $feature: feature({ NAME: null, POSTDIR: " N ", POSTTYPE: null }),
+    }),
+  ).toBe("N");
+});

From d95eeff63b71d6e38e209133ef1bbe7d6a7410dd Mon Sep 17 00:00:00 2001
From: Scott Davis <stdavis@utah.gov>
Date: Wed, 2 Sep 2026 14:17:03 -0600
Subject: [PATCH 12/13] chore(add-in): new release

---
 add-in/UGRC.UtransTools/Config.daml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/add-in/UGRC.UtransTools/Config.daml b/add-in/UGRC.UtransTools/Config.daml
index 42b6bc3..dc0f4e4 100644
--- a/add-in/UGRC.UtransTools/Config.daml
+++ b/add-in/UGRC.UtransTools/Config.daml
@@ -5,7 +5,7 @@
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="http://schemas.esri.com/DADF/Registry file:///C:/Program%20Files/ArcGIS/Pro/bin/ArcGIS.Desktop.Framework.xsd">
 
-  <AddInInfo id="{f893be2f-ad95-46be-9d60-fd6dba457152}" version="1.19" desktopVersion="3.6.59527" product="ArcGISPro">
+  <AddInInfo id="{f893be2f-ad95-46be-9d60-fd6dba457152}" version="1.20" desktopVersion="3.6.59527" product="ArcGISPro">
     <Name>UGRC_UtransTools</Name>
     <Description>UGRC_UtransTools description</Description>
     <Image>Images\AddinDesktop32.png</Image>

From 7fbf48b93783e3c9ca4907da8b2ef2738f04b152 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Thu, 3 Sep 2026 16:22:00 +0000
Subject: [PATCH 13/13] Use Pascal_Snake_Case for test names

Co-authored-by: stdavis <1326248+stdavis@users.noreply.github.com>
---
 .../ReviewRulesTests.cs                       | 30 +++++++++----------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/add-in/UGRC.UtransTools.Core.Tests/ReviewRulesTests.cs b/add-in/UGRC.UtransTools.Core.Tests/ReviewRulesTests.cs
index daaaff9..27eca3a 100644
--- a/add-in/UGRC.UtransTools.Core.Tests/ReviewRulesTests.cs
+++ b/add-in/UGRC.UtransTools.Core.Tests/ReviewRulesTests.cs
@@ -10,13 +10,13 @@ public sealed class ReviewRulesTests
     [InlineData("123.5", true)]
     [InlineData("12A", false)]
     [InlineData("12-14", false)]
-    public void Validates_address_range_values(string value, bool isValid)
+    public void Validates_Address_Range_Values(string value, bool isValid)
     {
         Assert.Equal(isValid, ReviewRules.IsValidAddressRange(value));
     }
 
     [Fact]
-    public void Normalizes_edited_road_values_for_saving()
+    public void Normalizes_Edited_Road_Values_For_Saving()
     {
         var values = ReviewRules.NormalizeEditedRoadValues(
             new Dictionary<string, string> { ["NAME"] = " O'Brien ", ["L_F_ADD"] = " " },
@@ -28,7 +28,7 @@ public void Normalizes_edited_road_values_for_saving()
     }
 
     [Fact]
-    public void Creates_status_only_save_for_unlinked_record_with_ignore_status()
+    public void Creates_Status_Only_Save_For_Unlinked_Record_With_Ignore_Status()
     {
         var plan = ReviewRules.CreateSavePlan(
             ChangeStatus.Ignore,
@@ -42,7 +42,7 @@ public void Creates_status_only_save_for_unlinked_record_with_ignore_status()
     }
 
     [Fact]
-    public void Creates_status_only_save_for_unlinked_record_with_revisit_status()
+    public void Creates_Status_Only_Save_For_Unlinked_Record_With_Revisit_Status()
     {
         var plan = ReviewRules.CreateSavePlan(
             ChangeStatus.Revisit,
@@ -56,7 +56,7 @@ public void Creates_status_only_save_for_unlinked_record_with_revisit_status()
     }
 
     [Fact]
-    public void Creates_road_save_for_linked_record_with_completed_status()
+    public void Creates_Road_Save_For_Linked_Record_With_Completed_Status()
     {
         var plan = ReviewRules.CreateSavePlan(
             ChangeStatus.Completed,
@@ -70,7 +70,7 @@ public void Creates_road_save_for_linked_record_with_completed_status()
     }
 
     [Fact]
-    public void Creates_status_only_save_for_linked_record_with_revisit_status()
+    public void Creates_Status_Only_Save_For_Linked_Record_With_Revisit_Status()
     {
         var plan = ReviewRules.CreateSavePlan(
             ChangeStatus.Revisit,
@@ -84,7 +84,7 @@ public void Creates_status_only_save_for_linked_record_with_revisit_status()
     }
 
     [Fact]
-    public void Creates_status_only_save_for_linked_record_with_ignore_status()
+    public void Creates_Status_Only_Save_For_Linked_Record_With_Ignore_Status()
     {
         var plan = ReviewRules.CreateSavePlan(
             ChangeStatus.Ignore,
@@ -98,7 +98,7 @@ public void Creates_status_only_save_for_linked_record_with_ignore_status()
     }
 
     [Fact]
-    public void Rejects_completed_save_for_unlinked_record()
+    public void Rejects_Completed_Save_For_Unlinked_Record()
     {
         var exception = Assert.Throws<InvalidOperationException>(() =>
             ReviewRules.CreateSavePlan(
@@ -115,7 +115,7 @@ public void Rejects_completed_save_for_unlinked_record()
     }
 
     [Fact]
-    public void Builds_road_payload()
+    public void Builds_Road_Payload()
     {
         var payload = ReviewRules.BuildRoadPayload(
             new Dictionary<string, object?>
@@ -135,7 +135,7 @@ public void Builds_road_payload()
     }
 
     [Fact]
-    public void Allows_new_road_creation_only_for_unlinked_new_records()
+    public void Allows_New_Road_Creation_Only_For_Unlinked_New_Records()
     {
         var selections = new[] { new DfcResultReview("N", -1), new DfcResultReview("N", -1) };
 
@@ -151,7 +151,7 @@ public void Allows_new_road_creation_only_for_unlinked_new_records()
     [InlineData("0", "2", "0")]
     [InlineData("25", "15", "25")]
     [InlineData("Active", "Retired", "Active")]
-    public void Prefers_primary_road_values_over_fallback_values(
+    public void Prefers_Primary_Road_Values_Over_Fallback_Values(
         string primaryValue,
         string fallbackValue,
         string defaultValue
@@ -166,7 +166,7 @@ string defaultValue
     [InlineData("", "15", "25", "15")]
     [InlineData(" ", "", "25", "25")]
     [InlineData("", null, "Active", "Active")]
-    public void Falls_back_when_county_road_value_is_blank(
+    public void Falls_Back_When_County_Road_Value_Is_Blank(
         string countyValue,
         string? utransValue,
         string defaultValue,
@@ -182,7 +182,7 @@ string expectedValue
     [InlineData("25", "25")]
     [InlineData("0", "25")]
     [InlineData("Unknown", "25")]
-    public void Normalizes_coded_values_to_allowed_values(string value, string expectedValue)
+    public void Normalizes_Coded_Values_To_Allowed_Values(string value, string expectedValue)
     {
         var result = ReviewRules.NormalizeCodedValue(
             value,
@@ -194,7 +194,7 @@ public void Normalizes_coded_values_to_allowed_values(string value, string expec
     }
 
     [Fact]
-    public void Transfers_editable_county_values_without_road_overrides()
+    public void Transfers_Editable_County_Values_Without_Road_Overrides()
     {
         var payload = ReviewRules.BuildNewRoadPayload(
             new Dictionary<string, object?>
@@ -215,7 +215,7 @@ public void Transfers_editable_county_values_without_road_overrides()
     }
 
     [Fact]
-    public void Builds_bulk_new_road_payload_from_editable_county_values_and_overrides()
+    public void Builds_Bulk_New_Road_Payload_From_Editable_County_Values_And_Overrides()
     {
         var payload = ReviewRules.BuildNewRoadPayload(
             new Dictionary<string, object?>