fix(schema): Deduplicate bridge status defs

Move the shared xcode bridge status schema fragment into the common structured-output defs file so the status and sync schemas cannot drift independently.

Also replace the hardcoded physical device UUID in the repo-maintained agent docs with a portable placeholder for other contributors.

Co-Authored-By: OpenAI Codex <noreply@openai.com>

Author: cameroncooke

AGENTS.md

@@ -56,7 +56,7 @@ Use these sections under `## [Unreleased]`:
 - When running long test suites (snapshot tests, smoke tests), ALWAYS write full output to a log file and read it afterwards. NEVER pipe through `tail` or `grep` directly — that loses output you may need to debug failures.
 - Pattern: `DEVICE_ID=... npm run test:snapshot 2>&1 | tee /tmp/snapshot-results.txt` then read `/tmp/snapshot-results.txt` with the native read tool.
 - If you need a summary, read the log file and grep/filter it — the full output is always preserved.
-- Snapshot test command: `DEVICE_ID=33689F72-9B74-5406-9842-1CC6A6A96A88 npm run test:snapshot`
+- Snapshot test command: `DEVICE_ID=<YOUR_DEVICE_ID> npm run test:snapshot`
 - If physical-device snapshot tests hang after the final test summary, the likely cause is Apple post-failure diagnostics invoking `devicectl diagnose`, which may prompt for a macOS password and wedge in automated runs; see `docs/dev/device-snapshot-password-hang-rca.md`.
 
 ## **CRITICAL** Tool Usage Rules **CRITICAL**

CLAUDE.md

@@ -56,7 +56,7 @@ Use these sections under `## [Unreleased]`:
 - When running long test suites (snapshot tests, smoke tests), ALWAYS write full output to a log file and read it afterwards. NEVER pipe through `tail` or `grep` directly — that loses output you may need to debug failures.
 - Pattern: `DEVICE_ID=... npm run test:snapshot 2>&1 | tee /tmp/snapshot-results.txt` then read `/tmp/snapshot-results.txt` with the native read tool.
 - If you need a summary, read the log file and grep/filter it — the full output is always preserved.
-- Snapshot test command: `DEVICE_ID=33689F72-9B74-5406-9842-1CC6A6A96A88 npm run test:snapshot`
+- Snapshot test command: `DEVICE_ID=<YOUR_DEVICE_ID> npm run test:snapshot`
 
 ## **CRITICAL** Tool Usage Rules **CRITICAL**
 - NEVER use sed/cat to read a file or a range of a file. Always use the native read tool.

schemas/structured-output/_defs/common.schema.json

@@ -395,6 +395,73 @@
         "bundleId",
         "env"
       ]
+    },
+    "bridgeStatus": {
+      "type": "object",
+      "additionalProperties": false,
+      "properties": {
+        "workflowEnabled": {
+          "type": "boolean"
+        },
+        "bridgeAvailable": {
+          "type": "boolean"
+        },
+        "bridgePath": {
+          "type": [
+            "string",
+            "null"
+          ]
+        },
+        "xcodeRunning": {
+          "type": [
+            "boolean",
+            "null"
+          ]
+        },
+        "connected": {
+          "type": "boolean"
+        },
+        "bridgePid": {
+          "type": [
+            "integer",
+            "null"
+          ]
+        },
+        "proxiedToolCount": {
+          "type": "integer",
+          "minimum": 0
+        },
+        "lastError": {
+          "type": [
+            "string",
+            "null"
+          ]
+        },
+        "xcodePid": {
+          "type": [
+            "string",
+            "null"
+          ]
+        },
+        "xcodeSessionId": {
+          "type": [
+            "string",
+            "null"
+          ]
+        }
+      },
+      "required": [
+        "workflowEnabled",
+        "bridgeAvailable",
+        "bridgePath",
+        "xcodeRunning",
+        "connected",
+        "bridgePid",
+        "proxiedToolCount",
+        "lastError",
+        "xcodePid",
+        "xcodeSessionId"
+      ]
     }
   }
 }

schemas/structured-output/xcodebuildmcp.output.xcode-bridge-status/1.schema.json

@@ -8,36 +8,6 @@
       "$ref": "https://xcodebuildmcp.com/schemas/structured-output/_defs/common.schema.json#/$defs/errorConsistency"
     }
   ],
-  "$defs": {
-    "bridgeStatus": {
-      "type": "object",
-      "additionalProperties": false,
-      "properties": {
-        "workflowEnabled": { "type": "boolean" },
-        "bridgeAvailable": { "type": "boolean" },
-        "bridgePath": { "type": ["string", "null"] },
-        "xcodeRunning": { "type": ["boolean", "null"] },
-        "connected": { "type": "boolean" },
-        "bridgePid": { "type": ["integer", "null"] },
-        "proxiedToolCount": { "type": "integer", "minimum": 0 },
-        "lastError": { "type": ["string", "null"] },
-        "xcodePid": { "type": ["string", "null"] },
-        "xcodeSessionId": { "type": ["string", "null"] }
-      },
-      "required": [
-        "workflowEnabled",
-        "bridgeAvailable",
-        "bridgePath",
-        "xcodeRunning",
-        "connected",
-        "bridgePid",
-        "proxiedToolCount",
-        "lastError",
-        "xcodePid",
-        "xcodeSessionId"
-      ]
-    }
-  },
   "properties": {
     "schema": { "const": "xcodebuildmcp.output.xcode-bridge-status" },
     "schemaVersion": { "const": "1" },
@@ -51,7 +21,9 @@
           "type": "string",
           "enum": ["status", "disconnect"]
         },
-        "status": { "$ref": "#/$defs/bridgeStatus" }
+        "status": {
+          "$ref": "https://xcodebuildmcp.com/schemas/structured-output/_defs/common.schema.json#/$defs/bridgeStatus"
+        }
       },
       "required": ["action", "status"]
     }

schemas/structured-output/xcodebuildmcp.output.xcode-bridge-sync/1.schema.json

@@ -8,36 +8,6 @@
       "$ref": "https://xcodebuildmcp.com/schemas/structured-output/_defs/common.schema.json#/$defs/errorConsistency"
     }
   ],
-  "$defs": {
-    "bridgeStatus": {
-      "type": "object",
-      "additionalProperties": false,
-      "properties": {
-        "workflowEnabled": { "type": "boolean" },
-        "bridgeAvailable": { "type": "boolean" },
-        "bridgePath": { "type": ["string", "null"] },
-        "xcodeRunning": { "type": ["boolean", "null"] },
-        "connected": { "type": "boolean" },
-        "bridgePid": { "type": ["integer", "null"] },
-        "proxiedToolCount": { "type": "integer", "minimum": 0 },
-        "lastError": { "type": ["string", "null"] },
-        "xcodePid": { "type": ["string", "null"] },
-        "xcodeSessionId": { "type": ["string", "null"] }
-      },
-      "required": [
-        "workflowEnabled",
-        "bridgeAvailable",
-        "bridgePath",
-        "xcodeRunning",
-        "connected",
-        "bridgePid",
-        "proxiedToolCount",
-        "lastError",
-        "xcodePid",
-        "xcodeSessionId"
-      ]
-    }
-  },
   "properties": {
     "schema": { "const": "xcodebuildmcp.output.xcode-bridge-sync" },
     "schemaVersion": { "const": "1" },
@@ -58,7 +28,9 @@
           },
           "required": ["added", "updated", "removed", "total"]
         },
-        "status": { "$ref": "#/$defs/bridgeStatus" }
+        "status": {
+          "$ref": "https://xcodebuildmcp.com/schemas/structured-output/_defs/common.schema.json#/$defs/bridgeStatus"
+        }
       },
       "required": ["sync", "status"]
     }