Merge branch (resolved)

backups/conflicts/sync_meta_conflict_1786548632.json

@@ -0,0 +1,4 @@
+{
+  "last_sync": "2026-08-12T15:30:32.063995700+00:00",
+  "version": 1
+}

hosts/4995165e-c801-4d62-949e-ca272a3b5313.json

@@ -4,7 +4,7 @@
   "hostname": "192.168.99.83",
   "port": 22,
   "username": "root",
-  "identity_id": null,
+  "identity_id": "e4027f44-fa3a-471d-a8c4-449d6a17af9a",
   "group_id": null,
   "tags": [
     "env:dev",
@@ -17,5 +17,5 @@
   "ssh_config_overrides": null,
   "notes": null,
   "created_at": "2026-06-11T06:25:52.544285+00:00",
-  "updated_at": "2026-06-17T09:06:33.410857+00:00"
+  "updated_at": "2026-08-12T15:30:08.490348+00:00"
 }

identities/e4027f44-fa3a-471d-a8c4-449d6a17af9a.json

@@ -0,0 +1,13 @@
+{
+  "id": "e4027f44-fa3a-471d-a8c4-449d6a17af9a",
+  "name": "sonpx-private",
+  "auth_method": {
+    "type": "private_key",
+    "private_key": "ENC:v1:U1RSTQG/aQAs/D+wE1UpZBKBIGy4la2R8leKpgcqRkZm8QoJgRRtApypDhzEgfabmDDTX+stVY0EyoV6M2agVNTuldrIcgskOkeL9mHV/DDJBrGTwlm204LOYdXKzn4tCuWEO10xpM+Krud6j3fKokWFYlihzSEwxOoIonWMpNmknf2nMqmgRhuAGOzZs4d0XkuPh3F5RFQnYc4aAwycVLyPVW4ZObtec9ar3qU0THYZbA5Mzs9RFqS2IInUpZZcvqHXcdWPBEggSDVOr5ae4ieTYIQtuGZbBF10wV4EQTDIxzlAu7eV/SP99e5aPCHIiyUb2+SPeqiSRmOLdEfj3uCcrEhofCuHyzdXXO15lwr6ERJRGgsjHUhSl6TxV691iBXDyN7StRMiYAc8Z9XYpEqBnD1b6c1jVMGHhT7WGrJUxqc6kduytNVbMGxS+GCBRmie4KEJjxNcEAZkgSC2AUS7sGiTsMAHRVP7/KovJYwe09Vz7tLug1dErgNkgXZ7DOKTcY1MHXbpnfkVrNbgYN4N+ogsJJBL3C6P2rcCJQuPdZPr3yCnR3jyPZ7xTb7Qdymn+nlqVaTjGH8=",
+    "passphrase": null,
+    "key_type": null,
+    "fingerprint": null
+  },
+  "created_at": "2026-08-12T15:29:50.883690+00:00",
+  "updated_at": "2026-08-12T15:29:50.883690+00:00"
+}

sync_meta.json

@@ -1,4 +1,4 @@
 {
-  "last_sync": "2026-08-12T15:30:32.063995700+00:00",
+  "last_sync": "2026-08-12T15:30:13.524312+00:00",
   "version": 1
 }