Resolve CONFLICTING with Phase 3 identity collection: keep retired schema_hints/catalog/registry/agent_metadata deleted, port aitable workflow edit-example via DeclareLeafMetadata, and retain main's event-bus socket fix plus CR #7 constraint/count gates. Co-authored-by: Cursor <cursoragent@cursor.com>