medicafe 0.250812.5__tar.gz → 0.250813.0__tar.gz

{medicafe-0.250812.5 → medicafe-0.250813.0}/MediBot/MediBot.bat

@@ -405,8 +405,6 @@ echo 6. Run MediBot
 echo.
 echo 7. Troubleshooting
 echo.
-echo 9. Toggle Performance Logging (session)
-echo.
 echo 8. Exit
 echo.
 set /p choice=Enter your choice:  
@@ -420,7 +418,6 @@ if "!choice!"=="4" goto united_claims_status
 if "!choice!"=="3" goto medilink_flow
 if "!choice!"=="2" goto download_emails
 if "!choice!"=="1" goto check_updates
-if "!choice!"=="9" goto toggle_perf_logging
 if "!choice!"=="0" goto end_script
 
 echo Invalid choice. Please try again.
@@ -572,7 +569,7 @@ if not exist "%_UPD_RUNNER%" (
 echo.
 echo Launching updater and closing this window...
 start "MediCafe Update" "%_UPD_RUNNER%"
-exit /b 0
+exit 0
 
 :: Download Carol's Emails
 :download_emails
@@ -636,7 +633,7 @@ if /I "%MEDICAFE_PERFORMANCE_LOGGING%"=="1" (
 echo.
 echo Note: This affects current session only. To persist, set in config.json.
 pause
-goto main_menu
+goto troubleshooting_menu
 
 :: United Claims Status
 :united_claims_status
@@ -715,14 +712,16 @@ echo Troubleshooting Options:
 echo.
 echo 1. Open Latest Log File
 echo 2. Clear Python Cache
-echo 3. Forced MediCafe version rollback - no dependencies
-echo 4. Back to Main Menu
+echo 3. Toggle Performance Logging ^(session^)
+echo 4. Forced MediCafe version rollback
+echo 5. Back to Main Menu
 echo.
 set /p tchoice=Enter your choice: 
 if "%tchoice%"=="1" goto open_latest_log
 if "%tchoice%"=="2" goto clear_cache_menu
-if "%tchoice%"=="3" goto forced_version_rollback
-if "%tchoice%"=="4" goto main_menu
+if "%tchoice%"=="3" goto toggle_perf_logging
+if "%tchoice%"=="4" goto forced_version_rollback
+if "%tchoice%"=="5" goto main_menu
 echo Invalid choice. Please try again.
 pause
 goto troubleshooting_menu
@@ -743,7 +742,7 @@ goto troubleshooting_menu
 :: End Script
 :end_script
 echo Exiting MediBot
-exit /b 0
+exit 0
 
 :: Full Debug Mode moved to external script full_debug_suite.bat
 

{medicafe-0.250812.5 → medicafe-0.250813.0}/MediBot/MediBot_Crosswalk_Library.py

@@ -376,6 +376,8 @@ def crosswalk_update(client, config, crosswalk): # Upstream of this is only Medi
                     'medisoft_medicare_id': []  # PERFORMANCE FIX: Use list instead of set to avoid conversions
                 }
                 MediLink_ConfigLoader.log("Initialized payer ID {} in crosswalk with endpoint '{}'.".format(payer_id, selected_endpoint), config, level="DEBUG")
+                # TODO (MEDICARE ENDPOINTS): If payer_id is Medicare (e.g., in config['MediLink_Config']['cob_settings']['medicare_payer_ids']),
+                # set endpoint to 'MEDICARE_PRIMARY' and optionally store 'crossover_endpoint' for later automation.
 
             # Add the insurance ID to the payer ID entry (PERFORMANCE FIX: Use list operations)
             insurance_id_str = str(insurance_id)  # Ensure ID is string

{medicafe-0.250812.5 → medicafe-0.250813.0}/MediBot/MediBot_Crosswalk_Utils.py

@@ -370,10 +370,12 @@ def save_crosswalk(client, config, crosswalk, skip_api_operations=False, api_cac
                     crosswalk['payer_id'][payer_id]['endpoint'] = select_endpoint(config)  # Use the helper function to set the endpoint
                     MediLink_ConfigLoader.log("Initialized 'endpoint' for payer ID {}.".format(payer_id), config, level="DEBUG")
 
-            # Initialize medisoft_id and medisoft_medicare_id as empty lists if they do not exist
-            crosswalk['payer_id'][payer_id].setdefault('medisoft_id', [])
-            crosswalk['payer_id'][payer_id].setdefault('medisoft_medicare_id', []) # does this work in 3.4.4?
-            MediLink_ConfigLoader.log("Ensured 'medisoft_id' and 'medisoft_medicare_id' for payer ID {} are initialized.".format(payer_id), config, level="DEBUG")
+        # Initialize medisoft_id and medisoft_medicare_id as empty lists if they do not exist
+        crosswalk['payer_id'][payer_id].setdefault('medisoft_id', [])
+        crosswalk['payer_id'][payer_id].setdefault('medisoft_medicare_id', []) # does this work in 3.4.4?
+        MediLink_ConfigLoader.log("Ensured 'medisoft_id' and 'medisoft_medicare_id' for payer ID {} are initialized.".format(payer_id), config, level="DEBUG")
+        # TODO (CROSSWALK VALIDATION): Enforce distinctness between 'medisoft_id' and 'medisoft_medicare_id' and support optional
+        # 'crossover_endpoint' per payer. Use config['MediLink_Config']['cob_settings']['medicare_payer_ids'] to detect Medicare payers.
         
         # Convert sets to sorted lists for JSON serialization
         for payer_id, details in crosswalk.get('payer_id', {}).items():

{medicafe-0.250812.5 → medicafe-0.250813.0}/MediBot/MediBot_Preprocessor_lib.py

@@ -816,6 +816,11 @@ def update_insurance_ids(csv_data, config, crosswalk):
         
         # Assign the resolved insurance ID to the row
         row['Ins1 Insurance ID'] = insurance_id
+        # TODO (SECONDARY QUEUE): When building a secondary-claims queue after Medicare crossover,
+        # set claim_type='secondary' and attach prior payer fields here from the Medicare primary outcome:
+        # - row['prior_payer_name'] = 'MEDICARE'
+        # - row['prior_payer_id'] = best Medicare ID from config/crosswalk
+        # - optionally row['primary_paid_amount'], row['cas_adjustments'] extracted from 835
         processed_count += 1
         # LOGGING STRATEGY: Remove success logging - DEBUG is typically silent anyway
         # if processed_count <= 10 or processed_count % 100 == 0:  # Log first 10 and every 100th

{medicafe-0.250812.5 → medicafe-0.250813.0}/MediBot/update_medicafe.py

@@ -1,5 +1,5 @@
 #update_medicafe.py
-import subprocess, sys, time, platform, os, shutil
+import subprocess, sys, time, platform, os, shutil, random
 
 # Safe import for pkg_resources with fallback
 try:
@@ -162,6 +162,8 @@ def get_latest_version(package, retries=3, delay=1):
                 time.sleep(delay)
     return None
 
+ 
+
 def check_internet_connection():
     try:
         requests.get("http://www.google.com", timeout=5)
@@ -288,7 +290,7 @@ def compare_versions(version1, version2):
     v2_parts = list(map(int, version2.split(".")))
     return (v1_parts > v2_parts) - (v1_parts < v2_parts)
 
-def upgrade_package(package, retries=3, delay=2):  # Updated retries to 3
+def upgrade_package(package, retries=4, delay=2, target_version=None):  # Updated retries to 4
     """
     Attempts to upgrade the package multiple times with delays in between.
     """
@@ -296,23 +298,33 @@ def upgrade_package(package, retries=3, delay=2):  # Updated retries to 3
         print_status("No internet connection detected. Please check your internet connection and try again.", "ERROR")
         print_final_result(False, "No internet connection available")
     
+    # Light verbosity: show pinned target once
+    if target_version:
+        print("Pinned target version: {}".format(target_version))
+
     for attempt in range(1, retries + 1):
-        print("Attempt {} to upgrade {}...".format(attempt, package))
+        print("Attempt {}/{} to upgrade {}...".format(attempt, retries, package))
         
         # Use a more compatible approach for Python 3.4
         # Try with --no-deps first to avoid dependency resolution issues
+        pkg_spec = package
+        if target_version:
+            pkg_spec = "{}=={}".format(package, target_version)
+
         cmd = [
             sys.executable, '-m', 'pip', 'install', '--upgrade',
-            '--no-deps', '--no-cache-dir', '--disable-pip-version-check', '-q', package
+            '--no-deps', '--no-cache-dir', '--disable-pip-version-check', '-q', pkg_spec
         ]
         
+        print("Using pip upgrade with --no-deps and --no-cache-dir")
         process = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
         stdout, stderr = process.communicate()
         
         if process.returncode == 0:
             print(stdout.decode().strip())
             new_version = get_installed_version(package)  # Get new version after upgrade
-            if compare_versions(new_version, get_latest_version(package)) >= 0:  # Compare versions
+            expected_version = target_version or get_latest_version(package)
+            if expected_version and compare_versions(new_version, expected_version) >= 0:  # Compare versions
                 if attempt == 1:
                     print_status("Upgrade succeeded!", "SUCCESS")
                 else:
@@ -320,20 +332,27 @@ def upgrade_package(package, retries=3, delay=2):  # Updated retries to 3
                 time.sleep(delay)
                 return True
             else:
-                print_status("Upgrade failed. Current version remains: {}".format(new_version), "WARNING")
+                print_status("Upgrade incomplete. Current version: {} Expected at least: {}".format(new_version, expected_version), "WARNING")
                 if attempt < retries:
                     print("Retrying in {} seconds...".format(delay))
-                    time.sleep(delay)
+                    try:
+                        time.sleep(delay + (random.random() * 0.5))
+                    except Exception:
+                        time.sleep(delay)
         else:
             print(stderr.decode().strip())
             print_status("Attempt {}: Upgrade failed with --no-deps.".format(attempt), "WARNING")
             
             # If --no-deps failed, try with --force-reinstall to bypass dependency issues
             if attempt < retries:
-                print("Retrying with --force-reinstall...")
+                print("Fallback this attempt: retrying with --force-reinstall...")
+                pkg_spec = package
+                if target_version:
+                    pkg_spec = "{}=={}".format(package, target_version)
+
                 cmd = [
                     sys.executable, '-m', 'pip', 'install', '--upgrade',
-                    '--force-reinstall', '--no-cache-dir', '--disable-pip-version-check', '-q', package
+                    '--force-reinstall', '--no-cache-dir', '--disable-pip-version-check', '-q', pkg_spec
                 ]
                 
                 process = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
@@ -342,19 +361,23 @@ def upgrade_package(package, retries=3, delay=2):  # Updated retries to 3
                 if process.returncode == 0:
                     print(stdout.decode().strip())
                     new_version = get_installed_version(package)
-                    if compare_versions(new_version, get_latest_version(package)) >= 0:
+                    expected_version = target_version or get_latest_version(package)
+                    if expected_version and compare_versions(new_version, expected_version) >= 0:
                         print_status("Attempt {}: Upgrade succeeded with --force-reinstall!".format(attempt), "SUCCESS")
                         time.sleep(delay)
                         return True
                     else:
-                        print_status("Upgrade failed. Current version remains: {}".format(new_version), "WARNING")
+                        print_status("Upgrade incomplete. Current version: {} Expected at least: {}".format(new_version, expected_version), "WARNING")
                 else:
                     print(stderr.decode().strip())
                     print_status("Attempt {}: Upgrade failed with --force-reinstall.".format(attempt), "WARNING")
                 
                 if attempt < retries:
                     print("Retrying in {} seconds...".format(delay))
-                    time.sleep(delay)
+                    try:
+                        time.sleep(delay + (random.random() * 0.5))
+                    except Exception:
+                        time.sleep(delay)
     
     print_status("All upgrade attempts failed.", "ERROR")
     return False
@@ -566,7 +589,7 @@ def main():
         print("Current version: {}".format(current_version))
         print("Target version: {}".format(latest_version))
 
-        if upgrade_package(package):
+        if upgrade_package(package, target_version=latest_version):
             # STEP 8: Verify upgrade
             debug_step(8, "Upgrade Verification")
             new_version = get_installed_version(package)

{medicafe-0.250812.5 → medicafe-0.250813.0}/MediCafe/api_core.py

@@ -983,18 +983,18 @@ def is_test_mode(client, body, endpoint_type):
 def submit_uhc_claim(client, x12_request_data):
     """
     Submits a UHC claim and retrieves the claim acknowledgement details.
-
+    
     This function first submits the claim using the provided x12 837p data. If the client is in Test Mode, 
     it returns a simulated response. If Test Mode is not enabled, it submits the claim and then retrieves 
     the claim acknowledgement details using the transaction ID from the initial response.
-
+    
     NOTE: This function uses endpoints that may not be available in the new swagger version:
     - /Claims/api/claim-submission/v1 (claim submission)
     - /Claims/api/claim-details/v1 (claim acknowledgement)
     
     If these endpoints are deprecated in the new swagger, this function will need to be updated
     to use the new available endpoints.
-
+    
     :param client: An instance of APIClient
     :param x12_request_data: The x12 837p data as a string
     :return: The final response containing the claim acknowledgement details or a dummy response if in Test Mode
@@ -1014,24 +1014,24 @@ def submit_uhc_claim(client, x12_request_data):
     endpoints = medi.get('endpoints', {})
     claim_submission_url = endpoints.get(endpoint_name, {}).get('additional_endpoints', {}).get('claim_submission', '')
     claim_details_url = endpoints.get(endpoint_name, {}).get('additional_endpoints', {}).get('claim_details', '')
-
+ 
     MediLink_ConfigLoader.log("Claim Submission URL: {}".format(claim_submission_url), level="INFO")
     MediLink_ConfigLoader.log("Claim Details URL: {}".format(claim_details_url), level="INFO")
-
+ 
     # Headers for the request
     headers = {'Content-Type': 'application/json'} 
-
+ 
     # Request body for claim submission
     claim_body = {'x12RequestData': x12_request_data}
-
+ 
     MediLink_ConfigLoader.log("Claim Body Keys: {}".format(list(claim_body.keys())), level="INFO")
     MediLink_ConfigLoader.log("Headers: {}".format(json.dumps(headers, indent=2)), level="INFO")
-
+ 
     # Check if Test Mode is enabled and return simulated response if so
     test_mode_response = is_test_mode(client, claim_body, 'claim_submission')
     if test_mode_response:
         return test_mode_response
-    
+ 
     # Make the API call to submit the claim
     try:
         MediLink_ConfigLoader.log("Making claim submission API call...", level="INFO")
@@ -1047,16 +1047,43 @@ def submit_uhc_claim(client, x12_request_data):
         
         # Prepare the request body for the claim acknowledgement retrieval
         acknowledgement_body = {'transactionId': transaction_id}
-
+ 
         # Check if Test Mode is enabled and return simulated response if so
         test_mode_response = is_test_mode(client, acknowledgement_body, 'claim_details')
         if test_mode_response:
             return test_mode_response
-
+ 
         # Make the API call to retrieve the claim acknowledgement details
         acknowledgement_response = client.make_api_call(endpoint_name, 'POST', claim_details_url, data=acknowledgement_body, headers=headers)
+        
+        # Persist as unified ack event (best-effort)
+        try:
+            from MediCafe.submission_index import append_ack_event, ensure_submission_index
+            cfg, _ = MediLink_ConfigLoader.load_configuration()
+            receipts_root = extract_medilink_config(cfg).get('local_claims_path', None)
+            if receipts_root:
+                ensure_submission_index(receipts_root)
+                status_text = ''
+                try:
+                    # Attempt to pull a readable status from the response
+                    status_text = acknowledgement_response.get('status') or acknowledgement_response.get('message') or ''
+                except Exception:
+                    status_text = ''
+                append_ack_event(
+                    receipts_root,
+                    '',  # claim_key unknown here
+                    status_text,
+                    'API-277',
+                    'uhcapi',
+                    {'transactionId': transaction_id},
+                    'api_ack',
+                    int(time.time())
+                )
+        except Exception:
+            pass
+        
         return acknowledgement_response
-
+ 
     except Exception as e:
         print("Error during claim processing: {}".format(e))
         raise

{medicafe-0.250812.5 → medicafe-0.250813.0}/MediCafe/submission_index.py

@@ -22,6 +22,9 @@ META_FILENAME = 'submission_index_meta.json'
 INDEX_FILENAME = 'submission_index.jsonl'
 LOCK_FILENAME = 'submission_index.lock'
 
+# New: ack field keys for richer timeline entries
+ACK_FIELDS = ['ack_type', 'ack_timestamp', 'control_ids', 'source', 'file_name']
+
 
 def build_initial_index(receipts_root, lookback_days=200):
     """
@@ -123,6 +126,47 @@ def compute_claim_key(patient_id, payer_id, primary_insurance, date_of_service,
     ])
 
 
+def append_ack_event(receipts_root, claim_key, status_text, ack_type, file_name, control_ids, source, ack_timestamp=None):
+    """
+    Append a lightweight ack/timeline event to the index. XP/Py3.4/ASCII-safe.
+    - claim_key may be empty if unknown. Caller should pass when available.
+    - control_ids is a dict with optional ISA/GS/ST/TRN or transactionId.
+    """
+    try:
+        _ensure_files_exist(receipts_root)
+        event = {
+            'claim_key': claim_key or '',
+            'patient_id': '',
+            'payer_id': '',
+            'primary_insurance': '',
+            'dos': '',
+            'endpoint': source or 'download_ack',
+            'submitted_at': '',
+            'receipt_file': file_name or '',
+            'status': status_text or '',
+            'notes': 'ack event',
+        }
+        # Attach ack fields with basic validation
+        try:
+            event['ack_type'] = ack_type or ''
+            event['ack_timestamp'] = ack_timestamp or int(time.time())
+            event['control_ids'] = control_ids or {}
+            event['source'] = source or ''
+            event['file_name'] = file_name or ''
+        except Exception:
+            pass
+        path = _index_path(receipts_root)
+        line = json.dumps(event)
+        f = open(path, 'a')
+        try:
+            f.write(line)
+            f.write("\n")
+        finally:
+            f.close()
+    except Exception:
+        pass
+
+
 # ------------------------- ASCII-safe meta/lock helpers -----------------------
 
 def _meta_path(root_dir):

{medicafe-0.250812.5 → medicafe-0.250813.0}/MediLink/MediLink_837p_cob_library.py

@@ -101,6 +101,10 @@ def create_2320_other_subscriber_segments(patient_data, config, crosswalk):
     is_secondary = patient_data.get('claim_type', 'primary') == 'secondary'
     
     if is_secondary:
+        # TODO (DATA CONTRACT): If 835-derived fields are present on patient_data, prefer them:
+        # - total_paid -> AMT*D
+        # - cas_adjustments -> CAS
+        # Otherwise accept 'primary_paid_amount' and 'cas_adjustments' provided by upstream workflow.
         # SBR segment for secondary payer
         responsibility_code = "S"  # Secondary
         insurance_type = determine_medicare_payer_type(patient_data, config)
@@ -111,7 +115,9 @@ def create_2320_other_subscriber_segments(patient_data, config, crosswalk):
         segments.append(sbr_segment)
         
         # AMT*D segment for total amount paid by primary
-        total_paid = patient_data.get('primary_paid_amount', '0.00')
+        # TODO (STRICT MODE): When config['MediLink_Config']['cob_settings']['validation_level'] >= 2,
+        # require presence of a numeric total (from 'total_paid' or 'primary_paid_amount').
+        total_paid = patient_data.get('total_paid', patient_data.get('primary_paid_amount', '0.00'))
         amt_segment = "AMT*D*{}~".format(total_paid)
         segments.append(amt_segment)
         
@@ -152,6 +158,7 @@ def create_2330B_prior_payer_segments(patient_data, config, crosswalk):
     segments = []
     
     # Get prior payer information
+    # TODO (CONFIG): Resolve Medicare payer ID from config['MediLink_Config']['cob_settings']['medicare_payer_ids'] if prior_payer_id not provided.
     prior_payer_name = patient_data.get('prior_payer_name', 'MEDICARE')
     prior_payer_id = patient_data.get('prior_payer_id', '00850')
     

{medicafe-0.250812.5 → medicafe-0.250813.0}/MediLink/MediLink_837p_encoder.py

@@ -613,6 +613,12 @@ def process_claim(config, endpoint, patient_data_list, crosswalk, client, suffix
     document_segments = []
 
     for patient_data in patient_data_list:
+        # TODO (SECONDARY PREP): Upstream should mark secondary claims and provide Medicare prior payer info when applicable.
+        # Expected minimal keys for Medicare-secondary:
+        # - claim_type='secondary'
+        # - prior_payer_name='MEDICARE'
+        # - prior_payer_id from config cob_settings.medicare_payer_ids (default '00850')
+        # - optional: primary_paid_amount, cas_adjustments
         # Validate each patient's data before processing
         is_valid, validation_errors = validate_claim_data(patient_data, medi)
         if is_valid:

{medicafe-0.250812.5 → medicafe-0.250813.0}/MediLink/MediLink_837p_encoder_library.py

@@ -980,6 +980,43 @@ def create_clm_and_related_segments(parsed_data, config, crosswalk):
     # - create_2330B_prior_payer_segments() for Medicare prior payer
     # - create_2430_service_line_cob_segments() for service-level adjudication
     # - create_2330C_other_subscriber_name_segments() when patient != subscriber
+    #
+    # Minimal, safe integration (guarded by feature flag):
+    if COB is not None:
+        cob_enabled = False
+        try:
+            # Read feature flag from configuration (expects medi['cob_settings']['enabled'])
+            from MediCafe.core_utils import extract_medilink_config
+            medi_cfg = extract_medilink_config(config)
+            cob_enabled = bool(medi_cfg.get('cob_settings', {}).get('enabled', False))
+        except Exception:
+            cob_enabled = False
+        
+        # Only add COB loops when explicitly enabled and claim is secondary
+        # TODO (COB VALIDATION): When COB is enabled and claim is secondary, validate required fields:
+        # - prior_payer_id/prior_payer_name present
+        # - primary_paid_amount present when sending AMT*D (or skip AMT if not available)
+        # - cas_adjustments schema if provided (list of {group, reason, amount})
+        # If critical fields are missing, log and proceed with best-effort unless config enforces strict mode.
+        if cob_enabled and validated_data.get('claim_type') == 'secondary':
+            try:
+                # 2320 - Other Subscriber Information (OI, AMT, CAS, etc.)
+                segments.extend(COB.create_2320_other_subscriber_segments(validated_data, config, crosswalk))
+            except Exception as _e1:
+                try:
+                    MediLink_ConfigLoader.log("COB 2320 insertion failed: {}".format(str(_e1)), config, level="WARNING")
+                except Exception:
+                    pass
+            
+            try:
+                # 2330B - Prior Payer (Medicare prior payer info, e.g., 00850)
+                segments.extend(COB.create_2330B_prior_payer_segments(validated_data, config, crosswalk))
+            except Exception as _e2:
+                try:
+                    MediLink_ConfigLoader.log("COB 2330B insertion failed: {}".format(str(_e2)), config, level="WARNING")
+                except Exception:
+                    pass
+    
     # TODO (COB ENHANCEMENT): Optional attachment references (PWK) for non-electronic EOB handling
     # See MediLink_837p_cob_library.create_pwk_attachment_segment() for implementation
     # Example: PWK*EB*FX*123456~ for attachment control number
@@ -1002,6 +1039,7 @@ def create_clm_and_related_segments(parsed_data, config, crosswalk):
     segments.append("DTP*472*D8*{}~".format(convert_date_format(validated_data['DATE'])))
     
     # Is there REF - Line Item Control Number missing here? Private insurance doesn't need it, but Medicare does?
+    # TODO (MEDICARE REF): Add conditional REF*6R (line item control number) when payer is Medicare or when crosswalk/config requires it.
     # segments.append("REF*6R*1~") # REF01, Reference Identification Qualifier; REF02, Line Item Control Number.
     # 6R - Provider Control Number (Number assigned by information provider company for tracking and billing purposes)
     # 1 - Reference information as defined for a particular Transaction Set or as specified by the Reference Identification Qualifier

{medicafe-0.250812.5 → medicafe-0.250813.0}/MediLink/MediLink_DataMgmt.py

@@ -330,7 +330,12 @@ def operate_winscp(operation_type, files, endpoint_config, local_storage_path, c
     local_storage_path = validate_local_storage_path(local_storage_path, config)
 
     remote_directory = get_remote_directory(endpoint_config, operation_type)
-    command = build_command(winscp_path, winscp_log_path, endpoint_config, remote_directory, operation_type, files, local_storage_path)
+    if operation_type == "download":
+        # Prefer explicit ack-focused mask if not provided by endpoint
+        filemask = endpoint_config.get('filemask') or ['era', '277', '277ibr', '277ebr', '999']
+    else:
+        filemask = None
+    command = build_command(winscp_path, winscp_log_path, endpoint_config, remote_directory, operation_type, files, local_storage_path, newer_than=None, filemask=filemask)
 
     if config.get("TestMode", True):
         MediLink_ConfigLoader.log("Test mode is enabled. Simulating operation.")
@@ -470,6 +475,48 @@ def get_remote_directory(endpoint_config, operation_type):
         MediLink_ConfigLoader.log("Critical Error: Endpoint config is missing key: {}".format(e))
         raise RuntimeError("Configuration error: Missing required remote directory in endpoint configuration.")
 
+def normalize_filemask(filemask):
+    """
+    Normalize various filemask inputs into WinSCP-compatible string.
+    Supports list of extensions, comma-separated string, or dict with 'extensions' and other filters.
+    Falls back to '*' when input is invalid.
+    """
+    try:
+        if not filemask:
+            return '*'
+        if isinstance(filemask, list):
+            parts = []
+            for ext in filemask:
+                s = str(ext).strip().lstrip('*.').lstrip('.')
+                if s:
+                    parts.append('*.{}'.format(s))
+            return '|'.join(parts) if parts else '*'
+        if isinstance(filemask, dict):
+            exts = filemask.get('extensions', [])
+            other = []
+            for k, v in filemask.items():
+                if k == 'extensions':
+                    continue
+                other.append(str(v))
+            ext_part = normalize_filemask(exts)
+            other_part = ';'.join(other)
+            if ext_part and other_part:
+                return '{};{}'.format(ext_part, other_part)
+            return ext_part or other_part or '*'
+        if isinstance(filemask, str):
+            # Support comma-separated or pipe-separated lists of extensions
+            raw = filemask.replace(' ', '')
+            if any(sep in raw for sep in [',', '|']):
+                tokens = raw.replace('|', ',').split(',')
+                return normalize_filemask([t for t in tokens if t])
+            # If looks like an extension, prefix
+            s = raw.lstrip('*.').lstrip('.')
+            if s and all(ch.isalnum() for ch in s):
+                return '*.{}'.format(s)
+            return raw or '*'
+    except Exception:
+        return '*'
+
 def build_command(winscp_path, winscp_log_path, endpoint_config, remote_directory, operation_type, files, local_storage_path, newer_than=None, filemask=None):
     # Log the operation type
     MediLink_ConfigLoader.log("[Build Command] Building WinSCP command for operation type: {}".format(operation_type))
@@ -581,14 +628,7 @@ def build_command(winscp_path, winscp_log_path, endpoint_config, remote_director
                 # 5. Add validation for WinSCP-compatible patterns
                 # 6. Add logging for debugging filemask translations
                 # 7. XP QUIRK: Prefer simple masks (e.g., *.csv|*.txt) and avoid complex AND/OR until verified on XP.
-                if isinstance(filemask, list):
-                    filemask_str = '|'.join(['*.' + ext for ext in filemask])
-                elif isinstance(filemask, dict):
-                    filemask_str = '|'.join(['*.' + ext for ext in filemask.keys()])
-                elif isinstance(filemask, str):
-                    filemask_str = filemask  # Assume it's already in the correct format
-                else:
-                    filemask_str = '*'  # Default to all files if filemask is None or unsupported type
+                filemask_str = normalize_filemask(filemask)
             else:
                 filemask_str = '*'  # Default to all files if filemask is None
 
@@ -659,38 +699,25 @@ def execute_winscp_command(command, operation_type, files, local_storage_path):
         MediLink_ConfigLoader.log("WinSCP {} operation completed successfully.".format(operation_type))
 
         if operation_type == 'download':
-            downloaded_files = list_downloaded_files(local_storage_path) 
-            # TODO (HIGH PRIORITY - WinSCP Path Configuration Issue): 
-            # PROBLEM: WinSCP is not downloading files to the expected local_storage_path directory.
-            # The list_downloaded_files() function is checking the wrong location.
-            #
-            # XP/WinSCP SUGGESTION:
-            # - Add config override 'winscp_download_path' to explicitly set WinSCP's target directory.
-            # - If set, prefer list_downloaded_files(config['MediLink_Config']['winscp_download_path']).
-            # - Otherwise, parse the WinSCP log to detect the actual path and fall back to local_storage_path.
-            #
-            # INVESTIGATION STEPS:
-            # 1. Check WinSCP logs to determine actual download destination:
-            #    - Look in config['MediLink_Config']['local_claims_path'] + "winscp_download.log"
-            #    - Parse log entries for "file downloaded to:" or similar patterns
-            # 2. Compare actual WinSCP download path vs configured local_storage_path
-            # 3. Check if WinSCP uses different path conventions (forward/backward slashes)
-            #
-            # IMPLEMENTATION OPTIONS:
-            # Option A: Fix WinSCP command to use correct target directory
-            #   - Update the lcd_command generation in execute_winscp_command()
-            #   - Ensure local_storage_path is properly escaped for WinSCP
-            # Option B: Update list_downloaded_files() to check actual WinSCP location
-            #   - Add function get_actual_winscp_download_path() that parses logs
-            #   - Call list_downloaded_files(get_actual_winscp_download_path())
-            # Option C: Add configuration parameter for WinSCP-specific download path
-            #   - Add 'winscp_download_path' to config
-            #   - Default to local_storage_path if not specified
-            #
-            # RECOMMENDED: Option A (fix root cause) + Option C (explicit config)
-            # FILES TO MODIFY: This file (execute_winscp_command, list_downloaded_files functions)
-            # TESTING: Verify downloads work correctly after fix with various file types
-            MediLink_ConfigLoader.log("Files currently located in local_storage_path: {}".format(downloaded_files), level="DEBUG")
+            # Prefer configured override if present
+            winscp_download_path = None
+            try:
+                from MediCafe.core_utils import extract_medilink_config
+                config, _ = MediLink_ConfigLoader.load_configuration()
+                medi = extract_medilink_config(config)
+                winscp_download_path = medi.get('winscp_download_path')
+            except Exception:
+                winscp_download_path = None
+
+            target_dir = winscp_download_path or local_storage_path
+            downloaded_files = list_downloaded_files(target_dir)
+            MediLink_ConfigLoader.log("Files currently located in target directory ({}): {}".format(target_dir, downloaded_files), level="DEBUG")
+
+            if not downloaded_files and winscp_download_path and winscp_download_path != local_storage_path:
+                # Fallback to original path if override empty
+                fallback_files = list_downloaded_files(local_storage_path)
+                MediLink_ConfigLoader.log("Fallback to local_storage_path yielded: {}".format(fallback_files), level="DEBUG")
+                downloaded_files = fallback_files
 
             if not downloaded_files:
                 MediLink_ConfigLoader.log("No files were downloaded or an error occurred during the listing process.", level="WARNING")
@@ -727,8 +754,12 @@ def list_downloaded_files(local_storage_path):
     except Exception as e:
         MediLink_ConfigLoader.log("Error occurred while listing files in {}: {}".format(local_storage_path, e), level="ERROR")
 
-    # Ensure that the function always returns a list
-    return downloaded_files
+    # Normalize to basenames so downstream move logic in MediLink_Down works cross-platform
+    try:
+        basenames = [os.path.basename(p) for p in downloaded_files]
+        return basenames
+    except Exception:
+        return downloaded_files
 
 def detect_new_files(directory_path, file_extension='.DAT'):
     """