diff --git a/packages/cli/package.json b/packages/cli/package.json
index f32200c7..0e945949 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@openrouter/spawn",
-  "version": "0.10.11",
+  "version": "0.10.12",
   "type": "module",
   "bin": {
     "spawn": "cli.js"
diff --git a/packages/cli/src/commands.ts b/packages/cli/src/commands.ts
index 1f20768a..a96558ff 100644
--- a/packages/cli/src/commands.ts
+++ b/packages/cli/src/commands.ts
@@ -2766,6 +2766,9 @@ async function cmdConnect(connection: VMConnection): Promise<void> {
     if (connection.server_name) {
       validateServerIdentifier(connection.server_name);
     }
+    if (connection.server_id) {
+      validateServerIdentifier(connection.server_id);
+    }
   } catch (err) {
     p.log.error(`Security validation failed: ${getErrorMessage(err)}`);
     p.log.info("Your spawn history file may be corrupted or tampered with.");
@@ -2830,6 +2833,9 @@ async function cmdEnterAgent(connection: VMConnection, agentKey: string, manifes
     if (connection.server_name) {
       validateServerIdentifier(connection.server_name);
     }
+    if (connection.server_id) {
+      validateServerIdentifier(connection.server_id);
+    }
   } catch (err) {
     p.log.error(`Security validation failed: ${getErrorMessage(err)}`);
     p.log.info("Your spawn history file may be corrupted or tampered with.");