Merge branch (resolved)

backups/conflicts/a57833f9-8e37-412a-b65d-37eae669b179_conflict_1789801207.json

@@ -1,17 +1,18 @@
 {
-  "id": "529708d1-7e0e-47b9-bf42-5a15cbfdb145",
+  "id": "a57833f9-8e37-412a-b65d-37eae669b179",
   "name": "Docker Password Host",
   "hostname": "127.0.0.1",
   "port": 2222,
   "username": "testuser",
-  "identity_id": "2b2897b3-9f1e-4c53-b05d-ccd2d8639ccb",
+  "identity_id": null,
   "group_id": null,
   "tags": [],
   "jump_host_id": null,
   "keepalive_interval": 1,
+  "keepalive_count_max": null,
   "legacy_algorithms": null,
   "ssh_config_overrides": null,
   "notes": null,
-  "created_at": "2026-08-14T05:29:30.180223+00:00",
+  "created_at": "2026-08-14T05:25:31.917244+00:00",
-  "updated_at": "2026-08-14T05:29:30.180223+00:00"
+  "updated_at": "2026-08-14T05:25:31.917244+00:00"
 }

backups/conflicts/ca4e5705-9e6d-400b-a196-a2551e5bfe27_conflict_1789801207.json

@@ -1,17 +1,18 @@
 {
-  "id": "529708d1-7e0e-47b9-bf42-5a15cbfdb145",
+  "id": "ca4e5705-9e6d-400b-a196-a2551e5bfe27",
   "name": "Docker Password Host",
   "hostname": "127.0.0.1",
   "port": 2222,
   "username": "testuser",
-  "identity_id": "2b2897b3-9f1e-4c53-b05d-ccd2d8639ccb",
+  "identity_id": null,
   "group_id": null,
   "tags": [],
   "jump_host_id": null,
   "keepalive_interval": 1,
+  "keepalive_count_max": null,
   "legacy_algorithms": null,
   "ssh_config_overrides": null,
   "notes": null,
-  "created_at": "2026-08-14T05:29:30.180223+00:00",
+  "created_at": "2026-08-14T05:27:50.361854+00:00",
-  "updated_at": "2026-08-14T05:29:30.180223+00:00"
+  "updated_at": "2026-08-14T05:27:50.361854+00:00"
 }

backups/conflicts/cfcc6e2e-666e-4928-9914-dea57e939bf0_conflict_1789801207.json

@@ -1,5 +1,5 @@
 {
-  "id": "77a6e3b5-ce22-4359-b0a8-66aabc7dd9c7",
+  "id": "cfcc6e2e-666e-4928-9914-dea57e939bf0",
   "name": "Docker Password Host",
   "hostname": "127.0.0.1",
   "port": 2222,
@@ -9,9 +9,10 @@
   "tags": [],
   "jump_host_id": null,
   "keepalive_interval": 1,
+  "keepalive_count_max": null,
   "legacy_algorithms": null,
   "ssh_config_overrides": null,
   "notes": null,
-  "created_at": "2026-08-14T05:23:21.962148+00:00",
+  "created_at": "2026-08-14T05:20:24.764057+00:00",
-  "updated_at": "2026-08-14T05:23:21.962148+00:00"
+  "updated_at": "2026-08-14T05:20:24.764057+00:00"
 }

hosts/3327c3d4-b96e-487b-9728-87ed3d237efa.json

@@ -0,0 +1,18 @@
+{
+  "id": "3327c3d4-b96e-487b-9728-87ed3d237efa",
+  "name": "sonpx.dev",
+  "hostname": "213.35.101.182",
+  "port": 2244,
+  "username": "opc",
+  "identity_id": "5e25e6af-5633-4063-adb3-6c64913e016e",
+  "group_id": null,
+  "tags": [],
+  "jump_host_id": null,
+  "keepalive_interval": null,
+  "keepalive_count_max": null,
+  "legacy_algorithms": false,
+  "ssh_config_overrides": null,
+  "notes": null,
+  "created_at": "2026-09-09T04:31:31.846731+00:00",
+  "updated_at": "2026-09-09T04:31:31.846731+00:00"
+}

hosts/3b702158-d23a-4fb3-8697-983cfba4332f.json

@@ -0,0 +1,22 @@
+{
+  "id": "3b702158-d23a-4fb3-8697-983cfba4332f",
+  "name": "dbs-dev-74",
+  "hostname": "192.168.99.74",
+  "port": 22,
+  "username": "root",
+  "identity_id": "7db2f101-b275-4525-bff3-e09a7a2ffbff",
+  "group_id": null,
+  "tags": [
+    "env:dev",
+    "svc:postgres",
+    "tool:jenkins"
+  ],
+  "jump_host_id": null,
+  "keepalive_interval": null,
+  "keepalive_count_max": null,
+  "legacy_algorithms": false,
+  "ssh_config_overrides": null,
+  "notes": null,
+  "created_at": "2026-08-27T08:30:17.991754+00:00",
+  "updated_at": "2026-08-27T08:30:39.020127+00:00"
+}

hosts/529708d1-7e0e-47b9-bf42-5a15cbfdb145.json~FETCH_HEAD_1

@@ -1,17 +0,0 @@
-{
-  "id": "529708d1-7e0e-47b9-bf42-5a15cbfdb145",
-  "name": "Docker Password Host",
-  "hostname": "127.0.0.1",
-  "port": 2222,
-  "username": "testuser",
-  "identity_id": "2b2897b3-9f1e-4c53-b05d-ccd2d8639ccb",
-  "group_id": null,
-  "tags": [],
-  "jump_host_id": null,
-  "keepalive_interval": 1,
-  "legacy_algorithms": null,
-  "ssh_config_overrides": null,
-  "notes": null,
-  "created_at": "2026-08-14T05:29:30.180223+00:00",
-  "updated_at": "2026-08-14T05:29:30.180223+00:00"
-}

hosts/529708d1-7e0e-47b9-bf42-5a15cbfdb145.json~FETCH_HEAD_2

@@ -1,17 +0,0 @@
-{
-  "id": "529708d1-7e0e-47b9-bf42-5a15cbfdb145",
-  "name": "Docker Password Host",
-  "hostname": "127.0.0.1",
-  "port": 2222,
-  "username": "testuser",
-  "identity_id": "2b2897b3-9f1e-4c53-b05d-ccd2d8639ccb",
-  "group_id": null,
-  "tags": [],
-  "jump_host_id": null,
-  "keepalive_interval": 1,
-  "legacy_algorithms": null,
-  "ssh_config_overrides": null,
-  "notes": null,
-  "created_at": "2026-08-14T05:29:30.180223+00:00",
-  "updated_at": "2026-08-14T05:29:30.180223+00:00"
-}

hosts/529708d1-7e0e-47b9-bf42-5a15cbfdb145.json~FETCH_HEAD_3

@@ -1,17 +0,0 @@
-{
-  "id": "529708d1-7e0e-47b9-bf42-5a15cbfdb145",
-  "name": "Docker Password Host",
-  "hostname": "127.0.0.1",
-  "port": 2222,
-  "username": "testuser",
-  "identity_id": "2b2897b3-9f1e-4c53-b05d-ccd2d8639ccb",
-  "group_id": null,
-  "tags": [],
-  "jump_host_id": null,
-  "keepalive_interval": 1,
-  "legacy_algorithms": null,
-  "ssh_config_overrides": null,
-  "notes": null,
-  "created_at": "2026-08-14T05:29:30.180223+00:00",
-  "updated_at": "2026-08-14T05:29:30.180223+00:00"
-}

hosts/529708d1-7e0e-47b9-bf42-5a15cbfdb145.json~FETCH_HEAD_4

@@ -1,17 +0,0 @@
-{
-  "id": "529708d1-7e0e-47b9-bf42-5a15cbfdb145",
-  "name": "Docker Password Host",
-  "hostname": "127.0.0.1",
-  "port": 2222,
-  "username": "testuser",
-  "identity_id": "2b2897b3-9f1e-4c53-b05d-ccd2d8639ccb",
-  "group_id": null,
-  "tags": [],
-  "jump_host_id": null,
-  "keepalive_interval": 1,
-  "legacy_algorithms": null,
-  "ssh_config_overrides": null,
-  "notes": null,
-  "created_at": "2026-08-14T05:29:30.180223+00:00",
-  "updated_at": "2026-08-14T05:29:30.180223+00:00"
-}

hosts/529708d1-7e0e-47b9-bf42-5a15cbfdb145.json~HEAD

@@ -1,17 +0,0 @@
-{
-  "id": "529708d1-7e0e-47b9-bf42-5a15cbfdb145",
-  "name": "Docker Password Host",
-  "hostname": "127.0.0.1",
-  "port": 2222,
-  "username": "testuser",
-  "identity_id": "2b2897b3-9f1e-4c53-b05d-ccd2d8639ccb",
-  "group_id": null,
-  "tags": [],
-  "jump_host_id": null,
-  "keepalive_interval": 1,
-  "legacy_algorithms": null,
-  "ssh_config_overrides": null,
-  "notes": null,
-  "created_at": "2026-08-14T05:29:30.180223+00:00",
-  "updated_at": "2026-08-14T05:29:30.180223+00:00"
-}

hosts/529708d1-7e0e-47b9-bf42-5a15cbfdb145.json~HEAD_0

@@ -1,17 +0,0 @@
-{
-  "id": "529708d1-7e0e-47b9-bf42-5a15cbfdb145",
-  "name": "Docker Password Host",
-  "hostname": "127.0.0.1",
-  "port": 2222,
-  "username": "testuser",
-  "identity_id": "2b2897b3-9f1e-4c53-b05d-ccd2d8639ccb",
-  "group_id": null,
-  "tags": [],
-  "jump_host_id": null,
-  "keepalive_interval": 1,
-  "legacy_algorithms": null,
-  "ssh_config_overrides": null,
-  "notes": null,
-  "created_at": "2026-08-14T05:29:30.180223+00:00",
-  "updated_at": "2026-08-14T05:29:30.180223+00:00"
-}

hosts/529708d1-7e0e-47b9-bf42-5a15cbfdb145.json~HEAD_1

@@ -1,17 +0,0 @@
-{
-  "id": "529708d1-7e0e-47b9-bf42-5a15cbfdb145",
-  "name": "Docker Password Host",
-  "hostname": "127.0.0.1",
-  "port": 2222,
-  "username": "testuser",
-  "identity_id": "2b2897b3-9f1e-4c53-b05d-ccd2d8639ccb",
-  "group_id": null,
-  "tags": [],
-  "jump_host_id": null,
-  "keepalive_interval": 1,
-  "legacy_algorithms": null,
-  "ssh_config_overrides": null,
-  "notes": null,
-  "created_at": "2026-08-14T05:29:30.180223+00:00",
-  "updated_at": "2026-08-14T05:29:30.180223+00:00"
-}

hosts/529708d1-7e0e-47b9-bf42-5a15cbfdb145.json~HEAD_2

@@ -1,17 +0,0 @@
-{
-  "id": "529708d1-7e0e-47b9-bf42-5a15cbfdb145",
-  "name": "Docker Password Host",
-  "hostname": "127.0.0.1",
-  "port": 2222,
-  "username": "testuser",
-  "identity_id": "2b2897b3-9f1e-4c53-b05d-ccd2d8639ccb",
-  "group_id": null,
-  "tags": [],
-  "jump_host_id": null,
-  "keepalive_interval": 1,
-  "legacy_algorithms": null,
-  "ssh_config_overrides": null,
-  "notes": null,
-  "created_at": "2026-08-14T05:29:30.180223+00:00",
-  "updated_at": "2026-08-14T05:29:30.180223+00:00"
-}

hosts/529708d1-7e0e-47b9-bf42-5a15cbfdb145.json~HEAD_3

@@ -1,17 +0,0 @@
-{
-  "id": "529708d1-7e0e-47b9-bf42-5a15cbfdb145",
-  "name": "Docker Password Host",
-  "hostname": "127.0.0.1",
-  "port": 2222,
-  "username": "testuser",
-  "identity_id": "2b2897b3-9f1e-4c53-b05d-ccd2d8639ccb",
-  "group_id": null,
-  "tags": [],
-  "jump_host_id": null,
-  "keepalive_interval": 1,
-  "legacy_algorithms": null,
-  "ssh_config_overrides": null,
-  "notes": null,
-  "created_at": "2026-08-14T05:29:30.180223+00:00",
-  "updated_at": "2026-08-14T05:29:30.180223+00:00"
-}

hosts/529708d1-7e0e-47b9-bf42-5a15cbfdb145.json~HEAD_4

@@ -1,17 +0,0 @@
-{
-  "id": "529708d1-7e0e-47b9-bf42-5a15cbfdb145",
-  "name": "Docker Password Host",
-  "hostname": "127.0.0.1",
-  "port": 2222,
-  "username": "testuser",
-  "identity_id": "2b2897b3-9f1e-4c53-b05d-ccd2d8639ccb",
-  "group_id": null,
-  "tags": [],
-  "jump_host_id": null,
-  "keepalive_interval": 1,
-  "legacy_algorithms": null,
-  "ssh_config_overrides": null,
-  "notes": null,
-  "created_at": "2026-08-14T05:29:30.180223+00:00",
-  "updated_at": "2026-08-14T05:29:30.180223+00:00"
-}

hosts/77a6e3b5-ce22-4359-b0a8-66aabc7dd9c7.json~HEAD

@@ -1,17 +0,0 @@
-{
-  "id": "77a6e3b5-ce22-4359-b0a8-66aabc7dd9c7",
-  "name": "Docker Password Host",
-  "hostname": "127.0.0.1",
-  "port": 2222,
-  "username": "testuser",
-  "identity_id": "a7ca3944-af0e-498b-abd1-6af456468102",
-  "group_id": null,
-  "tags": [],
-  "jump_host_id": null,
-  "keepalive_interval": 1,
-  "legacy_algorithms": null,
-  "ssh_config_overrides": null,
-  "notes": null,
-  "created_at": "2026-08-14T05:23:21.962148+00:00",
-  "updated_at": "2026-08-14T05:23:21.962148+00:00"
-}

hosts/e270d382-bbf4-4aa2-a7a0-1def1eddc68b.json

@@ -0,0 +1,22 @@
+{
+  "id": "e270d382-bbf4-4aa2-a7a0-1def1eddc68b",
+  "name": "nginx-99.9",
+  "hostname": "192.168.99.9",
+  "port": 22,
+  "username": "root",
+  "identity_id": "7db2f101-b275-4525-bff3-e09a7a2ffbff",
+  "group_id": null,
+  "tags": [
+    "env:dev",
+    "svc:postgres",
+    "tool:jenkins"
+  ],
+  "jump_host_id": null,
+  "keepalive_interval": null,
+  "keepalive_count_max": null,
+  "legacy_algorithms": false,
+  "ssh_config_overrides": null,
+  "notes": null,
+  "created_at": "2026-09-08T03:09:32.089183+00:00",
+  "updated_at": "2026-09-08T03:10:29.834018+00:00"
+}

hosts/ed0769c2-5ae5-43fc-ac2a-43782ef99f02.json~FETCH_HEAD

@@ -1,17 +0,0 @@
-{
-  "id": "ed0769c2-5ae5-43fc-ac2a-43782ef99f02",
-  "name": "Docker Password Host",
-  "hostname": "127.0.0.1",
-  "port": 2222,
-  "username": "testuser",
-  "identity_id": "d3182263-9145-46f3-acdf-9cdce6b4f1c0",
-  "group_id": null,
-  "tags": [],
-  "jump_host_id": null,
-  "keepalive_interval": 1,
-  "legacy_algorithms": null,
-  "ssh_config_overrides": null,
-  "notes": null,
-  "created_at": "2026-08-14T05:42:03.155846+00:00",
-  "updated_at": "2026-08-14T05:42:03.155846+00:00"
-}

hosts/ed0769c2-5ae5-43fc-ac2a-43782ef99f02.json~FETCH_HEAD_0

@@ -1,17 +0,0 @@
-{
-  "id": "ed0769c2-5ae5-43fc-ac2a-43782ef99f02",
-  "name": "Docker Password Host",
-  "hostname": "127.0.0.1",
-  "port": 2222,
-  "username": "testuser",
-  "identity_id": "d3182263-9145-46f3-acdf-9cdce6b4f1c0",
-  "group_id": null,
-  "tags": [],
-  "jump_host_id": null,
-  "keepalive_interval": 1,
-  "legacy_algorithms": null,
-  "ssh_config_overrides": null,
-  "notes": null,
-  "created_at": "2026-08-14T05:42:03.155846+00:00",
-  "updated_at": "2026-08-14T05:42:03.155846+00:00"
-}

hosts/ed0769c2-5ae5-43fc-ac2a-43782ef99f02.json~FETCH_HEAD_1

@@ -1,17 +0,0 @@
-{
-  "id": "ed0769c2-5ae5-43fc-ac2a-43782ef99f02",
-  "name": "Docker Password Host",
-  "hostname": "127.0.0.1",
-  "port": 2222,
-  "username": "testuser",
-  "identity_id": "d3182263-9145-46f3-acdf-9cdce6b4f1c0",
-  "group_id": null,
-  "tags": [],
-  "jump_host_id": null,
-  "keepalive_interval": 1,
-  "legacy_algorithms": null,
-  "ssh_config_overrides": null,
-  "notes": null,
-  "created_at": "2026-08-14T05:42:03.155846+00:00",
-  "updated_at": "2026-08-14T05:42:03.155846+00:00"
-}

hosts/ed0769c2-5ae5-43fc-ac2a-43782ef99f02.json~HEAD

@@ -1,17 +0,0 @@
-{
-  "id": "ed0769c2-5ae5-43fc-ac2a-43782ef99f02",
-  "name": "Docker Password Host",
-  "hostname": "127.0.0.1",
-  "port": 2222,
-  "username": "testuser",
-  "identity_id": "d3182263-9145-46f3-acdf-9cdce6b4f1c0",
-  "group_id": null,
-  "tags": [],
-  "jump_host_id": null,
-  "keepalive_interval": 1,
-  "legacy_algorithms": null,
-  "ssh_config_overrides": null,
-  "notes": null,
-  "created_at": "2026-08-14T05:42:03.155846+00:00",
-  "updated_at": "2026-08-14T05:42:03.155846+00:00"
-}

hosts/ed0769c2-5ae5-43fc-ac2a-43782ef99f02.json~HEAD_0

@@ -1,17 +0,0 @@
-{
-  "id": "ed0769c2-5ae5-43fc-ac2a-43782ef99f02",
-  "name": "Docker Password Host",
-  "hostname": "127.0.0.1",
-  "port": 2222,
-  "username": "testuser",
-  "identity_id": "d3182263-9145-46f3-acdf-9cdce6b4f1c0",
-  "group_id": null,
-  "tags": [],
-  "jump_host_id": null,
-  "keepalive_interval": 1,
-  "legacy_algorithms": null,
-  "ssh_config_overrides": null,
-  "notes": null,
-  "created_at": "2026-08-14T05:42:03.155846+00:00",
-  "updated_at": "2026-08-14T05:42:03.155846+00:00"
-}

hosts/ed0769c2-5ae5-43fc-ac2a-43782ef99f02.json~HEAD_1

@@ -1,17 +0,0 @@
-{
-  "id": "ed0769c2-5ae5-43fc-ac2a-43782ef99f02",
-  "name": "Docker Password Host",
-  "hostname": "127.0.0.1",
-  "port": 2222,
-  "username": "testuser",
-  "identity_id": "d3182263-9145-46f3-acdf-9cdce6b4f1c0",
-  "group_id": null,
-  "tags": [],
-  "jump_host_id": null,
-  "keepalive_interval": 1,
-  "legacy_algorithms": null,
-  "ssh_config_overrides": null,
-  "notes": null,
-  "created_at": "2026-08-14T05:42:03.155846+00:00",
-  "updated_at": "2026-08-14T05:42:03.155846+00:00"
-}

identities/2b2897b3-9f1e-4c53-b05d-ccd2d8639ccb.json~FETCH_HEAD

@@ -1,14 +0,0 @@
-{
-  "id": "2b2897b3-9f1e-4c53-b05d-ccd2d8639ccb",
-  "name": "Docker Test Identity",
-  "auth_method": {
-    "type": "password",
-<<<<<<< HEAD:identities/a7ca3944-af0e-498b-abd1-6af456468102.json
-    "password": "ENC:v1:U1RSTQEeotmMe5/SBVYgXsFyNxPNbrMNIvnYGmwKeh4zx3SjzhOYGCp+lvA="
-=======
-    "password": "ENC:v1:U1RSTQEShASLBCk+4IIGA2WHQ4Vc7EdrRYiusBHd352lU3Ap73PzGmZAunI="
->>>>>>> FETCH_HEAD:identities/2b2897b3-9f1e-4c53-b05d-ccd2d8639ccb.json
-  },
-  "created_at": "2026-08-14T05:29:30.176231+00:00",
-  "updated_at": "2026-08-14T05:29:30.176231+00:00"
-}

identities/2b2897b3-9f1e-4c53-b05d-ccd2d8639ccb.json~FETCH_HEAD_0

@@ -1,14 +0,0 @@
-{
-  "id": "2b2897b3-9f1e-4c53-b05d-ccd2d8639ccb",
-  "name": "Docker Test Identity",
-  "auth_method": {
-    "type": "password",
-<<<<<<< HEAD:identities/a7ca3944-af0e-498b-abd1-6af456468102.json
-    "password": "ENC:v1:U1RSTQFo22pgzHOlxQybNGS+Kn1B6lvDQMg1Gd4X0anDfyZ58Chz7NAkZ3o="
-=======
-    "password": "ENC:v1:U1RSTQEShASLBCk+4IIGA2WHQ4Vc7EdrRYiusBHd352lU3Ap73PzGmZAunI="
->>>>>>> FETCH_HEAD:identities/2b2897b3-9f1e-4c53-b05d-ccd2d8639ccb.json
-  },
-  "created_at": "2026-08-14T05:29:30.176231+00:00",
-  "updated_at": "2026-08-14T05:29:30.176231+00:00"
-}

identities/2b2897b3-9f1e-4c53-b05d-ccd2d8639ccb.json~FETCH_HEAD_1

@@ -1,14 +0,0 @@
-{
-  "id": "2b2897b3-9f1e-4c53-b05d-ccd2d8639ccb",
-  "name": "Docker Test Identity",
-  "auth_method": {
-    "type": "password",
-<<<<<<< HEAD:identities/a7ca3944-af0e-498b-abd1-6af456468102.json
-    "password": "ENC:v1:U1RSTQHTEK8VliH2l8UBFN94v8lrMsM1ohe2VL0bckdHUm5cPCzXiEvX12o="
-=======
-    "password": "ENC:v1:U1RSTQEShASLBCk+4IIGA2WHQ4Vc7EdrRYiusBHd352lU3Ap73PzGmZAunI="
->>>>>>> FETCH_HEAD:identities/2b2897b3-9f1e-4c53-b05d-ccd2d8639ccb.json
-  },
-  "created_at": "2026-08-14T05:29:30.176231+00:00",
-  "updated_at": "2026-08-14T05:29:30.176231+00:00"
-}

identities/2b2897b3-9f1e-4c53-b05d-ccd2d8639ccb.json~FETCH_HEAD_2

@@ -1,14 +0,0 @@
-{
-  "id": "2b2897b3-9f1e-4c53-b05d-ccd2d8639ccb",
-  "name": "Docker Test Identity",
-  "auth_method": {
-    "type": "password",
-<<<<<<< HEAD:identities/a7ca3944-af0e-498b-abd1-6af456468102.json
-    "password": "ENC:v1:U1RSTQEJjqeNoBXcaej6besvdunuO4E6i0Z5/1GaJIwY9D3fFPIbC4uApVQ="
-=======
-    "password": "ENC:v1:U1RSTQEShASLBCk+4IIGA2WHQ4Vc7EdrRYiusBHd352lU3Ap73PzGmZAunI="
->>>>>>> FETCH_HEAD:identities/2b2897b3-9f1e-4c53-b05d-ccd2d8639ccb.json
-  },
-  "created_at": "2026-08-14T05:29:30.176231+00:00",
-  "updated_at": "2026-08-14T05:29:30.176231+00:00"
-}

identities/2b2897b3-9f1e-4c53-b05d-ccd2d8639ccb.json~FETCH_HEAD_3

@@ -1,14 +0,0 @@
-{
-  "id": "2b2897b3-9f1e-4c53-b05d-ccd2d8639ccb",
-  "name": "Docker Test Identity",
-  "auth_method": {
-    "type": "password",
-<<<<<<< HEAD:identities/a7ca3944-af0e-498b-abd1-6af456468102.json
-    "password": "ENC:v1:U1RSTQGj3XaPChMDem8kig4sSC1L8V91kq4tYq37fnQqcZnocauf+Exbsh8="
-=======
-    "password": "ENC:v1:U1RSTQEShASLBCk+4IIGA2WHQ4Vc7EdrRYiusBHd352lU3Ap73PzGmZAunI="
->>>>>>> FETCH_HEAD:identities/2b2897b3-9f1e-4c53-b05d-ccd2d8639ccb.json
-  },
-  "created_at": "2026-08-14T05:29:30.176231+00:00",
-  "updated_at": "2026-08-14T05:29:30.176231+00:00"
-}

identities/2b2897b3-9f1e-4c53-b05d-ccd2d8639ccb.json~FETCH_HEAD_4

@@ -1,14 +0,0 @@
-{
-  "id": "2b2897b3-9f1e-4c53-b05d-ccd2d8639ccb",
-  "name": "Docker Test Identity",
-  "auth_method": {
-    "type": "password",
-<<<<<<< HEAD:identities/a7ca3944-af0e-498b-abd1-6af456468102.json
-    "password": "ENC:v1:U1RSTQGg4nQCSG1vKl2i1W8Q3m9m4USbkP+HmtQjpDYpLrtNTsxfj2Vv27A="
-=======
-    "password": "ENC:v1:U1RSTQEShASLBCk+4IIGA2WHQ4Vc7EdrRYiusBHd352lU3Ap73PzGmZAunI="
->>>>>>> FETCH_HEAD:identities/2b2897b3-9f1e-4c53-b05d-ccd2d8639ccb.json
-  },
-  "created_at": "2026-08-14T05:29:30.176231+00:00",
-  "updated_at": "2026-08-14T05:29:30.176231+00:00"
-}

identities/2b2897b3-9f1e-4c53-b05d-ccd2d8639ccb.json~HEAD

@@ -1,14 +0,0 @@
-{
-  "id": "2b2897b3-9f1e-4c53-b05d-ccd2d8639ccb",
-  "name": "Docker Test Identity",
-  "auth_method": {
-    "type": "password",
-<<<<<<< HEAD:identities/a7ca3944-af0e-498b-abd1-6af456468102.json
-    "password": "ENC:v1:U1RSTQEcyeKSsaxr0+1XqEGSRmnJ32HlR0U4xaMSotpS1fjCKAX0b/tEWHg="
-=======
-    "password": "ENC:v1:U1RSTQEShASLBCk+4IIGA2WHQ4Vc7EdrRYiusBHd352lU3Ap73PzGmZAunI="
->>>>>>> FETCH_HEAD:identities/2b2897b3-9f1e-4c53-b05d-ccd2d8639ccb.json
-  },
-  "created_at": "2026-08-14T05:29:30.176231+00:00",
-  "updated_at": "2026-08-14T05:29:30.176231+00:00"
-}

identities/2b2897b3-9f1e-4c53-b05d-ccd2d8639ccb.json~HEAD_0

@@ -1,14 +0,0 @@
-{
-  "id": "2b2897b3-9f1e-4c53-b05d-ccd2d8639ccb",
-  "name": "Docker Test Identity",
-  "auth_method": {
-    "type": "password",
-<<<<<<< HEAD:identities/a7ca3944-af0e-498b-abd1-6af456468102.json
-    "password": "ENC:v1:U1RSTQFn/70uE5Tpy2Vd5C4sJE8UBSEqrCXKVWrb73w22OZRLtbNNnsJs/E="
-=======
-    "password": "ENC:v1:U1RSTQEShASLBCk+4IIGA2WHQ4Vc7EdrRYiusBHd352lU3Ap73PzGmZAunI="
->>>>>>> FETCH_HEAD:identities/2b2897b3-9f1e-4c53-b05d-ccd2d8639ccb.json
-  },
-  "created_at": "2026-08-14T05:29:30.176231+00:00",
-  "updated_at": "2026-08-14T05:29:30.176231+00:00"
-}

identities/2b2897b3-9f1e-4c53-b05d-ccd2d8639ccb.json~HEAD_1

@@ -1,14 +0,0 @@
-{
-  "id": "2b2897b3-9f1e-4c53-b05d-ccd2d8639ccb",
-  "name": "Docker Test Identity",
-  "auth_method": {
-    "type": "password",
-<<<<<<< HEAD:identities/a7ca3944-af0e-498b-abd1-6af456468102.json
-    "password": "ENC:v1:U1RSTQH/iShG5ZPzh+4el2K3lHL96tx5r37DFrpGdCEP9Iw9AeTjGbjl4U0="
-=======
-    "password": "ENC:v1:U1RSTQEShASLBCk+4IIGA2WHQ4Vc7EdrRYiusBHd352lU3Ap73PzGmZAunI="
->>>>>>> FETCH_HEAD:identities/2b2897b3-9f1e-4c53-b05d-ccd2d8639ccb.json
-  },
-  "created_at": "2026-08-14T05:29:30.176231+00:00",
-  "updated_at": "2026-08-14T05:29:30.176231+00:00"
-}

identities/2b2897b3-9f1e-4c53-b05d-ccd2d8639ccb.json~HEAD_2

@@ -1,14 +0,0 @@
-{
-  "id": "2b2897b3-9f1e-4c53-b05d-ccd2d8639ccb",
-  "name": "Docker Test Identity",
-  "auth_method": {
-    "type": "password",
-<<<<<<< HEAD:identities/a7ca3944-af0e-498b-abd1-6af456468102.json
-    "password": "ENC:v1:U1RSTQHi2HjaMFvkT37wGVHDSLVSBJsjbX1bSFtpbV7nRB7FaFDa/LO87Kw="
-=======
-    "password": "ENC:v1:U1RSTQEShASLBCk+4IIGA2WHQ4Vc7EdrRYiusBHd352lU3Ap73PzGmZAunI="
->>>>>>> FETCH_HEAD:identities/2b2897b3-9f1e-4c53-b05d-ccd2d8639ccb.json
-  },
-  "created_at": "2026-08-14T05:29:30.176231+00:00",
-  "updated_at": "2026-08-14T05:29:30.176231+00:00"
-}

identities/2b2897b3-9f1e-4c53-b05d-ccd2d8639ccb.json~HEAD_3

@@ -1,14 +0,0 @@
-{
-  "id": "2b2897b3-9f1e-4c53-b05d-ccd2d8639ccb",
-  "name": "Docker Test Identity",
-  "auth_method": {
-    "type": "password",
-<<<<<<< HEAD:identities/a7ca3944-af0e-498b-abd1-6af456468102.json
-    "password": "ENC:v1:U1RSTQGXoqIZjJDGBOZHAQlOTA0tey+7GzHxpo/iqoS4Zrf8PrX5n2mVbhY="
-=======
-    "password": "ENC:v1:U1RSTQEShASLBCk+4IIGA2WHQ4Vc7EdrRYiusBHd352lU3Ap73PzGmZAunI="
->>>>>>> FETCH_HEAD:identities/2b2897b3-9f1e-4c53-b05d-ccd2d8639ccb.json
-  },
-  "created_at": "2026-08-14T05:29:30.176231+00:00",
-  "updated_at": "2026-08-14T05:29:30.176231+00:00"
-}

identities/2b2897b3-9f1e-4c53-b05d-ccd2d8639ccb.json~HEAD_4

@@ -1,14 +0,0 @@
-{
-  "id": "2b2897b3-9f1e-4c53-b05d-ccd2d8639ccb",
-  "name": "Docker Test Identity",
-  "auth_method": {
-    "type": "password",
-<<<<<<< HEAD:identities/a7ca3944-af0e-498b-abd1-6af456468102.json
-    "password": "ENC:v1:U1RSTQHoX8CTubuV9UZeR6HE23LlBaQvupSX+JwV1isWdm9KxSM7LCjGMKk="
-=======
-    "password": "ENC:v1:U1RSTQEShASLBCk+4IIGA2WHQ4Vc7EdrRYiusBHd352lU3Ap73PzGmZAunI="
->>>>>>> FETCH_HEAD:identities/2b2897b3-9f1e-4c53-b05d-ccd2d8639ccb.json
-  },
-  "created_at": "2026-08-14T05:29:30.176231+00:00",
-  "updated_at": "2026-08-14T05:29:30.176231+00:00"
-}

identities/5e25e6af-5633-4063-adb3-6c64913e016e.json

@@ -0,0 +1,13 @@
+{
+  "id": "5e25e6af-5633-4063-adb3-6c64913e016e",
+  "name": "sonpx.dev",
+  "auth_method": {
+    "type": "private_key",
+    "private_key": "ENC:v1:U1RSTQG6OYrTYkmSY03vpME3LVyXrDu7IN8MkxMLO7FR52GYH2qX9gRmV6ucUbd+cw9vmKXNN8utIgGB7twoWXk65ACt0BSZBGObVzySCiGdRlX/oWPKtWmmCrSM4E3apxLbXhnmL5kGLQm59lI/i6tvtyRSw+1V5M/PJgweEcrmRGQO7fGfCasMDWCMc9HFah5JSSp+Zgd0oQCK36kUao7ER4ZrxuBQF4djcBKumvojhXulN7lfmcgG0JK/oecY3M00dyGdW3WIfuCHLDpSAiG/gQ8J8jQuyKpXzNA7M+W5kdu/CCyDAKoNmDZSpaKtSwKF0m95M9RNNGjn55fVoXrf2fZqjauHExRXDlCjOhDLpPfkzb267zMt4wCPhat/6i2nHvBog0mJOjy0mLduHigC+mqywIl5YFBFI2sIOAV/TtU8ST2hCiHIVCfqk2j2sDJqxzBO3QhuOEcLG3FAxb49N65qKI5evz2gNPCV5QrmL/DMvqVJyk5UVEntOpSALnqORfByV74CsiKtTmS/XxLea5Ys2Y/DBHqVTdG9/kV52DT+1/6yDjOF8J7mythMO6Tke65yIdPVqrrF",
+    "passphrase": null,
+    "key_type": null,
+    "fingerprint": null
+  },
+  "created_at": "2026-09-09T04:31:21.639172+00:00",
+  "updated_at": "2026-09-09T04:31:21.639172+00:00"
+}

identities/91d024bd-bdf7-4f24-84dd-c9cd37475058.json~FETCH_HEAD

@@ -1,14 +0,0 @@
-{
-  "id": "91d024bd-bdf7-4f24-84dd-c9cd37475058",
-  "name": "Docker Test Identity",
-  "auth_method": {
-    "type": "password",
-<<<<<<< HEAD:identities/a7ca3944-af0e-498b-abd1-6af456468102.json
-    "password": "ENC:v1:U1RSTQGbQGufl9fVyMF1xmV8stEAxCUzC3Hw3k9NKtnpmJhfM1CHKFHEa5w="
-=======
-    "password": "ENC:v1:U1RSTQHm7Qx4E9phmCUzSNZE7ktg7jWT2MZL2VXtUSJkzfQlfjk4OCOcUUs="
->>>>>>> FETCH_HEAD:identities/91d024bd-bdf7-4f24-84dd-c9cd37475058.json
-  },
-  "created_at": "2026-08-14T05:25:31.913053+00:00",
-  "updated_at": "2026-08-14T05:25:31.913053+00:00"
-}

identities/91d024bd-bdf7-4f24-84dd-c9cd37475058.json~HEAD

@@ -1,14 +0,0 @@
-{
-  "id": "91d024bd-bdf7-4f24-84dd-c9cd37475058",
-  "name": "Docker Test Identity",
-  "auth_method": {
-    "type": "password",
-<<<<<<< HEAD:identities/a7ca3944-af0e-498b-abd1-6af456468102.json
-    "password": "ENC:v1:U1RSTQEj1UPOaYdnAnsH5Gg7MHpiw0wUgzRDpcvXKLw46aH+GHf/Aqe9paU="
-=======
-    "password": "ENC:v1:U1RSTQHm7Qx4E9phmCUzSNZE7ktg7jWT2MZL2VXtUSJkzfQlfjk4OCOcUUs="
->>>>>>> FETCH_HEAD:identities/91d024bd-bdf7-4f24-84dd-c9cd37475058.json
-  },
-  "created_at": "2026-08-14T05:25:31.913053+00:00",
-  "updated_at": "2026-08-14T05:25:31.913053+00:00"
-}

identities/d3182263-9145-46f3-acdf-9cdce6b4f1c0.json~FETCH_HEAD

@@ -1,14 +0,0 @@
-{
-  "id": "d3182263-9145-46f3-acdf-9cdce6b4f1c0",
-  "name": "Docker Test Identity",
-  "auth_method": {
-    "type": "password",
-<<<<<<< HEAD:identities/a7ca3944-af0e-498b-abd1-6af456468102.json
-    "password": "ENC:v1:U1RSTQGbEtoVS4YrxC3NbBmhxe7RgPCPxj04coa2e80Qhi8cNeNHT4EnFr8="
-=======
-    "password": "ENC:v1:U1RSTQFq5AK14rRkdKl/YEe82y5Z8oE8Qej6oLP7b68oPUEDISRbGZLJ9zY="
->>>>>>> FETCH_HEAD:identities/d3182263-9145-46f3-acdf-9cdce6b4f1c0.json
-  },
-  "created_at": "2026-08-14T05:42:03.153822+00:00",
-  "updated_at": "2026-08-14T05:42:03.153822+00:00"
-}

identities/d3182263-9145-46f3-acdf-9cdce6b4f1c0.json~FETCH_HEAD_0

@@ -1,14 +0,0 @@
-{
-  "id": "d3182263-9145-46f3-acdf-9cdce6b4f1c0",
-  "name": "Docker Test Identity",
-  "auth_method": {
-    "type": "password",
-<<<<<<< HEAD:identities/a7ca3944-af0e-498b-abd1-6af456468102.json
-    "password": "ENC:v1:U1RSTQGG9cTdRVEap10v0ckR63uN5s0iO79DvYjH5UGDPeqTDWfBqN96+1o="
-=======
-    "password": "ENC:v1:U1RSTQFq5AK14rRkdKl/YEe82y5Z8oE8Qej6oLP7b68oPUEDISRbGZLJ9zY="
->>>>>>> FETCH_HEAD:identities/d3182263-9145-46f3-acdf-9cdce6b4f1c0.json
-  },
-  "created_at": "2026-08-14T05:42:03.153822+00:00",
-  "updated_at": "2026-08-14T05:42:03.153822+00:00"
-}

identities/d3182263-9145-46f3-acdf-9cdce6b4f1c0.json~FETCH_HEAD_1

@@ -1,14 +0,0 @@
-{
-  "id": "d3182263-9145-46f3-acdf-9cdce6b4f1c0",
-  "name": "Docker Test Identity",
-  "auth_method": {
-    "type": "password",
-<<<<<<< HEAD:identities/a7ca3944-af0e-498b-abd1-6af456468102.json
-    "password": "ENC:v1:U1RSTQFYyHgmsoe9kuSYbZieirkaEwxd2zTtM2PH79UnDUx3P36Go2DUaM0="
-=======
-    "password": "ENC:v1:U1RSTQFq5AK14rRkdKl/YEe82y5Z8oE8Qej6oLP7b68oPUEDISRbGZLJ9zY="
->>>>>>> FETCH_HEAD:identities/d3182263-9145-46f3-acdf-9cdce6b4f1c0.json
-  },
-  "created_at": "2026-08-14T05:42:03.153822+00:00",
-  "updated_at": "2026-08-14T05:42:03.153822+00:00"
-}

identities/d3182263-9145-46f3-acdf-9cdce6b4f1c0.json~HEAD

@@ -1,14 +0,0 @@
-{
-  "id": "d3182263-9145-46f3-acdf-9cdce6b4f1c0",
-  "name": "Docker Test Identity",
-  "auth_method": {
-    "type": "password",
-<<<<<<< HEAD:identities/a7ca3944-af0e-498b-abd1-6af456468102.json
-    "password": "ENC:v1:U1RSTQEnAAYX3oN1vj9anMLGWj1rPmmD2wmr2Db28aXArkz9etjrIb3HcJ4="
-=======
-    "password": "ENC:v1:U1RSTQFq5AK14rRkdKl/YEe82y5Z8oE8Qej6oLP7b68oPUEDISRbGZLJ9zY="
->>>>>>> FETCH_HEAD:identities/d3182263-9145-46f3-acdf-9cdce6b4f1c0.json
-  },
-  "created_at": "2026-08-14T05:42:03.153822+00:00",
-  "updated_at": "2026-08-14T05:42:03.153822+00:00"
-}

identities/d3182263-9145-46f3-acdf-9cdce6b4f1c0.json~HEAD_0

@@ -1,14 +0,0 @@
-{
-  "id": "d3182263-9145-46f3-acdf-9cdce6b4f1c0",
-  "name": "Docker Test Identity",
-  "auth_method": {
-    "type": "password",
-<<<<<<< HEAD:identities/a7ca3944-af0e-498b-abd1-6af456468102.json
-    "password": "ENC:v1:U1RSTQFYh2qbbKg6KjtJucQD5L+L4Vn1l5jSHwTsShybOOihJth9xfHmwDQ="
-=======
-    "password": "ENC:v1:U1RSTQFq5AK14rRkdKl/YEe82y5Z8oE8Qej6oLP7b68oPUEDISRbGZLJ9zY="
->>>>>>> FETCH_HEAD:identities/d3182263-9145-46f3-acdf-9cdce6b4f1c0.json
-  },
-  "created_at": "2026-08-14T05:42:03.153822+00:00",
-  "updated_at": "2026-08-14T05:42:03.153822+00:00"
-}

identities/d3182263-9145-46f3-acdf-9cdce6b4f1c0.json~HEAD_1

@@ -1,14 +0,0 @@
-{
-  "id": "d3182263-9145-46f3-acdf-9cdce6b4f1c0",
-  "name": "Docker Test Identity",
-  "auth_method": {
-    "type": "password",
-<<<<<<< HEAD:identities/a7ca3944-af0e-498b-abd1-6af456468102.json
-    "password": "ENC:v1:U1RSTQGkBLimjyZO3SISWOquBk+MyhMd3qLN8/Vn6H+Yj3x5hHJ2IXFMsOs="
-=======
-    "password": "ENC:v1:U1RSTQFq5AK14rRkdKl/YEe82y5Z8oE8Qej6oLP7b68oPUEDISRbGZLJ9zY="
->>>>>>> FETCH_HEAD:identities/d3182263-9145-46f3-acdf-9cdce6b4f1c0.json
-  },
-  "created_at": "2026-08-14T05:42:03.153822+00:00",
-  "updated_at": "2026-08-14T05:42:03.153822+00:00"
-}

tags/4b7ea2fb-e200-4b1f-bc8d-0a81665a32b2.json

@@ -1,7 +1,7 @@
 {
   "id": "4b7ea2fb-e200-4b1f-bc8d-0a81665a32b2",
   "name": "env:dev",
-  "asset_count": 6,
+  "asset_count": 8,
   "is_builtin": true,
   "created_at": "2026-08-12 15:37:50",
   "updated_at": "2026-08-12 08:44:31"

tags/a1b2c3d4-6001-4a01-b001-000000000002.json

@@ -1,7 +1,7 @@
 {
   "id": "a1b2c3d4-6001-4a01-b001-000000000002",
   "name": "tool:jenkins",
-  "asset_count": 3,
+  "asset_count": 5,
   "is_builtin": true,
   "created_at": "2026-08-12 15:37:50",
   "updated_at": "2026-08-12 08:44:31"

tags/a1b2c3d4-9001-4a01-b001-000000000002.json

@@ -1,7 +1,7 @@
 {
   "id": "a1b2c3d4-9001-4a01-b001-000000000002",
   "name": "svc:postgres",
-  "asset_count": 3,
+  "asset_count": 5,
   "is_builtin": true,
   "created_at": "2026-08-12 15:37:50",
   "updated_at": "2026-08-12 08:44:31"