fix: persist result server metadata for estimation [code:qws] [system:RC_GH200]

Author: yoshifuminakamura

scripts/estimate_common.sh

@@ -102,6 +102,23 @@ read_values() {
   est_uuid=$(jq -r '._server_uuid // empty' "$json_file")
   est_timestamp=$(jq -r '._server_timestamp // empty' "$json_file")
 
+  # Fallback: read send_results manifest if the result JSON itself does not
+  # carry the server-assigned metadata.
+  if [[ -z "$est_uuid" || -z "$est_timestamp" ]]; then
+    local meta_file
+    local basename
+    meta_file="$(dirname "$json_file")/result_server_meta.json"
+    basename=$(basename "$json_file")
+    if [[ -f "$meta_file" ]]; then
+      if [[ -z "$est_uuid" ]]; then
+        est_uuid=$(jq -r --arg file "$basename" '.[$file].uuid // empty' "$meta_file")
+      fi
+      if [[ -z "$est_timestamp" ]]; then
+        est_timestamp=$(jq -r --arg file "$basename" '.[$file].timestamp // empty' "$meta_file")
+      fi
+    fi
+  fi
+
   # Fallback: extract from filename if not in JSON
   if [[ -z "$est_uuid" || -z "$est_timestamp" ]]; then
     local basename

scripts/run_estimate.sh

@@ -23,6 +23,12 @@ found=0
 for json_file in results/result*.json; do
   [[ ! -f "$json_file" ]] && continue
   found=1
+  echo "Input result metadata for $json_file:"
+  jq '{code, system, Exp, _server_uuid, _server_timestamp}' "$json_file" || true
+  if [[ -f results/result_server_meta.json ]]; then
+    echo "Available result metadata manifest:"
+    jq . results/result_server_meta.json || true
+  fi
   echo "Running estimation: $estimate_script $json_file"
   bash "$estimate_script" "$json_file"
 done

scripts/send_results.sh

@@ -5,6 +5,9 @@ echo "Sending results to server"
 
 ls results/
 
+meta_file="results/result_server_meta.json"
+echo "{}" > "$meta_file"
+
 # Loop over all result*.json files
 for json_file in results/result*.json; do
   [[ ! -f "$json_file" ]] && continue
@@ -51,6 +54,20 @@ with open('${tmp_file}', 'w') as f:
 " && mv "$tmp_file" "$json_file"
   echo "Wrote _server_uuid and _server_timestamp back to $json_file"
 
+  tmp_meta_file="${meta_file}.tmp"
+  python3 -c "
+import json
+with open('${meta_file}', 'r') as f:
+    d = json.load(f)
+d['$(basename "$json_file")'] = {
+    'uuid': '${uuid}',
+    'timestamp': '${timestamp}'
+}
+with open('${tmp_meta_file}', 'w') as f:
+    json.dump(d, f, indent=2)
+" && mv "$tmp_meta_file" "$meta_file"
+  echo "Updated result metadata manifest: $meta_file"
+
   # Determine corresponding TGZ name
   tgz_base="padata"